From e50ba876b1b16a34b3b9e12dd7eb318905d66b6d Mon Sep 17 00:00:00 2001
From: Adubbz <Adubbz@users.noreply.github.com>
Date: Mon, 8 Jan 2024 14:34:39 +1100
Subject: [PATCH] Fix crashing on Fabric

---
 .../client/particle/ThermoregulatorParticle.java     |  1 +
 .../toughasnails/fabric/core/ToughAsNailsFabric.java | 12 +++---------
 fabric/src/main/resources/fabric.mod.json            |  5 +----
 forge/src/main/resources/META-INF/mods.toml          |  2 +-
 gradle.properties                                    |  2 +-
 neoforge/src/main/resources/META-INF/mods.toml       |  2 +-
 6 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/common/src/main/java/toughasnails/client/particle/ThermoregulatorParticle.java b/common/src/main/java/toughasnails/client/particle/ThermoregulatorParticle.java
index 71809cdc..a9c12358 100644
--- a/common/src/main/java/toughasnails/client/particle/ThermoregulatorParticle.java
+++ b/common/src/main/java/toughasnails/client/particle/ThermoregulatorParticle.java
@@ -57,6 +57,7 @@ public Provider(SpriteSet p_105899_) {
             this.sprites = p_105899_;
         }
 
+        @Override
         public Particle createParticle(SimpleParticleType p_105910_, ClientLevel p_105911_, double p_105912_, double p_105913_, double p_105914_, double p_105915_, double p_105916_, double p_105917_)
         {
             ThermoregulatorParticle particle = new ThermoregulatorParticle(p_105911_, p_105912_, p_105913_, p_105914_, p_105915_, p_105916_, p_105917_);
diff --git a/fabric/src/main/java/toughasnails/fabric/core/ToughAsNailsFabric.java b/fabric/src/main/java/toughasnails/fabric/core/ToughAsNailsFabric.java
index 9026f371..697e7fb7 100644
--- a/fabric/src/main/java/toughasnails/fabric/core/ToughAsNailsFabric.java
+++ b/fabric/src/main/java/toughasnails/fabric/core/ToughAsNailsFabric.java
@@ -4,26 +4,20 @@
  ******************************************************************************/
 package toughasnails.fabric.core;
 
-import glitchcore.fabric.GlitchCoreFabric;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
+import glitchcore.fabric.GlitchCoreInitializer;
 import toughasnails.core.ToughAsNails;
 
-public class ToughAsNailsFabric implements ModInitializer, ClientModInitializer
+public class ToughAsNailsFabric implements GlitchCoreInitializer
 {
     @Override
     public void onInitialize()
     {
         ToughAsNails.init();
-        GlitchCoreFabric.prepareEvents();
     }
 
     @Override
     public void onInitializeClient()
     {
-        ClientLifecycleEvents.CLIENT_STARTED.register(client -> {
-            ToughAsNails.setupClient();
-        });
+        ToughAsNails.setupClient();
     }
 }
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 680460ce..78b1a1ad 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -16,10 +16,7 @@
   "icon": "${mod_id}_logo.png",
   "environment": "*",
   "entrypoints": {
-    "main": [
-      "toughasnails.fabric.core.ToughAsNailsFabric"
-    ],
-    "client": [
+    "glitchcore": [
       "toughasnails.fabric.core.ToughAsNailsFabric"
     ]
   },
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index aa75aea2..32cf6fa0 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -23,5 +23,5 @@ logoFile="${mod_id}_logo.png"
     modId="glitchcore"
     mandatory=true
     versionRange="[${glitchcore_version},)"
-    ordering="NONE"
+    ordering="AFTER"
     side="BOTH"
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index f02cdd18..94e6107d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -40,5 +40,5 @@ org.gradle.daemon=false
 
 # Dependencies
 nightconfig_version=3.6.7
-glitchcore_version=1.0.0.41
+glitchcore_version=1.0.0.43
 serene_seasons_version=9.3.0.0
diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
index d72e5c54..fd72875c 100644
--- a/neoforge/src/main/resources/META-INF/mods.toml
+++ b/neoforge/src/main/resources/META-INF/mods.toml
@@ -23,5 +23,5 @@ logoFile="${mod_id}_logo.png"
     modId="glitchcore"
     required=true
     versionRange="[${glitchcore_version},)"
-    ordering="NONE"
+    ordering="AFTER"
     side="BOTH"
\ No newline at end of file