diff --git a/src/client/java/hi/sierra/greedy_meshing/client/GreedyRuntimeState.java b/src/client/java/hi/sierra/greedy_meshing/client/GreedyRuntimeState.java index 4c56251..ac5a3ed 100644 --- a/src/client/java/hi/sierra/greedy_meshing/client/GreedyRuntimeState.java +++ b/src/client/java/hi/sierra/greedy_meshing/client/GreedyRuntimeState.java @@ -24,6 +24,28 @@ public final class GreedyRuntimeState { private GreedyRuntimeState() { } + private static final boolean FLAT_LIGHTING_LOADED = FabricLoader.getInstance().isModLoaded("flat-lighting"); + private static volatile boolean flatLighting; + private static volatile long flatLightingCheckNanos; + + /** True when Flat Lighting is installed and its cardinal lighting is off (reads its config only, re-read at most once a second). */ + public static boolean isFlatLighting() { + if (!FLAT_LIGHTING_LOADED) { + return false; + } + long now = System.nanoTime(); + if (now - flatLightingCheckNanos > 1_000_000_000L) { + flatLightingCheckNanos = now; + try { + flatLighting = java.nio.file.Files.readString(FabricLoader.getInstance().getConfigDir().resolve("flat-lighting.json")) + .replace(" ", "").contains("\"cardinalLighting\":false"); + } catch (Exception e) { + flatLighting = false; + } + } + return flatLighting; + } + public static boolean isRuntimeGreedyActive() { return GreedyConfig.enabled(); } diff --git a/src/client/java/hi/sierra/greedy_meshing/mixin/client/SectionCompilerMixin.java b/src/client/java/hi/sierra/greedy_meshing/mixin/client/SectionCompilerMixin.java index f65da4d..b6c7461 100644 --- a/src/client/java/hi/sierra/greedy_meshing/mixin/client/SectionCompilerMixin.java +++ b/src/client/java/hi/sierra/greedy_meshing/mixin/client/SectionCompilerMixin.java @@ -247,7 +247,8 @@ protected abstract BufferBuilder getOrBeginLayer( int baseY = work.baseY(); int baseZ = work.baseZ(); work.scratchLighting.applyDirectionalShade = - !GreedyRuntimeState.isInSableSubLevel(baseX >> 4, baseZ >> 4); + !GreedyRuntimeState.isInSableSubLevel(baseX >> 4, baseZ >> 4) + && !GreedyRuntimeState.isFlatLighting(); long[][] mergeKeys = work.faceMergeKeys(); populateFaceVisibility(renderSectionRegion, work.sectionStates(), work.visibleFaces(), mergeKeys, baseX, baseY, baseZ, work.eligibleIndices(), work.eligibleCount()); diff --git a/src/client/java/hi/sierra/greedy_meshing/mixin/client/sodium/SodiumChunkBuilderMeshingTaskMixin.java b/src/client/java/hi/sierra/greedy_meshing/mixin/client/sodium/SodiumChunkBuilderMeshingTaskMixin.java index c4c5d0e..5575583 100644 --- a/src/client/java/hi/sierra/greedy_meshing/mixin/client/sodium/SodiumChunkBuilderMeshingTaskMixin.java +++ b/src/client/java/hi/sierra/greedy_meshing/mixin/client/sodium/SodiumChunkBuilderMeshingTaskMixin.java @@ -417,7 +417,8 @@ public abstract class SodiumChunkBuilderMeshingTaskMixin { int baseY = work.sectionOrigin().getY(); int baseZ = work.sectionOrigin().getZ(); work.scratchLighting.applyDirectionalShade = - !GreedyRuntimeState.isInSableSubLevel(baseX >> 4, baseZ >> 4); + !GreedyRuntimeState.isInSableSubLevel(baseX >> 4, baseZ >> 4) + && !GreedyRuntimeState.isFlatLighting(); BitSet[] visibleFaces = GREEDY_MESHING$VISIBLE.get(); long[][] mergeKeys = work.faceMergeKeys(); GreedySectionCache sectionCache = work.sectionCache; diff --git a/src/client/java/hi/sierra/greedy_meshing/mixin/client/vulkan/VulkanBuildTaskMixin.java b/src/client/java/hi/sierra/greedy_meshing/mixin/client/vulkan/VulkanBuildTaskMixin.java index 9144912..ee9fbfc 100644 --- a/src/client/java/hi/sierra/greedy_meshing/mixin/client/vulkan/VulkanBuildTaskMixin.java +++ b/src/client/java/hi/sierra/greedy_meshing/mixin/client/vulkan/VulkanBuildTaskMixin.java @@ -298,7 +298,8 @@ public abstract class VulkanBuildTaskMixin { int baseY = origin.getY(); int baseZ = origin.getZ(); work.scratchLighting.applyDirectionalShade = - !GreedyRuntimeState.isInSableSubLevel(baseX >> 4, baseZ >> 4); + !GreedyRuntimeState.isInSableSubLevel(baseX >> 4, baseZ >> 4) + && !GreedyRuntimeState.isFlatLighting(); BitSet[] visibleFaces = GREEDY_MESHING$VISIBLE.get(); long[][] mergeKeys = work.faceMergeKeys(); populateFaceVisibility(world, work.sectionStates(), visibleFaces, mergeKeys, baseX, baseY, baseZ);