1.21.2/.3 update (#4970)

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.7-SNAPSHOT"
+    id "fabric-loom" version "1.8-SNAPSHOT"
     id "maven-publish"
     id "com.github.johnrengelman.shadow" version "8.1.1"
 }

gradle.properties

@@ -1,10 +1,10 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric (https://fabricmc.net/develop)
-minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.3
-loader_version=0.15.11
-fapi_version=0.102.1+1.21.1
+minecraft_version=1.21.3
+yarn_mappings=1.21.3+build.2
+loader_version=0.16.9
+fapi_version=0.108.0+1.21.3
 
 # Mod Properties
 mod_version=0.5.9
@@ -14,16 +14,16 @@ archives_base_name=meteor-client
 # Dependency Versions
 
 # Baritone (https://github.com/MeteorDevelopment/baritone)
-baritone_version=1.21
+baritone_version=1.21.3
 
 # Sodium (https://github.com/CaffeineMC/sodium-fabric)
-sodium_version=mc1.21-0.6.0-beta.2-fabric
+sodium_version=mc1.21.3-0.6.0-fabric
 
 # Lithium (https://github.com/CaffeineMC/lithium-fabric)
-lithium_version=mc1.21.1-0.14.0-beta.1
+lithium_version=mc1.21.3-0.14.2
 
 # Iris (https://github.com/IrisShaders/Iris)
-iris_version=1.7.3+1.21
+iris_version=1.8.0+1.21.3-fabric
 
 # Orbit (https://github.com/MeteorDevelopment/orbit)
 orbit_version=0.2.4
@@ -41,7 +41,7 @@ reflections_version=0.10.2
 netty_version=4.1.90.Final
 
 # ViaFabricPlus (https://github.com/ViaVersion/ViaFabricPlus)
-viafabricplus_version=3.4.4
+viafabricplus_version=3.5.1
 
 # WaybackAuthLib (https://github.com/FlorianMichael/WaybackAuthLib)
 waybackauthlib_version=1.0.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/meteordevelopment/meteorclient/asm/transformers/GameRendererTransformer.java

@@ -17,7 +17,7 @@ public class GameRendererTransformer extends AsmTransformer {
     public GameRendererTransformer() {
         super(mapClassName("net/minecraft/class_757"));
 
-        getFovMethod = new MethodInfo("net/minecraft/class_4184", null, new Descriptor("Lnet/minecraft/class_4184;", "F", "Z", "D"), true);
+        getFovMethod = new MethodInfo("net/minecraft/class_4184", null, new Descriptor("Lnet/minecraft/class_4184;", "F", "Z", "F"), true);
     }
 
     @Override
@@ -30,7 +30,7 @@ public void transform(ClassNode klass) {
 
         //noinspection DataFlowIssue
         for (AbstractInsnNode insn : method.instructions) {
-            if (insn instanceof LdcInsnNode in && in.cst instanceof Double && (double) in.cst == 90) {
+            if (insn instanceof LdcInsnNode in && in.cst instanceof Float && (float) in.cst == 90) {
                 InsnList insns = new InsnList();
                 generateEventCall(insns, new LdcInsnNode(in.cst));
 
@@ -39,14 +39,14 @@ public void transform(ClassNode klass) {
                 injectionCount++;
             }
             else if (
-                (insn instanceof MethodInsnNode in1 && in1.name.equals("intValue") && insn.getNext() instanceof InsnNode _in && _in.getOpcode() == Opcodes.I2D)
+                (insn instanceof MethodInsnNode in1 && in1.name.equals("intValue") && insn.getNext() instanceof InsnNode _in && _in.getOpcode() == Opcodes.I2F)
                 ||
                 (insn instanceof MethodInsnNode in2 && in2.owner.equals(klass.name) && in2.name.startsWith("redirect") && in2.name.endsWith("getFov")) // Wi Zoom compatibility
             ) {
                 InsnList insns = new InsnList();
 
-                insns.add(new VarInsnNode(Opcodes.DSTORE, method.maxLocals));
-                generateEventCall(insns, new VarInsnNode(Opcodes.DLOAD, method.maxLocals));
+                insns.add(new VarInsnNode(Opcodes.FSTORE, method.maxLocals));
+                generateEventCall(insns, new VarInsnNode(Opcodes.FLOAD, method.maxLocals));
 
                 method.instructions.insert(insn.getNext(), insns);
                 injectionCount++;
@@ -59,9 +59,9 @@ else if (
     private void generateEventCall(InsnList insns, AbstractInsnNode loadPreviousFov) {
         insns.add(new FieldInsnNode(Opcodes.GETSTATIC, "meteordevelopment/meteorclient/MeteorClient", "EVENT_BUS", "Lmeteordevelopment/orbit/IEventBus;"));
         insns.add(loadPreviousFov);
-        insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "meteordevelopment/meteorclient/events/render/GetFovEvent", "get", "(D)Lmeteordevelopment/meteorclient/events/render/GetFovEvent;"));
+        insns.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "meteordevelopment/meteorclient/events/render/GetFovEvent", "get", "(F)Lmeteordevelopment/meteorclient/events/render/GetFovEvent;"));
         insns.add(new MethodInsnNode(Opcodes.INVOKEINTERFACE, "meteordevelopment/orbit/IEventBus", "post", "(Ljava/lang/Object;)Ljava/lang/Object;"));
         insns.add(new TypeInsnNode(Opcodes.CHECKCAST, "meteordevelopment/meteorclient/events/render/GetFovEvent"));
-        insns.add(new FieldInsnNode(Opcodes.GETFIELD, "meteordevelopment/meteorclient/events/render/GetFovEvent", "fov", "D"));
+        insns.add(new FieldInsnNode(Opcodes.GETFIELD, "meteordevelopment/meteorclient/events/render/GetFovEvent", "fov", "F"));
     }
 }

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

@@ -106,14 +106,14 @@ public RegistryEntry.Reference<T> parse(StringReader reader) throws CommandSynta
         Identifier identifier = Identifier.fromCommandInput(reader);
         RegistryKey<T> registryKey = RegistryKey.of(this.registryRef, identifier);
         return MinecraftClient.getInstance().getNetworkHandler().getRegistryManager()
-            .getWrapperOrThrow(this.registryRef)
+            .getOrThrow(this.registryRef)
             .getOptional(registryKey)
             .orElseThrow(() -> NOT_FOUND_EXCEPTION.createWithContext(reader, identifier, this.registryRef.getValue()));
     }
 
     @Override
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-        return CommandSource.suggestIdentifiers(MinecraftClient.getInstance().getNetworkHandler().getRegistryManager().getWrapperOrThrow(this.registryRef).streamKeys().map(RegistryKey::getValue), builder);
+        return CommandSource.suggestIdentifiers(MinecraftClient.getInstance().getNetworkHandler().getRegistryManager().getOrThrow(this.registryRef).streamKeys().map(RegistryKey::getValue), builder);
     }
 
     @Override

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

@@ -60,6 +60,6 @@ private void damagePlayer(int amount) {
     }
 
     private void sendPositionPacket(double x, double y, double z, boolean onGround) {
-        mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(x, y, z, onGround));
+        mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(x, y, z, onGround, mc.player.horizontalCollision));
     }
 }

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

