Incomplete port to 1.21.10

S-N00B-1 · S-N00B-1 · commit d41258716ae7 · 2025-11-10T21:29:14.000-08:00
TODO rendering changes required because RenderSystem and shader colours were gutted.
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/ResourcePreloader/ResourcePreloaderMod.java b/src/main/java/net/kyrptonaught/lemclienthelper/ResourcePreloader/ResourcePreloaderMod.java
@@ -72,7 +72,7 @@ public static void downloadPacks() {
                 Util.nonCriticalIoPool().execute(() -> downloadPack(rpOption, downloadsDirectory, SHA1, headers, proxy, () -> {
                     counter.getAndDecrement();
                     if (counter.get() <= 0 && getConfig().toastComplete) {
-                        SystemToast.add(Minecraft.getInstance().getToasts(), SystemToast.SystemToastId.PERIODIC_NOTIFICATION, Component.translatable("key.lemclienthelper.alldownloadcomplete"), null);
+                        SystemToast.add(Minecraft.getInstance().getToastManager(), SystemToast.SystemToastId.PERIODIC_NOTIFICATION, Component.translatable("key.lemclienthelper.alldownloadcomplete"), null);
                     }
                 }));
             }
@@ -114,7 +114,7 @@ public static void setStatus(UUID packID, Component status, Component status2) {
 
     private static Map<String, String> getHeaders(User session) {
         WorldVersion gameVersion = SharedConstants.getCurrentVersion();
-        return Map.of("X-Minecraft-Username", session.getName(), "X-Minecraft-UUID", UndashedUuid.toString(session.getProfileId()), "X-Minecraft-Version", gameVersion.getName(), "X-Minecraft-Version-ID", gameVersion.getId(), "X-Minecraft-Pack-Format", String.valueOf(gameVersion.getPackVersion(PackType.CLIENT_RESOURCES)), "User-Agent", "Minecraft Java/" + gameVersion.getName());
+        return Map.of("X-Minecraft-Username", session.getName(), "X-Minecraft-UUID", UndashedUuid.toString(session.getProfileId()), "X-Minecraft-Version", gameVersion.name(), "X-Minecraft-Version-ID", gameVersion.id(), "X-Minecraft-Pack-Format", String.valueOf(gameVersion.packVersion(PackType.CLIENT_RESOURCES)), "User-Agent", "Minecraft Java/" + gameVersion.name());
     }
 
     private static HttpUtil.DownloadProgressListener createListener(AllPacks.RPOption rpOption, Runnable onComplete) {
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/SmallInv/ExtendedSlot.java b/src/main/java/net/kyrptonaught/lemclienthelper/SmallInv/ExtendedSlot.java
@@ -1,12 +1,10 @@
 package net.kyrptonaught.lemclienthelper.SmallInv;
 
 
-import com.mojang.datafixers.util.Pair;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
 
@@ -67,8 +65,7 @@ public int getMaxStackSize(ItemStack stack) {
         return baseSlot.getMaxStackSize(stack);
     }
 
-    @Nullable
-    public Pair<ResourceLocation, ResourceLocation> getNoItemIcon() {
+    public ResourceLocation getNoItemIcon() {
         return baseSlot.getNoItemIcon();
     }
 
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/SmallInv/SmallInvMod.java b/src/main/java/net/kyrptonaught/lemclienthelper/SmallInv/SmallInvMod.java
@@ -5,6 +5,7 @@
 import net.kyrptonaught.lemclienthelper.LEMClientHelperMod;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.core.component.DataComponents;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
@@ -23,7 +24,7 @@ public class SmallInvMod {
     public static void onInitialize() {
         LEMClientHelperMod.configManager.registerFile(MOD_ID, new SmallInvConfig());
         LEMClientHelperMod.configManager.load(MOD_ID);
-        closeSmallInvKey = KeyBindingHelper.registerKeyBinding(new KeyMapping(LEMClientHelperMod.MOD_ID + ".key.closesmallinv", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_I, "key.category." + LEMClientHelperMod.MOD_ID));
+        closeSmallInvKey = KeyBindingHelper.registerKeyBinding(new KeyMapping(LEMClientHelperMod.MOD_ID + ".key.closesmallinv", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_I, KeyMapping.Category.register(ResourceLocation.fromNamespaceAndPath(LEMClientHelperMod.MOD_ID, "keys"))));
 
         registerSmallSlot(5, 55, 9);
         registerSmallSlot(6, 55, 27);
@@ -50,7 +51,7 @@ public static boolean isSmallInv(Player player) {
         if (!getConfig().enabled) return false;
 
         //give @p knowledge_book{display:{Name:'{"text":" "}'},SmallInv:1,CustomModelData:1}
-        for (ItemStack itemStack : player.getInventory().items) {
+        for (ItemStack itemStack : player.getInventory().getNonEquipmentItems()) {
             if (isSmallSlot(itemStack))
                 return true;
         }
@@ -83,6 +84,6 @@ public static boolean isKeybindPressed(int pressedKeyCode, boolean isMouse) {
     public static boolean isSmallSlot(ItemStack stack) {
         return stack.is(Items.KNOWLEDGE_BOOK) &&
                 stack.has(DataComponents.CUSTOM_DATA) &&
-                stack.get(DataComponents.CUSTOM_DATA).contains("SmallInv");
+                stack.getOrDefault(DataComponents.CUSTOM_DATA,null).copyTag().contains("SmallInv");
     }
 }
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/customWorldBorder/CustomWorldBorderArea.java b/src/main/java/net/kyrptonaught/lemclienthelper/customWorldBorder/CustomWorldBorderArea.java
@@ -48,7 +48,7 @@ public double getLerpSpeed() {
     }
 
     @Override
-    public long getLerpRemainingTime() {
+    public long getLerpTime() {
         return 0;
     }
 
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/hud/armorHud/ArmorHudRenderer.java b/src/main/java/net/kyrptonaught/lemclienthelper/hud/armorHud/ArmorHudRenderer.java
@@ -32,14 +32,14 @@ public static void onHudRender(GuiGraphics context, DeltaTracker v) {
         if (client.player != null && ArmorHudMod.shouldDisplayArmor() && !client.options.hideGui) {
             int height = client.getWindow().getGuiScaledHeight();
 
-            context.pose().pushPose();
+            context.pose().pushMatrix();
             context.pose().translate(HudMod.getConfig().xOffset, height / 2f, 0);
             context.pose().scale(HudMod.getConfig().armorHudScale, HudMod.getConfig().armorHudScale, 1f);
             context.pose().translate(0, -32, 0);
             context.setColor(1f, 1f, 1f, HudMod.getConfig().transparency);
 
             for (int i = 0; i < 4; i++) {
-                ItemStack armorStack = client.player.getInventory().getArmor(i);
+                ItemStack armorStack = client.player.getInventory().getItem(i);
                 int y = 16 * (3 - i);
                 if (armorStack.isEmpty()) {
                     draw(context, EMPTY_SLOTS[i], 0, y);
@@ -49,15 +49,15 @@ public static void onHudRender(GuiGraphics context, DeltaTracker v) {
                 }
             }
             context.setColor(1f, 1f, 1f, 1f);
-            context.pose().popPose();
+            context.pose().popMatrix();
         }
     }
 
     public static void onHudRenderDummy(GuiGraphics context, float xOffset, float scale) {
         Minecraft client = Minecraft.getInstance();
         int height = client.getWindow().getGuiScaledHeight();
 
-        context.pose().pushPose();
+        context.pose().pushMatrix();
         context.pose().translate(xOffset, height / 2f, 0);
         context.pose().scale(scale, scale, 1f);
         context.pose().translate(0, -32, 0);
@@ -76,7 +76,7 @@ public static void onHudRenderDummy(GuiGraphics context, float xOffset, float sc
             }
         }
         context.setColor(1f, 1f, 1f, 1f);
-        context.pose().popPose();
+        context.pose().popMatrix();
     }
 
     private static void draw(GuiGraphics context, ResourceLocation texture, float x, float y) {
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/hud/genericHud/BannerRenderer.java b/src/main/java/net/kyrptonaught/lemclienthelper/hud/genericHud/BannerRenderer.java
@@ -45,14 +45,14 @@ public static void render(GuiGraphics context, float lastDur) {
         int x = (width/2) - (int)((24 * shieldScale)/2);
         int y = ((13 * height)/50) - (int)((34 * shieldScale)/2);
 
-        context.pose().pushPose();
+        context.pose().pushMatrix();
         RenderSystem.enableBlend();
 
         if (elapsed >= 0.1f) { renderParticles(context,elapsed,(width/2),height); }
         renderShield(context,x,y);
         if (elapsed >= (16f/30f)) { renderBanner(context,elapsed,width,height); }
 
-        context.pose().popPose();
+        context.pose().popMatrix();
 
         if (elapsed >= elapsedMax) {
             reset();
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/hud/genericHud/GenericHudMod.java b/src/main/java/net/kyrptonaught/lemclienthelper/hud/genericHud/GenericHudMod.java
@@ -6,7 +6,6 @@
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.loader.api.FabricLoader;
-import net.kyrptonaught.lemclienthelper.hud.genericHud.HideVanillaHUD;
 import net.kyrptonaught.lemclienthelper.hud.genericHud.packets.BannerPacket;
 import net.kyrptonaught.lemclienthelper.hud.genericHud.packets.PlayerBarPacket;
 
@@ -45,8 +44,6 @@
 import wily.legacy.client.screen.compat.SodiumCompat;
 import wily.legacy.init.LegacyRegistries;
 import wily.legacy.network.TopMessage;
-import wily.legacy.util.MCAccount;
-import wily.legacy.util.ScreenUtil;
 
 import java.util.Optional;
 
@@ -64,15 +61,15 @@ public static void onInitialize() {
                 LegacyOptions.CLIENT_STORAGE.load();
                 UIAccessor accessor = FactoryScreenUtil.getGuiAccessor();
                 accessor.getStaticDefinitions().add(UIDefinition.createBeforeInit((a) -> {
-                    if ((Boolean)LegacyMixinOptions.legacyGui.get()) {
+                    if (LegacyMixinOptions.legacyGui.get()) {
                         a.getElements().put(FactoryGuiElement.EXPERIENCE_BAR.name() + ".isVisible", () -> {
-                            return HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.EXPERIENCE) && HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.STATS) && HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.ALL);
+                            return HideVanillaHUD.visible.getOrDefault(HideVanillaHUD.HUD_ELEMENT.EXPERIENCE, true) && HideVanillaHUD.visible.getOrDefault(HideVanillaHUD.HUD_ELEMENT.STATS,true) && HideVanillaHUD.visible.getOrDefault(HideVanillaHUD.HUD_ELEMENT.ALL, true);
                         });
                         a.getElements().put(FactoryGuiElement.PLAYER_HEALTH.name() + ".isVisible", () -> {
-                            return HideVanillaHUD.visibe.getValue(HideVanillaHUD.HEARTS.HOTBAR) && HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.STATS) && HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.ALL);
+                            return HideVanillaHUD.visible.getOrDefault(HideVanillaHUD.HUD_ELEMENT.HEARTS, true) && HideVanillaHUD.visible.getOrDefault(HideVanillaHUD.HUD_ELEMENT.STATS,true) && HideVanillaHUD.visible.getOrDefault(HideVanillaHUD.HUD_ELEMENT.ALL, true);
                         });
                         a.getElements().put(FactoryGuiElement.HOTBAR.name() + ".isVisible", () -> {
-                            return HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.HOTBAR) && HideVanillaHUD.visibe.getValue(HideVanillaHUD.HUD_ELEMENT.ALL);
+                            return HideVanillaHUD.visible.getOrDefault(HideVanillaHUD.HUD_ELEMENT.HOTBAR, true) && HideVanillaHUD.visible.getOrDefault(HideVanillaHUD.HUD_ELEMENT.ALL, true);
                         });
                     }
                 }));
@@ -86,7 +83,7 @@ public static void onInitialize() {
         PayloadTypeRegistry.playS2C().register(PlayerBarPacket.PACKET_ID, PlayerBarPacket.codec);
         ClientPlayNetworking.registerGlobalReceiver(PlayerBarPacket.PACKET_ID, ((payload, context) -> { 
                 SHOULD_RENDER_PLAYERBAR = payload.enabled();
-                HideVanillaHUD.visibe.put(HideVanillaHUD.HUD_ELEMENT.EXPERIENCE, !payload.enabled());
+                HideVanillaHUD.visible.put(HideVanillaHUD.HUD_ELEMENT.EXPERIENCE, !payload.enabled());
         }));
 
         PayloadTypeRegistry.playS2C().register(BannerPacket.PACKET_ID, BannerPacket.codec);
@@ -130,7 +127,7 @@ public static void onInitialize() {
                                                                                 new serverInfoPackets.phasePacket(
                                                                                         ServerInfoData.MINIGAME_PHASES.values()[IntegerArgumentType.getInteger(context,"phase")]));
                                                                         ServerPlayNetworking.send(EntityArgument.getPlayer(context, "target"),
-                                                                                new BannerPacket(ComponentArgument.getComponent(context,"text"), Optional.of(FloatArgumentType.getFloat(context, "elapsedMax"))));
+                                                                                new BannerPacket(ComponentArgument.getRawComponent(context,"text"), Optional.of(FloatArgumentType.getFloat(context, "elapsedMax"))));
                                                                         return 0;
                                                         })).executes(context -> {
                                                                     ServerPlayNetworking.send(EntityArgument.getPlayer(context, "target"),
@@ -143,7 +140,7 @@ public static void onInitialize() {
                                                                             new serverInfoPackets.phasePacket(
                                                                                     ServerInfoData.MINIGAME_PHASES.values()[IntegerArgumentType.getInteger(context, "phase")]));
                                                                     ServerPlayNetworking.send(EntityArgument.getPlayer(context, "target"),
-                                                                            new BannerPacket(ComponentArgument.getComponent(context, "text"),Optional.empty()));
+                                                                            new BannerPacket(ComponentArgument.getRawComponent(context, "text"),Optional.empty()));
                                                                     return 0;
                                                                 })))))))));
 
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/hud/genericHud/HideVanillaHUD.java b/src/main/java/net/kyrptonaught/lemclienthelper/hud/genericHud/HideVanillaHUD.java
@@ -1,17 +1,20 @@
-package net.kyrptonaught.lemclienthelper.hud.glideHud;
+package net.kyrptonaught.lemclienthelper.hud.genericHud;
 
 import java.util.HashMap;
 
