some fixes

PolyhedralDev · Sep 18, 2024 · 06457bf · 06457bf
1 parent b63f5f4
commit 06457bf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 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
@@ -10,5 +10,5 @@
 @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
@@ -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/...fecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java b/...fecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java
@@ -16,6 +16,7 @@
 
 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 @@ private void injectConstructor(Thread serverThread, LevelStorage.Session session
                                    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/...ifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java b/...ifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java
@@ -28,10 +28,12 @@
 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
@@ -12,6 +12,7 @@
 
 
 public final class LifecycleUtil {
+    public static boolean initialized = false;
     private LifecycleUtil() {
 
     }