From 69f5dbd63a36f7759be5f38b11e3a820f5cf1366 Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Thu, 16 Dec 2021 20:23:27 +0100
Subject: [PATCH] fabric-1.18: add CHUNK_GENERATE mixin

---
 .../mixin/ThreadedAnvilChunkStorageMixin.java | 32 +++++++++++++++++++
 .../src/main/resources/dynmap.mixins.json     |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ThreadedAnvilChunkStorageMixin.java

diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ThreadedAnvilChunkStorageMixin.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ThreadedAnvilChunkStorageMixin.java
new file mode 100644
index 00000000..4f2a8c22
--- /dev/null
+++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ThreadedAnvilChunkStorageMixin.java
@@ -0,0 +1,32 @@
+package org.dynmap.fabric_1_18.mixin;
+
+import net.minecraft.server.world.ChunkHolder;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.server.world.ThreadedAnvilChunkStorage;
+import net.minecraft.world.chunk.Chunk;
+import org.dynmap.fabric_1_18.access.ProtoChunkAccessor;
+import org.dynmap.fabric_1_18.event.CustomServerChunkEvents;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(value = ThreadedAnvilChunkStorage.class, priority = 666 /* fire before Fabric API CHUNK_LOAD event */)
+public abstract class ThreadedAnvilChunkStorageMixin {
+    @Final
+    @Shadow
+    ServerWorld world;
+
+    @Inject(
+            /* Same place as fabric-lifecycle-events-v1 event CHUNK_LOAD (we will fire before it) */
+            method = "method_17227",
+            at = @At("TAIL")
+    )
+    private void onChunkGenerate(ChunkHolder chunkHolder, Chunk protoChunk, CallbackInfoReturnable<Chunk> callbackInfoReturnable) {
+        if (((ProtoChunkAccessor)protoChunk).getTouchedByWorldGen()) {
+            CustomServerChunkEvents.CHUNK_GENERATE.invoker().onChunkGenerate(this.world, callbackInfoReturnable.getReturnValue());
+        }
+    }
+}
\ No newline at end of file
diff --git a/fabric-1.18/src/main/resources/dynmap.mixins.json b/fabric-1.18/src/main/resources/dynmap.mixins.json
index 0f9ad822..1b99931d 100644
--- a/fabric-1.18/src/main/resources/dynmap.mixins.json
+++ b/fabric-1.18/src/main/resources/dynmap.mixins.json
@@ -10,6 +10,7 @@
     "ProtoChunkMixin",
     "ServerPlayerEntityMixin",
     "ServerPlayNetworkHandlerMixin",
+    "ThreadedAnvilChunkStorageMixin",
     "WorldChunkMixin"
   ],
   "injectors": {