From e1aa537670ae229f1d1f5096243f626a9fde86c8 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Fri, 3 Feb 2023 13:03:55 +0800 Subject: [PATCH] make wct recipe not removed --- src/main/java/com/glodblock/github/FluidCraft.java | 5 +++-- .../com/glodblock/github/loader/ChannelLoader.java | 2 ++ .../com/glodblock/github/loader/RecipeLoader.java | 13 +++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index a15ad4ec..0360725f 100644 --- 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 class FluidCraft { 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 index 198bd0ff..bdd47117 100644 --- a/src/main/java/com/glodblock/github/loader/ChannelLoader.java +++ b/src/main/java/com/glodblock/github/loader/ChannelLoader.java @@ -10,6 +10,8 @@ import cpw.mods.fml.relauncher.Side; 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 index 08ad3c9f..31b323de 100644 --- a/src/main/java/com/glodblock/github/loader/RecipeLoader.java +++ b/src/main/java/com/glodblock/github/loader/RecipeLoader.java @@ -22,6 +22,8 @@ import extracells.registries.ItemEnum; 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 class RecipeLoader implements Runnable { 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 class RecipeLoader implements Runnable { 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())); + } + } }