From 06457bf3ced441619bc9ac0994b7842dc33ea323 Mon Sep 17 00:00:00 2001
From: Zoe Gidiere <duplexsys@protonmail.com>
Date: Wed, 18 Sep 2024 15:43:31 -0600
Subject: [PATCH] some fixes

---
 .../com/dfsek/terra/mod/mixin/invoke/FluidBlockInvoker.java | 2 +-
 .../src/main/resources/terra.common.mixins.json             | 1 +
 .../lifecycle/mixin/lifecycle/MinecraftServerMixin.java     | 6 ++++++
 .../lifecycle/mixin/lifecycle/RegistryLoaderMixin.java      | 4 +++-
 .../java/com/dfsek/terra/lifecycle/util/LifecycleUtil.java  | 1 +
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/invoke/FluidBlockInvoker.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/invoke/FluidBlockInvoker.java
index a6b50409c..620d03ec1 100644
--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/invoke/FluidBlockInvoker.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/invoke/FluidBlockInvoker.java
@@ -10,5 +10,5 @@ import org.spongepowered.asm.mixin.gen.Invoker;
 @Mixin(FluidBlock.class)
 public interface FluidBlockInvoker {
     @Invoker("getFluidState")
-    public FluidState invokeGetFluidState(BlockState state);
+    FluidState invokeGetFluidState(BlockState state);
 }
diff --git a/platforms/mixin-common/src/main/resources/terra.common.mixins.json b/platforms/mixin-common/src/main/resources/terra.common.mixins.json
index f8d0718e4..e25cb7da4 100644
--- a/platforms/mixin-common/src/main/resources/terra.common.mixins.json
+++ b/platforms/mixin-common/src/main/resources/terra.common.mixins.json
@@ -36,6 +36,7 @@
         "implementations.terra.inventory.meta.ItemStackMetaMixin",
         "implementations.terra.world.ChunkRegionMixin",
         "implementations.terra.world.ServerWorldMixin",
+        "invoke.FluidBlockInvoker",
         "lifecycle.DataPackContentsMixin"
     ],
     "client": [
diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java
index 25ac340d0..63a8b8170 100644
--- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java
+++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java
@@ -16,6 +16,7 @@ import java.net.Proxy;
 
 import com.dfsek.terra.lifecycle.LifecyclePlatform;
 
+import static com.dfsek.terra.lifecycle.util.LifecycleUtil.initialized;
 
 @Mixin(MinecraftServer.class)
 public class MinecraftServerMixin {
@@ -29,4 +30,9 @@ public class MinecraftServerMixin {
                                    WorldGenerationProgressListenerFactory worldGenerationProgressListenerFactory, CallbackInfo ci) {
         LifecyclePlatform.setServer((MinecraftServer) (Object) this);
     }
+
+    @Inject(method = "shutdown()V", at = @At("RETURN"))
+    private void injectShutdown(CallbackInfo ci) {
+        initialized = false;
+    }
 }
diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java
index b1ff48396..739c084f3 100644
--- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java
+++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java
@@ -28,10 +28,12 @@ import com.dfsek.terra.lifecycle.LifecyclePlatform;
 import com.dfsek.terra.lifecycle.util.LifecycleUtil;
 import com.dfsek.terra.lifecycle.util.RegistryHack;
 
+import static com.dfsek.terra.lifecycle.util.LifecycleUtil.initialized;
+
 
 @Mixin(RegistryLoader.class)
 public class RegistryLoaderMixin {
-    private static boolean initialized = false;
+
     @Shadow
     @Final
     private static Logger LOGGER;
diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleUtil.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleUtil.java
index a251bedbd..28346a6eb 100644
--- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleUtil.java
+++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleUtil.java
@@ -12,6 +12,7 @@ import com.dfsek.terra.mod.CommonPlatform;
 
 
 public final class LifecycleUtil {
+    public static boolean initialized = false;
     private LifecycleUtil() {
 
     }