1.17 support.

build.gradle

@@ -1,11 +1,11 @@
 plugins {
-	id 'fabric-loom' version '0.4-SNAPSHOT'
+	id 'fabric-loom' version '0.9-SNAPSHOT'
 	id 'maven-publish'
-	id 'com.github.johnrengelman.shadow' version '6.0.0' //https://plugins.gradle.org/plugin/com.github.johnrengelman.shadow
+	id 'com.github.johnrengelman.shadow' version '7.0.0' //https://plugins.gradle.org/plugin/com.github.johnrengelman.shadow
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_16
+targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -27,16 +27,10 @@ dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-	
+
 	//compile group: 'com.nukkitx.protocol', name: 'bedrock-v408', version: '2.6.0-SNAPSHOT'
-	compile("com.nukkitx.protocol:bedrock-v431:2.7.0-SNAPSHOT") {
-		exclude group: 'com.nukkitx.fastutil'
-		exclude group: 'io.netty'
-	}
-	shadow ('com.nukkitx.protocol:bedrock-v431:2.7.0-SNAPSHOT') {
-		exclude group: 'com.nukkitx.fastutil'
-		exclude group: 'io.netty'
-	}
+	implementation  'com.nukkitx.protocol:bedrock-v448:2.9.0-SNAPSHOT'
+	implementation  'com.nukkitx.protocol:bedrock-v448:2.9.0-SNAPSHOT'
 }
 
 processResources {

gradle.properties

@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.5
-	yarn_mappings=1.16.5+build.8
-	loader_version=0.11.3
+	minecraft_version=1.17.1
+	yarn_mappings=1.17.1+build.39
+	loader_version=0.11.6
 
 # Mod Properties
 	mod_version = 0.0.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/me/THEREALWWEFAN231/tunnelmc/bedrockconnection/Client.java

@@ -12,7 +12,7 @@
 import com.nukkitx.protocol.bedrock.BedrockPacketCodec;
 import com.nukkitx.protocol.bedrock.BedrockSession;
 import com.nukkitx.protocol.bedrock.packet.LoginPacket;
-import com.nukkitx.protocol.bedrock.v431.Bedrock_v431;
+import com.nukkitx.protocol.bedrock.v448.Bedrock_v448;
 
 import io.netty.util.AsciiString;
 import me.THEREALWWEFAN231.tunnelmc.TunnelMC;
@@ -30,7 +30,7 @@ public class Client {
 
 	public static Client instance = new Client();
 	private final Logger logger = LogManager.getLogger(ClientBatchHandler.class);
-	public BedrockPacketCodec bedrockPacketCodec = Bedrock_v431.V431_CODEC;
+	public BedrockPacketCodec bedrockPacketCodec = Bedrock_v448.V448_CODEC;
 	private String ip;
 	private int port;
 	private boolean onlineMode;

src/main/java/me/THEREALWWEFAN231/tunnelmc/gui/BedrockConnectionScreen.java

@@ -33,7 +33,7 @@ public BedrockConnectionScreen(Screen parent) {
 
 	public void init() {
 		this.client.keyboard.setRepeatEvents(true);
-		this.joinServerButton = this.addButton(new ButtonWidget(this.width / 2 - 102, this.height / 4 + 100 + 12, 204, 20, new TranslatableText("selectServer.select"), button -> {
+		this.joinServerButton = this.addDrawable(new ButtonWidget(this.width / 2 - 102, this.height / 4 + 100 + 12, 204, 20, new TranslatableText("selectServer.select"), button -> {
 			if (BedrockConnectionScreen.this.addressField.getText().isEmpty()) {
 				return;
 			}
@@ -48,7 +48,7 @@ public void init() {
 			Client.instance.initialize(BedrockConnectionScreen.this.addressField.getText(), port, BedrockConnectionScreen.this.onlineModeWidget.isChecked());
 		}));
 
-		this.addButton(new ButtonWidget(this.width / 2 - 102, this.height / 4 + 125 + 12, 204, 20, ScreenTexts.CANCEL, button -> BedrockConnectionScreen.this.client.openScreen(BedrockConnectionScreen.this.parent)));
+		this.addDrawable(new ButtonWidget(this.width / 2 - 102, this.height / 4 + 125 + 12, 204, 20, ScreenTexts.CANCEL, button -> BedrockConnectionScreen.this.client.setScreen(BedrockConnectionScreen.this.parent)));
 		this.addressField = new TextFieldWidget(this.textRenderer, this.width / 2 - 100, (this.height / 4) + 16, 200, 20, new LiteralText("Enter IP"));
 		this.portField = new TextFieldWidget(this.textRenderer, this.width / 2 - 100, (this.height / 4) + 46, 200, 20, new LiteralText("Enter Port"));
 		this.onlineModeWidget = new CheckboxWidget(this.width / 2 - 100, (this.height / 4) + 80, 200, 20, new LiteralText("Online mode"), true);
@@ -108,7 +108,7 @@ public void resize(MinecraftClient client, int width, int height) {
 	}
 
 	public void onClose() {
-		this.client.openScreen(this.parent);
+		this.client.setScreen(this.parent);
 	}
 
 	public void removed() {

src/main/java/me/THEREALWWEFAN231/tunnelmc/javaconnection/packet/ClickSlotC2SPacketTranslator.java

@@ -35,7 +35,7 @@ public void onCursorStackClickEmptySlot(ScreenHandler screenHandler, int clicked
 
 		inventoryTransactionPacket.setTransactionType(TransactionType.NORMAL);
 		inventoryTransactionPacket.setActionType(0);//I have no idea
-		inventoryTransactionPacket.setRuntimeEntityId(TunnelMC.mc.player.getEntityId());
+		inventoryTransactionPacket.setRuntimeEntityId(TunnelMC.mc.player.getId());
 
 		{
 			BedrockContainer cursorContainer = Client.instance.containers.getPlayerContainerCursorContainer();
@@ -82,7 +82,7 @@ public void onEmptyCursorClickStack(ScreenHandler screenHandler, int clickedSlot
 
 		inventoryTransactionPacket.setTransactionType(TransactionType.NORMAL);
 		inventoryTransactionPacket.setActionType(0);//I have no idea
-		inventoryTransactionPacket.setRuntimeEntityId(TunnelMC.mc.player.getEntityId());
+		inventoryTransactionPacket.setRuntimeEntityId(TunnelMC.mc.player.getId());
 
 		{
 			BedrockContainer cursorContainer = Client.instance.containers.getPlayerContainerCursorContainer();
@@ -120,7 +120,7 @@ public void onHoverOverStackDropItem(ScreenHandler screenHandler, int clickedSlo
 
 		inventoryTransactionPacket.setTransactionType(TransactionType.NORMAL);
 		inventoryTransactionPacket.setActionType(0);//I have no idea
-		inventoryTransactionPacket.setRuntimeEntityId(TunnelMC.mc.player.getEntityId());
+		inventoryTransactionPacket.setRuntimeEntityId(TunnelMC.mc.player.getId());
 
 		BedrockContainer containerForClickedSlot = ScreenHandlerTranslatorManager.getBedrockContainerFromJava(screenHandler, clickedSlotId);
 
@@ -166,7 +166,7 @@ public void onCursorStackAddToStack(ScreenHandler screenHandler, int clickedSlot
 
 		inventoryTransactionPacket.setTransactionType(TransactionType.NORMAL);
 		inventoryTransactionPacket.setActionType(0);//I have no idea
-		inventoryTransactionPacket.setRuntimeEntityId(TunnelMC.mc.player.getEntityId());
+		inventoryTransactionPacket.setRuntimeEntityId(TunnelMC.mc.player.getId());
 
 		BedrockContainer containerForClickedSlot = JavaContainerFinder.getContainerFromJava(screenHandler, clickedSlotId);
 

src/main/java/me/THEREALWWEFAN231/tunnelmc/javaconnection/packet/ClientCommandC2SPacketTranslator.java

@@ -17,28 +17,28 @@ public void translate(ClientCommandC2SPacket packet) {
 
 		if (packet.getMode() == Mode.PRESS_SHIFT_KEY) {
 			PlayerActionPacket playerActionPacket = new PlayerActionPacket();
-			playerActionPacket.setRuntimeEntityId(TunnelMC.mc.player.getEntityId());
+			playerActionPacket.setRuntimeEntityId(TunnelMC.mc.player.getId());
 			playerActionPacket.setAction(PlayerActionType.START_SNEAK);
 			playerActionPacket.setBlockPosition(Vector3i.ZERO);
 
 			Client.instance.sendPacket(playerActionPacket);
 		} else if (packet.getMode() == Mode.RELEASE_SHIFT_KEY) {
 			PlayerActionPacket playerActionPacket = new PlayerActionPacket();
-			playerActionPacket.setRuntimeEntityId(TunnelMC.mc.player.getEntityId());
+			playerActionPacket.setRuntimeEntityId(TunnelMC.mc.player.getId());
 			playerActionPacket.setAction(PlayerActionType.STOP_SNEAK);
 			playerActionPacket.setBlockPosition(Vector3i.ZERO);
 
 			Client.instance.sendPacket(playerActionPacket);
 		} else if (packet.getMode() == Mode.START_SPRINTING) {
 			PlayerActionPacket playerActionPacket = new PlayerActionPacket();
-			playerActionPacket.setRuntimeEntityId(TunnelMC.mc.player.getEntityId());
+			playerActionPacket.setRuntimeEntityId(TunnelMC.mc.player.getId());
 			playerActionPacket.setAction(PlayerActionType.START_SPRINT);
 			playerActionPacket.setBlockPosition(Vector3i.ZERO);
 
 			Client.instance.sendPacket(playerActionPacket);
 		} else if (packet.getMode() == Mode.STOP_SPRINTING) {
 			PlayerActionPacket playerActionPacket = new PlayerActionPacket();
-			playerActionPacket.setRuntimeEntityId(TunnelMC.mc.player.getEntityId());
+			playerActionPacket.setRuntimeEntityId(TunnelMC.mc.player.getId());
 			playerActionPacket.setAction(PlayerActionType.STOP_SPRINT);
 			playerActionPacket.setBlockPosition(Vector3i.ZERO);
 

src/main/java/me/THEREALWWEFAN231/tunnelmc/javaconnection/packet/ClientStatusC2SPacketTranslator.java

@@ -21,7 +21,7 @@ public void translate(ClientStatusC2SPacket packet) {
 			RespawnPacket respawnPacket = new RespawnPacket();
 			respawnPacket.setPosition(Vector3f.ZERO);
 			respawnPacket.setState(State.CLIENT_READY);
-			respawnPacket.setRuntimeEntityId(TunnelMC.mc.player.getEntityId());
+			respawnPacket.setRuntimeEntityId(TunnelMC.mc.player.getId());
 
 			Client.instance.sendPacket(respawnPacket);
 

src/main/java/me/THEREALWWEFAN231/tunnelmc/javaconnection/packet/HandSwingC2SPacketTranslator.java

@@ -13,7 +13,7 @@ public class HandSwingC2SPacketTranslator extends PacketTranslator<HandSwingC2SP
 	public void translate(HandSwingC2SPacket packet) {
 		AnimatePacket animatePacket = new AnimatePacket();
 		animatePacket.setAction(AnimatePacket.Action.SWING_ARM);
-		animatePacket.setRuntimeEntityId(TunnelMC.mc.player.getEntityId());
+		animatePacket.setRuntimeEntityId(TunnelMC.mc.player.getId());
 		Client.instance.sendPacket(animatePacket);
 	}
 

src/main/java/me/THEREALWWEFAN231/tunnelmc/javaconnection/packet/PlayerActionTranslator.java

@@ -27,7 +27,7 @@ public class PlayerActionTranslator extends PacketTranslator<PlayerActionC2SPack
 	@Override
 	public void translate(PlayerActionC2SPacket packet) {
 
-		int runtimeId = TunnelMC.mc.player.getEntityId();
+		int runtimeId = TunnelMC.mc.player.getId();
 
 		Vector3i blockPosition = Vector3i.from(packet.getPos().getX(), packet.getPos().getY(), packet.getPos().getZ());
 		if (packet.getAction() == Action.START_DESTROY_BLOCK) {
@@ -72,8 +72,8 @@ public void translate(PlayerActionC2SPacket packet) {
 			inventoryTransactionPacket.setActionType(2);
 			inventoryTransactionPacket.setBlockPosition(blockPosition);
 			inventoryTransactionPacket.setBlockFace(packet.getDirection().ordinal());
-			inventoryTransactionPacket.setHotbarSlot(TunnelMC.mc.player.inventory.selectedSlot);
-			inventoryTransactionPacket.setItemInHand(Client.instance.containers.getPlayerInventory().getItemFromSlot(TunnelMC.mc.player.inventory.selectedSlot));
+			inventoryTransactionPacket.setHotbarSlot(TunnelMC.mc.player.getInventory().selectedSlot);
+			inventoryTransactionPacket.setItemInHand(Client.instance.containers.getPlayerInventory().getItemFromSlot(TunnelMC.mc.player.getInventory().selectedSlot));
 			inventoryTransactionPacket.setPlayerPosition(Vector3f.from(TunnelMC.mc.player.getPos().x, TunnelMC.mc.player.getPos().y, TunnelMC.mc.player.getPos().z));
 			inventoryTransactionPacket.setClickPosition(Vector3f.ZERO);
 
@@ -102,7 +102,7 @@ public Class<?> getPacketClass() {
 
 	@EventTarget
 	public void event(EventPlayerTick event) {
-		int runtimeId = TunnelMC.mc.player.getEntityId();
+		int runtimeId = TunnelMC.mc.player.getId();
 		PlayerActionType action = PlayerActionType.CONTINUE_BREAK;
 
 		PlayerActionPacket playerActionPacket = new PlayerActionPacket();

src/main/java/me/THEREALWWEFAN231/tunnelmc/javaconnection/packet/PlayerInteractBlockC2SPacketTranslator.java

@@ -25,14 +25,14 @@ public void translate(PlayerInteractBlockC2SPacket packet) {
 		Vector3i blockPosition = Vector3i.from(blockPos.getX(), blockPos.getY(), blockPos.getZ());
 		Vec3d sideHitOffset = packet.getBlockHitResult().getPos().subtract(blockPos.getX(), blockPos.getY(), blockPos.getZ());
 
-		ItemData placingItem = Client.instance.containers.getPlayerInventory().getItemFromSlot(TunnelMC.mc.player.inventory.selectedSlot);
+		ItemData placingItem = Client.instance.containers.getPlayerInventory().getItemFromSlot(TunnelMC.mc.player.getInventory().selectedSlot);
 
 		InventoryTransactionPacket placeInventoryTransactionPacket = new InventoryTransactionPacket();
 		placeInventoryTransactionPacket.setTransactionType(TransactionType.ITEM_USE);
 		placeInventoryTransactionPacket.setActionType(0);
 		placeInventoryTransactionPacket.setBlockPosition(blockPosition);
 		placeInventoryTransactionPacket.setBlockFace(packet.getBlockHitResult().getSide().ordinal());
-		placeInventoryTransactionPacket.setHotbarSlot(TunnelMC.mc.player.inventory.selectedSlot);
+		placeInventoryTransactionPacket.setHotbarSlot(TunnelMC.mc.player.getInventory().selectedSlot);
 		placeInventoryTransactionPacket.setItemInHand(placingItem);
 		placeInventoryTransactionPacket.setPlayerPosition(Vector3f.from(TunnelMC.mc.player.getPos().x, TunnelMC.mc.player.getPos().y + TunnelMC.mc.player.getEyeHeight(EntityPose.STANDING), TunnelMC.mc.player.getPos().z));
 		placeInventoryTransactionPacket.setClickPosition(Vector3f.from(sideHitOffset.x, sideHitOffset.y, sideHitOffset.z));
@@ -45,7 +45,7 @@ public void translate(PlayerInteractBlockC2SPacket packet) {
 		idkInventoryTransactionPacket.setActionType(1);
 		idkInventoryTransactionPacket.setBlockPosition(Vector3i.ZERO);
 		idkInventoryTransactionPacket.setBlockFace(255);
-		idkInventoryTransactionPacket.setHotbarSlot(TunnelMC.mc.player.inventory.selectedSlot);
+		idkInventoryTransactionPacket.setHotbarSlot(TunnelMC.mc.player.getInventory().selectedSlot);
 		idkInventoryTransactionPacket.setItemInHand(placingItem);
 		idkInventoryTransactionPacket.setPlayerPosition(Vector3f.from(TunnelMC.mc.player.getPos().x, TunnelMC.mc.player.getPos().y + TunnelMC.mc.player.getEyeHeight(EntityPose.STANDING), TunnelMC.mc.player.getPos().z));
 		idkInventoryTransactionPacket.setClickPosition(Vector3f.ZERO);

src/main/java/me/THEREALWWEFAN231/tunnelmc/javaconnection/packet/PlayerInteractEntityC2SPacketTranslator.java

@@ -10,19 +10,20 @@
 import me.THEREALWWEFAN231.tunnelmc.translator.PacketTranslator;
 import net.minecraft.entity.EntityPose;
 import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket;
+import net.minecraft.world.World;
 
 public class PlayerInteractEntityC2SPacketTranslator extends PacketTranslator<PlayerInteractEntityC2SPacket>{
 
 	@Override
 	public void translate(PlayerInteractEntityC2SPacket packet) {
 
-		ItemData holdingItem = Client.instance.containers.getPlayerInventory().getItemFromSlot(TunnelMC.mc.player.inventory.selectedSlot);
+		ItemData holdingItem = Client.instance.containers.getPlayerInventory().getItemFromSlot(TunnelMC.mc.player.getInventory().selectedSlot);
 
 		InventoryTransactionPacket inventoryTransactionPacket = new InventoryTransactionPacket();
 		inventoryTransactionPacket.setTransactionType(TransactionType.ITEM_USE_ON_ENTITY);
 		inventoryTransactionPacket.setActionType(1);
-		inventoryTransactionPacket.setRuntimeEntityId(packet.getEntity(TunnelMC.mc.world).getEntityId());
-		inventoryTransactionPacket.setHotbarSlot(TunnelMC.mc.player.inventory.selectedSlot);
+		inventoryTransactionPacket.setRuntimeEntityId(packet.getEntity(TunnelMC.mc.world.getServer().getWorld(World.OVERWORLD)).getId());
+		inventoryTransactionPacket.setHotbarSlot(TunnelMC.mc.player.getInventory().selectedSlot);
 		inventoryTransactionPacket.setItemInHand(holdingItem);
 		inventoryTransactionPacket.setPlayerPosition(Vector3f.from(TunnelMC.mc.player.getPos().x, TunnelMC.mc.player.getPos().y + TunnelMC.mc.player.getEyeHeight(EntityPose.STANDING), TunnelMC.mc.player.getPos().z));
 		inventoryTransactionPacket.setClickPosition(Vector3f.ZERO);

src/main/java/me/THEREALWWEFAN231/tunnelmc/javaconnection/packet/PlayerInteractItemC2SPacketTranslator.java

@@ -24,7 +24,7 @@ public class PlayerInteractItemC2SPacketTranslator extends PacketTranslator<Play
 	@Override
 	public void translate(PlayerInteractItemC2SPacket packet) {
 
-		ItemData usingItem = Client.instance.containers.getPlayerInventory().getItemFromSlot(TunnelMC.mc.player.inventory.selectedSlot);
+		ItemData usingItem = Client.instance.containers.getPlayerInventory().getItemFromSlot(TunnelMC.mc.player.getInventory().selectedSlot);
 
 		if (TunnelMC.mc.crosshairTarget.getType() == HitResult.Type.BLOCK) {
 			BlockPos blockPos = ((BlockHitResult) TunnelMC.mc.crosshairTarget).getBlockPos();
@@ -37,7 +37,7 @@ public void translate(PlayerInteractItemC2SPacket packet) {
 			useInventoryTransactionPacket.setActionType(0);
 			useInventoryTransactionPacket.setBlockPosition(blockPosition);
 			useInventoryTransactionPacket.setBlockFace(((BlockHitResult) TunnelMC.mc.crosshairTarget).getSide().ordinal());
-			useInventoryTransactionPacket.setHotbarSlot(TunnelMC.mc.player.inventory.selectedSlot);
+			useInventoryTransactionPacket.setHotbarSlot(TunnelMC.mc.player.getInventory().selectedSlot);
 			useInventoryTransactionPacket.setItemInHand(usingItem);
 			useInventoryTransactionPacket.setPlayerPosition(Vector3f.from(TunnelMC.mc.player.getPos().x, TunnelMC.mc.player.getPos().y + TunnelMC.mc.player.getEyeHeight(EntityPose.STANDING), TunnelMC.mc.player.getPos().z));
 			useInventoryTransactionPacket.setClickPosition(Vector3f.from(sideHitOffset.x, sideHitOffset.y, sideHitOffset.z));
@@ -52,7 +52,7 @@ public void translate(PlayerInteractItemC2SPacket packet) {
 			inventoryTransactionPacket.setActionType(1);
 			inventoryTransactionPacket.setBlockPosition(Vector3i.ZERO);
 			inventoryTransactionPacket.setBlockFace(255);
-			inventoryTransactionPacket.setHotbarSlot(TunnelMC.mc.player.inventory.selectedSlot);
+			inventoryTransactionPacket.setHotbarSlot(TunnelMC.mc.player.getInventory().selectedSlot);
 			inventoryTransactionPacket.setItemInHand(usingItem);
 			inventoryTransactionPacket.setPlayerPosition(Vector3f.from(TunnelMC.mc.player.getPos().x, TunnelMC.mc.player.getPos().y + TunnelMC.mc.player.getEyeHeight(EntityPose.STANDING), TunnelMC.mc.player.getPos().z));
 			inventoryTransactionPacket.setClickPosition(Vector3f.ZERO);

src/main/java/me/THEREALWWEFAN231/tunnelmc/javaconnection/packet/UpdateSelectedSlotC2SPacketTranslator.java

@@ -28,7 +28,7 @@ public static void updateHotbarItem(int hotbarSlot) {
 			return;
 		}
 
-		long runtimeEntityId = TunnelMC.mc.player.getEntityId();
+		long runtimeEntityId = TunnelMC.mc.player.getId();
 		BedrockContainer container = Client.instance.containers.getPlayerInventory();
 
 		ItemData item = container.getItemFromSlot(hotbarSlot);

src/main/java/me/THEREALWWEFAN231/tunnelmc/javaconnection/packet/movement/PlayerMoveTranslator.java

@@ -34,15 +34,15 @@ public static void translateMovementPacket(PlayerMoveC2SPacket playerMoveC2SPack
 		double currentPosX = playerMoveC2SPacket.getX(TunnelMC.mc.player.getPos().x);
 		double currentPosY = playerMoveC2SPacket.getY(TunnelMC.mc.player.getPos().y) + TunnelMC.mc.player.getEyeHeight(EntityPose.STANDING);
 		double currentPosZ = playerMoveC2SPacket.getZ(TunnelMC.mc.player.getPos().z);
-		float currentYaw = playerMoveC2SPacket.getYaw(TunnelMC.mc.player.yaw);
-		float currentPitch = playerMoveC2SPacket.getPitch(TunnelMC.mc.player.pitch);
+		float currentYaw = playerMoveC2SPacket.getYaw(TunnelMC.mc.player.getYaw());
+		float currentPitch = playerMoveC2SPacket.getPitch(TunnelMC.mc.player.getPitch());
 		boolean currentlyOnGround = playerMoveC2SPacket.isOnGround();
 
 		if (PlayerMoveTranslator.lastPosX == currentPosX && PlayerMoveTranslator.lastPosY == currentPosY && PlayerMoveTranslator.lastPosZ == currentPosZ && PlayerMoveTranslator.lastYaw == currentYaw && PlayerMoveTranslator.lastPitch == currentPitch && PlayerMoveTranslator.lastOnGround == currentlyOnGround) {
 			return;
 		}
 
-		int runtimeId = TunnelMC.mc.player.getEntityId();
+		int runtimeId = TunnelMC.mc.player.getId();
 
 		MovePlayerPacket movePlayerPacket = new MovePlayerPacket();
 		movePlayerPacket.setRuntimeEntityId(runtimeId);

src/main/java/me/THEREALWWEFAN231/tunnelmc/mixins/MixinMinecraftClient.java

@@ -40,7 +40,7 @@ private void handleInputEvents(CallbackInfo callbackInfo) {
 
 			InteractPacket interactPacket = new InteractPacket();
 			interactPacket.setAction(Action.OPEN_INVENTORY);
-			interactPacket.setRuntimeEntityId(TunnelMC.mc.player.getEntityId());
+			interactPacket.setRuntimeEntityId(TunnelMC.mc.player.getId());
 
 			Client.instance.sendPacket(interactPacket);
 		}

src/main/java/me/THEREALWWEFAN231/tunnelmc/mixins/MixinMultiplayerScreen.java

@@ -22,8 +22,8 @@ protected MixinMultiplayerScreen(Text title) {
 
 	@Inject(method = "init", at = @At(value = "RETURN"))
 	public void init(CallbackInfo callback) {
-		this.addButton(new ButtonWidget(5, 5, 150, 20, new LiteralText("Connect To Bedrock Server"), (buttonWidget) -> {
-			TunnelMC.mc.openScreen(new BedrockConnectionScreen(this));
+		this.addDrawable(new ButtonWidget(5, 5, 150, 20, new LiteralText("Connect To Bedrock Server"), (buttonWidget) -> {
+			TunnelMC.mc.setScreen(new BedrockConnectionScreen(this));
 		}));
 	}