new: call ServerChunkEvents.CHUNK_GENERATE (FabricMC/fabric#4183)

RelativityMC · Oct 27, 2024 · f9c250b · f9c250b
1 parent 404e068
commit f9c250b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/...rc/main/java/com/ishland/c2me/rewrites/chunksystem/common/fapi/LifecycleEventInvoker.java b/...rc/main/java/com/ishland/c2me/rewrites/chunksystem/common/fapi/LifecycleEventInvoker.java
@@ -6,9 +6,12 @@
 
 public class LifecycleEventInvoker {
 
-    public static void invokeChunkLoaded(ServerWorld world, WorldChunk chunk) {
+    public static void invokeChunkLoaded(ServerWorld world, WorldChunk chunk, boolean newChunk) {
         try {
             ServerChunkEvents.CHUNK_LOAD.invoker().onChunkLoad(world, chunk);
+            if (newChunk) {
+                ServerChunkEvents.CHUNK_GENERATE.invoker().onChunkGenerate(world, chunk);
+            }
         } catch (Throwable t) {
             t.printStackTrace();
         }

diff --git a/...src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/ServerAccessible.java b/...src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/ServerAccessible.java
@@ -67,7 +67,7 @@ public CompletionStage<Void> upgradeToThis(ChunkLoadingContext context) {
                 worldChunk.updateAllBlockEntities();
                 worldChunk.addChunkTickSchedulers(serverWorld);
                 if (ModStatuses.fabric_lifecycle_events_v1) {
-                    LifecycleEventInvoker.invokeChunkLoaded(serverWorld, worldChunk);
+                    LifecycleEventInvoker.invokeChunkLoaded(serverWorld, worldChunk, !(protoChunk instanceof WrapperProtoChunk));
                 }
             }
 

diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ fabric.loom.multiProjectOptimisation=true
 minecraft_version=1.21.1
 yarn_mappings=1.21.1+build.1
 loader_version=0.16.3
-fabric_version=0.102.0+1.21.1
+fabric_version=0.107.0+1.21.1
 # Mod Properties
 mod_version=0.3.0+alpha.0
 maven_group=com.ishland.c2me

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -36,6 +36,7 @@
   },
   "breaks": {
     "tic_tacs": "*",
-    "optifabric": "*"
+    "optifabric": "*",
+    "fabric-api": "<0.107.0"
   }
 }