1.21.6 Update (#5499)

Author: Wide-Cat

gradle.properties

@@ -2,10 +2,10 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.configuration-cache=true
 
 # Fabric (https://fabricmc.net/develop)
-minecraft_version=1.21.5
-yarn_mappings=1.21.5+build.1
-loader_version=0.16.12
-fapi_version=0.121.0+1.21.5
+minecraft_version=1.21.6
+yarn_mappings=1.21.6+build.1
+loader_version=0.16.14
+fapi_version=0.127.1+1.21.6
 
 # Mod Properties
 maven_group=meteordevelopment
@@ -14,19 +14,19 @@ archives_base_name=meteor-client
 # Dependency Versions
 
 # Baritone (https://github.com/MeteorDevelopment/baritone)
-baritone_version=1.21.4
+baritone_version=1.21.5
 
 # Sodium (https://github.com/CaffeineMC/sodium-fabric)
-sodium_version=mc1.21.5-0.6.12-fabric
+sodium_version=mc1.21.6-0.6.13-fabric
 
 # Lithium (https://github.com/CaffeineMC/lithium-fabric)
-lithium_version=mc1.21.5-0.16.0-fabric
+lithium_version=mc1.21.6-0.17.0-fabric
 
 # Iris (https://github.com/IrisShaders/Iris)
-iris_version=1.8.11+1.21.5-fabric
+iris_version=1.9.0+1.21.6-fabric
 
 # ModMenu (https://github.com/TerraformersMC/ModMenu)
-modmenu_version=14.0.0-rc.2
+modmenu_version=15.0.0-beta.3
 
 # Orbit (https://github.com/MeteorDevelopment/orbit)
 orbit_version=0.2.4
@@ -44,7 +44,7 @@ reflections_version=0.10.2
 netty_version=4.1.118.Final
 
 # ViaFabricPlus (https://github.com/ViaVersion/ViaFabricPlus)
-viafabricplus_version=4.1.0
+viafabricplus_version=4.1.5
 
 # WaybackAuthLib (https://github.com/FlorianMichael/WaybackAuthLib)
 waybackauthlib_version=1.0.1

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -139,19 +139,12 @@ private void basicInfo() {
         );
 
         info("Port: %d", ServerAddress.parse(server.address).getPort());
-
         info("Type: %s", mc.getNetworkHandler().getBrand() != null ? mc.getNetworkHandler().getBrand() : "unknown");
-
         info("Motd: %s", server.label != null ? server.label.getString() : "unknown");
-
         info("Version: %s", server.version.getString());
-
         info("Protocol version: %d", server.protocolVersion);
-
         info("Difficulty: %s (Local: %.2f)", mc.world.getDifficulty().getTranslatableName().getString(), mc.world.getLocalDifficulty(mc.player.getBlockPos()).getLocalDifficulty());
-
         info("Day: %d", mc.world.getTimeOfDay() / 24000L);
-
         info("Permission level: %s", formatPerms());
     }
 
