noDarkness improvement and noBlindness

Author: beanbag44

src/main/java/com/lambda/mixin/render/BackgroundRendererMixin.java

@@ -17,13 +17,23 @@
 
 package com.lambda.mixin.render;
 
+import com.lambda.module.modules.render.NoRender;
 import com.lambda.module.modules.render.WorldColors;
 import net.minecraft.client.render.BackgroundRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.biome.Biome;
+import org.spongepowered.asm.mixin.Final;
 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.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
+import java.util.stream.Stream;
 
 /**
  * <pre>{@code
@@ -39,6 +49,8 @@
 // FixMe: This crashes the game
 @Mixin(BackgroundRenderer.class)
 public class BackgroundRendererMixin {
+    @Shadow @Final private static List<BackgroundRenderer.StatusEffectFogModifier> FOG_MODIFIERS;
+
     @Redirect(method = "getFogColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/Vec3d;getX()D"))
     private static double redirectRed(Vec3d baseColor) {
         return WorldColors.fogOfWarColor(baseColor).getX();
@@ -59,4 +71,15 @@ private static int redirectWaterFogColor(Biome biome) {
         return WorldColors.waterFogColor(biome.getWaterFogColor());
     }
 
+    @Inject(method = "getFogModifier(Lnet/minecraft/entity/Entity;F)Lnet/minecraft/client/render/BackgroundRenderer$StatusEffectFogModifier;", at = @At("HEAD"), cancellable = true)
+    private static void injectFogModifier(Entity entity, float tickProgress, CallbackInfoReturnable<BackgroundRenderer.StatusEffectFogModifier> cir){
+        if (entity instanceof LivingEntity livingEntity) {
+            Stream<BackgroundRenderer.StatusEffectFogModifier> modifiers = FOG_MODIFIERS
+                    .stream()
+                    .filter((modifier) ->
+                            modifier.shouldApply(livingEntity, tickProgress) && NoRender.shouldAcceptFog(modifier)
+                    );
+            cir.setReturnValue(modifiers.findFirst().orElse(null));
+        }
+    }
 }

src/main/java/com/lambda/mixin/render/WorldRendererMixin.java

@@ -19,12 +19,18 @@
 
 import com.lambda.module.modules.player.Freecam;
 import com.lambda.module.modules.render.CameraTweaks;
+import com.lambda.module.modules.render.NoRender;
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.WorldRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffects;
 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.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(WorldRenderer.class)
 public class WorldRendererMixin {
@@ -37,4 +43,14 @@ private boolean renderIsThirdPerson(Camera camera) {
     private boolean renderSetupTerrainModifyArg(boolean hasForcedFrustum) {
         return Freecam.INSTANCE.isEnabled() || CameraTweaks.INSTANCE.isEnabled() || hasForcedFrustum;
     }
+
+    @Inject(method = "hasBlindnessOrDarkness(Lnet/minecraft/client/render/Camera;)Z", at = @At(value = "HEAD"), cancellable = true)
+    private void modifyEffectCheck(Camera camera, CallbackInfoReturnable<Boolean> cir) {
+        Entity entity = camera.getFocusedEntity();
+        if (entity instanceof LivingEntity livingEntity && NoRender.INSTANCE.isEnabled()) {
+            boolean blind = livingEntity.hasStatusEffect(StatusEffects.BLINDNESS) && !NoRender.getNoBlindness();
+            boolean dark = livingEntity.hasStatusEffect(StatusEffects.DARKNESS) && !NoRender.getNoDarkness();
+            cir.setReturnValue(blind || dark);
+        }
+    }
 }

src/main/kotlin/com/lambda/module/modules/render/NoRender.kt

@@ -19,17 +19,29 @@ package com.lambda.module.modules.render
 
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
+import net.minecraft.client.render.BackgroundRenderer.StatusEffectFogModifier
+import net.minecraft.entity.effect.StatusEffects
 
 object NoRender : Module(
     name = "NoRender",
     description = "Disables rendering of certain things",
     tag = ModuleTag.RENDER,
 ) {
+    @JvmStatic val noBlindness by setting("No Blindness", true)
     @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)
     @JvmStatic val noChatVerificationToast by setting("No Chat Verification Toast", true)
     @JvmStatic val noExplosion by setting("No Explosions", true)
-}
+
+    @JvmStatic
+    fun shouldAcceptFog(modifier: StatusEffectFogModifier) =
+        when {
+            isDisabled -> true
+            modifier.statusEffect == StatusEffects.BLINDNESS && noBlindness -> false
+            modifier.statusEffect == StatusEffects.DARKNESS && noDarkness -> false
+            else -> true
+        }
+}

src/main/resources/lambda.accesswidener

@@ -26,6 +26,7 @@ transitive-accessible method net/minecraft/item/BlockItem placeFromNbt (Lnet/min
 transitive-accessible method net/minecraft/item/BlockItem postPlacement (Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/block/BlockState;)Z
 transitive-accessible method net/minecraft/item/BlockItem getPlaceSound (Lnet/minecraft/block/BlockState;)Lnet/minecraft/sound/SoundEvent;
 transitive-accessible field net/minecraft/state/State owner Ljava/lang/Object;
+accessible class net/minecraft/client/render/BackgroundRenderer$StatusEffectFogModifier
 
 # Entity
 transitive-accessible field net/minecraft/entity/projectile/FireworkRocketEntity shooter Lnet/minecraft/entity/LivingEntity;