From 247f366417baf804340aa2cf64bc210d8662d19e Mon Sep 17 00:00:00 2001 From: boubou19 Date: Tue, 7 Feb 2023 20:44:54 +0100 Subject: [PATCH] don't register recipes if coremod is present --- .../common/WirelessCraftingTerminal.java | 9 ++++----- .../core/sync/packets/PacketConfigSync.java | 5 ++++- .../wirelesscraftingterminal/handlers/ConfigHandler.java | 4 +++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java index 9b8f5e8..d7c044f 100644 --- a/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java @@ -2,6 +2,7 @@ package net.p455w0rd.wirelesscraftingterminal.common; import java.io.File; +import cpw.mods.fml.common.*; import net.minecraft.creativetab.CreativeTabs; import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; @@ -16,12 +17,8 @@ import net.p455w0rd.wirelesscraftingterminal.reference.Reference; import appeng.api.AEApi; import appeng.api.features.IWirelessTermHandler; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.LoaderState; -import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @@ -73,7 +70,9 @@ public class WirelessCraftingTerminal { long stopwatch = WCTLog.beginSection("Init"); IntegrationRegistry.INSTANCE.init(); WirelessCraftingTerminal.WCTState = LoaderState.INITIALIZATION; - RecipeHandler.loadRecipes(!Reference.WCT_MINETWEAKER_OVERRIDE); + if (!Loader.isModLoaded("dreamcraft")) { + RecipeHandler.loadRecipes(!Reference.WCT_MINETWEAKER_OVERRIDE); + } AchievementHandler.init(); WCTLog.endSection("Init", stopwatch); } diff --git a/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java index 6dff7c5..a8da8dd 100644 --- a/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java @@ -1,5 +1,6 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync.packets; +import cpw.mods.fml.common.Loader; import net.minecraft.entity.player.EntityPlayer; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo; @@ -58,7 +59,9 @@ public class PacketConfigSync extends WCTPacket { Reference.WCT_MINETWEAKER_OVERRIDE = this.mineTweakerOverride; ConfigHandler.removeBooster(); ConfigHandler.removeBoosterIcon(); - RecipeHandler.loadRecipes(mtChanged); + if (!Loader.isModLoaded("dreamcraft")) { + RecipeHandler.loadRecipes(mtChanged); + } mtChanged = false; } } diff --git a/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java index a739162..5d04ccb 100644 --- a/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java @@ -125,7 +125,9 @@ public class ConfigHandler { } public static void reloadRecipes() { - RecipeHandler.loadRecipes(mtChanged); + if (!Loader.isModLoaded("dreamcraft")) { + RecipeHandler.loadRecipes(mtChanged); + } mtChanged = false; }