removed broken mixin

DimensionalDevelopment · Jul 31, 2023 · 7f1f49d · 7f1f49d
1 parent 3759413
commit 7f1f49d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 82 deletions.
diff --git a/src/main/java/com/mystic/atlantis/lighting/AtlantisChunkSkylightProvider.java b/src/main/java/com/mystic/atlantis/lighting/AtlantisChunkSkylightProvider.java
@@ -15,34 +15,32 @@
 
 public class AtlantisChunkSkylightProvider extends SkyLightEngine {
 
-	public AtlantisChunkSkylightProvider(LightChunkGetter chunkProvider) {
-		super(chunkProvider);
-	}
+    public AtlantisChunkSkylightProvider(LightChunkGetter chunkProvider) {
+        super(chunkProvider);
+    }
 
-	@Override
-	protected int computeLevelFromNeighbor(long sourceId, long targetId, int level) {
-		int propagatedLevel = super.computeLevelFromNeighbor(sourceId, targetId, level);
+    @Override
+    protected int computeLevelFromNeighbor(long sourceId, long targetId, int level) {
+        int propagatedLevel = super.computeLevelFromNeighbor(sourceId, targetId, level);
 
-		if (AtlantisConfig.INSTANCE.shouldHavePerBiomeLighting.get()) {
-			BlockPos blockPos = BlockPos.of(targetId);
-			ChunkPos chunkPos = new ChunkPos(blockPos);
+        BlockPos blockPos = BlockPos.of(targetId);
+        ChunkPos chunkPos = new ChunkPos(blockPos);
 
-			BlockGetter blockGetter = chunkSource.getChunkForLighting(chunkPos.x, chunkPos.z);
-			if (blockGetter instanceof ChunkAccess chunkAccess) {
-				Holder<Biome> biome = chunkAccess.getNoiseBiome(
-						QuartPos.fromBlock(blockPos.getX()),
-						QuartPos.fromBlock(blockPos.getY()),
-						QuartPos.fromBlock(blockPos.getZ())
-				);
-				if (biome.unwrapKey().isPresent()) {
-					if (ACommonFEvents.map != null) {
-						if (ACommonFEvents.map.containsKey(biome.unwrapKey().get().location())) {
-							return Math.min(ACommonFEvents.map.get(biome.unwrapKey().get().location()), propagatedLevel);
-						}
-					}
-				}
-			}
-		}
-		return propagatedLevel;
-	}
+        BlockGetter blockGetter = chunkSource.getChunkForLighting(chunkPos.x, chunkPos.z);
+        if (blockGetter instanceof ChunkAccess chunkAccess) {
+            Holder<Biome> biome = chunkAccess.getNoiseBiome(
+                    QuartPos.fromBlock(blockPos.getX()),
+                    QuartPos.fromBlock(blockPos.getY()),
+                    QuartPos.fromBlock(blockPos.getZ())
+            );
+            if (biome.unwrapKey().isPresent()) {
+                if (ACommonFEvents.map != null) {
+                    if (ACommonFEvents.map.containsKey(biome.unwrapKey().get().location())) {
+                        return Math.min(ACommonFEvents.map.get(biome.unwrapKey().get().location()), propagatedLevel);
+                    }
+                }
+            }
+        }
+        return propagatedLevel;
+    }
 }
diff --git a/src/main/java/com/mystic/atlantis/mixin/LightingProviderMixin.java b/src/main/java/com/mystic/atlantis/mixin/LightingProviderMixin.java
@@ -1,5 +1,6 @@
 package com.mystic.atlantis.mixin;
 
+import com.mystic.atlantis.config.AtlantisConfig;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
@@ -25,7 +26,7 @@ abstract public class LightingProviderMixin implements LightEventListener {
 	@Inject(at = @At("TAIL"), method = "<init>")
 	public void init(LightChunkGetter chunkProvider, boolean hasBlockLight, boolean hasSkyLight, CallbackInfo ci) {
 		if(chunkProvider.getLevel() instanceof Level level){
-			if (DimensionAtlantis.isAtlantisDimension(level)) {
+			if (DimensionAtlantis.isAtlantisDimension(level) && AtlantisConfig.INSTANCE.shouldHavePerBiomeLighting.get()) {
 				skyEngine = hasSkyLight ? new AtlantisChunkSkylightProvider(chunkProvider) : null;
 			}
 		}

diff --git a/src/main/java/com/mystic/atlantis/mixin/SkyLightEngineRadonFix.java b/src/main/java/com/mystic/atlantis/mixin/SkyLightEngineRadonFix.java
diff --git a/src/main/resources/atlantis.mixins.json b/src/main/resources/atlantis.mixins.json
@@ -19,7 +19,6 @@
     "RedstoneAccessor",
     "RedstoneWireBlockMixin",
     "RenderBubblesMixin",
-    "SkyLightEngineRadonFix",
     "WorldLightManagerMixin"
   ],
   "client": [