More stuff from #5724

Author: MineGame159

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

@@ -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
 
 # 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

…t/mixin/EntityRenderDispatcherMixin.java …ient/mixin/EntityRenderManagerMixin.javasrc/main/java/meteordevelopment/meteorclient/mixin/EntityRenderDispatcherMixin.java renamed to src/main/java/meteordevelopment/meteorclient/mixin/EntityRenderManagerMixin.java src/main/java/meteordevelopment/meteorclient/mixin/EntityRenderDispatcherMixin.java renamed to src/main/java/meteordevelopment/meteorclient/mixin/EntityRenderManagerMixin.java

@@ -5,17 +5,18 @@
 
 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;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(EntityRenderManager.class)
-public abstract class EntityRenderDispatcherMixin {
+public abstract class EntityRenderManagerMixin {
     @Shadow
     public Camera camera;
 
@@ -58,26 +59,16 @@ 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/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,7 +5,7 @@
 
 package meteordevelopment.meteorclient.mixininterface;
 
-import meteordevelopment.meteorclient.mixin.EntityRenderDispatcherMixin;
+import meteordevelopment.meteorclient.mixin.EntityRenderManagerMixin;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.state.EntityRenderState;
@@ -23,7 +23,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

@@ -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/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

@@ -79,7 +79,7 @@
     "EntityAccessor",
     "EntityBucketItemAccessor",
     "EntityMixin",
-    "EntityRenderDispatcherMixin",
+    "EntityRenderManagerMixin",
     "EntityRendererMixin",
     "EntityRenderStateMixin",
     "EntityTrackingSectionAccessor",