Implement ChunkWatchEvent.UnWatch (#143)

* Implement ChunkWatchEvent.UnWatch

NOTE: This implementation follows upstream 1.14.4 Forge, not the commit
we're tracking which doesn't implement it at all.

* fix error

Co-authored-by: Glitch <glitchieproductionsofficial@gmail.com>

Author: kitlith

patchwork-events-world/src/main/java/net/minecraftforge/event/world/ChunkWatchEvent.java

@@ -91,9 +91,9 @@ public Watch(ServerPlayerEntity player, ChunkPos pos, ServerWorld world) {
 	 *
 	 * <p>This event is fired on the {@link net.minecraftforge.common.MinecraftForge#EVENT_BUS}.</p>
 	 */
-	/* TODO public static class UnWatch extends ChunkWatchEvent {
+	public static class UnWatch extends ChunkWatchEvent {
 		public UnWatch(ServerPlayerEntity player, ChunkPos pos, ServerWorld world) {
 			super(player, pos, world);
 		}
-	}*/
+	}
 }

patchwork-events-world/src/main/java/net/patchworkmc/impl/event/world/WorldEvents.java

@@ -23,10 +23,14 @@
 import java.util.List;
 
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.ChunkWatchEvent;
 import net.minecraftforge.event.world.WorldEvent;
 
 import net.minecraft.entity.EntityCategory;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.dimension.DimensionType;
@@ -62,6 +66,14 @@ public static void onWorldSave(IWorld world) {
 		MinecraftForge.EVENT_BUS.post(new WorldEvent.Save(world));
 	}
 
+	public static void fireChunkWatch(boolean watch, ServerPlayerEntity entity, ChunkPos chunkpos, ServerWorld world) {
+		if (watch) {
+			MinecraftForge.EVENT_BUS.post(new ChunkWatchEvent.Watch(entity, chunkpos, world));
+		} else {
+			MinecraftForge.EVENT_BUS.post(new ChunkWatchEvent.UnWatch(entity, chunkpos, world));
+		}
+	}
+
 	@Override
 	public void onInitialize() {
 		ServerWorldEvents.LOAD.register((server, world) -> {

patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinThreadedAnvilChunkStorage.java

@@ -19,8 +19,6 @@
 
 package net.patchworkmc.mixin.event.world;
 
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.world.ChunkWatchEvent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -33,17 +31,17 @@
 import net.minecraft.server.world.ThreadedAnvilChunkStorage;
 import net.minecraft.util.math.ChunkPos;
 
+import net.patchworkmc.impl.event.world.WorldEvents;
+
 @Mixin(ThreadedAnvilChunkStorage.class)
 public class MixinThreadedAnvilChunkStorage {
 	@Shadow
 	private ServerWorld world;
 
 	@Inject(method = "sendWatchPackets", at = @At("HEAD"))
 	private void fireWatchEvents(ServerPlayerEntity player, ChunkPos pos, Packet<?>[] packets, boolean withinMaxWatchDistance, boolean withinViewDistance, CallbackInfo callback) {
-		if (withinViewDistance && !withinMaxWatchDistance) {
-			ChunkWatchEvent.Watch event = new ChunkWatchEvent.Watch(player, pos, world);
-
-			MinecraftForge.EVENT_BUS.post(event);
+		if (this.world == player.world && withinMaxWatchDistance != withinViewDistance) {
+			WorldEvents.fireChunkWatch(withinViewDistance, player, pos, this.world);
 		}
 	}
 }