make wct recipe not removed

GTNewHorizons · Feb 3, 2023 · e1aa537 · e1aa537
1 parent 8655189
commit e1aa537
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java
@@ -46,7 +46,7 @@ public class FluidCraft {
     @Mod.EventHandler
     public static void preInit(FMLPreInitializationEvent event) {
         Config.run();
-        (new ChannelLoader()).run();
+        ChannelLoader.INSTANCE.run();
         proxy.preInit(event);
     }
 
@@ -70,8 +70,9 @@ public static void postInit(FMLPostInitializationEvent event) {
         ItemAndBlockHolder.loadSetting();
 
         if (!Config.removeRecipe) {
-            (new RecipeLoader()).run();
+            RecipeLoader.INSTANCE.run();
         }
+        RecipeLoader.runWCTRecipe();
 
         if (ModAndClassUtil.isV2) {
             CalculatorV2PluginLoader.installCalculatorV2Plugins();

diff --git a/src/main/java/com/glodblock/github/loader/ChannelLoader.java b/src/main/java/com/glodblock/github/loader/ChannelLoader.java
@@ -10,6 +10,8 @@
 
 public class ChannelLoader implements Runnable {
 
+    public static final ChannelLoader INSTANCE = new ChannelLoader();
+
     @Override
     @SuppressWarnings("all")
     public void run() {

diff --git a/src/main/java/com/glodblock/github/loader/RecipeLoader.java b/src/main/java/com/glodblock/github/loader/RecipeLoader.java
@@ -22,6 +22,8 @@
 
 public class RecipeLoader implements Runnable {
 
+    public static final RecipeLoader INSTANCE = new RecipeLoader();
+
     public static final ItemStack AE2_INTERFACE = GameRegistry
             .findItemStack("appliedenergistics2", "tile.BlockInterface", 1);
     public static final ItemStack AE2_PROCESS_ENG = new ItemStack(
@@ -133,10 +135,6 @@ public void run() {
         GameRegistry.addShapelessRecipe(INTERFACE.stack(), FLUID_INTERFACE.stack());
         GameRegistry.addShapelessRecipe(WIRELESS_FLUID_TERM.stack(), AE2_WIRELESS_TERMINAL, BUCKET);
         GameRegistry.addShapelessRecipe(WIRELESS_PATTERN_TERM.stack(), WIRELESS_FLUID_TERM, FLUID_TERMINAL);
-        if (ModAndClassUtil.WCT) {
-            GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_PATTERN_TERM.stack()));
-            GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_FLUID_TERM.stack()));
-        }
         GameRegistry
                 .addRecipe(new ShapedOreRecipe(CERTUS_QUARTZ_TANK.stack(), "GGG", "G G", "GGG", 'G', AE2_QUARTZ_GLASS));
         GameRegistry.addShapelessRecipe(FLUID_AUTO_FILLER.stack(), FLUID_TERMINAL, ENCODER);
@@ -451,4 +449,11 @@ public void run() {
                             AE2_BLANK_PATTERN));
         }
     }
+
+    public static void runWCTRecipe() {
+        if (ModAndClassUtil.WCT) {
+            GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_PATTERN_TERM.stack()));
+            GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_FLUID_TERM.stack()));
+        }
+    }
 }