better handling of missing or incorrect phos dependency

related #20
BiggerSeries · Jan 7, 2024 · 1643fc0 · 1643fc0
1 parent 51a392a
commit 1643fc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/net/roguelogix/quartz/internal/EventListener.java b/src/main/java/net/roguelogix/quartz/internal/EventListener.java
@@ -8,6 +8,7 @@
 import net.roguelogix.phosphophyllite.registry.ClientOnly;
 import net.roguelogix.phosphophyllite.registry.OnModLoad;
 import net.roguelogix.phosphophyllite.util.NonnullDefault;
+import net.roguelogix.quartz.QuartzConfig;
 
 @ClientOnly
 @NonnullDefault
@@ -25,7 +26,7 @@ public static void initQuartz() {
     }
 
     static {
-        if (!DatagenModLoader.isRunningDataGen()) {
+        if (!DatagenModLoader.isRunningDataGen() && QuartzConfig.INIT_COMPLETED) {
             try {
                 QuartzCore.init();
             } catch (Throwable e) {

diff --git a/src/main/java/net/roguelogix/quartz/internal/mixin/ResourceReloadListener.java b/src/main/java/net/roguelogix/quartz/internal/mixin/ResourceReloadListener.java
@@ -1,6 +1,7 @@
 package net.roguelogix.quartz.internal.mixin;
 
 import net.minecraft.client.ResourceLoadStateTracker;
+import net.roguelogix.quartz.QuartzConfig;
 import net.roguelogix.quartz.internal.QuartzCore;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -11,6 +12,8 @@
 public class ResourceReloadListener {
     @Inject(method = "finishReload", at = @At("HEAD"))
     public void finishReload(CallbackInfo ci) {
-        QuartzCore.resourcesReloaded();
+        if (QuartzConfig.INIT_COMPLETED){
+            QuartzCore.resourcesReloaded();
+        }
     }
 }