Merge pull request #78 from Logging4J/master

LiquidOverlay Setting in NoRender
coltonk9043 · Jan 4, 2025 · a47f190 · a47f190
2 parents e31b858 + 3430d5c
commit a47f190
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/src/main/java/net/aoba/mixin/CameraMixin.java b/src/main/java/net/aoba/mixin/CameraMixin.java
@@ -1,5 +1,7 @@
 package net.aoba.mixin;
 
+import net.aoba.module.modules.movement.Freecam;
+import net.aoba.module.modules.render.NoRender;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -43,7 +45,10 @@ private void onCameraUdate(BlockView area, Entity focusedEntity, boolean thirdPe
 	@Inject(at = {
 			@At("HEAD") }, method = "getSubmersionType()Lnet/minecraft/block/enums/CameraSubmersionType;", cancellable = true)
 	private void onGetSubmersionType(CallbackInfoReturnable<CameraSubmersionType> cir) {
-		if (Aoba.getInstance().moduleManager.freecam.state.getValue()) {
+		Freecam freecam = Aoba.getInstance().moduleManager.freecam;
+		NoRender norender = Aoba.getInstance().moduleManager.norender;
+
+		if (freecam.state.getValue() || (norender.state.getValue() && norender.getNoLiquidOverlay())) {
 			cir.setReturnValue(CameraSubmersionType.NONE);
 		}
 	}

diff --git a/src/main/java/net/aoba/mixin/InGameOverlayRendererMixin.java b/src/main/java/net/aoba/mixin/InGameOverlayRendererMixin.java
@@ -1,5 +1,6 @@
 package net.aoba.mixin;
 
+import net.minecraft.client.MinecraftClient;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -13,6 +14,7 @@
 
 @Mixin(InGameOverlayRenderer.class)
 public abstract class InGameOverlayRendererMixin {
+
 	@Inject(method = "renderFireOverlay(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;)V", at = @At("HEAD"), cancellable = true)
 	private static void onRenderFireOverlay(MatrixStack matrices, VertexConsumerProvider vertexConsumers,
 			CallbackInfo info) {
@@ -21,4 +23,13 @@ private static void onRenderFireOverlay(MatrixStack matrices, VertexConsumerProv
 		if (norender.state.getValue() && norender.getNoFireOverlay())
 			info.cancel();
 	}
+
+	@Inject(method = "renderUnderwaterOverlay", at = @At("HEAD"), cancellable = true)
+    private static void onRenderUnderwaterOverlay(MinecraftClient client, MatrixStack matrices,
+			VertexConsumerProvider vertexConsumers, CallbackInfo info) {
+		NoRender norender = Aoba.getInstance().moduleManager.norender;
+
+		if (norender.state.getValue() && norender.getNoLiquidOverlay())
+			info.cancel();
+	}
 }
diff --git a/src/main/java/net/aoba/module/modules/render/NoRender.java b/src/main/java/net/aoba/module/modules/render/NoRender.java
@@ -32,6 +32,10 @@ public class NoRender extends Module {
 			.displayName("Powder Snow Overlay").description("Does not render the overlay when in powder snow.")
 			.defaultValue(false).build();
 
+	private BooleanSetting noLiquidOverlay = BooleanSetting.builder().id("norender_liquid")
+			.displayName("Liquid Overlay").description("Does not render the overlay when in liquids.")
+			.defaultValue(false).build();
+
 	private BooleanSetting noCrosshair = BooleanSetting.builder().id("norender_crosshair").displayName("Crosshair")
 			.description("Does not render the crosshair.").defaultValue(false).build();
 
@@ -47,6 +51,7 @@ public NoRender() {
 		this.addSetting(noFireOverlay);
 		this.addSetting(noPortalOverlay);
 		this.addSetting(noPowderSnowOverlay);
+		this.addSetting(noLiquidOverlay);
 		this.addSetting(noCrosshair);
 	}
 
@@ -93,6 +98,10 @@ public boolean getNoPowderSnowOverlay() {
 		return this.noPowderSnowOverlay.getValue();
 	}
 
+	public boolean getNoLiquidOverlay() {
+		return this.noLiquidOverlay.getValue();
+	}
+
 	public boolean getNoCrosshair() {
 		return this.noCrosshair.getValue();
 	}