@@ -212,7 +205,10 @@ private void onReadPacket(PacketEvent.Receive event) {
 
             // This gets the root node of the command tree. From there, all of its children have to be of type
             // LiteralCommandNode, so we don't need to worry about checking or casting and can just grab the name
-            packet.getCommandTree(CommandRegistryAccess.of(handler.getCombinedDynamicRegistries(), handler.getEnabledFeatures())).getChildren().forEach(node -> {
+            packet.getCommandTree(
+                CommandRegistryAccess.of(handler.getCombinedDynamicRegistries(), handler.getEnabledFeatures()),
+                ClientPlayNetworkHandlerAccessor.getCommandNodeFactory()
+            ).getChildren().forEach(node -> {
                 String[] split = node.getName().split(":");
                 if (split.length > 1) {
                     if (!commandTreePlugins.contains(split[0])) commandTreePlugins.add(split[0]);

gradlew

@@ -234,10 +234,15 @@ public boolean charTyped(char chr, int keyCode) {
     }
 
     @Override
-    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-        if (!Utils.canUpdate()) renderBackground(context, mouseX, mouseY, delta);
+    public void renderBackground(DrawContext context, int mouseX, int mouseY, float deltaTicks) {
+        if (this.client.world == null) {
+            this.renderPanoramaBackground(context, deltaTicks);
+        }
+    }
 
-        double s = mc.getWindow().getScaleFactor();
+    @Override
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        int s = mc.getWindow().getScaleFactor();
         mouseX *= s;
         mouseY *= s;
 
@@ -247,7 +252,6 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         GuiKeyEvents.canUseKeys = true;
 
         // Apply projection without scaling
-        context.draw();
         Utils.unscaledProjection();
 
         onRenderBefore(context, delta);
@@ -268,7 +272,6 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
             if (tooltip) DEBUG_RENDERER.render(RENDERER.tooltipWidget);
         }
 
-        context.draw();
         Utils.scaledProjection();
 
         runAfterRenderTasks();

gradlew.bat

@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Stack;
 
+import static meteordevelopment.meteorclient.MeteorClient.mc;
 import static meteordevelopment.meteorclient.utils.Utils.getWindowHeight;
 import static meteordevelopment.meteorclient.utils.Utils.getWindowWidth;
 
@@ -82,6 +83,11 @@ public static void init() {
 
     public void begin(DrawContext drawContext) {
         this.drawContext = drawContext;
+        this.drawContext.createNewRootLayer();
+
+        var matrices = drawContext.getMatrices();
+        matrices.pushMatrix();
+        matrices.scale(1.0f / mc.getWindow().getScaleFactor());
 
         scissorStart(0, 0, getWindowWidth(), getWindowHeight());
     }
@@ -91,6 +97,9 @@ public void end() {
 
         for (Runnable task : postTasks) task.run();
         postTasks.clear();
+
+        drawContext.getMatrices().popMatrix();
+        drawContext.createNewRootLayer();
     }
 
     public void beginRender() {
@@ -109,7 +118,7 @@ public void endRender(Scissor scissor) {
         rTex.end();
 
         r.render();
-        rTex.render(pass -> pass.bindSampler("u_Texture", TEXTURE.getGlTexture()));
+        rTex.render("u_Texture", TEXTURE.getGlTextureView());
 
         // Normal text
         theme.textRenderer().begin(theme.scale(1));
@@ -144,6 +153,8 @@ public void scissorStart(double x, double y, double width, double height) {
         }
 
         scissorStack.push(scissorPool.get().set(x, y, width, height));
+        drawContext.enableScissor((int) x, (int) y, (int) (x + width), (int) (y + height));
+
         beginRender();
     }
 
@@ -156,6 +167,7 @@ public void scissorEnd() {
         for (Runnable task : scissor.postTasks) task.run();
         scissor.pop();
 
+        drawContext.disableScissor();
         if (!scissorStack.isEmpty()) beginRender();
 
         scissorPool.free(scissor);
@@ -236,7 +248,7 @@ public void texture(double x, double y, double width, double height, double rota
             rTex.texQuad(x, y, width, height, rotation, 0, 0, 1, 1, WHITE);
             rTex.end();
 
-            rTex.render(texture.getGlTexture());
+            rTex.render(texture.getGlTextureView());
         });
     }
 
@@ -245,7 +257,7 @@ public void post(Runnable task) {
     }
 
     public void item(ItemStack itemStack, int x, int y, float scale, boolean overlay) {
-        RenderUtils.drawItem(drawContext, itemStack, x, y, scale, overlay);
+        RenderUtils.drawItem(drawContext, itemStack, x, y, scale, overlay, null, false);
     }
 
     public void absolutePost(Runnable task) {

src/main/java/meteordevelopment/meteorclient/commands/commands/ServerCommand.java

@@ -32,14 +32,14 @@
 public abstract class BookEditScreenMixin extends Screen {
     @Shadow @Final private List<String> pages;
     @Shadow private int currentPage;
-    @Shadow private boolean dirty;
+
+    @Shadow
+    protected abstract void updatePage();
 
     public BookEditScreenMixin(Text title) {
         super(title);
     }
 
-    @Shadow protected abstract void updateButtons();
-
     @Inject(method = "init", at = @At("TAIL"))
     private void onInit(CallbackInfo info) {
         addDrawableChild(
@@ -99,8 +99,7 @@ private void onInit(CallbackInfo info) {
 
                         currentPage = tag.getInt("currentPage", 0);
 
-                        dirty = true;
-                        updateButtons();
+                        updatePage();
                     } catch (IOException e) {
                         e.printStackTrace();
                     }