diff options
Diffstat (limited to 'src/Java/miscutil/core/handler')
3 files changed, 22 insertions, 11 deletions
diff --git a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java index 4ab66d3099..a62d7c6734 100644 --- a/src/Java/miscutil/core/handler/COMPAT_HANDLER.java +++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java @@ -121,7 +121,7 @@ public class COMPAT_HANDLER { } if (LoadedMods.IndustrialCraft2){ COMPAT_IC2.OreDict(); - } + } } public static void RemoveRecipesFromOtherMods(){ diff --git a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java index b3c7934c9a..668487c5b7 100644 --- a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java +++ b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java @@ -1,18 +1,27 @@ package miscutil.core.handler; -import growthcraft.core.GrowthCraftCore; -import miscutil.core.intermod.growthcraft.Growthcraft_Handler; -import miscutil.core.lib.LoadedMods; +import miscutil.core.intermod.growthcraft.HANDLER_Growthcraft; +import miscutil.core.intermod.thermalfoundation.HANDLER_ThermalFoundation; +import miscutil.gregtech.HANDLER_Gregtech; public class COMPAT_IntermodStaging { - public static void load(){ - if (LoadedMods.Growthcraft || GrowthCraftCore.instance != null){ - Growthcraft_Handler.run(); - } - + public static void preInit(){ + HANDLER_Growthcraft.preInit(); + HANDLER_ThermalFoundation.preInit(); + HANDLER_Gregtech.preInit(); } - - + + public static void init(){ + HANDLER_ThermalFoundation.Init(); + HANDLER_Gregtech.init(); + } + + public static void postInit(){ + HANDLER_ThermalFoundation.postInit(); + HANDLER_Gregtech.postInit(); + } + + } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java index afc899410b..781daccde3 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java @@ -3,6 +3,7 @@ package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; import miscutil.gregtech.api.enums.GregtechItemList; import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaCondensor; +import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityElectricBlastFurnace; import miscutil.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityIronBlastFurnace; public class GregtechSteamCondenser @@ -27,6 +28,7 @@ public class GregtechSteamCondenser GregtechItemList.Machine_Iron_BlastFurnace.set(new GregtechMetaTileEntityIronBlastFurnace(768, "ironmachine.blastfurnace", "Iron Plated Blast Furnace").getStackForm(1L)); + GregtechItemList.Machine_Electric_BlastFurnace.set(new GregtechMetaTileEntityElectricBlastFurnace(796, "electric.blastfurnace", "Electric Blast Furnace").getStackForm(1L)); //ItemUtils.recipeBuilder(slot_1, slot_2, slot_3, slot_4, slot_5, slot_6, slot_7, slot_8, slot_9, resultItem); |