Add comment

Author: lowercasebtw

src/main/java/org/visuals/legacy/animatium/util/Utils.java

@@ -47,6 +47,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.InventoryMenu;
 import net.minecraft.world.level.GameType;
+import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
@@ -180,4 +181,13 @@ public static boolean isSingleplayer() {
         final IntegratedServer server = Minecraft.getInstance().getSingleplayerServer();
         return server != null && server.isSingleplayer();
     }
+
+    public static float getBrightness(final LevelReader reader, final BlockPos blockPos) {
+        final float amount = reader.getMaxLocalRawBrightness(blockPos) / 15.0F;
+        return Mth.lerp(reader.dimensionType().ambientLight(), amount / (4.0F - 3.0F * amount), 1.0F);
+    }
+
+    public static float getBrightness(final Entity entity) {
+        return getBrightness(entity.level(), entity.blockPosition()); // Older versions inspected from the foot position, not eye position
+    }
 }

src/main/java/org/visuals/legacy/animatium/util/rendering/LegacyFogDarkness.java

@@ -25,10 +25,9 @@
 
 package org.visuals.legacy.animatium.util.rendering;
 
-import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.LevelReader;
+import org.visuals.legacy.animatium.util.Utils;
 
 public final class LegacyFogDarkness {
     public static final LegacyFogDarkness INSTANCE = new LegacyFogDarkness();
@@ -41,17 +40,10 @@ public final class LegacyFogDarkness {
 
     public void tick(final Entity entity, final int viewDistance) {
         this.prevDarkness = this.darkness;
-        this.darkness = Mth.lerp(0.1F, this.darkness, Mth.lerp(this.getBrightness(entity), viewDistance / 32.0F, 1.0F));
+        this.darkness = Mth.lerp(0.1F, this.darkness, Mth.lerp(Utils.getBrightness(entity), viewDistance / 32.0F, 1.0F));
     }
 
     public float getDarkness(final float tickDelta) {
         return Mth.lerp(tickDelta, this.prevDarkness, this.darkness);
     }
-
-    private float getBrightness(final Entity entity) {
-        final LevelReader reader = entity.level();
-        final BlockPos blockPos = entity.blockPosition();
-        final float amount = reader.getMaxLocalRawBrightness(blockPos) / 15.0F;
-        return Mth.lerp(reader.dimensionType().ambientLight(), amount / (4.0F - 3.0F * amount), 1.0F);
-    }
 }