23w17a

src/main/java/carpet/mixins/LayerLightEngine_scarpetChunkCreationMixin.java

@@ -1,23 +1,25 @@
 package carpet.mixins;
 
+import carpet.fakes.LightStorageInterface;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.gen.Invoker;
 
 import carpet.fakes.ChunkLightProviderInterface;
 import carpet.fakes.Lighting_scarpetChunkCreationInterface;
 import net.minecraft.world.level.chunk.DataLayer;
-import net.minecraft.world.level.lighting.LayerLightEngine;
+import net.minecraft.world.level.lighting.LightEngine;
 import net.minecraft.world.level.lighting.LayerLightSectionStorage;
 
-@Mixin(LayerLightEngine.class)
+@Mixin(LightEngine.class)
 public abstract class LayerLightEngine_scarpetChunkCreationMixin implements Lighting_scarpetChunkCreationInterface, ChunkLightProviderInterface
 {
     @Shadow
     @Final
     protected LayerLightSectionStorage<?> storage;
 
+    @Shadow protected abstract void clearQueuedSectionBlocks(final long l);
+
     @Override
     public void removeLightData(final long pos)
     {
@@ -31,6 +33,13 @@ public abstract class LayerLightEngine_scarpetChunkCreationMixin implements Ligh
     }
 
     @Override
-    @Invoker("getLevel")
-    public abstract int callGetCurrentLevelFromSection(DataLayer array, long blockPos);
+    public int callGetCurrentLevelFromSection(DataLayer array, long blockPos) {
+        return ((LightStorageInterface)storage).getLightLevelByLong(blockPos);
+    };
+
+    @Override
+    public void clearQueuedSectionBlocksPublicAccess(long sectionPos)
+    {
+        clearQueuedSectionBlocks(sectionPos);
+    }
 }