From 567b1dbce55b44f7055021994c80848abb087734 Mon Sep 17 00:00:00 2001
From: miozune <miozune@gmail.com>
Date: Wed, 25 Oct 2023 23:02:07 +0900
Subject: [PATCH] Move DefaultExtractorLoader to FMLLoadCompleteEvent (#168)

---
 .gitignore                                    | 41 ++++++++++++++++---
 build.gradle                                  |  4 +-
 .../java/com/glodblock/github/FluidCraft.java |  8 ++--
 .../glodblock/github/proxy/ClientProxy.java   |  8 +++-
 .../glodblock/github/proxy/CommonProxy.java   |  3 ++
 5 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 39a19e4a..5e80e0ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,38 @@
-*.bat
-.gradle/
-.idea/
-out/
+.gradle
+.settings
+/.idea/
+/.vscode/
+/run/
+/build/
+/eclipse/
+.classpath
+.project
+/bin/
+/config/
+/crash-reports/
+/logs/
+options.txt
+/saves/
+usernamecache.json
+banned-ips.json
+banned-players.json
+eula.txt
+ops.json
+server.properties
+servers.dat
+usercache.json
+whitelist.json
+/out/
 *.iml
 *.ipr
 *.iws
-run/
-build/
+src/main/resources/mixins.*([!.]).json
+*.bat
+*.DS_Store
+!gradlew.bat
+.factorypath
+addon.local.gradle
+addon.local.gradle.kts
+addon.late.local.gradle
+addon.late.local.gradle.kts
+layout.json
diff --git a/build.gradle b/build.gradle
index b74b980f..e59189c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1696952014
+//version: 1697697256
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -798,7 +798,7 @@ dependencies {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17')
     }
 
     java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java
index 96b5d375..18a4e3e0 100644
--- a/src/main/java/com/glodblock/github/FluidCraft.java
+++ b/src/main/java/com/glodblock/github/FluidCraft.java
@@ -89,6 +89,11 @@ public class FluidCraft {
         proxy.postInit(event);
     }
 
+    @Mod.EventHandler
+    public void onLoadComplete(FMLLoadCompleteEvent event) {
+        proxy.onLoadComplete(event);
+    }
+
     @Mod.EventHandler
     public void onServerStart(FMLServerStartingEvent event) {
         SPacketMEUpdateBuffer.init();
@@ -106,9 +111,6 @@ public class FluidCraft {
         }
     }
 
-    @Mod.EventHandler
-    public void onLoadComplete(FMLLoadCompleteEvent event) {}
-
     public static ResourceLocation resource(String path) {
         return new ResourceLocation(MODID, path);
     }
diff --git a/src/main/java/com/glodblock/github/proxy/ClientProxy.java b/src/main/java/com/glodblock/github/proxy/ClientProxy.java
index 282d5a97..6f3446f1 100644
--- a/src/main/java/com/glodblock/github/proxy/ClientProxy.java
+++ b/src/main/java/com/glodblock/github/proxy/ClientProxy.java
@@ -7,6 +7,7 @@ import com.glodblock.github.nei.recipes.DefaultExtractorLoader;
 import com.glodblock.github.util.ModAndClassUtil;
 
 import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 
@@ -28,8 +29,13 @@ public class ClientProxy extends CommonProxy {
     @Override
     public void postInit(FMLPostInitializationEvent event) {
         super.postInit(event);
+    }
+
+    @Override
+    public void onLoadComplete(FMLLoadCompleteEvent event) {
+        super.onLoadComplete(event);
         if (ModAndClassUtil.NEI) {
-            (new DefaultExtractorLoader()).run();
+            new DefaultExtractorLoader().run();
         }
     }
 }
diff --git a/src/main/java/com/glodblock/github/proxy/CommonProxy.java b/src/main/java/com/glodblock/github/proxy/CommonProxy.java
index 1a7ae60b..2662b4c0 100644
--- a/src/main/java/com/glodblock/github/proxy/CommonProxy.java
+++ b/src/main/java/com/glodblock/github/proxy/CommonProxy.java
@@ -21,6 +21,7 @@ import appeng.api.config.Upgrades;
 import appeng.helpers.InterfaceTerminalSupportedClassProvider;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
@@ -72,6 +73,8 @@ public class CommonProxy {
         InterfaceTerminalSupportedClassProvider.register(TileFluidInterface.class);
     }
 
+    public void onLoadComplete(FMLLoadCompleteEvent event) {}
+
     public void registerRenderers() {}
 
     public void registerMovables() {