1.21.11 update (#5924)

* Update to 25w42a

A little buggy but mostly fine

* bump version to 1.21.11-pre1

* Extremely simple naming changes

* Lots and lots of fixes. The game loads and you can join worlds. A few todos and testing to go over

Regenerated PacketUtils

* fix texture rendering, cleanup unused mixins

* Fix logging into microsoft accounts

* bump version to 1.21.11

* revert fabric loader versioning changes

* bump sodium/iris versions

looks like no code changes necessary

* Bump deps, fix method names

* fix conflict

* hopefully fix a crash

Author: Wide-Cat

build.gradle.kts

@@ -81,7 +81,7 @@ dependencies {
     modInclude(fabricApi.module("fabric-resource-loader-v1", fapiVersion))
 
     // Compat fixes
-    modCompileOnly(fabricApi.module("fabric-renderer-indigo", fapiVersion))
+//    modCompileOnly(fabricApi.module("fabric-renderer-indigo", fapiVersion)) TODO: re-enable when available
     modCompileOnly(libs.sodium) { isTransitive = false }
     modCompileOnly(libs.lithium) { isTransitive = false }
     modCompileOnly(libs.iris) { isTransitive = false }
@@ -151,7 +151,8 @@ tasks {
             "version" to project.version,
             "build_number" to buildNumber,
             "commit" to commit,
-            "minecraft_version" to libs.versions.minecraft.get()
+            "minecraft_version" to libs.versions.minecraft.get(),
+            "loader_version" to libs.versions.fabric.loader.get()
         )
 
         inputs.properties(propertyMap)

gradle/libs.versions.toml

@@ -1,23 +1,23 @@
 [versions]
 # Fabric (https://fabricmc.net/develop)
-minecraft = "1.21.10"
-yarn-mappings = "1.21.10+build.2"
-fabric-loader = "0.17.0"
-fabric-api = "0.136.0+1.21.10"
+minecraft = "1.21.11"
+yarn-mappings = "1.21.11+build.3"
+fabric-loader = "0.18.2"
+fabric-api = "0.139.5+1.21.11"
 
 # Plugins
 # Loom (https://github.com/FabricMC/fabric-loom)
-loom = "1.12-SNAPSHOT"
+loom = "1.14-SNAPSHOT"
 
 # Mods
 # Baritone (https://github.com/MeteorDevelopment/baritone)
 baritone = "1.21.10-SNAPSHOT"
 # Sodium (https://github.com/CaffeineMC/sodium-fabric)
-sodium = "mc1.21.10-0.7.2-fabric"
+sodium = "mc1.21.11-0.8.0-fabric"
 # Lithium (https://github.com/CaffeineMC/lithium-fabric)
-lithium = "mc1.21.10-0.20.0-fabric"
+lithium = "mc1.21.11-0.21.1-fabric"
 # Iris (https://github.com/IrisShaders/Iris)
-iris = "1.9.6+1.21.10-fabric"
+iris = "1.10.2+1.21.11-fabric"
 # ModMenu (https://github.com/TerraformersMC/ModMenu)
 modmenu = "15.0.0"
 # Orbit (https://github.com/MeteorDevelopment/orbit)
@@ -29,9 +29,9 @@ discordipc = "1.1"
 # Reflections (https://github.com/ronmamo/reflections)
 reflections = "0.10.2"
 # Netty (https://github.com/netty/netty)
-netty = "4.1.118.Final"
+netty = "4.2.7.Final"
 # ViaFabricPlus (https://github.com/ViaVersion/ViaFabricPlus)
-viafabricplus = "4.3.1"
+viafabricplus = "4.4.0"
 # WaybackAuthLib (https://github.com/FlorianMichael/WaybackAuthLib)
 waybackauthlib = "1.0.1"
 

src/main/java/meteordevelopment/meteorclient/MixinPlugin.java

@@ -56,7 +56,7 @@ public void onLoad(String mixinPackage) {
 
             mixinTransformerField.set(delegate, mixinTransformer);
         } catch (NoSuchFieldException | IllegalAccessException e) {
-            e.printStackTrace();
+            MeteorClient.LOG.error("Error loading the mixin plugin", e);
         }
 
         isIndigoPresent = FabricLoader.getInstance().isModLoaded("fabric-renderer-indigo");

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

@@ -8,7 +8,6 @@
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.suggestion.Suggestion;
 import com.mojang.brigadier.suggestion.Suggestions;
-import joptsimple.internal.Strings;
 import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.commands.Command;
 import meteordevelopment.meteorclient.events.packets.PacketEvent;
@@ -20,6 +19,8 @@
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.command.CommandRegistryAccess;
 import net.minecraft.command.CommandSource;
+import net.minecraft.command.DefaultPermissions;
+import net.minecraft.command.permission.PermissionPredicate;
 import net.minecraft.network.packet.c2s.play.RequestCommandCompletionsC2SPacket;
 import net.minecraft.network.packet.s2c.play.CommandSuggestionsS2CPacket;
 import net.minecraft.network.packet.s2c.play.CommandTreeS2CPacket;
@@ -29,7 +30,10 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
-import org.apache.commons.lang3.StringUtils;
+import net.minecraft.world.LocalDifficulty;
+import net.minecraft.world.attribute.EnvironmentAttributes;
+import net.minecraft.world.dimension.DimensionType;
+import org.apache.commons.lang3.Strings;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -143,23 +147,27 @@ private void basicInfo() {
         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("Difficulty: %s (Local: %.2f)",
+            mc.world.getDifficulty().getTranslatableName().getString(),
+            new LocalDifficulty(
+                mc.world.getDifficulty(),
+                mc.world.getTimeOfDay(),
+                mc.world.getChunk(mc.player.getBlockPos()).getInhabitedTime(),
+                DimensionType.MOON_SIZES[mc.world.getEnvironmentAttributes().getAttributeValue(EnvironmentAttributes.MOON_PHASE_VISUAL, mc.player.getBlockPos()).getIndex()] // lol
+            ).getLocalDifficulty()
+        );
         info("Day: %d", mc.world.getTimeOfDay() / 24000L);
         info("Permission level: %s", formatPerms());
     }
 
     public String formatPerms() {
-        int p = 5;
-        while (!mc.player.hasPermissionLevel(p) && p > 0) p--;
-
-        return switch (p) {
-            case 0 -> "0 (No Perms)";
-            case 1 -> "1 (No Perms)";
-            case 2 -> "2 (Player Command Access)";
-            case 3 -> "3 (Server Command Access)";
-            case 4 -> "4 (Operator)";
-            default -> p + " (Unknown)";
-        };
+        PermissionPredicate permissions = mc.player.getPermissions();
+
+        if (permissions.hasPermission(DefaultPermissions.OWNERS)) return "4 (Owner)";
+        else if (permissions.hasPermission(DefaultPermissions.ADMINS)) return "3 (Admin)";
+        else if (permissions.hasPermission(DefaultPermissions.GAMEMASTERS)) return "2 (Gamemaster)";
+        else if (permissions.hasPermission(DefaultPermissions.MODERATORS)) return "1 (Moderator)";
+        else return "0 (No Perms)";
     }
 
 
@@ -170,7 +178,7 @@ private void printPlugins() {
         plugins.replaceAll(this::formatName);
 
         if (!plugins.isEmpty()) {
-            info("Plugins (%d): %s ", plugins.size(), Strings.join(plugins.toArray(new String[0]), ", "));
+            info("Plugins (%d): %s ", plugins.size(), String.join(", ", plugins));
         } else {
             error("No plugins found.");
         }
@@ -249,7 +257,7 @@ private String formatName(String name) {
         if (ANTICHEAT_LIST.contains(name.toLowerCase())) {
             return String.format("%s%s(default)", Formatting.RED, name);
         }
-        else if (StringUtils.containsIgnoreCase(name, "exploit") || StringUtils.containsIgnoreCase(name, "cheat") || StringUtils.containsIgnoreCase(name, "illegal")) {
+        else if (Strings.CI.contains(name, "exploit") || Strings.CI.contains(name, "cheat") || Strings.CI.contains(name, "illegal")) {
             return String.format("%s%s(default)", Formatting.RED, name);
         }
 

src/main/java/meteordevelopment/meteorclient/gui/DefaultSettingsWidgetFactory.java

@@ -25,7 +25,7 @@
 import meteordevelopment.meteorclient.utils.Utils;
 import meteordevelopment.meteorclient.utils.render.color.SettingColor;
 import net.minecraft.client.resource.language.I18n;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -110,7 +110,7 @@ private void group(WVerticalList list, SettingGroup group, String filter, List<R
         RemoveInfo removeInfo = null;
 
         for (Setting<?> setting : group) {
-            if (!StringUtils.containsIgnoreCase(setting.title, filter)) continue;
+            if (!Strings.CI.contains(setting.title, filter)) continue;
 
             boolean visible = setting.isVisible();
             setting.lastWasVisible = visible;

src/main/java/meteordevelopment/meteorclient/gui/WidgetScreen.java

@@ -17,7 +17,6 @@
 import meteordevelopment.meteorclient.utils.Utils;
 import meteordevelopment.meteorclient.utils.misc.CursorStyle;
 import meteordevelopment.meteorclient.utils.misc.input.Input;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Click;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
@@ -304,8 +303,8 @@ protected void runAfterRenderTasks() {
     protected void onRenderBefore(DrawContext drawContext, float delta) {}
 
     @Override
-    public void resize(MinecraftClient client, int width, int height) {
-        super.resize(client, width, height);
+    public void resize(int width, int height) {
+        super.resize(width, height);
         root.invalidate();
     }
 

src/main/java/meteordevelopment/meteorclient/gui/renderer/GuiRenderer.java

@@ -118,7 +118,7 @@ public void endRender(Scissor scissor) {
         rTex.end();
 
         r.render();
-        rTex.render("u_Texture", TEXTURE.getGlTextureView());
+        rTex.render("u_Texture", TEXTURE.getGlTextureView(), TEXTURE.getSampler());
 
         // Normal text
         theme.textRenderer().begin(theme.scale(1));
@@ -254,7 +254,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.getGlTextureView());
+            rTex.render(texture.getGlTextureView(), texture.getSampler());
         });
     }
 

src/main/java/meteordevelopment/meteorclient/gui/screens/settings/BlockSettingScreen.java

@@ -16,7 +16,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.registry.Registries;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 public class BlockSettingScreen extends WindowScreen {
     private final BlockSetting setting;
@@ -54,7 +54,7 @@ private void initTable() {
             if (skipValue(block)) continue;
 
             WItemWithLabel item = theme.itemWithLabel(block.asItem().getDefaultStack(), Names.get(block));
-            if (!filterText.isEmpty() && !StringUtils.containsIgnoreCase(item.getLabelText(), filterText)) continue;
+            if (!filterText.isEmpty() && !Strings.CI.contains(item.getLabelText(), filterText)) continue;
             table.add(item);
 
             WButton select = table.add(theme.button("Select")).expandCellX().right().widget();

src/main/java/meteordevelopment/meteorclient/gui/screens/settings/FontFaceSettingScreen.java

@@ -19,7 +19,7 @@
 import meteordevelopment.meteorclient.renderer.text.FontFamily;
 import meteordevelopment.meteorclient.renderer.text.FontInfo;
 import meteordevelopment.meteorclient.settings.FontFaceSetting;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 import java.util.List;
 
@@ -72,7 +72,7 @@ private void initTable() {
             String name = fontFamily.getName();
 
             WLabel item = theme.label(name);
-            if (!filterText.isEmpty() && !StringUtils.containsIgnoreCase(name, filterText)) continue;
+            if (!filterText.isEmpty() && !Strings.CI.contains(name, filterText)) continue;
             table.add(item);
 
             WDropdown<FontInfo.Type> dropdown = table.add(theme.dropdown(FontInfo.Type.Regular)).right().widget();

src/main/java/meteordevelopment/meteorclient/gui/screens/settings/ItemSettingScreen.java

@@ -16,7 +16,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
 import net.minecraft.registry.Registries;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 public class ItemSettingScreen extends WindowScreen {
     private final ItemSetting setting;
@@ -53,7 +53,7 @@ public void initTable() {
             if (item == Items.AIR) continue;
 
             WItemWithLabel itemLabel = theme.itemWithLabel(item.getDefaultStack(), Names.get(item));
-            if (!filterText.isEmpty() && !StringUtils.containsIgnoreCase(itemLabel.getLabelText(), filterText)) continue;
+            if (!filterText.isEmpty() && !Strings.CI.contains(itemLabel.getLabelText(), filterText)) continue;
             table.add(itemLabel);
 
             WButton select = table.add(theme.button("Select")).expandCellX().right().widget();