Update to 1.21.9

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("fabric-loom") version "1.11-SNAPSHOT"
     id("maven-publish")
-    id("com.gradleup.shadow") version "9.0.0-beta11"
+    id("com.gradleup.shadow") version "9.2.2"
 }
 
 base {

gradle.properties

@@ -2,10 +2,10 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.configuration-cache=true
 
 # Fabric (https://fabricmc.net/develop)
-minecraft_version=1.21.9-pre4
-yarn_mappings=1.21.9-pre4+build.2
+minecraft_version=1.21.9
+yarn_mappings=1.21.9+build.1
 loader_version=0.17.2
-fapi_version=0.133.11+1.21.9
+fapi_version=0.133.14+1.21.9
 
 # Mod Properties
 maven_group=meteordevelopment
@@ -17,16 +17,16 @@ archives_base_name=meteor-client
 baritone_version=1.21.5
 
 # Sodium (https://github.com/CaffeineMC/sodium-fabric)
-sodium_version=mc1.21.6-0.6.13-fabric
+sodium_version=mc1.21.9-0.7.0-fabric
 
 # Lithium (https://github.com/CaffeineMC/lithium-fabric)
-lithium_version=mc1.21.6-0.17.0-fabric
+lithium_version=mc1.21.9-0.19.0-fabric
 
 # Iris (https://github.com/IrisShaders/Iris)
-iris_version=1.9.0+1.21.6-fabric
+iris_version=1.9.3+1.21.9-fabric
 
 # ModMenu (https://github.com/TerraformersMC/ModMenu)
-modmenu_version=15.0.0-beta.3
+modmenu_version=15.0.0
 
 # 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.5
+viafabricplus_version=4.2.4
 
 # WaybackAuthLib (https://github.com/FlorianMichael/WaybackAuthLib)
 waybackauthlib_version=1.0.1

src/main/java/meteordevelopment/meteorclient/mixin/DefaultSkinHelperMixin.java

@@ -16,7 +16,7 @@
 @Mixin(DefaultSkinHelper.class)
 public abstract class DefaultSkinHelperMixin {
     // Player model rendering in main menu
-    @Inject(method = "getSkinTextures(Ljava/util/UUID;)Lnet/minecraft/client/util/SkinTextures;", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "getSkinTextures(Ljava/util/UUID;)Lnet/minecraft/entity/player/SkinTextures;", at = @At("HEAD"), cancellable = true)
     private static void onShouldUseSlimModel(UUID uuid, CallbackInfoReturnable<Boolean> info) {
         if (uuid == null) info.setReturnValue(false);
     }

src/main/java/meteordevelopment/meteorclient/mixin/EnchantingTableBlockEntityRendererMixin.java

@@ -20,8 +20,8 @@
 
 @Mixin(EnchantingTableBlockEntityRenderer.class)
 public abstract class EnchantingTableBlockEntityRendererMixin {
-    @WrapWithCondition(method = "render(Lnet/minecraft/block/entity/EnchantingTableBlockEntity;FLnet/minecraft/client/util/math/MatrixStack;IILnet/minecraft/util/math/Vec3d;Lnet/minecraft/client/render/command/ModelCommandRenderer$CrumblingOverlayCommand;Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;submitModel(Lnet/minecraft/client/model/Model;Ljava/lang/Object;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/RenderLayer;IIILnet/minecraft/client/texture/Sprite;ILnet/minecraft/client/render/command/ModelCommandRenderer$CrumblingOverlayCommand;)V"))
-    private boolean onRenderBookModelRenderProxy(OrderedRenderCommandQueue instance, Model model, Object o, MatrixStack matrixStack, RenderLayer renderLayer, int i, int j, int k, Sprite sprite, int l, ModelCommandRenderer.CrumblingOverlayCommand crumblingOverlayCommand) {
+    @WrapWithCondition(method = "render(Lnet/minecraft/client/render/block/entity/state/EnchantingTableBlockEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;Lnet/minecraft/client/render/state/CameraRenderState;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;submitModel(Lnet/minecraft/client/model/Model;Ljava/lang/Object;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/RenderLayer;IIILnet/minecraft/client/texture/Sprite;ILnet/minecraft/client/render/command/ModelCommandRenderer$CrumblingOverlayCommand;)V"))
+    private boolean onRenderBookModelRenderProxy(OrderedRenderCommandQueue instance, Model<?> model, Object o, MatrixStack matrixStack, RenderLayer renderLayer, int i, int j, int k, Sprite sprite, int l, ModelCommandRenderer.CrumblingOverlayCommand crumblingOverlayCommand) {
         return !Modules.get().get(NoRender.class).noEnchTableBook();
     }
 }

src/main/java/meteordevelopment/meteorclient/mixin/EndCrystalEntityRendererMixin.java

@@ -63,9 +63,10 @@ private void onInit(CallbackInfo info) {
     // Chams - Color
 
     @WrapWithCondition(method = "render(Lnet/minecraft/client/render/entity/state/EndCrystalEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;Lnet/minecraft/client/render/state/CameraRenderState;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;submitModel(Lnet/minecraft/client/model/Model;Ljava/lang/Object;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/RenderLayer;IIILnet/minecraft/client/render/command/ModelCommandRenderer$CrumblingOverlayCommand;)V"))
-    private boolean render$color(OrderedRenderCommandQueue instance, Model model, Object state, MatrixStack matrixStack, RenderLayer renderLayer, int light, int uv, int outlineColor, ModelCommandRenderer.CrumblingOverlayCommand crumblingOverlayCommand) {
+    private <S> boolean render$color(OrderedRenderCommandQueue instance, Model<? super S> model, S state, MatrixStack matrixStack, RenderLayer renderLayer, int light, int uv, int outlineColor, ModelCommandRenderer.CrumblingOverlayCommand crumblingOverlayCommand) {
         if (chams.isActive() && chams.crystals.get()) {
-            instance.submitModel(model,
+            instance.submitModel(
+                model,
                 state,
                 matrixStack,
                 END_CRYSTAL,
@@ -74,7 +75,8 @@ private void onInit(CallbackInfo info) {
                 chams.crystalsColor.get().getPacked(),
                 null,
                 outlineColor,
-                null);
+                null
+            );
             return false;
         }
 

src/main/java/meteordevelopment/meteorclient/mixin/EntityRenderDispatcherMixin.java → src/main/java/meteordevelopment/meteorclient/mixin/EntityRenderManagerMixin.java

@@ -5,8 +5,11 @@
 
 package meteordevelopment.meteorclient.mixin;
 
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import meteordevelopment.meteorclient.mixininterface.IEntityRenderState;
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.entity.EntityRenderManager;
+import net.minecraft.client.render.entity.state.EntityRenderState;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -15,7 +18,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(EntityRenderManager.class)
-public abstract class EntityRenderDispatcherMixin {
+public abstract class EntityRenderManagerMixin {
     @Shadow
     public Camera camera;
 
@@ -58,24 +61,21 @@ private <E extends Entity, S extends EntityRenderState> void render(E entity, do
         v += 1;
         matrices.scale((float) v, (float) v, (float) v);
     }
+    */
 
     // IEntityRenderState
 
-    @ModifyExpressionValue(method = "render(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/EntityRenderer;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/EntityRenderer;getAndUpdateRenderState(Lnet/minecraft/entity/Entity;F)Lnet/minecraft/client/render/entity/state/EntityRenderState;"))
-    private <E extends Entity, S extends EntityRenderState> S render$getAndUpdateRenderState(S state, E entity, double x, double y, double z, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, EntityRenderer<? super E, S> renderer) {
+    @ModifyExpressionValue(
+        method = "getAndUpdateRenderState(Lnet/minecraft/entity/Entity;F)Lnet/minecraft/client/render/entity/state/EntityRenderState;",
+        at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/EntityRenderer;getAndUpdateRenderState(Lnet/minecraft/entity/Entity;F)Lnet/minecraft/client/render/entity/state/EntityRenderState;")
+    )
+    private <E extends Entity> EntityRenderState getAndUpdateRenderState$setEntity(EntityRenderState state, E entity, float tickProgress) {
         ((IEntityRenderState) state).meteor$setEntity(entity);
         return state;
     }
 
     // Player model rendering in main menu
 
-    @Inject(method = "renderShadow", at = @At("HEAD"), cancellable = true)
-    private static void onRenderShadow(MatrixStack matrices, VertexConsumerProvider vertexConsumers, EntityRenderState renderState, float opacity, WorldView world, float radius, CallbackInfo info) {
-        if (PostProcessShaders.rendering) info.cancel();
-        if (Modules.get().get(NoRender.class).noDeadEntities() && renderState instanceof LivingEntityRenderState livingEntityRenderState && livingEntityRenderState.deathTime > 0) info.cancel();
-    }
-     */
-
     @Inject(method = "getSquaredDistanceToCamera(Lnet/minecraft/entity/Entity;)D", at = @At("HEAD"), cancellable = true)
     private void onGetSquaredDistanceToCameraEntity(Entity entity, CallbackInfoReturnable<Double> info) {
         if (camera == null) info.setReturnValue(0.0);

src/main/java/meteordevelopment/meteorclient/mixin/EntityRendererMixin.java

@@ -18,8 +18,10 @@
 import net.minecraft.client.render.Frustum;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.state.EntityRenderState;
+import net.minecraft.client.render.entity.state.LivingEntityRenderState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.FallingBlockEntity;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.text.Text;
 import net.minecraft.world.LightType;
@@ -74,6 +76,21 @@ private void onGetOutlineColor(T entity, S state, float tickProgress, CallbackIn
         }
     }
 
+    @Inject(method = "updateShadow(Lnet/minecraft/entity/Entity;Lnet/minecraft/client/render/entity/state/EntityRenderState;)V", at = @At("HEAD"), cancellable = true)
+    private void updateShadow(Entity entity, EntityRenderState renderState, CallbackInfo ci) {
+        if (PostProcessShaders.rendering) {
+            ci.cancel();
+            return;
+        }
+
+        if (Modules.get().get(NoRender.class).noDeadEntities() &&
+            entity instanceof LivingEntity &&
+            renderState instanceof LivingEntityRenderState livingEntityRenderState &&
+            livingEntityRenderState.deathTime > 0) {
+            ci.cancel();
+        }
+    }
+
     @Unique
     private ESP getESP() {
         if (esp == null) {

src/main/java/meteordevelopment/meteorclient/mixin/LivingEntityRendererMixin.java

@@ -65,6 +65,7 @@ private Team hasLabelClientPlayerEntityGetScoreboardTeamProxy(Team team) {
 
     // Chams - player color
 
+    @SuppressWarnings("rawtypes")
     @WrapWithCondition(method = "render(Lnet/minecraft/client/render/entity/state/LivingEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;Lnet/minecraft/client/render/state/CameraRenderState;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;submitModel(Lnet/minecraft/client/model/Model;Ljava/lang/Object;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/RenderLayer;IIILnet/minecraft/client/texture/Sprite;ILnet/minecraft/client/render/command/ModelCommandRenderer$CrumblingOverlayCommand;)V"))
     private boolean render$render(OrderedRenderCommandQueue instance, Model model, Object state, MatrixStack matrixStack, RenderLayer renderLayer, int light, int overlay, int mixColor, Sprite sprite, int outlineColor, ModelCommandRenderer.CrumblingOverlayCommand crumblingOverlayCommand) {
         if (!chams.isActive() || !chams.players.get() || !(((IEntityRenderState) state).meteor$getEntity() instanceof PlayerEntity player)) return true;

src/main/java/meteordevelopment/meteorclient/mixin/MobSpawnerBlockEntityRendererMixin.java

@@ -18,7 +18,7 @@
 
 @Mixin(MobSpawnerBlockEntityRenderer.class)
 public abstract class MobSpawnerBlockEntityRendererMixin implements BlockEntityRenderer<MobSpawnerBlockEntity, MobSpawnerBlockEntityRenderState> {
-    @Inject(method = "render(Lnet/minecraft/client/render/block/entity/state/MobSpawnerBlockEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;)V", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "render(Lnet/minecraft/client/render/block/entity/state/BlockEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;Lnet/minecraft/client/render/state/CameraRenderState;)V", at = @At("HEAD"), cancellable = true)
     private void onRender(CallbackInfo ci) {
         if (Modules.get().get(NoRender.class).noMobInSpawner()) ci.cancel();
     }

src/main/java/meteordevelopment/meteorclient/mixin/sodium/SodiumFluidRendererImplDefaultRenderContextMixin.java

@@ -43,8 +43,8 @@ private void onGetColorProvider(Fluid fluid, CallbackInfoReturnable<ColorProvide
     }
 
     @Unique
-    private void lavaColorProvider(LevelSlice level, BlockPos pos, BlockPos.Mutable posMutable, FluidState state, ModelQuadView quads, int[] colors) {
+    private void lavaColorProvider(LevelSlice slice, BlockPos pos, BlockPos.Mutable scratchPos, FluidState state, ModelQuadView quad, int[] output, boolean smooth) {
         Color c = ambience.lavaColor.get();
-        Arrays.fill(colors, ColorABGR.pack(c.r, c.g, c.b, c.a));
+        Arrays.fill(output, ColorABGR.pack(c.r, c.g, c.b, c.a));
     }
 }

src/main/java/meteordevelopment/meteorclient/mixininterface/IEntityRenderState.java

@@ -5,11 +5,8 @@
 
 package meteordevelopment.meteorclient.mixininterface;
 
-import meteordevelopment.meteorclient.mixin.EntityRenderDispatcherMixin;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.EntityRenderer;
+import meteordevelopment.meteorclient.mixin.EntityRenderManagerMixin;
 import net.minecraft.client.render.entity.state.EntityRenderState;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 
 public interface IEntityRenderState {
@@ -23,7 +20,7 @@ public interface IEntityRenderState {
      *
      * @return The entity that the render state refers to
      *
-     * @see EntityRenderDispatcherMixin#render$getAndUpdateRenderState(EntityRenderState, Entity, double, double, double, float, MatrixStack, VertexConsumerProvider, int, EntityRenderer)
+     * @see EntityRenderManagerMixin#getAndUpdateRenderState$setEntity(EntityRenderState, Entity, float)
      */
     Entity meteor$getEntity();
 

src/main/java/meteordevelopment/meteorclient/systems/accounts/types/TheAlteningAccount.java

@@ -23,7 +23,7 @@
 import static meteordevelopment.meteorclient.MeteorClient.mc;
 
 public class TheAlteningAccount extends Account<TheAlteningAccount> implements TokenAccount {
-    private static final Environment ENVIRONMENT = new Environment("http://sessionserver.thealtening.com", "http://authserver.thealtening.com", "The Altening");
+    private static final Environment ENVIRONMENT = new Environment("http://sessionserver.thealtening.com", "http://authserver.thealtening.com", "https://api.mojang.com", "The Altening");
     private static final YggdrasilAuthenticationService SERVICE = new YggdrasilAuthenticationService(mc.getNetworkProxy(), ENVIRONMENT);
     private String token;
     private @Nullable WaybackAuthLib auth;
@@ -60,7 +60,7 @@ public boolean login() {
         applyLoginEnvironment(SERVICE);
 
         try {
-            setSession(new Session(auth.getCurrentProfile().name(), auth.getCurrentProfile().id (), auth.getAccessToken(), Optional.empty(), Optional.empty()));
+            setSession(new Session(auth.getCurrentProfile().name(), auth.getCurrentProfile().id(), auth.getAccessToken(), Optional.empty(), Optional.empty()));
             return true;
         } catch (Exception e) {
             MeteorClient.LOG.error("Failed to login with TheAltening.");

src/main/java/meteordevelopment/meteorclient/systems/modules/movement/Velocity.java

@@ -152,9 +152,9 @@ private void onTick(TickEvent.Post event) {
     private void onPacketReceive(PacketEvent.Receive event) {
         if (knockback.get() && event.packet instanceof EntityVelocityUpdateS2CPacket packet
             && packet.getEntityId() == mc.player.getId()) {
-            double velX = (packet.method_73085().getX() - mc.player.getVelocity().x) * knockbackHorizontal.get();
-            double velY = (packet.method_73085().getY() - mc.player.getVelocity().y) * knockbackVertical.get();
-            double velZ = (packet.method_73085().getZ() - mc.player.getVelocity().z) * knockbackHorizontal.get();
+            double velX = (packet.getVelocity().getX() - mc.player.getVelocity().x) * knockbackHorizontal.get();
+            double velY = (packet.getVelocity().getY() - mc.player.getVelocity().y) * knockbackVertical.get();
+            double velZ = (packet.getVelocity().getZ() - mc.player.getVelocity().z) * knockbackHorizontal.get();
             ((EntityVelocityUpdateS2CPacketAccessor) packet).meteor$setVelocity(
                 new Vec3d(velX * 8000 + mc.player.getVelocity().x * 8000, velY * 8000 + mc.player.getVelocity().y * 8000, velZ * 8000 + mc.player.getVelocity().z * 8000)
             );

src/main/resources/fabric.mod.json

@@ -47,14 +47,14 @@
   },
   "depends": {
     "java": ">=21",
-    "minecraft": ["${minecraft_version}", "1.21.7", "1.21.6"],
+    "minecraft": ["${minecraft_version}"],
     "fabricloader": ">=${loader_version}"
   },
   "breaks": {
     "optifabric": "*",
     "feather": "*",
     "origins": "*",
-    "sodium": "<0.6.12",
+    "sodium": "<0.7.0",
     "morechathistory": "*"
   }
 }

src/main/resources/meteor-client.mixins.json

@@ -80,8 +80,8 @@
     "EntityAccessor",
     "EntityBucketItemAccessor",
     "EntityMixin",
-    "EntityRenderDispatcherMixin",
     "EntityRendererMixin",
+    "EntityRenderManagerMixin",
     "EntityRenderStateMixin",
     "EntityTrackingSectionAccessor",
     "EntityVelocityUpdateS2CPacketAccessor",