@@ -9,6 +9,7 @@
 import meteordevelopment.meteorclient.commands.Command;
 import net.minecraft.command.CommandSource;
 import net.minecraft.network.packet.c2s.play.PlayerInputC2SPacket;
+import net.minecraft.util.PlayerInput;
 
 public class DismountCommand extends Command {
     public DismountCommand() {
@@ -18,7 +19,8 @@ public DismountCommand() {
     @Override
     public void build(LiteralArgumentBuilder<CommandSource> builder) {
         builder.executes(context -> {
-            mc.getNetworkHandler().sendPacket(new PlayerInputC2SPacket(0, 0, false, true));
+            PlayerInput sneak = new PlayerInput(false, false, false, false, false, true, false);
+            mc.getNetworkHandler().sendPacket(new PlayerInputC2SPacket(sneak));
             return SINGLE_SUCCESS;
         });
     }

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

@@ -96,7 +96,7 @@ private void one(CommandContext<CommandSource> context, ToIntFunction<Enchantmen
     private void all(boolean onlyPossible, ToIntFunction<Enchantment> level) throws CommandSyntaxException {
         ItemStack itemStack = tryGetItemStack();
 
-        mc.getNetworkHandler().getRegistryManager().getOptionalWrapper(RegistryKeys.ENCHANTMENT).ifPresent(registry -> {
+        mc.getNetworkHandler().getRegistryManager().getOptional(RegistryKeys.ENCHANTMENT).ifPresent(registry -> {
             registry.streamEntries().forEach(enchantment -> {
                 if (!onlyPossible || enchantment.value().isAcceptableItem(itemStack)) {
                     Utils.addEnchantment(itemStack, enchantment, level.applyAsInt(enchantment.value()));

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

@@ -19,7 +19,7 @@ public FovCommand() {
     @Override
     public void build(LiteralArgumentBuilder<CommandSource> builder) {
         builder.then(argument("fov", IntegerArgumentType.integer(0, 180)).executes(context -> {
-            ((ISimpleOption) (Object) mc.options.getFov()).set(context.getArgument("fov", Integer.class));
+            ((ISimpleOption) (Object) mc.options.getFov()).meteor$set(context.getArgument("fov", Integer.class));
             return SINGLE_SUCCESS;
         }));
     }

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

@@ -79,7 +79,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
 
             if (validBasic(stack)) {
                 ComponentMap components = ComponentMapArgumentType.getComponentMap(ctx, "component");
-                ComponentMapImpl stackComponents = (ComponentMapImpl) stack.getComponents();
+                MergedComponentMap stackComponents = (MergedComponentMap) stack.getComponents();
 
                 DataResult<Unit> dataResult = ItemStack.validateComponents(components);
                 dataResult.getOrThrow(MALFORMED_ITEM_EXCEPTION::create);
@@ -115,7 +115,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
 
                 ComponentType<?> componentType = Registries.DATA_COMPONENT_TYPE.get(componentTypeKey);
 
-                ComponentMapImpl components = (ComponentMapImpl) stack.getComponents();
+                MergedComponentMap components = (MergedComponentMap) stack.getComponents();
                 components.applyChanges(ComponentChanges.builder().remove(componentType).build());
 
                 setStack(stack);

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

@@ -34,8 +34,8 @@
 import java.util.Map;
 
 public class NotebotCommand extends Command {
-    private final static SimpleCommandExceptionType INVALID_SONG = new SimpleCommandExceptionType(Text.literal("Invalid song."));
-    private final static DynamicCommandExceptionType INVALID_PATH = new DynamicCommandExceptionType(object -> Text.literal("'%s' is not a valid path.".formatted(object)));
+    private static final SimpleCommandExceptionType INVALID_SONG = new SimpleCommandExceptionType(Text.literal("Invalid song."));
+    private static final DynamicCommandExceptionType INVALID_PATH = new DynamicCommandExceptionType(object -> Text.literal("'%s' is not a valid path.".formatted(object)));
 
     int ticks = -1;
     private final Map<Integer, List<Note>> song = new HashMap<>(); // tick -> notes
@@ -144,7 +144,7 @@ private void onTick(TickEvent.Post event) {
 
     @EventHandler
     private void onReadPacket(PacketEvent.Receive event) {
-        if (event.packet instanceof PlaySoundS2CPacket sound && sound.getSound().value().getId().getPath().contains("note_block")) {
+        if (event.packet instanceof PlaySoundS2CPacket sound && sound.getSound().value().id().getPath().contains("note_block")) {
             if (ticks == -1) ticks = 0;
             List<Note> notes = song.computeIfAbsent(ticks, tick -> new ArrayList<>());
             var note = getNote(sound);
@@ -212,7 +212,7 @@ private Note getNote(PlaySoundS2CPacket soundPacket) {
     }
 
     private NoteBlockInstrument getInstrumentFromSound(SoundEvent sound) {
-        String path = sound.getId().getPath();
+        String path = sound.id().getPath();
         if (path.contains("harp"))
             return NoteBlockInstrument.HARP;
         else if (path.contains("basedrum"))

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

@@ -11,8 +11,9 @@
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.commands.Command;
-import meteordevelopment.meteorclient.mixin.MapRendererAccessor;
+import meteordevelopment.meteorclient.mixin.MapTextureManagerAccessor;
 import net.minecraft.client.render.MapRenderer;
+import net.minecraft.client.texture.MapTextureManager;
 import net.minecraft.command.CommandSource;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.FilledMapItem;
@@ -70,8 +71,8 @@ private void saveMap(int scale) throws CommandSyntaxException {
         File path = getPath();
         if (path == null) throw OOPS.create();
 
-        MapRenderer mapRenderer = mc.gameRenderer.getMapRenderer();
-        MapRenderer.MapTexture texture = ((MapRendererAccessor) mapRenderer).invokeGetMapTexture(map.get(DataComponentTypes.MAP_ID), state);
+        MapRenderer mapRenderer = mc.gameRenderer.getClient().getMapRenderer();
+        MapTextureManager.MapTexture texture = ((MapTextureManagerAccessor) mapRenderer).invokeGetMapTexture(map.get(DataComponentTypes.MAP_ID), state);
         if (texture.texture.getImage() == null) throw OOPS.create();
 
         try {

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

@@ -49,10 +49,10 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
                 // No vehicle version
                 // For each 10 blocks, send a player move packet with no delta
                 for (int packetNumber = 0; packetNumber < (packetsRequired - 1); packetNumber++) {
-                    mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.OnGroundOnly(true));
+                    mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.OnGroundOnly(true, mc.player.horizontalCollision));
                 }
                 // Now send the final player move packet
-                mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX(), mc.player.getY() + blocks, mc.player.getZ(), true));
+                mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX(), mc.player.getY() + blocks, mc.player.getZ(), true, mc.player.horizontalCollision));
                 mc.player.setPosition(mc.player.getX(), mc.player.getY() + blocks, mc.player.getZ());
             }
 

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

@@ -84,7 +84,7 @@ private String waypointFullPos(Waypoint waypoint) {
     private int addWaypoint(CommandContext<CommandSource> context, boolean withCoords) {
         if (mc.player == null) return -1;
 
-        BlockPos pos = withCoords ? context.getArgument("pos", PosArgument.class).toAbsoluteBlockPos(mc.player.getCommandSource()) : mc.player.getBlockPos().up(2);
+        BlockPos pos = withCoords ? context.getArgument("pos", PosArgument.class).toAbsoluteBlockPos(mc.player.getCommandSource(mc.getServer().getOverworld())) : mc.player.getBlockPos().up(2);
         Waypoint waypoint = new Waypoint.Builder()
             .name(StringArgumentType.getString(context, "waypoint"))
             .pos(pos)

src/main/java/meteordevelopment/meteorclient/events/render/GetFovEvent.java

@@ -8,9 +8,9 @@
 public class GetFovEvent {
     private static final GetFovEvent INSTANCE = new GetFovEvent();
 
-    public double fov;
+    public float fov;
 
-    public static GetFovEvent get(double fov) {
+    public static GetFovEvent get(float fov) {
         INSTANCE.fov = fov;
         return INSTANCE;
     }

src/main/java/meteordevelopment/meteorclient/events/render/RenderItemEntityEvent.java

@@ -6,33 +6,32 @@
 package meteordevelopment.meteorclient.events.render;
 
 import meteordevelopment.meteorclient.events.Cancellable;
+import meteordevelopment.meteorclient.mixininterface.IEntityRenderState;
 import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.entity.state.ItemEntityRenderState;
 import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.ItemEntity;
-import net.minecraft.util.math.random.Random;
 
 public class RenderItemEntityEvent extends Cancellable {
     private static final RenderItemEntityEvent INSTANCE = new RenderItemEntityEvent();
 
     public ItemEntity itemEntity;
-    public float f;
+    public ItemEntityRenderState renderState;
     public float tickDelta;
     public MatrixStack matrixStack;
     public VertexConsumerProvider vertexConsumerProvider;
     public int light;
-    public Random random;
     public ItemRenderer itemRenderer;
 
-    public static RenderItemEntityEvent get(ItemEntity itemEntity, float f, float tickDelta, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int light, Random random, ItemRenderer itemRenderer) {
+    public static RenderItemEntityEvent get(ItemEntityRenderState renderState, float tickDelta, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int light, ItemRenderer itemRenderer) {
         INSTANCE.setCancelled(false);
-        INSTANCE.itemEntity = itemEntity;
-        INSTANCE.f = f;
+        INSTANCE.itemEntity = (ItemEntity) ((IEntityRenderState) renderState).meteor$getEntity();
+        INSTANCE.renderState = renderState;
         INSTANCE.tickDelta = tickDelta;
         INSTANCE.matrixStack = matrixStack;
         INSTANCE.vertexConsumerProvider = vertexConsumerProvider;
         INSTANCE.light = light;
-        INSTANCE.random = random;
         INSTANCE.itemRenderer = itemRenderer;
         return INSTANCE;
     }

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

@@ -344,7 +344,7 @@ private void blockDataW(WTable table, BlockDataSetting<?> setting) {
 
     private void potionW(WTable table, PotionSetting setting) {
         WHorizontalList list = table.add(theme.horizontalList()).expandX().widget();
-        WItemWithLabel item = list.add(theme.itemWithLabel(setting.get().potion, I18n.translate(setting.get().potion.getTranslationKey()))).widget();
+        WItemWithLabel item = list.add(theme.itemWithLabel(setting.get().potion, I18n.translate(setting.get().potion.getItem().getTranslationKey()))).widget();
 
         WButton button = list.add(theme.button("Select")).expandCellX().widget();
         button.action = () -> {

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

@@ -106,7 +106,7 @@ public void endRender() {
 
         r.render(drawContext.getMatrices());
 
-        GL.bindTexture(TEXTURE.getGlId());
+        GL.getTexture(TEXTURE.getGlId());
         rTex.render(drawContext.getMatrices());
 
         // Normal text

src/main/java/meteordevelopment/meteorclient/gui/screens/NotebotSongsScreen.java

@@ -84,13 +84,9 @@ private void addPath(Path path) {
 
         table.add(theme.label(FilenameUtils.getBaseName(path.getFileName().toString()))).expandCellX();
         WButton load = table.add(theme.button("Load")).right().widget();
-        load.action = () -> {
-            notebot.loadSong(path.toFile());
-        };
+        load.action = () -> notebot.loadSong(path.toFile());
         WButton preview = table.add(theme.button("Preview")).right().widget();
-        preview.action = () -> {
-            notebot.previewSong(path.toFile());
-        };
+        preview.action = () -> notebot.previewSong(path.toFile());
 
         table.row();
     }

src/main/java/meteordevelopment/meteorclient/gui/screens/accounts/AccountInfoScreen.java

@@ -10,14 +10,13 @@
 import meteordevelopment.meteorclient.gui.widgets.containers.WHorizontalList;
 import meteordevelopment.meteorclient.gui.widgets.pressable.WButton;
 import meteordevelopment.meteorclient.systems.accounts.Account;
-import meteordevelopment.meteorclient.systems.accounts.AccountType;
 import meteordevelopment.meteorclient.systems.accounts.TokenAccount;
 import meteordevelopment.meteorclient.utils.render.color.Color;
 
 import static meteordevelopment.meteorclient.MeteorClient.mc;
 
 public class AccountInfoScreen extends WindowScreen {
-    private Account<?> account;
+    private final Account<?> account;
 
     public AccountInfoScreen(GuiTheme theme, Account<?> account) {
         super(theme, account.getUsername() + " details");

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

@@ -97,7 +97,7 @@ private void generateWidgets() {
             try {
                 Identifier id = entry.contains(":") ? Identifier.of(entry) : Identifier.ofVanilla(entry);
                 addValue(RegistryKey.of(registryKey, id));
-            } catch (InvalidIdentifierException e) {}
+            } catch (InvalidIdentifierException ignored) {}
         };
 
         table.add(theme.verticalSeparator()).expandWidgetY();

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

@@ -27,7 +27,7 @@ public void initWidgets() {
         WTable table = add(theme.table()).expandX().widget();
 
         for (MyPotion potion : MyPotion.values()) {
-            table.add(theme.itemWithLabel(potion.potion, I18n.translate(potion.potion.getTranslationKey())));
+            table.add(theme.itemWithLabel(potion.potion, I18n.translate(potion.potion.getItem().getTranslationKey())));
 
             WButton select = table.add(theme.button("Select")).widget();
             select.action = () -> {