From 1c8565d4fffec269cf041372d16b5d721f3e6fde Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 15 May 2024 16:46:20 +0100 Subject: [PATCH] Updated mappings. --- .../micle/loginprotection/data/ProtectedPlayerManager.java | 6 +++--- .../dev/micle/loginprotection/mixin/GuiRenderTickMixin.java | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/dev/micle/loginprotection/data/ProtectedPlayerManager.java b/src/main/java/dev/micle/loginprotection/data/ProtectedPlayerManager.java index 85f28da..51fff8a 100644 --- a/src/main/java/dev/micle/loginprotection/data/ProtectedPlayerManager.java +++ b/src/main/java/dev/micle/loginprotection/data/ProtectedPlayerManager.java @@ -40,7 +40,7 @@ public class ProtectedPlayerManager { try { protectedPlayers.add(new ProtectedPlayer(playerUUID, ProtectedPlayer.State.JOINING)); NetworkManager.getChannel().sendTo(new PlayerStatePacket(ProtectedPlayer.State.JOINING), - LoginProtection.getProxy().getServer().getPlayerList().getPlayer(playerUUID).connection.getConnection(), + LoginProtection.getProxy().getServer().getPlayerList().getPlayer(playerUUID).connection.connection, NetworkDirection.PLAY_TO_CLIENT); } catch (NullPointerException ignored) {} } @@ -143,7 +143,7 @@ public class ProtectedPlayerManager { // Send state packet to player NetworkManager.getChannel().sendTo(new PlayerStatePacket(protectedPlayer.getState()), - player.connection.getConnection(), + player.connection.connection, NetworkDirection.PLAY_TO_CLIENT); } } @@ -166,7 +166,7 @@ public class ProtectedPlayerManager { try { // Send request for list input tick packet to player NetworkManager.getChannel().sendTo(new RequestLastInputTickPacket(), - LoginProtection.getProxy().getServer().getPlayerList().getPlayer(playerUUID).connection.getConnection(), + LoginProtection.getProxy().getServer().getPlayerList().getPlayer(playerUUID).connection.connection, NetworkDirection.PLAY_TO_CLIENT); } catch (NullPointerException e) { removePlayer(playerUUID); diff --git a/src/main/java/dev/micle/loginprotection/mixin/GuiRenderTickMixin.java b/src/main/java/dev/micle/loginprotection/mixin/GuiRenderTickMixin.java index 6b61d66..8b63d5d 100644 --- a/src/main/java/dev/micle/loginprotection/mixin/GuiRenderTickMixin.java +++ b/src/main/java/dev/micle/loginprotection/mixin/GuiRenderTickMixin.java @@ -6,6 +6,7 @@ import dev.micle.loginprotection.data.ProtectedPlayer; import dev.micle.loginprotection.proxy.Proxy; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.gui.overlay.ForgeGui; @@ -18,8 +19,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @OnlyIn(Dist.CLIENT) public class GuiRenderTickMixin { @Inject(method = "render", at = @At(value = "HEAD")) - private void onClientTick(PoseStack poseStack, float partialTicks, CallbackInfo callbackInfo) { + private void onClientTick(GuiGraphics guiGraphics, float partialTick, CallbackInfo ci) { // Setup + PoseStack poseStack = guiGraphics.pose(); poseStack.pushPose(); poseStack.translate(Minecraft.getInstance().getWindow().getGuiScaledWidth() / 2.0, Minecraft.getInstance().getWindow().getGuiScaledHeight() / 2.0, 0); @@ -39,7 +41,7 @@ public class GuiRenderTickMixin { int argb = 0xFFFFFFFF; // Draw the player's protection state - font.drawShadow(poseStack, Proxy.Client.getPlayerState().toString().replace("_", " "), offsetX, offsetY, argb); + guiGraphics.drawString(font, Proxy.Client.getPlayerState().toString().replace("_", " "), (int)offsetX, (int)offsetY, argb); } poseStack.popPose();