fix: use new lighting sync method added in 1.21.2

RelativityMC · Oct 26, 2024 · ffe2dc0 · ffe2dc0
1 parent 3c6c78b
commit ffe2dc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/c2me-base/src/main/java/com/ishland/c2me/base/mixin/access/IServerLightingProvider.java b/c2me-base/src/main/java/com/ishland/c2me/base/mixin/access/IServerLightingProvider.java
@@ -13,7 +13,4 @@ public interface IServerLightingProvider {
     @Invoker
     void invokeUpdateChunkStatus(ChunkPos pos);
 
-    @Invoker
-    void invokeEnqueue(int x, int z, IntSupplier completedLevelSupplier, ServerLightingProvider.Stage stage, Runnable task);
-
 }
diff --git a/...tem/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/ReadFromDisk.java b/...tem/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/ReadFromDisk.java
@@ -202,16 +202,11 @@ private CompletionStage<Void> asyncSave(ServerChunkLoadingManager tacs, Chunk ch
         }
     }
 
-    protected CompletionStage<Void> syncWithLightEngine(ChunkLoadingContext context) {
-        final CompletableFuture<Void> future = new CompletableFuture<>();
-        ((IServerLightingProvider) ((IThreadedAnvilChunkStorage) context.tacs()).getLightingProvider()).invokeEnqueue(
+    protected CompletionStage<?> syncWithLightEngine(ChunkLoadingContext context) {
+        return ((IThreadedAnvilChunkStorage) context.tacs()).getLightingProvider().enqueue(
                 context.holder().getKey().x,
-                context.holder().getKey().z,
-                () -> 0,
-                ServerLightingProvider.Stage.POST_UPDATE,
-                () -> future.complete(null)
+                context.holder().getKey().z
         );
-        return future;
     }
 
     @Override
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,4 @@ public interface IServerLightingProvider { @@
         @Invoker
         void invokeUpdateChunkStatus(ChunkPos pos);
-        @Invoker
-        void invokeEnqueue(int x, int z, IntSupplier completedLevelSupplier, ServerLightingProvider.Stage stage, Runnable task);
     }