From 781c9db5843c44ab3dfb1c433d204e9bc8e95468 Mon Sep 17 00:00:00 2001 From: luomolhx <2932965369@qq.com> Date: Wed, 11 Dec 2024 21:41:03 +0800 Subject: [PATCH 1/2] fix bug and move loader to proxy class --- .../silvermoon/boxplusplus/boxplusplus.java | 2 -- .../boxplusplus/common/CommonProxy.java | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/silvermoon/boxplusplus/boxplusplus.java b/src/main/java/com/silvermoon/boxplusplus/boxplusplus.java index 6c9f8b4..f548d84 100644 --- a/src/main/java/com/silvermoon/boxplusplus/boxplusplus.java +++ b/src/main/java/com/silvermoon/boxplusplus/boxplusplus.java @@ -8,7 +8,6 @@ import com.silvermoon.boxplusplus.common.CommonProxy; import com.silvermoon.boxplusplus.common.loader.BlockRegister; -import com.silvermoon.boxplusplus.common.loader.RecipeLoader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; @@ -65,7 +64,6 @@ public void postInit(FMLPostInitializationEvent event) { // register server commands in this event handler (Remove if not needed) public void serverStarting(FMLServerStartingEvent event) { proxy.serverStarting(event); - new RecipeLoader().run(); } public static final CreativeTabs BoxTab = new CreativeTabs("BoxPlusPlus") { diff --git a/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java b/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java index 98e45a4..c3e0e37 100644 --- a/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java +++ b/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java @@ -1,7 +1,13 @@ package com.silvermoon.boxplusplus.common; +import static com.silvermoon.boxplusplus.boxplusplus.LOG; +import static gregtech.api.enums.Mods.BartWorks; + +import net.minecraft.item.ItemStack; + import com.silvermoon.boxplusplus.common.config.Config; import com.silvermoon.boxplusplus.common.loader.BlockRegister; +import com.silvermoon.boxplusplus.common.loader.RecipeLoader; import com.silvermoon.boxplusplus.common.loader.TileEntitiesLoader; import com.silvermoon.boxplusplus.network.NetworkLoader; import com.silvermoon.boxplusplus.util.ResultModuleRequirement; @@ -11,6 +17,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import gregtech.api.recipe.check.CheckRecipeResultRegistry; +import gregtech.api.util.GTModHandler; public class CommonProxy { @@ -34,5 +41,15 @@ public void postInit(FMLPostInitializationEvent event) { } // register server commands in this event handler (Remove if not needed) - public void serverStarting(FMLServerStartingEvent event) {} + public void serverStarting(FMLServerStartingEvent event) { + ItemStack modItem = GTModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 64, 3); + if (modItem != null) { + LOG.info( + "{} is already registered", + modItem.getItem() + .getUnlocalizedName()); + } else { + new RecipeLoader().run(); + } + } } From 639ae48c1cee6d827e12d98aa6ca2d9e4077eda1 Mon Sep 17 00:00:00 2001 From: luomolhx <2932965369@qq.com> Date: Wed, 11 Dec 2024 22:22:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=89=A7=E8=A1=8Crecipe=20loader=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boxplusplus/common/CommonProxy.java | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java b/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java index c3e0e37..2fd5dfe 100644 --- a/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java +++ b/src/main/java/com/silvermoon/boxplusplus/common/CommonProxy.java @@ -1,10 +1,5 @@ package com.silvermoon.boxplusplus.common; -import static com.silvermoon.boxplusplus.boxplusplus.LOG; -import static gregtech.api.enums.Mods.BartWorks; - -import net.minecraft.item.ItemStack; - import com.silvermoon.boxplusplus.common.config.Config; import com.silvermoon.boxplusplus.common.loader.BlockRegister; import com.silvermoon.boxplusplus.common.loader.RecipeLoader; @@ -17,11 +12,12 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GTModHandler; public class CommonProxy { - // preInit "Run before anything else. Read your config, create blocks, items, etc, and register them with the + private static boolean hasRunRecipeLoader = true; + + // preInit "Run before anything else. Read your config, create blocks, items, etc., and register them with the // GameRegistry." (Remove if not needed) public void preInit(FMLPreInitializationEvent event) { Config.synchronizeConfiguration(event.getSuggestedConfigurationFile()); @@ -42,14 +38,10 @@ public void postInit(FMLPostInitializationEvent event) { // register server commands in this event handler (Remove if not needed) public void serverStarting(FMLServerStartingEvent event) { - ItemStack modItem = GTModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 64, 3); - if (modItem != null) { - LOG.info( - "{} is already registered", - modItem.getItem() - .getUnlocalizedName()); - } else { + if (hasRunRecipeLoader) { new RecipeLoader().run(); + hasRunRecipeLoader = false; } + } }