1.21.5 update (MeteorDevelopment#5265)

* Initial commit

TODO: update fabric-renderer-indigo version when it releases

* fix a bunch of errors

* Fix even more errors

Issues with optionals should hopefully now be resolved, unless I missed any. Major issues remaining are with rendering changes, removal of tool/weapon items, and inventory changes.

* Mixins + version bump

* Fix issues with inventory and tool/weapon changes

* Dependency bump

Fabric renderer Indigo was updated

* Dependency bump 1.21.5 stable

* Dependency bump

* Fixed rendering + some other things

* Fix scissor not being applied to items in GUI

* Fixed line rendering in Renderer2D

* fix EntityOwner npe

* fix meteor toast

* `RegistryListSettingScreen` -> `CollectionListSettingScreen`
relax parameter from `Registry<T>` to `Iterable<T>`

* remove `PacketUtils.PacketRegistry` in favor of a set

* Dependency bump

Also suppress some deprecation warns

* Properly suppress warns

Added compile args to provide better logs in the future, suppress launch subproject warns.

* PacketUtilsUtil fix filter

Previous comparison wouldn't skip the excluded packets

* Fix merge commit

* Minor cleanup

* Include fabric-api-base in the built jar, since it is required by fabric-resource-loader-v0 now

* Handle planned deprecation

Add missing Suppress too

* remove module registry

* deprecate `Modules#getList`

* cache snbt reader

* PotionSpoof rework

Spoofing clientside effects is unreliable/broken on pretty much any server.
Module rebranded as NoStatusEffects with only effect blocking capability.

* fixes and improvements

* Fix Shader ESP and Chams

---------

Co-authored-by: Wide_Cat <[email protected]>
Co-authored-by: MineGame159 <[email protected]>
Co-authored-by: RacoonDog <[email protected]>
Co-authored-by: Wide-Cat <[email protected]>

Author: 4 people

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    id("fabric-loom") version "1.9-SNAPSHOT"
+    id("fabric-loom") version "1.10-SNAPSHOT"
     id("maven-publish")
-    id("com.gradleup.shadow") version "9.0.0-beta4"
+    id("com.gradleup.shadow") version "9.0.0-beta11"
 }
 
 base {
@@ -75,6 +75,8 @@ dependencies {
     minecraft("com.mojang:minecraft:${properties["minecraft_version"] as String}")
     mappings("net.fabricmc:yarn:${properties["yarn_mappings"] as String}:v2")
     modImplementation("net.fabricmc:fabric-loader:${properties["loader_version"] as String}")
+
+    modInclude(fabricApi.module("fabric-api-base", properties["fapi_version"] as String))
     modInclude(fabricApi.module("fabric-resource-loader-v0", properties["fapi_version"] as String))
 
     // Compat fixes
@@ -155,6 +157,8 @@ tasks {
 
     withType<JavaCompile> {
         options.release = 21
+        options.compilerArgs.add("-Xlint:deprecation")
+        options.compilerArgs.add("-Xlint:unchecked")
     }
 
     shadowJar {

gradle.properties

@@ -2,10 +2,10 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.configuration-cache=true
 
 # Fabric (https://fabricmc.net/develop)
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.7
-loader_version=0.16.9
-fapi_version=0.114.0+1.21.4
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
+loader_version=0.16.12
+fapi_version=0.119.6+1.21.5
 
 # Mod Properties
 maven_group=meteordevelopment
@@ -17,16 +17,16 @@ archives_base_name=meteor-client
 baritone_version=1.21.4
 
 # Sodium (https://github.com/CaffeineMC/sodium-fabric)
-sodium_version=mc1.21.4-0.6.6-fabric
+sodium_version=mc1.21.5-0.6.12-fabric
 
 # Lithium (https://github.com/CaffeineMC/lithium-fabric)
-lithium_version=mc1.21.4-0.14.3-fabric
+lithium_version=mc1.21.5-0.16.0-fabric
 
 # Iris (https://github.com/IrisShaders/Iris)
-iris_version=1.8.5+1.21.4-fabric
+iris_version=1.8.11+1.21.5-fabric
 
 # ModMenu (https://github.com/TerraformersMC/ModMenu)
-modmenu_version=13.0.2
+modmenu_version=14.0.0-rc.2
 
 # Orbit (https://github.com/MeteorDevelopment/orbit)
 orbit_version=0.2.4
@@ -41,10 +41,10 @@ discordipc_version=1.1
 reflections_version=0.10.2
 
 # Netty (https://github.com/netty/netty)
-netty_version=4.1.90.Final
+netty_version=4.1.118.Final
 
 # ViaFabricPlus (https://github.com/ViaVersion/ViaFabricPlus)
-viafabricplus_version=4.0.0
+viafabricplus_version=4.1.0
 
 # WaybackAuthLib (https://github.com/FlorianMichael/WaybackAuthLib)
 waybackauthlib_version=1.0.1

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

launch/build.gradle.kts

@@ -8,5 +8,6 @@ version = "0.1.0"
 tasks {
     withType<JavaCompile> {
         options.release = 8
+        options.compilerArgs.add("-Xlint:-options") // Suppress Java 8 deprecation warnings
     }
 }

src/main/java/meteordevelopment/meteorclient/commands/arguments/CompoundNbtTagArgumentType.java

@@ -15,7 +15,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import static net.minecraft.nbt.StringNbtReader.EXPECTED_VALUE;
+import static net.minecraft.nbt.StringNbtReader.EXPECTED_COMPOUND;
 
 public class CompoundNbtTagArgumentType implements ArgumentType<NbtCompound> {
     private static final CompoundNbtTagArgumentType INSTANCE = new CompoundNbtTagArgumentType();
@@ -35,7 +35,7 @@ private CompoundNbtTagArgumentType() {}
     public NbtCompound parse(StringReader reader) throws CommandSyntaxException {
         reader.skipWhitespace();
         if (!reader.canRead()) {
-            throw EXPECTED_VALUE.createWithContext(reader);
+            throw EXPECTED_COMPOUND.createWithContext(reader);
         }
         StringBuilder b = new StringBuilder();
         int open = 0;
@@ -52,7 +52,7 @@ else if (reader.peek() == '}') {
         }
         reader.expect('}');
         b.append('}');
-        return StringNbtReader.parse(b.toString()
+        return StringNbtReader.readCompound(b.toString()
                 .replace("$", "§")
                 .replace("§§", "$")
         );

src/main/java/meteordevelopment/meteorclient/commands/arguments/RegistryEntryReferenceArgumentType.java

@@ -91,6 +91,7 @@ public static RegistryEntry.Reference<StatusEffect> getStatusEffect(CommandConte
         return getRegistryEntry(context, name, RegistryKeys.STATUS_EFFECT);
     }
 
+    @SuppressWarnings("unchecked")
     private static <T> RegistryEntry.Reference<T> getRegistryEntry(CommandContext<?> context, String name, RegistryKey<Registry<T>> registryRef) throws CommandSyntaxException {
         RegistryEntry.Reference<T> reference = context.getArgument(name, RegistryEntry.Reference.class);
         RegistryKey<?> registryKey = reference.registryKey();

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

@@ -35,7 +35,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
             ChatUtils.info("--- Bound Modules ((highlight)%d(default)) ---", modules.size());
 
             for (Module module : modules) {
-                HoverEvent hoverEvent = new HoverEvent(HoverEvent.Action.SHOW_TEXT, getTooltip(module));
+                HoverEvent hoverEvent = new HoverEvent.ShowText(getTooltip(module));
 
                 MutableText text = Text.literal(module.title).formatted(Formatting.WHITE);
                 text.setStyle(text.getStyle().withHoverEvent(hoverEvent));

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

@@ -61,8 +61,8 @@ private MutableText getCommandText(Command command) {
             text.append(Text.literal(", ").formatted(Formatting.GRAY));
         text.setStyle(text
             .getStyle()
-            .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, tooltip))
-            .withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, Config.get().prefix.get() + command.getName()))
+            .withHoverEvent(new HoverEvent.ShowText(tooltip))
+            .withClickEvent(new ClickEvent.SuggestCommand(Config.get().prefix.get() + command.getName()))
         );
 
         return text;

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

@@ -13,6 +13,8 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.argument.ItemStackArgumentType;
+import net.minecraft.component.type.AttributeModifierSlot;
+import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.text.Text;
@@ -42,25 +44,27 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
 
         // Main Inv
         builder.then(literal("inventory").executes(context -> drop(player -> {
-            for (int i = 9; i < player.getInventory().main.size(); i++) {
+            for (int i = 9; i < player.getInventory().getMainStacks().size(); i++) {
                 InvUtils.drop().slotMain(i - 9);
             }
         })));
 
         // Hotbar and main inv
         builder.then(literal("all").executes(context -> drop(player -> {
-                    for (int i = 0; i < player.getInventory().size(); i++) {
-                        InvUtils.drop().slot(i);
-                    }
-                    InvUtils.drop().slotOffhand();
-                })));
+            for (int i = 0; i < player.getInventory().size(); i++) {
+                InvUtils.drop().slot(i);
+            }
+            InvUtils.drop().slotOffhand();
+        })));
 
         // Armor
         builder.then(literal("armor").executes(context -> drop(player -> {
-                    for (int i = 0; i < player.getInventory().armor.size(); i++) {
-                        InvUtils.drop().slotArmor(i);
-                    }
-                })));
+            for (EquipmentSlot equipmentSlot : AttributeModifierSlot.ARMOR) {
+                if (equipmentSlot.getType() == EquipmentSlot.Type.HUMANOID_ARMOR) {
+                    InvUtils.drop().slotArmor(equipmentSlot.getEntitySlotId());
+                }
+            }
+        })));
 
         // Specific item
         builder.then(argument("item", ItemStackArgumentType.itemStack(REGISTRY_ACCESS)).executes(context -> drop(player -> {