diff options
17 files changed, 62 insertions, 60 deletions
diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java index 3ef3f87f77..0c772aa6bb 100644 --- a/src/Java/miscutil/core/common/CommonProxy.java +++ b/src/Java/miscutil/core/common/CommonProxy.java @@ -1,11 +1,10 @@ package miscutil.core.common; import static miscutil.core.lib.CORE.DEBUG; -import static miscutil.core.lib.LoadedMods.Gregtech; import miscutil.core.block.ModBlocks; -import miscutil.core.common.compat.COMPAT_HANDLER; import miscutil.core.creative.AddToCreativeTab; import miscutil.core.gui.ModGUI; +import miscutil.core.handler.COMPAT_HANDLER; import miscutil.core.handler.events.PickaxeBlockBreakEventHandler; import miscutil.core.item.ModItems; import miscutil.core.lib.CORE; @@ -14,7 +13,6 @@ import miscutil.core.tileentities.ModTileEntities; import miscutil.core.util.PlayerCache; import miscutil.core.util.Utils; import miscutil.core.util.debug.DEBUG_INIT; -import miscutil.gregtech.api.init.InitGregtech; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -23,7 +21,8 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; public class CommonProxy { public void preInit(FMLPreInitializationEvent e) { - Utils.LOG_INFO("Doing some house cleaning."); + Utils.LOG_INFO("Doing some house cleaning."); + LoadedMods.checkLoaded(); Utils.LOG_INFO("Making sure we're ready to party!"); if (!DEBUG){ Utils.LOG_WARNING("Development mode not enabled."); @@ -33,18 +32,7 @@ public class CommonProxy { } else { Utils.LOG_WARNING("Development mode not set."); - } - - ModItems.init(); - ModBlocks.init(); - if (Gregtech) { - Utils.LOG_INFO("Gregtech Found - Loading Resources."); - InitGregtech.run(); - } - else { - Utils.LOG_WARNING("Gregtech not Found - Skipping Resources."); - } - LoadedMods.checkLoaded(); + } AddToCreativeTab.initialiseTabs(); } @@ -53,11 +41,13 @@ public class CommonProxy { if (CORE.DEBUG){ DEBUG_INIT.registerHandlers(); } + ModItems.init(); + ModBlocks.init(); MinecraftForge.EVENT_BUS.register(new PickaxeBlockBreakEventHandler()); - //Compat Handling - COMPAT_HANDLER.InitialiseHandlerThenAddRecipes(); + //Compat Handling COMPAT_HANDLER.registerMyModsOreDictEntries(); + COMPAT_HANDLER.registerGregtechMachines(); COMPAT_HANDLER.intermodOreDictionarySupport(); } @@ -65,6 +55,7 @@ public class CommonProxy { Utils.LOG_INFO("Cleaning up, doing postInit."); PlayerCache.initCache(); //Compat Handling + COMPAT_HANDLER.InitialiseHandlerThenAddRecipes(); COMPAT_HANDLER.RemoveRecipesFromOtherMods(); COMPAT_HANDLER.InitialiseLateHandlerThenAddRecipes(); COMPAT_HANDLER.startLoadingGregAPIBasedRecipes(); diff --git a/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java b/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java index bf4de21aca..247463e975 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_CompactWindmills.java @@ -1,7 +1,7 @@ package miscutil.core.common.compat; -import static miscutil.core.common.compat.COMPAT_HANDLER.AddRecipeQueue; -import static miscutil.core.common.compat.COMPAT_HANDLER.RemoveRecipeQueue; +import static miscutil.core.handler.COMPAT_HANDLER.AddRecipeQueue; +import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; import miscutil.core.util.UtilsItems; import miscutil.core.util.recipe.ShapedRecipeObject; import net.minecraft.item.ItemStack; diff --git a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java index fe6d516fb2..7b5dcc670a 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java @@ -1,8 +1,8 @@ package miscutil.core.common.compat; -import static miscutil.core.common.compat.COMPAT_HANDLER.AddRecipeQueue; -import static miscutil.core.common.compat.COMPAT_HANDLER.RemoveRecipeQueue; +import static miscutil.core.handler.COMPAT_HANDLER.AddRecipeQueue; +import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; import miscutil.core.util.UtilsItems; import miscutil.core.util.recipe.ShapedRecipeObject; import net.minecraft.item.ItemStack; diff --git a/src/Java/miscutil/core/common/compat/COMPAT_HANDLER.java b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java index 7cac0bcef2..49b7121465 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_HANDLER.java +++ b/src/Java/miscutil/core/handler/COMPAT_HANDLER.java @@ -1,5 +1,6 @@ -package miscutil.core.common.compat; +package miscutil.core.handler; +import static miscutil.core.lib.LoadedMods.Gregtech; import static miscutil.core.util.UtilsItems.removeCraftingRecipe; import gregtech.api.util.GT_OreDictUnificator; @@ -7,8 +8,25 @@ import java.util.LinkedList; import java.util.Queue; import miscutil.core.block.ModBlocks; +import miscutil.core.common.compat.COMPAT_BigReactors; +import miscutil.core.common.compat.COMPAT_CompactWindmills; +import miscutil.core.common.compat.COMPAT_EnderIO; +import miscutil.core.common.compat.COMPAT_ExtraUtils; +import miscutil.core.common.compat.COMPAT_IC2; +import miscutil.core.common.compat.COMPAT_MorePlanets; +import miscutil.core.common.compat.COMPAT_PneumaticCraft; +import miscutil.core.common.compat.COMPAT_RFTools; +import miscutil.core.common.compat.COMPAT_SimplyJetpacks; +import miscutil.core.common.compat.COMPAT_Thaumcraft; import miscutil.core.handler.registration.LateRegistrationHandler; import miscutil.core.handler.registration.RegistrationHandler; +import miscutil.core.handler.registration.gregtech.GregtechConduits; +import miscutil.core.handler.registration.gregtech.GregtechEnergyBuffer; +import miscutil.core.handler.registration.gregtech.GregtechIndustrialCentrifuge; +import miscutil.core.handler.registration.gregtech.GregtechIndustrialCokeOven; +import miscutil.core.handler.registration.gregtech.GregtechIndustrialPlatePress; +import miscutil.core.handler.registration.gregtech.GregtechSafeBlock; +import miscutil.core.handler.registration.gregtech.GregtechSteamCondenser; import miscutil.core.item.ModItems; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; @@ -51,6 +69,18 @@ public class COMPAT_HANDLER { } } + public static void registerGregtechMachines() { + if (Gregtech) { + GregtechEnergyBuffer.run(); + GregtechConduits.run(); + GregtechSteamCondenser.run(); + GregtechSafeBlock.run(); + GregtechIndustrialCentrifuge.run(); + GregtechIndustrialCokeOven.run(); + GregtechIndustrialPlatePress.run(); + } + + } //InterMod public static void intermodOreDictionarySupport(){ diff --git a/src/Java/miscutil/core/handler/InitGregtech.java b/src/Java/miscutil/core/handler/InitGregtech.java new file mode 100644 index 0000000000..13321b2b7b --- /dev/null +++ b/src/Java/miscutil/core/handler/InitGregtech.java @@ -0,0 +1,7 @@ +package miscutil.core.handler; + + +public class InitGregtech { + + +} diff --git a/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java b/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java index 7c6396b338..207e3589c6 100644 --- a/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java +++ b/src/Java/miscutil/core/handler/registration/LateRegistrationHandler.java @@ -1,6 +1,6 @@ package miscutil.core.handler.registration; -import miscutil.core.common.compat.COMPAT_HANDLER; +import miscutil.core.handler.COMPAT_HANDLER; import miscutil.core.util.Utils; import miscutil.core.util.recipe.ShapedRecipeObject; diff --git a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java index 7bb3d33f84..5a5be61933 100644 --- a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java +++ b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java @@ -1,6 +1,6 @@ package miscutil.core.handler.registration; -import miscutil.core.common.compat.COMPAT_HANDLER; +import miscutil.core.handler.COMPAT_HANDLER; import miscutil.core.util.Utils; import miscutil.core.util.recipe.RECIPES_Machines; import miscutil.core.util.recipe.RECIPES_Shapeless; diff --git a/src/Java/miscutil/gregtech/api/init/machines/GregtechCobbleGenerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechCobbleGenerator.java index 3b6d0834a1..00323bce33 100644 --- a/src/Java/miscutil/gregtech/api/init/machines/GregtechCobbleGenerator.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechCobbleGenerator.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.api.init.machines; +package miscutil.core.handler.registration.gregtech; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; diff --git a/src/Java/miscutil/gregtech/api/init/machines/GregtechConduits.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java index 318ff5f882..370a5d94a8 100644 --- a/src/Java/miscutil/gregtech/api/init/machines/GregtechConduits.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.api.init.machines; +package miscutil.core.handler.registration.gregtech; import static miscutil.core.lib.LoadedMods.Gregtech; import gregtech.api.enums.GT_Values; diff --git a/src/Java/miscutil/gregtech/api/init/machines/GregtechEnergyBuffer.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java index 46b7fd8a53..b6fe9fe07d 100644 --- a/src/Java/miscutil/gregtech/api/init/machines/GregtechEnergyBuffer.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechEnergyBuffer.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.api.init.machines; +package miscutil.core.handler.registration.gregtech; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; diff --git a/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialCentrifuge.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java index 4bad285fd5..06da27f8a3 100644 --- a/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialCentrifuge.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCentrifuge.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.api.init.machines; +package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; import miscutil.gregtech.api.enums.GregtechItemList; diff --git a/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialCokeOven.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java index 6ddfbf7bc4..00aecf6415 100644 --- a/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialCokeOven.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialCokeOven.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.api.init.machines; +package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; import miscutil.gregtech.api.enums.GregtechItemList; diff --git a/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialPlatePress.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java index 266263380e..c66dad598d 100644 --- a/src/Java/miscutil/gregtech/api/init/machines/GregtechIndustrialPlatePress.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechIndustrialPlatePress.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.api.init.machines; +package miscutil.core.handler.registration.gregtech; import miscutil.gregtech.api.enums.GregtechItemList; import miscutil.gregtech.common.machines.multi.GregtechMetaTileEntityIndustrialPlatePress; diff --git a/src/Java/miscutil/gregtech/api/init/machines/GregtechSafeBlock.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java index f580d5da3a..a285970602 100644 --- a/src/Java/miscutil/gregtech/api/init/machines/GregtechSafeBlock.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSafeBlock.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.api.init.machines; +package miscutil.core.handler.registration.gregtech; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; diff --git a/src/Java/miscutil/gregtech/api/init/machines/GregtechSteamCondenser.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java index 9886bbb3af..652f089719 100644 --- a/src/Java/miscutil/gregtech/api/init/machines/GregtechSteamCondenser.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSteamCondenser.java @@ -1,4 +1,4 @@ -package miscutil.gregtech.api.init.machines; +package miscutil.core.handler.registration.gregtech; import miscutil.core.util.Utils; import miscutil.gregtech.api.enums.GregtechItemList; diff --git a/src/Java/miscutil/core/util/UtilsItems.java b/src/Java/miscutil/core/util/UtilsItems.java index 8587deabd0..7f80534804 100644 --- a/src/Java/miscutil/core/util/UtilsItems.java +++ b/src/Java/miscutil/core/util/UtilsItems.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import miscutil.core.common.compat.COMPAT_HANDLER; +import miscutil.core.handler.COMPAT_HANDLER; import miscutil.core.handler.registration.LateRegistrationHandler; import miscutil.core.handler.registration.RegistrationHandler; import miscutil.core.lib.CORE; diff --git a/src/Java/miscutil/gregtech/api/init/InitGregtech.java b/src/Java/miscutil/gregtech/api/init/InitGregtech.java deleted file mode 100644 index c610107d04..0000000000 --- a/src/Java/miscutil/gregtech/api/init/InitGregtech.java +++ /dev/null @@ -1,26 +0,0 @@ -package miscutil.gregtech.api.init; - -import static miscutil.core.lib.LoadedMods.Gregtech; -import miscutil.gregtech.api.init.machines.GregtechConduits; -import miscutil.gregtech.api.init.machines.GregtechEnergyBuffer; -import miscutil.gregtech.api.init.machines.GregtechIndustrialCentrifuge; -import miscutil.gregtech.api.init.machines.GregtechIndustrialCokeOven; -import miscutil.gregtech.api.init.machines.GregtechIndustrialPlatePress; -import miscutil.gregtech.api.init.machines.GregtechSafeBlock; -import miscutil.gregtech.api.init.machines.GregtechSteamCondenser; - -public class InitGregtech { - - public static void run() { - if (Gregtech) { - GregtechEnergyBuffer.run(); - GregtechConduits.run(); - GregtechSteamCondenser.run(); - GregtechSafeBlock.run(); - GregtechIndustrialCentrifuge.run(); - GregtechIndustrialCokeOven.run(); - GregtechIndustrialPlatePress.run(); - } - - } -} |