diff --git a/src/main/java/carpet/mixins/BlockLightStorage_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/BlockLightStorage_scarpetChunkCreationMixin.java index 0241fa17..2e700c1e 100644 --- a/src/main/java/carpet/mixins/BlockLightStorage_scarpetChunkCreationMixin.java +++ b/src/main/java/carpet/mixins/BlockLightStorage_scarpetChunkCreationMixin.java @@ -26,7 +26,7 @@ public abstract class BlockLightStorage_scarpetChunkCreationMixin extends LightS @Override public void processRelight(final ChunkLightProvider lightProvider, final long cPos) { - final LevelPropagatorInterface levelPropagator = (LevelPropagatorInterface) lightProvider; + final LevelPropagator_resetChunkInterface levelPropagator = (LevelPropagator_resetChunkInterface) lightProvider; for (int y = -1; y < 17; ++y) { @@ -57,7 +57,7 @@ public abstract class BlockLightStorage_scarpetChunkCreationMixin extends LightS final int srcLevel = ((ChunkLightProviderInterface) lightProvider).callGetCurrentLevelFromSection(neighborLightArray, src); - levelPropagator.invokeUpdateLevel(src, dst, levelPropagator.callGetPropagatedLevel(src, dst, srcLevel), true); + levelPropagator.cmInvokeUpdateLevel(src, dst, levelPropagator.cmCallGetPropagatedLevel(src, dst, srcLevel), true); } } } diff --git a/src/main/java/carpet/mixins/LevelPropagatorInterface.java b/src/main/java/carpet/mixins/LevelPropagator_resetChunkInterface.java similarity index 56% rename from src/main/java/carpet/mixins/LevelPropagatorInterface.java rename to src/main/java/carpet/mixins/LevelPropagator_resetChunkInterface.java index 3808bd10..fcfe9e41 100644 --- a/src/main/java/carpet/mixins/LevelPropagatorInterface.java +++ b/src/main/java/carpet/mixins/LevelPropagator_resetChunkInterface.java @@ -6,11 +6,11 @@ import org.spongepowered.asm.mixin.gen.Invoker; import net.minecraft.world.chunk.light.LevelPropagator; @Mixin(LevelPropagator.class) -public interface LevelPropagatorInterface +public interface LevelPropagator_resetChunkInterface { @Invoker("updateLevel") - void invokeUpdateLevel(long sourceId, long id, int level, boolean decrease); + void cmInvokeUpdateLevel(long sourceId, long id, int level, boolean decrease); @Invoker("getPropagatedLevel") - int callGetPropagatedLevel(long sourceId, long targetId, int level); + int cmCallGetPropagatedLevel(long sourceId, long targetId, int level); } diff --git a/src/main/java/carpet/mixins/SkyLightStorage_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/SkyLightStorage_scarpetChunkCreationMixin.java index 9ee0a85d..bf6bdc07 100644 --- a/src/main/java/carpet/mixins/SkyLightStorage_scarpetChunkCreationMixin.java +++ b/src/main/java/carpet/mixins/SkyLightStorage_scarpetChunkCreationMixin.java @@ -59,7 +59,7 @@ public abstract class SkyLightStorage_scarpetChunkCreationMixin extends LightSto @Override public void processRelight(final ChunkLightProvider lightProvider, final long cPos) { - final LevelPropagatorInterface levelPropagator = (LevelPropagatorInterface) lightProvider; + final LevelPropagator_resetChunkInterface levelPropagator = (LevelPropagator_resetChunkInterface) lightProvider; for (int y = -1; y < 17; ++y) { @@ -101,7 +101,7 @@ public abstract class SkyLightStorage_scarpetChunkCreationMixin extends LightSto ((ChunkLightProviderInterface) lightProvider).callGetCurrentLevelFromSection(neighborCeilingLightArray, src) : this.isSectionEnabled(ChunkSectionPos.withZeroY(neighborCeilingSectionPos)) ? 0 : 15; - levelPropagator.invokeUpdateLevel(src, dst, levelPropagator.callGetPropagatedLevel(src, dst, srcLevel), true); + levelPropagator.cmInvokeUpdateLevel(src, dst, levelPropagator.cmCallGetPropagatedLevel(src, dst, srcLevel), true); } } } diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index 2c60b685..fe26a886 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -36,7 +36,7 @@ "ThreadedAnvilChunkStorage_scarpetChunkCreationMixin", "ChunkHolder_scarpetChunkCreationMixin", "ServerLightingProvider_scarpetMixin", - "LevelPropagatorInterface", + "LevelPropagator_resetChunkInterface", "ChunkTicketManager_scarpetChunkCreationMixin", "LightingProvider_scarpetChunkCreationMixin", "ChunkLightProvider_scarpetChunkCreationMixin",