Add ServerChunkEvents.Generate (#4183)

* Add a new chunk generate event, fired alongside the chunk load event when a chunk is first upgraded to full status

* fix style

* Add logging test for generate event

After creating an SP world and waiting for all nearby chunks to generate (logging to stop), closing the SP world and opening it again should not log any fresh generation. Moving to an unexplored area will start logging again.

(cherry picked from commit 4402f4ee73)

fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/api/event/lifecycle/v1/ServerChunkEvents.java

@@ -37,6 +37,17 @@ public final class ServerChunkEvents {
 		}
 	});
 
+	/**
+	 * Called when a newly generated chunk is loaded into a ServerWorld.
+	 *
+	 * <p>When this event is called, the chunk is already in the world.
+	 */
+	public static final Event<ServerChunkEvents.Generate> CHUNK_GENERATE = EventFactory.createArrayBacked(ServerChunkEvents.Generate.class, callbacks -> (serverWorld, chunk) -> {
+		for (Generate callback : callbacks) {
+			callback.onChunkGenerate(serverWorld, chunk);
+		}
+	});
+
 	/**
 	 * Called when a chunk is unloaded from a ServerWorld.
 	 *
@@ -53,6 +64,11 @@ public final class ServerChunkEvents {
 		void onChunkLoad(ServerWorld world, WorldChunk chunk);
 	}
 
+	@FunctionalInterface
+	public interface Generate {
+		void onChunkGenerate(ServerWorld world, WorldChunk chunk);
+	}
+
 	@FunctionalInterface
 	public interface Unload {
 		void onChunkUnload(ServerWorld world, WorldChunk chunk);

fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/ChunkGeneratingMixin.java

@@ -26,6 +26,7 @@ import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkGenerating;
 import net.minecraft.world.chunk.ChunkGenerationContext;
 import net.minecraft.world.chunk.WorldChunk;
+import net.minecraft.world.chunk.WrapperProtoChunk;
 
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
 
@@ -35,5 +36,9 @@ abstract class ChunkGeneratingMixin {
 	private static void onChunkLoad(Chunk chunk, ChunkGenerationContext chunkGenerationContext, AbstractChunkHolder chunkHolder, CallbackInfoReturnable<Chunk> callbackInfoReturnable) {
 		// We fire the event at TAIL since the chunk is guaranteed to be a WorldChunk then.
 		ServerChunkEvents.CHUNK_LOAD.invoker().onChunkLoad(chunkGenerationContext.world(), (WorldChunk) callbackInfoReturnable.getReturnValue());
+
+		if (!(chunk instanceof WrapperProtoChunk)) {
+			ServerChunkEvents.CHUNK_GENERATE.invoker().onChunkGenerate(chunkGenerationContext.world(), (WorldChunk) callbackInfoReturnable.getReturnValue());
+		}
 	}
 }

fabric-lifecycle-events-v1/src/testmod/java/net/fabricmc/fabric/test/event/lifecycle/ServerChunkLifecycleTests.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.test.event.lifecycle;
+
+import com.mojang.logging.LogUtils;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import org.slf4j.Logger;
+
+import net.minecraft.util.Identifier;
+
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
+
+public final class ServerChunkLifecycleTests implements ModInitializer {
+	private static final Logger LOGGER = LogUtils.getLogger();
+
+	@Override
+	public void onInitialize() {
+		setupChunkGenerateTest();
+	}
+
+	/**
+	 * After creating an SP world and waiting for all nearby chunks to generate (logging to stop),
+	 * closing the SP world and opening it again should not log any fresh generation.
+	 * Moving to an unexplored area will start logging again.
+	 */
+	private static void setupChunkGenerateTest() {
+		final Object2IntMap<Identifier> generated = new Object2IntOpenHashMap<>();
+
+		ServerTickEvents.END_WORLD_TICK.register(world -> {
+			final int count = generated.removeInt(world.getRegistryKey().getValue());
+
+			if (count > 0) {
+				LOGGER.info("Loaded {} freshly generated chunks in {} during tick #{}", count, world.getRegistryKey().getValue(), world.getServer().getTicks());
+			}
+		});
+
+		ServerChunkEvents.CHUNK_GENERATE.register((world, chunk) -> {
+			generated.mergeInt(world.getRegistryKey().getValue(), 1, Integer::sum);
+		});
+	}
+}

fabric-lifecycle-events-v1/src/testmod/resources/fabric.mod.json

@@ -12,6 +12,7 @@
     "main": [
       "net.fabricmc.fabric.test.event.lifecycle.CommonLifecycleTests",
       "net.fabricmc.fabric.test.event.lifecycle.ServerBlockEntityLifecycleTests",
+      "net.fabricmc.fabric.test.event.lifecycle.ServerChunkLifecycleTests",
       "net.fabricmc.fabric.test.event.lifecycle.ServerEntityLifecycleTests",
       "net.fabricmc.fabric.test.event.lifecycle.ServerLifecycleTests",
       "net.fabricmc.fabric.test.event.lifecycle.ServerTickTests",