no render mixin fixes

beanbag44 · beanbag44 · commit 440e171c6ee0 · 2025-12-18T06:17:18.000Z
diff --git a/src/main/java/com/lambda/mixin/render/DebugHudMixin.java b/src/main/java/com/lambda/mixin/render/DebugHudMixin.java
@@ -17,14 +17,8 @@
 
 package com.lambda.mixin.render;
 
-import com.lambda.util.DebugInfoHud;
 import net.minecraft.client.gui.hud.DebugHud;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.List;
 
 @Mixin(DebugHud.class)
 public class DebugHudMixin {
diff --git a/src/main/java/com/lambda/mixin/render/ParticleManagerMixin.java b/src/main/java/com/lambda/mixin/render/ParticleManagerMixin.java
diff --git a/src/main/java/com/lambda/mixin/render/blockentity/AbstractSignBlockEntityRendererMixin.java b/src/main/java/com/lambda/mixin/render/blockentity/AbstractSignBlockEntityRendererMixin.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.mixin.render.blockEntity;
+package com.lambda.mixin.render.blockentity;
 
 import com.lambda.module.modules.render.NoRender;
 import net.minecraft.client.render.block.entity.AbstractSignBlockEntityRenderer;
diff --git a/src/main/java/com/lambda/mixin/render/blockentity/BeaconBlockEntityRendererMixin.java b/src/main/java/com/lambda/mixin/render/blockentity/BeaconBlockEntityRendererMixin.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.mixin.render.blockEntity;
+package com.lambda.mixin.render.blockentity;
 
 import com.lambda.module.modules.render.NoRender;
 import net.minecraft.client.render.block.entity.BeaconBlockEntityRenderer;
diff --git a/src/main/java/com/lambda/mixin/render/blockentity/BlockEntityRenderDispatcherMixin.java b/src/main/java/com/lambda/mixin/render/blockentity/BlockEntityRenderDispatcherMixin.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.mixin.render.blockEntity;
+package com.lambda.mixin.render.blockentity;
 
 import com.lambda.module.modules.render.NoRender;
 import net.minecraft.block.entity.BlockEntity;
diff --git a/src/main/java/com/lambda/mixin/render/blockentity/EnchantingTableBlockEntityRendererMixin.java b/src/main/java/com/lambda/mixin/render/blockentity/EnchantingTableBlockEntityRendererMixin.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.mixin.render.blockEntity;
+package com.lambda.mixin.render.blockentity;
 
 import com.lambda.module.modules.render.NoRender;
 import net.minecraft.client.render.block.entity.EnchantingTableBlockEntityRenderer;
@@ -30,8 +30,8 @@
 
 @Mixin(EnchantingTableBlockEntityRenderer.class)
 public class EnchantingTableBlockEntityRendererMixin {
-//    @WrapWithCondition(method = "render(Lnet/minecraft/block/entity/EnchantingTableBlockEntity;FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/util/math/Vec3d;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/BookModel;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;II)V"))
-//    private boolean wrapRender(BookModel instance, MatrixStack matrixStack, VertexConsumer vertexConsumer, int i, int j) {
-//        return NoRender.INSTANCE.isDisabled() || !NoRender.getNoEnchantingTableBook();
-//    }
+    @Inject(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("HEAD"), cancellable = true)
+    private void injectRender(EnchantingTableBlockEntityRenderState renderState, MatrixStack matrices, OrderedRenderCommandQueue queue, CameraRenderState cameraRenderState, CallbackInfo ci) {
+        if (NoRender.INSTANCE.isEnabled() && NoRender.getNoEnchantingTableBook()) ci.cancel();
+    }
 }
diff --git a/src/main/java/com/lambda/mixin/render/blockentity/MobSpawnerBlockEntityRendererMixin.java b/src/main/java/com/lambda/mixin/render/blockentity/MobSpawnerBlockEntityRendererMixin.java
@@ -15,18 +15,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.mixin.render.blockEntity;
+package com.lambda.mixin.render.blockentity;
 
 import com.lambda.module.modules.render.NoRender;
-import net.minecraft.block.entity.MobSpawnerBlockEntity;
-import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.block.entity.MobSpawnerBlockEntityRenderer;
 import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.EntityRenderManager;
 import net.minecraft.client.render.entity.state.EntityRenderState;
 import net.minecraft.client.render.state.CameraRenderState;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
diff --git a/src/main/java/com/lambda/mixin/render/particle/BillboardParticleMixin.java b/src/main/java/com/lambda/mixin/render/particle/BillboardParticleMixin.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.mixin.render.particle;
+
+import com.lambda.module.modules.render.NoRender;
+import net.minecraft.client.particle.BillboardParticle;
+import net.minecraft.client.particle.BillboardParticleSubmittable;
+import net.minecraft.client.particle.Particle;
+import net.minecraft.client.render.Camera;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(BillboardParticle.class)
+public class BillboardParticleMixin {
+    @Inject(method = "render(Lnet/minecraft/client/particle/BillboardParticleSubmittable;Lnet/minecraft/client/render/Camera;F)V", at = @At("HEAD"), cancellable = true)
+    private void injectRender(BillboardParticleSubmittable submittable, Camera camera, float tickDelta, CallbackInfo ci) {
+        if (NoRender.shouldOmitParticle((Particle) ((Object) this))) ci.cancel();
+    }
+}
diff --git a/src/main/java/com/lambda/mixin/render/particle/ElderGuardianParticleRendererMixin.java b/src/main/java/com/lambda/mixin/render/particle/ElderGuardianParticleRendererMixin.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.mixin.render.particle;
+
+import com.lambda.module.modules.render.NoRender;
+import net.minecraft.client.particle.ElderGuardianParticle;
+import net.minecraft.client.particle.ElderGuardianParticleRenderer;
+import net.minecraft.client.particle.NoRenderParticleRenderer;
+import net.minecraft.client.render.Camera;
+import net.minecraft.client.render.Frustum;
+import net.minecraft.client.render.Submittable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ElderGuardianParticleRenderer.class)
+public class ElderGuardianParticleRendererMixin {
+    @Inject(method = "render", at = @At("HEAD"), cancellable = true)
+    private void injectRender(Frustum frustum, Camera camera, float tickProgress, CallbackInfoReturnable<Submittable> cir) {
+        if (NoRender.shouldOmitParticle(ElderGuardianParticle.class)) cir.setReturnValue(NoRenderParticleRenderer.EMPTY);
+    }
+}
diff --git a/src/main/java/com/lambda/mixin/render/particle/ItemPickupParticleRendererMixin.java b/src/main/java/com/lambda/mixin/render/particle/ItemPickupParticleRendererMixin.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.mixin.render.particle;
+
+import com.lambda.module.modules.render.NoRender;
+import net.minecraft.client.particle.ItemPickupParticle;
+import net.minecraft.client.particle.ItemPickupParticleRenderer;
+import net.minecraft.client.particle.NoRenderParticleRenderer;
+import net.minecraft.client.render.Camera;
+import net.minecraft.client.render.Frustum;
+import net.minecraft.client.render.Submittable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ItemPickupParticleRenderer.class)
+public class ItemPickupParticleRendererMixin {
+    @Inject(method = "render", at = @At("HEAD"), cancellable = true)
+    private void injectRender(Frustum frustum, Camera camera, float tickProgress, CallbackInfoReturnable<Submittable> cir) {
+        if (NoRender.shouldOmitParticle(ItemPickupParticle.class)) cir.setReturnValue(NoRenderParticleRenderer.EMPTY);
+    }
+}
diff --git a/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt b/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt
@@ -41,7 +41,6 @@ import com.lambda.util.player.SlotUtils.hotbarAndStorage
 import com.lambda.util.world.raycast.RayCastUtils.entityResult
 import net.minecraft.entity.LivingEntity
 import net.minecraft.util.Hand
