From 261e3ddc006a1bd3a64426cee1555658fe75cd69 Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Thu, 16 Dec 2021 20:22:19 +0100
Subject: [PATCH] fabric-1.18: remove ChunkDataEvents.SAVE

---
 .../org/dynmap/fabric_1_18/DynmapPlugin.java  |  1 -
 .../fabric_1_18/event/ChunkDataEvents.java    | 24 -----------------
 .../mixin/ThreadedAnvilChunkStorageMixin.java | 26 -------------------
 .../src/main/resources/dynmap.mixins.json     |  1 -
 4 files changed, 52 deletions(-)
 delete mode 100644 fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/ChunkDataEvents.java
 delete 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/DynmapPlugin.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java
index 2588f6f0..23083d9c 100644
--- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java
+++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java
@@ -46,7 +46,6 @@ import org.dynmap.fabric_1_18.command.DmarkerCommand;
 import org.dynmap.fabric_1_18.command.DynmapCommand;
 import org.dynmap.fabric_1_18.command.DynmapExpCommand;
 import org.dynmap.fabric_1_18.event.BlockEvents;
-import org.dynmap.fabric_1_18.event.ChunkDataEvents;
 import org.dynmap.fabric_1_18.event.CustomServerLifecycleEvents;
 import org.dynmap.fabric_1_18.event.PlayerEvents;
 import org.dynmap.fabric_1_18.mixin.BiomeEffectsAccessor;
diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/ChunkDataEvents.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/ChunkDataEvents.java
deleted file mode 100644
index d50f50b8..00000000
--- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/event/ChunkDataEvents.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.dynmap.fabric_1_18.event;
-
-import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.event.EventFactory;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.world.chunk.Chunk;
-
-public class ChunkDataEvents {
-    private ChunkDataEvents() {
-    }
-
-    public static Event<Save> SAVE = EventFactory.createArrayBacked(Save.class,
-            (listeners) -> (world, chunk) -> {
-                for (Save callback : listeners) {
-                    callback.onSave(world, chunk);
-                }
-            }
-    );
-
-    @FunctionalInterface
-    public interface Save {
-        void onSave(ServerWorld world, Chunk chunk);
-    }
-}
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
deleted file mode 100644
index cecee77d..00000000
--- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/mixin/ThreadedAnvilChunkStorageMixin.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.dynmap.fabric_1_18.mixin;
-
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.server.world.ThreadedAnvilChunkStorage;
-import net.minecraft.world.chunk.Chunk;
-import org.dynmap.fabric_1_18.event.ChunkDataEvents;
-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(ThreadedAnvilChunkStorage.class)
-public abstract class ThreadedAnvilChunkStorageMixin {
-    @Shadow
-    @Final
-    private ServerWorld world;
-
-    @Inject(method = "save(Lnet/minecraft/world/chunk/Chunk;)Z", at = @At("RETURN"))
-    private void save(Chunk chunk, CallbackInfoReturnable<Boolean> info) {
-        if (info.getReturnValueZ()) {
-            ChunkDataEvents.SAVE.invoker().onSave(this.world, chunk);
-        }
-    }
-}
diff --git a/fabric-1.18/src/main/resources/dynmap.mixins.json b/fabric-1.18/src/main/resources/dynmap.mixins.json
index 67da3f92..42302d05 100644
--- a/fabric-1.18/src/main/resources/dynmap.mixins.json
+++ b/fabric-1.18/src/main/resources/dynmap.mixins.json
@@ -11,7 +11,6 @@
     "ServerPlayerEntityMixin",
     "ServerPlayNetworkHandlerMixin",
     "ThreadedAnvilChunkStorageAccessor",
-    "ThreadedAnvilChunkStorageMixin",
     "WorldChunkMixin"
   ],
   "injectors": {