From 7f1f49d2f6c265913cc52100a5edd2fd7a92d32a Mon Sep 17 00:00:00 2001 From: Mysticpasta1 Date: Mon, 31 Jul 2023 18:54:33 -0500 Subject: [PATCH] removed broken mixin --- .../AtlantisChunkSkylightProvider.java | 52 +++++++++--------- .../atlantis/mixin/LightingProviderMixin.java | 3 +- .../mixin/SkyLightEngineRadonFix.java | 53 ------------------- src/main/resources/atlantis.mixins.json | 1 - 4 files changed, 27 insertions(+), 82 deletions(-) delete mode 100644 src/main/java/com/mystic/atlantis/mixin/SkyLightEngineRadonFix.java diff --git a/src/main/java/com/mystic/atlantis/lighting/AtlantisChunkSkylightProvider.java b/src/main/java/com/mystic/atlantis/lighting/AtlantisChunkSkylightProvider.java index 462d7ce4..4c1b76c0 100644 --- 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 = 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 = 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; + } } \ No newline at end of file diff --git a/src/main/java/com/mystic/atlantis/mixin/LightingProviderMixin.java b/src/main/java/com/mystic/atlantis/mixin/LightingProviderMixin.java index 328a8bc4..9223bc1a 100644 --- 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 = "") 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 deleted file mode 100644 index 4485ecda..00000000 --- a/src/main/java/com/mystic/atlantis/mixin/SkyLightEngineRadonFix.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.mystic.atlantis.mixin; - -import com.mystic.atlantis.dimension.DimensionAtlantis; -import com.mystic.atlantis.event.ACommonFEvents; -import net.caffeinemc.phosphor.mixin.chunk.light.MixinChunkSkyLightProvider; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Holder; -import net.minecraft.core.QuartPos; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.chunk.ChunkAccess; -import net.minecraft.world.level.lighting.SkyLightEngine; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -@Mixin(value = {SkyLightEngine.class}, priority = 2000) -public abstract class SkyLightEngineRadonFix { - - /** - * @author Mysticpasta1 - * @reason fix radon messing with my per biome lighting code! - */ - @Overwrite - public int computeLevelFromNeighbor(long fromId, long toId, int currentLevel) { - if(chunkSource.getLevel() instanceof Level level) { - if (DimensionAtlantis.isAtlantisDimension(level)) { - int propagatedLevel = getPropagatedLevel(fromId, null, toId, currentLevel); - - BlockPos blockPos = BlockPos.of(toId); - ChunkPos chunkPos = new ChunkPos(blockPos); - - BlockGetter blockGetter = chunkSource.getChunkForLighting(chunkPos.x, chunkPos.z); - if (blockGetter instanceof ChunkAccess chunkAccess) { - Holder 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 this.getPropagatedLevel(fromId, null, toId, currentLevel); - } -} diff --git a/src/main/resources/atlantis.mixins.json b/src/main/resources/atlantis.mixins.json index a67fd83d..8148cf0d 100644 --- a/src/main/resources/atlantis.mixins.json +++ b/src/main/resources/atlantis.mixins.json @@ -19,7 +19,6 @@ "RedstoneAccessor", "RedstoneWireBlockMixin", "RenderBubblesMixin", - "SkyLightEngineRadonFix", "WorldLightManagerMixin" ], "client": [