Merge branch 'master' into feature/renderer

emyfops · emyfops · commit 20704e2be57e · 2024-05-19T11:57:33.000-04:00
diff --git a/common/src/main/java/com/lambda/mixin/items/BarrierBlockMixin.java b/common/src/main/java/com/lambda/mixin/items/BarrierBlockMixin.java
@@ -0,0 +1,23 @@
+package com.lambda.mixin.items;
+
+import com.lambda.module.modules.render.BlockESP;
+import net.minecraft.block.BarrierBlock;
+import net.minecraft.block.BlockRenderType;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+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(BarrierBlock.class)
+public class BarrierBlockMixin {
+
+    @Inject(method = "getRenderType", at = @At(value = "RETURN"), cancellable = true)
+    private void getRenderType(BlockState state, CallbackInfoReturnable<BlockRenderType> cir) {
+        if (BlockESP.INSTANCE.isEnabled()
+                && BlockESP.getBarrier()
+                && state.getBlock() == Blocks.BARRIER
+        ) cir.setReturnValue(BlockRenderType.MODEL);
+    }
+}
diff --git a/common/src/main/java/com/lambda/mixin/render/BlockRenderManagerMixin.java b/common/src/main/java/com/lambda/mixin/render/BlockRenderManagerMixin.java
@@ -0,0 +1,22 @@
+package com.lambda.mixin.render;
+
+import com.lambda.module.modules.render.BlockESP;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.client.render.block.BlockRenderManager;
+import net.minecraft.client.render.model.BakedModel;
+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(BlockRenderManager.class)
+public abstract class BlockRenderManagerMixin {
+    @Inject(method = "getModel", at = @At("HEAD"), cancellable = true)
+    private void getModel(BlockState state, CallbackInfoReturnable<BakedModel> cir) {
+        if (BlockESP.INSTANCE.isEnabled()
+                && BlockESP.getBarrier()
+                && state.getBlock() == Blocks.BARRIER
+        ) cir.setReturnValue(BlockESP.getModel());
+    }
+}
diff --git a/common/src/main/java/com/lambda/mixin/render/InGameOverlayRendererMixin.java b/common/src/main/java/com/lambda/mixin/render/InGameOverlayRendererMixin.java
@@ -0,0 +1,51 @@
+package com.lambda.mixin.render;
+
+import com.lambda.module.modules.render.NoRender;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.hud.InGameOverlayRenderer;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.client.util.math.MatrixStack;
+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.ModifyArg;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(InGameOverlayRenderer.class)
+public class InGameOverlayRendererMixin {
+    @Inject(method = "renderFireOverlay", at = @At("HEAD"), cancellable = true)
+    private static void onRenderFireOverlay(
+            MinecraftClient mc,
+            MatrixStack matrixStack,
+            CallbackInfo ci
+    ) {
+        if (NoRender.INSTANCE.isEnabled() && NoRender.getNoBurning()) ci.cancel();
+    }
+
+    @ModifyArg(method = "renderFireOverlay", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;translate(FFF)V"), index = 1)
+    private static float onRenderFireOverlayTranslate(float x) {
+        if (NoRender.INSTANCE.isEnabled()) {
+            return (float) NoRender.getFireOverlayYOffset();
+        } else {
+            return -0.3f;
+        }
+    }
+
+    @Inject(method = "renderUnderwaterOverlay", at = @At("HEAD"), cancellable = true)
+    private static void onRenderUnderwaterOverlay(
+            MinecraftClient mc,
+            MatrixStack matrixStack,
+            CallbackInfo ci
+    ) {
+        if (NoRender.INSTANCE.isEnabled() && NoRender.getNoUnderwater()) ci.cancel();
+    }
+
+    @Inject(method = "renderInWallOverlay", at = @At("HEAD"), cancellable = true)
+    private static void onRenderInWallOverlay(
+            Sprite sprite,
+            MatrixStack matrices,
+            CallbackInfo ci
+    ) {
+        if (NoRender.INSTANCE.isEnabled() && NoRender.getNoInWall()) ci.cancel();
+    }
+}
diff --git a/common/src/main/java/com/lambda/mixin/render/LightmapTextureManagerMixin.java b/common/src/main/java/com/lambda/mixin/render/LightmapTextureManagerMixin.java
@@ -13,11 +13,11 @@
 @Mixin(LightmapTextureManager.class)
 public class LightmapTextureManagerMixin {
     @ModifyArg(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/texture/NativeImage;setColor(III)V"), index = 2)
-    private int updateModify(int x) {
+    private int updateModify(int color) {
         if (Fullbright.INSTANCE.isEnabled() || XRay.INSTANCE.isEnabled()) {
             return 0xFFFFFFFF;
         }
-        return x;
+        return color;
     }
 
     @Inject(method = "getDarknessFactor(F)F", at = @At("HEAD"), cancellable = true)
diff --git a/common/src/main/java/com/lambda/mixin/render/RenderLayersMixin.java b/common/src/main/java/com/lambda/mixin/render/RenderLayersMixin.java
@@ -0,0 +1,20 @@
+package com.lambda.mixin.render;
+
+import com.lambda.module.modules.render.XRay;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderLayers;
+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(RenderLayers.class)
+public class RenderLayersMixin {
+    @Inject(method = "getBlockLayer", at = @At("HEAD"), cancellable = true)
+    private static void onGetBlockLayer(BlockState state, CallbackInfoReturnable<RenderLayer> cir) {
+        if (XRay.INSTANCE.isDisabled()) return;
+
+        if (!XRay.isSelected(state)) cir.setReturnValue(RenderLayer.getTranslucent());
+    }
+}
diff --git a/common/src/main/kotlin/com/lambda/core/FriendManager.kt b/common/src/main/kotlin/com/lambda/core/FriendManager.kt
@@ -1,8 +1,7 @@
-package com.lambda.friend
+package com.lambda.core
 
 import com.lambda.config.Configurable
 import com.lambda.config.configurations.FriendConfig
-import com.lambda.core.Loadable
 import com.mojang.authlib.GameProfile
 import net.minecraft.server.network.ServerPlayerEntity
 import java.util.UUID
diff --git a/common/src/main/kotlin/com/lambda/core/Loader.kt b/common/src/main/kotlin/com/lambda/core/Loader.kt
@@ -3,8 +3,6 @@ package com.lambda.core
 import com.lambda.Lambda
 import com.lambda.Lambda.LOG
 import com.lambda.command.CommandManager
-import com.lambda.config.configurations.GuiConfig
-import com.lambda.friend.FriendManager
 import com.lambda.graphics.renderer.gui.font.LambdaFont
 import com.lambda.gui.GuiConfigurable
 import com.lambda.interaction.PlayerPacketManager
diff --git a/common/src/main/kotlin/com/lambda/module/Module.kt b/common/src/main/kotlin/com/lambda/module/Module.kt
@@ -101,6 +101,7 @@ abstract class Module(
     val customTags = setting("Tags", emptySet<ModuleTag>(), visibility = { false })
 
     var isEnabled by isEnabledSetting
+    val isDisabled get() = !isEnabled
     override val isMuted: Boolean
         get() = !isEnabled && !alwaysListening
     val keybind by keybindSetting
diff --git a/common/src/main/kotlin/com/lambda/module/modules/render/BlockESP.kt b/common/src/main/kotlin/com/lambda/module/modules/render/BlockESP.kt
@@ -0,0 +1,26 @@
+package com.lambda.module.modules.render
+
+import com.lambda.Lambda.mc
+import com.lambda.module.Module
+import com.lambda.module.tag.ModuleTag
+import net.minecraft.client.render.model.BakedModel
+
+object BlockESP : Module(
+    name = "BlockESP",
+    description = "Render block ESP",
+    defaultTags = setOf(ModuleTag.RENDER)
+) {
+    @JvmStatic val barrier by setting("Solid Barrier Block", true, "Render barrier blocks")
+
+    // ToDo: I wanted to render this as a transparent / translucent block with a red tint.
+    //  Like the red stained glass block without the texture sprite.
+    //  Creating a custom baked model for this would be needed but seems really hard to do.
+    //  mc.blockRenderManager.getModel(Blocks.RED_STAINED_GLASS.defaultState)
+    @JvmStatic val model: BakedModel get() = mc.bakedModelManager.missingModel
+
+    init {
+        onToggle {
+            mc.worldRenderer.reload()
+        }
+    }
+}
diff --git a/common/src/main/kotlin/com/lambda/module/modules/render/NoRender.kt b/common/src/main/kotlin/com/lambda/module/modules/render/NoRender.kt
@@ -9,4 +9,8 @@ object NoRender : Module(
     defaultTags = setOf(ModuleTag.RENDER)
 ) {
     @JvmStatic val noDarkness by setting("No Darkness", true)
+    @JvmStatic val noBurning by setting("No Burning Overlay", true)
+    @JvmStatic val fireOverlayYOffset by setting("Fire Overlay Y Offset", -0.3, -0.8..0.0, 0.1) { !noBurning }
+    @JvmStatic val noUnderwater by setting("No Underwater Overlay", true)
+    @JvmStatic val noInWall by setting("No In Wall Overlay", true)
 }
diff --git a/common/src/main/kotlin/com/lambda/module/modules/render/XRay.kt b/common/src/main/kotlin/com/lambda/module/modules/render/XRay.kt
@@ -2,9 +2,40 @@ package com.lambda.module.modules.render
 
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
 
 object XRay : Module(
     name = "XRay",
     description = "Allows you to see ores through walls",
     defaultTags = setOf(ModuleTag.RENDER)
-)
+) {
+    private val defaultBlocks = setOf(
+        Blocks.COAL_ORE, Blocks.DEEPSLATE_COAL_ORE,
+        Blocks.IRON_ORE, Blocks.DEEPSLATE_IRON_ORE,
+        Blocks.GOLD_ORE, Blocks.DEEPSLATE_GOLD_ORE,
+        Blocks.LAPIS_ORE, Blocks.DEEPSLATE_LAPIS_ORE,
+        Blocks.REDSTONE_ORE, Blocks.DEEPSLATE_REDSTONE_ORE,
+        Blocks.DIAMOND_ORE, Blocks.DEEPSLATE_DIAMOND_ORE,
+        Blocks.EMERALD_ORE, Blocks.DEEPSLATE_EMERALD_ORE,
+        Blocks.COPPER_ORE, Blocks.DEEPSLATE_COPPER_ORE,
+        Blocks.NETHER_GOLD_ORE, Blocks.NETHER_QUARTZ_ORE,
+        Blocks.ANCIENT_DEBRIS
+    )
+
+    private val selection by setting("Block Selection", defaultBlocks, "Block selection that will be shown (whitelist) or hidden (blacklist)")
+    private val mode by setting("Selection Mode", Selection.WHITELIST, "The mode of the block selection")
+
+    @JvmStatic fun isSelected(blockState: BlockState) = mode.select(blockState)
+
+    enum class Selection(val select: (BlockState) -> Boolean) {
+        WHITELIST({ it.block in selection }),
+        BLACKLIST({ it.block !in selection })
+    }
+
+    init {
+        onToggle {
+            mc.worldRenderer.reload()
+        }
+    }
+}
diff --git a/common/src/main/resources/lambda.mixins.common.json b/common/src/main/resources/lambda.mixins.common.json
@@ -15,16 +15,20 @@
     "input.KeyBindingMixin",
     "input.KeyboardMixin",
     "input.MouseMixin",
+    "items.BarrierBlockMixin",
     "items.TridentMixin",
+    "render.BlockRenderManagerMixin",
     "render.CameraMixin",
     "render.ChatInputSuggestorMixin",
     "render.ChatScreenMixin",
     "render.DebugHudMixin",
     "render.GameRendererMixin",
     "render.GlStateManagerMixin",
     "render.InGameHudMixin",
+    "render.InGameOverlayRendererMixin",
     "render.LightmapTextureManagerMixin",
     "render.LivingEntityRendererMixin",
+    "render.RenderLayersMixin",
     "render.RenderTickCounterMixin",
     "render.VertexBufferMixin",
     "render.WorldRendererMixin",

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@`
`13`	`13`	`@Mixin(LightmapTextureManager.class)`
`14`	`14`	`public class LightmapTextureManagerMixin {`
`15`	`15`	`@ModifyArg(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/texture/NativeImage;setColor(III)V"), index = 2)`
`16`		`- private int updateModify(int x) {`
	`16`	`+ private int updateModify(int color) {`
`17`	`17`	`if (Fullbright.INSTANCE.isEnabled() \|\| XRay.INSTANCE.isEnabled()) {`
`18`	`18`	`return 0xFFFFFFFF;`
`19`	`19`	`}`
`20`		`- return x;`
	`20`	`+ return color;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`@Inject(method = "getDarknessFactor(F)F", at = @At("HEAD"), cancellable = true)`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,8 @@ object NoRender : Module(`
`9`	`9`	`defaultTags = setOf(ModuleTag.RENDER)`
`10`	`10`	`) {`
`11`	`11`	`@JvmStatic val noDarkness by setting("No Darkness", true)`
	`12`	`+ @JvmStatic val noBurning by setting("No Burning Overlay", true)`
	`13`	`+ @JvmStatic val fireOverlayYOffset by setting("Fire Overlay Y Offset", -0.3, -0.8..0.0, 0.1) { !noBurning }`
	`14`	`+ @JvmStatic val noUnderwater by setting("No Underwater Overlay", true)`
	`15`	`+ @JvmStatic val noInWall by setting("No In Wall Overlay", true)`
`12`	`16`	`}`