Cleanup

Red-Studio-Ragnarok · Sep 1, 2023 · 3fe1cea · 3fe1cea
1 parent 7682469
commit 3fe1cea
Show file tree

Hide file tree

Showing 9 changed files with 382 additions and 474 deletions.
diff --git a/src/main/java/io/redstudioragnarok/alfheim/api/IChunkLighting.java b/src/main/java/io/redstudioragnarok/alfheim/api/IChunkLighting.java
diff --git a/src/main/java/io/redstudioragnarok/alfheim/api/IChunkLightingData.java b/src/main/java/io/redstudioragnarok/alfheim/api/IChunkLightingData.java
@@ -1,5 +1,8 @@
 package io.redstudioragnarok.alfheim.api;
 
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.EnumSkyBlock;
+
 /**
  * @author Luna Lage (Desoroxxx)
  * @author Angeline (@jellysquid)
@@ -16,4 +19,8 @@ public interface IChunkLightingData {
     void alfheim$setLightInitialized(final boolean lightInitialized);
 
     void alfheim$setSkylightUpdatedPublic();
+
+    void alfheim$initNeighborLightChecks();
+
+    byte alfheim$getCachedLightFor(final EnumSkyBlock enumSkyBlock, final BlockPos pos);
 }
diff --git a/src/main/java/io/redstudioragnarok/alfheim/gui/WarningScreen.java b/src/main/java/io/redstudioragnarok/alfheim/gui/WarningScreen.java
diff --git a/...fheim/lighting/LightingEngineHelpers.java → ...oragnarok/alfheim/lighting/LightUtil.java b/...fheim/lighting/LightingEngineHelpers.java → ...oragnarok/alfheim/lighting/LightUtil.java
@@ -8,11 +8,10 @@
 
 /**
  * @author Luna Lage (Desoroxxx)
- * @author kappa-maintainer
  * @author embeddedt
  * @since 0.1
  */
-public final class LightingEngineHelpers {
+public final class LightUtil {
 
     private static final boolean DYNAMIC_LIGHTS_LOADED = Loader.isModLoaded("dynamiclights");
 

diff --git a/src/main/java/io/redstudioragnarok/alfheim/lighting/LightingEngine.java b/src/main/java/io/redstudioragnarok/alfheim/lighting/LightingEngine.java
@@ -1,6 +1,6 @@
 package io.redstudioragnarok.alfheim.lighting;
 
-import io.redstudioragnarok.alfheim.api.IChunkLighting;
+import io.redstudioragnarok.alfheim.api.IChunkLightingData;
 import io.redstudioragnarok.alfheim.utils.PooledLongQueue;
 import io.redstudioragnarok.redcore.utils.MathUtil;
 import net.minecraft.block.state.IBlockState;
@@ -528,7 +528,7 @@ private boolean nextItem() {
     }
 
     private byte getCursorCachedLight(final EnumSkyBlock lightType) {
-        return ((IChunkLighting) currentChunk).alfheim$getCachedLightFor(lightType, currentPos);
+        return ((IChunkLightingData) currentChunk).alfheim$getCachedLightFor(lightType, currentPos);
     }
 
     /**
@@ -542,7 +542,7 @@ private byte getCursorLuminosity(final IBlockState state, final EnumSkyBlock lig
                 return 0;
         }
 
-        return (byte) MathUtil.clampMaxFirst(LightingEngineHelpers.getLightValueForState(state, world, currentPos), 0, MAX_LIGHT_LEVEL);
+        return (byte) MathUtil.clampMaxFirst(LightUtil.getLightValueForState(state, world, currentPos), 0, MAX_LIGHT_LEVEL);
     }
 
     private byte getPosOpacity(final BlockPos blockPos, final IBlockState blockState) {