-import net.minecraft.util.math.Vec3d
 
 object KillAura : Module(
     name = "KillAura",
@@ -61,16 +60,12 @@ object KillAura : Module(
     val target: LivingEntity?
         get() = targeting.target()
 
-    private var shakeRandom = Vec3d.ZERO
-    private var speedMultiplier = 1.0
-
     private var lastAttackTime = 0L
     private var hitDelay = 100.0
 
     private var prevY = 0.0
     private var lastY = 0.0
     private var lastOnGround = true
-    private var onGroundTicks = 0
 
     enum class Group(override val displayName: String) : NamedEnum {
         Build("Build"),
@@ -145,13 +140,9 @@ object KillAura : Module(
     }
 
     private fun reset() {
-        speedMultiplier = 1.0
-        shakeRandom = Vec3d.ZERO
-
         lastY = 0.0
         prevY = 0.0
         lastOnGround = true
-        onGroundTicks = 0
 
         lastAttackTime = 0L
         hitDelay = 100.0
diff --git a/src/main/kotlin/com/lambda/module/modules/render/NoRender.kt b/src/main/kotlin/com/lambda/module/modules/render/NoRender.kt
@@ -147,6 +147,10 @@ object NoRender : Module(
     fun shouldOmitParticle(particle: Particle) =
         isEnabled && particleMap[particle.javaClass.simpleName] in particles
 
+    @JvmStatic
+    fun shouldOmitParticle(particle: Class<out Particle>) =
+        isEnabled && particleMap[particle.simpleName] in particles
+
     @JvmStatic
     fun shouldOmitEntity(entity: Entity): Boolean {
         val simpleName = entity.javaClass.simpleName
diff --git a/src/main/kotlin/com/lambda/module/modules/render/ViewModel.kt b/src/main/kotlin/com/lambda/module/modules/render/ViewModel.kt
@@ -36,6 +36,7 @@ import org.joml.Vector3f
 import org.joml.Vector3i
 import kotlin.math.tan
 
+@Suppress("unused")
 object ViewModel : Module(
     name = "ViewModel",
     description = "Adjusts hand and held item rendering",
@@ -115,17 +116,13 @@ object ViewModel : Module(
 
         listen<KeyboardEvent.Press> { event ->
             if (event.keyCode == mc.options.attackKey.boundKey.code) {
-                if (event.isPressed) {
-                    attackKeyTicksPressed = 0
-                } else if (event.isReleased) {
-                    attackKeyTicksPressed = -1
-                }
+                if (event.isPressed) attackKeyTicksPressed = 0
+                else if (event.isReleased) attackKeyTicksPressed = -1
             }
         }
 
         listen<TickEvent.Pre> {
-            if (attackKeyTicksPressed != -1)
-                attackKeyTicksPressed++
+            if (attackKeyTicksPressed != -1) attackKeyTicksPressed++
         }
     }
 
@@ -158,20 +155,16 @@ object ViewModel : Module(
 
         val matrix = matrices.peek().positionMatrix
 
-        val distance = if (emptyHand) {
-            handFovAnchorDistance
-        } else {
-            when (side) {
-                Side.Left -> leftFovAnchorDistance
-                Side.Right -> rightFovAnchorDistance
-            }
+        val distance = if (emptyHand) handFovAnchorDistance
+        else when (side) {
+            Side.Left -> leftFovAnchorDistance
+            Side.Right -> rightFovAnchorDistance
         }
 
-        val warpMatrix = Matrix4f().apply {
-            translate(0f, 0f, -distance)
-            scale(1f, 1f, fovRatio)
-            translate(0f, 0f, distance)
-        }
+        val warpMatrix = Matrix4f()
+            .translate(0f, 0f, -distance)
+            .scale(1f, 1f, fovRatio)
+            .translate(0f, 0f, distance)
 
         matrix.mul(warpMatrix)
     }
@@ -212,14 +205,12 @@ object ViewModel : Module(
 
     private fun getRotationVec(side: Side, emptyHand: Boolean) =
         when (side) {
-            Side.Left -> {
+            Side.Left ->
                 if (emptyHand) Vector3i(handXRotation, -handYRotation, -handZRotation)
                 else Vector3i(leftXRotation, -leftYRotation, -leftZRotation)
-            }
-            Side.Right -> {
+            Side.Right ->
                 if (emptyHand) Vector3i(handXRotation, handYRotation, handZRotation)
                 else Vector3i(rightXRotation, rightYRotation, rightZRotation)
-            }
         }
 
     fun adjustSwing(hand: Hand, player: AbstractClientPlayerEntity) =
diff --git a/src/main/resources/lambda.accesswidener b/src/main/resources/lambda.accesswidener
@@ -28,6 +28,7 @@ transitive-accessible method net/minecraft/item/BlockItem getPlaceSound (Lnet/mi
 transitive-accessible field net/minecraft/state/State owner Ljava/lang/Object;
 # MOVED in 1.21.11: BackgroundRenderer$StatusEffectFogModifier -> net/minecraft/client/render/fog/StatusEffectFogModifier
 transitive-accessible class net/minecraft/client/render/fog/StatusEffectFogModifier
+transitive-accessible field net/minecraft/client/particle/NoRenderParticleRenderer EMPTY Lnet/minecraft/client/render/Submittable;
 
 # Entity
 transitive-accessible field net/minecraft/entity/projectile/FireworkRocketEntity shooter Lnet/minecraft/entity/LivingEntity;
diff --git a/src/main/resources/lambda.mixins.common.json b/src/main/resources/lambda.mixins.common.json