-import net.kyrptonaught.lemclienthelper.ServerInfo.ServerInfoData;
-import net.kyrptonaught.lemclienthelper.hud.HudMod;
-import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.Mth;
-
 public class HideVanillaHUD {
-    public static final enum HUD_ELEMENT {
+
+    /**
+     * <pre>
+     * ALL - All Elements
+     * EXPERIENCE - Experience Bar/Locator Bar
+     * HEARTS - Player health
+     * HOTBAR - Player hotbar
+     * HUNGER - Player hunger
+     * STATS - EXPERIENCE, HEARTS, &, HUNGER
+     * </pre>
+     */
+    public enum HUD_ELEMENT {
         ALL,
         EXPERIENCE,
         HEARTS,
@@ -22,10 +25,4 @@ public static final enum HUD_ELEMENT {
 
     public static HashMap<HUD_ELEMENT, Boolean> visible;
 
-    init {
-        visible.clear();
-        HUD_ELEMENT.forEach(element -> 
-            visibe.putIfAbsent(element, true)
-        );
-    }
 }
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/hud/genericHud/packets/HideVanillaHUDPacket.java b/src/main/java/net/kyrptonaught/lemclienthelper/hud/genericHud/packets/HideVanillaHUDPacket.java
@@ -1,6 +1,7 @@
 package net.kyrptonaught.lemclienthelper.hud.genericHud.packets;
 
 import net.kyrptonaught.lemclienthelper.hud.genericHud.HideVanillaHUD;
+import net.kyrptonaught.lemclienthelper.hud.glideHud.GlideHudMod;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.codec.ByteBufCodecs;
@@ -14,8 +15,8 @@
 /**
  * HideVanillaHUDPacket sends banner to client
  *
- * @param element an enumerator, HOTBAR, HEARTS, HUNGER, STATS (Hearts & Hunger), ALL (Hearts, Hunger, & Hotbar).
- * @param visibe boolean, Is the element visible, false for hidden, true for shown.
+ * @param element HideVanillaHUD.HUD_ELEMENT, {@link HideVanillaHUD.HUD_ELEMENT}.
+ * @param visible boolean, Is the element visible, false for hidden, true for shown.
  */
 public record HideVanillaHUDPacket(HideVanillaHUD.HUD_ELEMENT element, boolean visible) implements CustomPacketPayload {
     public static final Type<HideVanillaHUDPacket> PACKET_ID = new Type<>(ResourceLocation.fromNamespaceAndPath("hud", "hidevanilla"));
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/hud/glideHud/GlideHudRenderer.java b/src/main/java/net/kyrptonaught/lemclienthelper/hud/glideHud/GlideHudRenderer.java
@@ -44,7 +44,7 @@ public static void onHudRender(GuiGraphics context, DeltaTracker v) {
             int height = client.getWindow().getGuiScaledHeight();
             int width = client.getWindow().getGuiScaledWidth();
 
-            context.pose().pushPose();
+            context.pose().pushMatrix();
             context.pose().translate((width - HudMod.getConfig().xOffset), height / 2f, 0);
             context.pose().scale(HudMod.getConfig().armorHudScale, HudMod.getConfig().armorHudScale, 1f);
             context.pose().translate(0, -24, 0);
@@ -54,7 +54,7 @@ public static void onHudRender(GuiGraphics context, DeltaTracker v) {
             renderSpeedometer(context, client);
             if (ServerInfoData.getGamemode() == ServerInfoData.GAME_MODES.SCORE_ATTACK) {renderScore(context, client);}
             context.setColor(1f, 1f, 1f, 1f);
-            context.pose().popPose();
+            context.pose().popMatrix();
         }
     }
 
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/mixin/SmallInv/HandledScreenMixin.java b/src/main/java/net/kyrptonaught/lemclienthelper/mixin/SmallInv/HandledScreenMixin.java
@@ -8,6 +8,8 @@
 import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
 import net.minecraft.client.gui.screens.inventory.InventoryScreen;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.client.input.KeyEvent;
+import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.ChestMenu;
@@ -43,23 +45,23 @@ public void setPlayerTitleY(CallbackInfo ci) {
     }
 
     @Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true)
-    public void keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) {
-        if (SmallInvMod.isKeybindPressed(keyCode, false)) {
+    public void keyPressed(KeyEvent keyEvent, CallbackInfoReturnable<Boolean> cir) {
+        if (SmallInvMod.isKeybindPressed(keyEvent.key(), false)) {
             setIsSmall(false);
             cir.setReturnValue(true);
         }
     }
 
     @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
-    public void mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) {
-        if (SmallInvMod.isKeybindPressed(button, true)) {
+    public void mouseClicked(MouseButtonEvent mouseButtonEvent, boolean bl, CallbackInfoReturnable<Boolean> cir) {
+        if (SmallInvMod.isKeybindPressed(mouseButtonEvent.button(), true)) {
             setIsSmall(false);
             cir.setReturnValue(true);
         }
     }
 
     @Inject(method = "hasClickedOutside", at = @At("HEAD"), cancellable = true)
-    public void isClickOutsideSmallBounds(double mouseX, double mouseY, int left, int top, int button, CallbackInfoReturnable<Boolean> cir) {
+    public void isClickOutsideSmallBounds(double mouseX, double mouseY, int left, int top, CallbackInfoReturnable<Boolean> cir) {
         if (getIsSmall()) {
             AbstractContainerScreen<?> handledScreen = (AbstractContainerScreen<?>) (Object) this;
             if (!(handledScreen instanceof InventoryScreen) &&
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/mixin/SmallInv/MidnightControlsMixin.java b/src/main/java/net/kyrptonaught/lemclienthelper/mixin/SmallInv/MidnightControlsMixin.java
@@ -1,6 +1,9 @@
 package net.kyrptonaught.lemclienthelper.mixin.SmallInv;
 
+import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.InputHandlers;
+import eu.midnightdust.midnightcontrols.client.enums.ButtonState;
+import net.minecraft.client.Minecraft;
 import net.minecraft.world.inventory.Slot;
 import org.aperlambda.lambdacommon.utils.Pair;
 import org.spongepowered.asm.mixin.Mixin;
@@ -13,8 +16,8 @@
 @Mixin(InputHandlers.class)
 public class MidnightControlsMixin {
 
-    @Inject(method = "lambda$handleInventorySlotPad$16", at = @At(value = "HEAD"), cancellable = true)
-    private static void skipDisabledSlots(int guiLeft, int guiTop, double mouseX, double mouseY, Slot mouseSlot, int direction, Pair<Slot, Double> entry, CallbackInfoReturnable<Boolean> cir) {
-        if (!entry.key.isActive()) cir.setReturnValue(false);
+    @Inject(method = "lambda$handleInventorySlotPad$9", at = @At(value = "HEAD"), cancellable = true)
+    private static void skipDisabledSlots(int direction, Minecraft client, ButtonBinding binding, float value, ButtonState action, CallbackInfoReturnable<Boolean> cir) {
+        if (!binding.isAvailable()) cir.setReturnValue(false);
     }
 }
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/mixin/SmallInv/invs/GenericContainerScreenMixin.java b/src/main/java/net/kyrptonaught/lemclienthelper/mixin/SmallInv/invs/GenericContainerScreenMixin.java
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/mixin/SmallInv/invs/MultipleScreenMixin.java b/src/main/java/net/kyrptonaught/lemclienthelper/mixin/SmallInv/invs/MultipleScreenMixin.java
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/mixin/TakeEverything/ScreenHandlerMixin.java b/src/main/java/net/kyrptonaught/lemclienthelper/mixin/TakeEverything/ScreenHandlerMixin.java
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/mixin/bookGui/BookScreenMixin.java b/src/main/java/net/kyrptonaught/lemclienthelper/mixin/bookGui/BookScreenMixin.java
diff --git a/src/main/java/net/kyrptonaught/lemclienthelper/mixin/hud/genericHud/HideVanillaHUDMixin.java b/src/main/java/net/kyrptonaught/lemclienthelper/mixin/hud/genericHud/HideVanillaHUDMixin.java

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public static void downloadPacks() {`
`72`	`72`	`Util.nonCriticalIoPool().execute(() -> downloadPack(rpOption, downloadsDirectory, SHA1, headers, proxy, () -> {`
`73`	`73`	`counter.getAndDecrement();`
`74`	`74`	`if (counter.get() <= 0 && getConfig().toastComplete) {`
`75`		`- SystemToast.add(Minecraft.getInstance().getToasts(), SystemToast.SystemToastId.PERIODIC_NOTIFICATION, Component.translatable("key.lemclienthelper.alldownloadcomplete"), null);`
	`75`	`+ SystemToast.add(Minecraft.getInstance().getToastManager(), SystemToast.SystemToastId.PERIODIC_NOTIFICATION, Component.translatable("key.lemclienthelper.alldownloadcomplete"), null);`
`76`	`76`	`}`
`77`	`77`	`}));`
`78`	`78`	`}`
`@@ -114,7 +114,7 @@ public static void setStatus(UUID packID, Component status, Component status2) {`
`114`	`114`
`115`	`115`	`private static Map<String, String> getHeaders(User session) {`
`116`	`116`	`WorldVersion gameVersion = SharedConstants.getCurrentVersion();`
`117`		`- return Map.of("X-Minecraft-Username", session.getName(), "X-Minecraft-UUID", UndashedUuid.toString(session.getProfileId()), "X-Minecraft-Version", gameVersion.getName(), "X-Minecraft-Version-ID", gameVersion.getId(), "X-Minecraft-Pack-Format", String.valueOf(gameVersion.getPackVersion(PackType.CLIENT_RESOURCES)), "User-Agent", "Minecraft Java/" + gameVersion.getName());`
	`117`	`+ return Map.of("X-Minecraft-Username", session.getName(), "X-Minecraft-UUID", UndashedUuid.toString(session.getProfileId()), "X-Minecraft-Version", gameVersion.name(), "X-Minecraft-Version-ID", gameVersion.id(), "X-Minecraft-Pack-Format", String.valueOf(gameVersion.packVersion(PackType.CLIENT_RESOURCES)), "User-Agent", "Minecraft Java/" + gameVersion.name());`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`private static HttpUtil.DownloadProgressListener createListener(AllPacks.RPOption rpOption, Runnable onComplete) {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public double getLerpSpeed() {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Override`
`51`		`- public long getLerpRemainingTime() {`
	`51`	`+ public long getLerpTime() {`
`52`	`52`	`return 0;`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,14 @@ public static void onHudRender(GuiGraphics context, DeltaTracker v) {`
`32`	`32`	`if (client.player != null && ArmorHudMod.shouldDisplayArmor() && !client.options.hideGui) {`
`33`	`33`	`int height = client.getWindow().getGuiScaledHeight();`
`34`	`34`
`35`		`- context.pose().pushPose();`
	`35`	`+ context.pose().pushMatrix();`
`36`	`36`	`context.pose().translate(HudMod.getConfig().xOffset, height / 2f, 0);`
`37`	`37`	`context.pose().scale(HudMod.getConfig().armorHudScale, HudMod.getConfig().armorHudScale, 1f);`
`38`	`38`	`context.pose().translate(0, -32, 0);`
`39`	`39`	`context.setColor(1f, 1f, 1f, HudMod.getConfig().transparency);`
`40`	`40`
`41`	`41`	`for (int i = 0; i < 4; i++) {`
`42`		`- ItemStack armorStack = client.player.getInventory().getArmor(i);`
	`42`	`+ ItemStack armorStack = client.player.getInventory().getItem(i);`
`43`	`43`	`int y = 16 * (3 - i);`
`44`	`44`	`if (armorStack.isEmpty()) {`
`45`	`45`	`draw(context, EMPTY_SLOTS[i], 0, y);`
`@@ -49,15 +49,15 @@ public static void onHudRender(GuiGraphics context, DeltaTracker v) {`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`context.setColor(1f, 1f, 1f, 1f);`
`52`		`- context.pose().popPose();`
	`52`	`+ context.pose().popMatrix();`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public static void onHudRenderDummy(GuiGraphics context, float xOffset, float scale) {`
`57`	`57`	`Minecraft client = Minecraft.getInstance();`
`58`	`58`	`int height = client.getWindow().getGuiScaledHeight();`
`59`	`59`
`60`		`- context.pose().pushPose();`
	`60`	`+ context.pose().pushMatrix();`
`61`	`61`	`context.pose().translate(xOffset, height / 2f, 0);`
`62`	`62`	`context.pose().scale(scale, scale, 1f);`
`63`	`63`	`context.pose().translate(0, -32, 0);`
`@@ -76,7 +76,7 @@ public static void onHudRenderDummy(GuiGraphics context, float xOffset, float sc`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`context.setColor(1f, 1f, 1f, 1f);`
`79`		`- context.pose().popPose();`
	`79`	`+ context.pose().popMatrix();`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`private static void draw(GuiGraphics context, ResourceLocation texture, float x, float y) {`