diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/common')
12 files changed, 362 insertions, 350 deletions
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index afaf055da3..53c4256ed6 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -1,12 +1,11 @@ package gtPlusPlus.core.common; -import java.util.Iterator; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.event.*; +import static gtPlusPlus.core.lib.CORE.DEBUG; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.handler.*; +import gtPlusPlus.core.handler.COMPAT_HANDLER; +import gtPlusPlus.core.handler.COMPAT_IntermodStaging; +import gtPlusPlus.core.handler.GuiHandler; import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; @@ -17,110 +16,119 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.debug.DEBUG_INIT; import gtPlusPlus.core.util.player.PlayerCache; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; + +import java.util.Iterator; + import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; public class CommonProxy { - - private static void handleGtIntegrationInit() { - Utils.LOG_INFO("Setting up our own GT_Proxy."); - final Meta_GT_Proxy GtProxy = new Meta_GT_Proxy(); - for (final String tOreName : OreDictionary.getOreNames()) { - ItemStack tOreStack; - Utils.LOG_INFO("Iterating list of GT materials for custom tool parts."); - for (final Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$.hasNext(); GtProxy - .registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { - Utils.LOG_INFO("Iterating Material"); - tOreStack = (ItemStack) i$.next(); - } - } - } - - public CommonProxy() { - // Should Register Gregtech Materials I've Made + + public CommonProxy(){ + //Should Register Gregtech Materials I've Made MinecraftForge.EVENT_BUS.register(this); FMLCommonHandler.instance().bus().register(this); - if (LoadedMods.Gregtech) { - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { + if (LoadedMods.Gregtech){ + if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ Utils.LOG_INFO("We're using Gregtech 5.09 Experimental."); } else { Utils.LOG_INFO("We're using Gregtech 5.08 or an equivalent fork."); } - CommonProxy.handleGtIntegrationInit(); + handleGtIntegrationInit(); } } - - @SuppressWarnings("static-method") - public int addArmor(final String armor) { - return 0; + private static void handleGtIntegrationInit(){ + Utils.LOG_INFO("Setting up our own GT_Proxy."); + Meta_GT_Proxy GtProxy = new Meta_GT_Proxy(); + for (String tOreName : OreDictionary.getOreNames()) { + ItemStack tOreStack; + Utils.LOG_INFO("Iterating list of GT materials for custom tool parts."); + for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$.hasNext(); GtProxy.registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { + Utils.LOG_INFO("Iterating Material"); + tOreStack = (ItemStack) i$.next(); + } + } } - public void generateMysteriousParticles(final Entity theEntity) { + public void preInit(FMLPreInitializationEvent e) { + 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."); + } + else if (DEBUG){ + Utils.LOG_INFO("Development mode enabled."); + } + else { + Utils.LOG_WARNING("Development mode not set."); + } + AddToCreativeTab.initialiseTabs(); + COMPAT_IntermodStaging.preInit(); + //Apparently I should do this here. Might put it in Init for a test. + //Growthcraft_Handler.run(); } - public void init(final FMLInitializationEvent e) { - // Debug Loading - if (CORE.DEBUG) { - DEBUG_INIT.registerHandlers(); - } + public void init(FMLInitializationEvent e) { + //Debug Loading + if (CORE.DEBUG){ + DEBUG_INIT.registerHandlers(); + } ModItems.init(); ModBlocks.init(); RECIPE_CONSTANTS.initialise(); MinecraftForge.EVENT_BUS.register(new PickaxeBlockBreakEventHandler()); - - // Compat Handling + + //Compat Handling COMPAT_HANDLER.registerMyModsOreDictEntries(); COMPAT_HANDLER.intermodOreDictionarySupport(); COMPAT_IntermodStaging.init(); } - public void postInit(final FMLPostInitializationEvent e) { + public void postInit(FMLPostInitializationEvent e) { Utils.LOG_INFO("Cleaning up, doing postInit."); - PlayerCache.initCache(); - // Compat Handling + PlayerCache.initCache(); + //Compat Handling COMPAT_HANDLER.InitialiseHandlerThenAddRecipes(); COMPAT_HANDLER.RemoveRecipesFromOtherMods(); COMPAT_HANDLER.startLoadingGregAPIBasedRecipes(); COMPAT_IntermodStaging.postInit(); } - - public void preInit(final FMLPreInitializationEvent e) { - Utils.LOG_INFO("Doing some house cleaning."); - LoadedMods.checkLoaded(); - Utils.LOG_INFO("Making sure we're ready to party!"); - - if (!CORE.DEBUG) { - Utils.LOG_WARNING("Development mode not enabled."); - } - else if (CORE.DEBUG) { - Utils.LOG_INFO("Development mode enabled."); - } - else { - Utils.LOG_WARNING("Development mode not set."); - } - AddToCreativeTab.initialiseTabs(); - COMPAT_IntermodStaging.preInit(); - // Apparently I should do this here. Might put it in Init for a test. - // Growthcraft_Handler.run(); + + + public void serverStarting(FMLServerStartingEvent e) + { + COMPAT_HANDLER.InitialiseLateHandlerThenAddRecipes(); } - public void registerNetworkStuff() { + public void registerNetworkStuff(){ GuiHandler.init(); } + public void registerTileEntities(){ + ModTileEntities.init(); + } + public void registerRenderThings() { } - public void registerTileEntities() { - ModTileEntities.init(); + @SuppressWarnings("static-method") + public int addArmor(String armor) { + return 0; } + + public void generateMysteriousParticles(Entity theEntity) { } - public void serverStarting(final FMLServerStartingEvent e) { - COMPAT_HANDLER.InitialiseLateHandlerThenAddRecipes(); - } } diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java index ad253d116f..634fbe47d2 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java @@ -8,24 +8,24 @@ import gtPlusPlus.core.util.Utils; public class COMPAT_Baubles { - public static void baublesLoaded() { + public static void run(){ + if (LoadedMods.Baubles){ + baublesLoaded(); + } + else { + baublesNotLoaded(); + } + } + + public static void baublesLoaded(){ Utils.LOG_INFO("Baubles Found - Loading Wearables."); ModItems.itemPersonalCloakingDevice = new ItemCloakingDevice(0); - // itemPersonalCloakingDeviceCharged = new ItemCloakingDevice(0).set; + //itemPersonalCloakingDeviceCharged = new ItemCloakingDevice(0).set; ModItems.itemPersonalHealingDevice = new ItemHealingDevice(); } - - public static void baublesNotLoaded() { + + public static void baublesNotLoaded(){ Utils.LOG_INFO("Baubles Not Found - Skipping Resources."); } - - public static void run() { - if (LoadedMods.Baubles) { - COMPAT_Baubles.baublesLoaded(); - } - else { - COMPAT_Baubles.baublesNotLoaded(); - } - } - + } diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java index 76b229f315..7f4aa0541a 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java @@ -6,14 +6,14 @@ import net.minecraft.item.ItemStack; public class COMPAT_BigReactors { - public static void OreDict() { - COMPAT_BigReactors.run(); + public static void OreDict(){ + run(); } - - private static final void run() { + + private static final void run(){ GT_OreDictUnificator.registerOre("plateBlutonium", new ItemStack(ModItems.itemPlateBlutonium)); GT_OreDictUnificator.registerOre("plateCyanite", new ItemStack(ModItems.itemPlateCyanite)); GT_OreDictUnificator.registerOre("plateLudicrite", new ItemStack(ModItems.itemPlateLudicrite)); } - + } diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java index 26ee8cd3c1..c64e332c50 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java @@ -1,171 +1,171 @@ package gtPlusPlus.core.common.compat; -import gtPlusPlus.core.handler.COMPAT_HANDLER; +import static gtPlusPlus.core.handler.COMPAT_HANDLER.AddRecipeQueue; +import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; import gtPlusPlus.core.recipe.ShapedRecipeObject; import gtPlusPlus.core.util.item.ItemUtils; import net.minecraft.item.ItemStack; + + public class COMPAT_CompactWindmills { - // Change IC2 Upgrades - public static ItemStack kineticWind = ItemUtils.simpleMetaStack("IC2:blockKineticGenerator", 0, 1); - public static ItemStack shaftIron = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 11, 1); - public static ItemStack cableCopper = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 1367, - 1); - public static String plateRubber = "ore:plateRubber"; - - // Machine Casings - public static ItemStack elvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 0, 1); - public static ItemStack lvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 1, 1); - public static ItemStack mvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 2, 1); - public static ItemStack hvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 3, 1); - public static ItemStack evCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 4, 1); - public static ItemStack ivCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 5, 1); - - // GT Transformers - public static ItemStack elvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 20, 1); - public static ItemStack lvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 21, 1); - public static ItemStack mvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 22, 1); - public static ItemStack hvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 23, 1); - public static ItemStack evTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 24, 1); - - // Compact Windmills - public static ItemStack elvWindmill = ItemUtils - .simpleMetaStack("CompactWindmills:blockCompactWindmill", 0, 1); - public static ItemStack lvWindmill = ItemUtils - .simpleMetaStack("CompactWindmills:blockCompactWindmill", 1, 1); - public static ItemStack mvWindmill = ItemUtils - .simpleMetaStack("CompactWindmills:blockCompactWindmill", 2, 1); - public static ItemStack hvWindmill = ItemUtils - .simpleMetaStack("CompactWindmills:blockCompactWindmill", 3, 1); - public static ItemStack evWindmill = ItemUtils - .simpleMetaStack("CompactWindmills:blockCompactWindmill", 4, 1); - - // Compact Rotors - public static ItemStack rotor2 = ItemUtils.getItemStack("CompactWindmills:WOOL", 1); - public static ItemStack rotor1 = ItemUtils.getItemStack("CompactWindmills:WOOD", 1); - public static ItemStack rotor3 = ItemUtils.getItemStack("CompactWindmills:ALLOY", 1); - public static ItemStack rotor4 = ItemUtils.getItemStack("CompactWindmills:CARBON", 1); - public static ItemStack rotor5 = ItemUtils.getItemStack("CompactWindmills:IRIDIUM", 1); - - // IC2 Rotors - public static ItemStack rotorIC1 = ItemUtils.getItemStack("IC2:itemwoodrotor", 1); - public static ItemStack rotorIC2 = ItemUtils.getItemStack("IC2:itemironrotor", 1); - public static ItemStack rotorIC3 = ItemUtils.getItemStack("IC2:itemsteelrotor", 1); - public static ItemStack rotorIC4 = ItemUtils.getItemStack("IC2:itemwcarbonrotor", 1); - public static ItemStack rotorBlade1 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 7, 1); - public static ItemStack rotorBlade2 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 8, 1); - public static ItemStack rotorBlade3 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 10, 1); - public static ItemStack rotorBlade4 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 9, 1); - - // Plates - public static String plateTier1 = "ore:plateMagnalium"; - public static String plateTier2 = "ore:plateStainlessSteel"; - public static String plateTier3 = "ore:plateTitanium"; - public static String plateTier4 = "ore:plateTungstenSteel"; - public static String plateTier5 = "ore:plateNichrome"; - public static String plateCarbon = "ore:plateAlloyCarbon"; - public static String plateAlloy = "ore:plateAlloyAdvanced"; - - // Circuits - public static String circuitTier1 = "ore:circuitGood"; - public static String circuitTier2 = "ore:circuitAdvanced"; - public static String circuitTier3 = "ore:circuitData"; - public static String circuitTier4 = "ore:circuitElite"; - public static String circuitTier5 = "ore:circuitMaster"; - - // Wooden Rotor - public static ShapedRecipeObject Wooden_Rotor = new ShapedRecipeObject(COMPAT_CompactWindmills.rotorBlade1, - "ore:plateAnyIron", "ore:plateAnyIron", "ore:screwAluminium", COMPAT_CompactWindmills.rotorIC1, - "ore:screwAluminium", COMPAT_CompactWindmills.rotorBlade1, "plateAnyIron", - COMPAT_CompactWindmills.rotorBlade1, COMPAT_CompactWindmills.rotor1); - // Alloy Rotor - public static ShapedRecipeObject Alloy_Rotor = new ShapedRecipeObject(COMPAT_CompactWindmills.plateAlloy, - COMPAT_CompactWindmills.plateAlloy, COMPAT_CompactWindmills.plateAlloy, COMPAT_CompactWindmills.plateAlloy, - COMPAT_CompactWindmills.rotorIC3, COMPAT_CompactWindmills.plateAlloy, COMPAT_CompactWindmills.plateAlloy, - COMPAT_CompactWindmills.plateAlloy, COMPAT_CompactWindmills.plateAlloy, COMPAT_CompactWindmills.rotor3); - // Carbon Rotor - public static ShapedRecipeObject Carbon_Rotor = new ShapedRecipeObject(COMPAT_CompactWindmills.plateCarbon, - COMPAT_CompactWindmills.rotorBlade4, COMPAT_CompactWindmills.plateCarbon, - COMPAT_CompactWindmills.rotorBlade4, COMPAT_CompactWindmills.rotor3, COMPAT_CompactWindmills.rotorBlade4, - COMPAT_CompactWindmills.plateCarbon, COMPAT_CompactWindmills.rotorBlade4, - COMPAT_CompactWindmills.plateCarbon, COMPAT_CompactWindmills.rotor4); - - // Kinetic Wind Turbine - public static ShapedRecipeObject KWT = new ShapedRecipeObject(COMPAT_CompactWindmills.plateCarbon, - COMPAT_CompactWindmills.shaftIron, COMPAT_CompactWindmills.plateCarbon, COMPAT_CompactWindmills.cableCopper, - COMPAT_CompactWindmills.mvCasing, COMPAT_CompactWindmills.cableCopper, COMPAT_CompactWindmills.plateRubber, - COMPAT_CompactWindmills.plateCarbon, COMPAT_CompactWindmills.plateRubber, - COMPAT_CompactWindmills.kineticWind); - - // ELV Windmill - public static ShapedRecipeObject WM_ELV = new ShapedRecipeObject( - - COMPAT_CompactWindmills.circuitTier1, COMPAT_CompactWindmills.elvTransformer, - COMPAT_CompactWindmills.circuitTier1, COMPAT_CompactWindmills.plateTier1, COMPAT_CompactWindmills.lvCasing, - COMPAT_CompactWindmills.plateTier1, COMPAT_CompactWindmills.plateTier1, COMPAT_CompactWindmills.rotor1, - COMPAT_CompactWindmills.plateTier1, COMPAT_CompactWindmills.elvWindmill); - - // LV Windmill - public static ShapedRecipeObject WM_LV = new ShapedRecipeObject(COMPAT_CompactWindmills.circuitTier2, - COMPAT_CompactWindmills.lvTransformer, COMPAT_CompactWindmills.circuitTier2, - COMPAT_CompactWindmills.plateTier2, COMPAT_CompactWindmills.mvCasing, COMPAT_CompactWindmills.plateTier2, - COMPAT_CompactWindmills.plateTier2, COMPAT_CompactWindmills.rotor2, COMPAT_CompactWindmills.plateTier2, - COMPAT_CompactWindmills.lvWindmill); - - // MV Windmill - public static ShapedRecipeObject WM_MV = new ShapedRecipeObject(COMPAT_CompactWindmills.circuitTier3, - COMPAT_CompactWindmills.mvTransformer, COMPAT_CompactWindmills.circuitTier3, - COMPAT_CompactWindmills.plateTier3, COMPAT_CompactWindmills.hvCasing, COMPAT_CompactWindmills.plateTier3, - COMPAT_CompactWindmills.plateTier3, COMPAT_CompactWindmills.rotor3, COMPAT_CompactWindmills.plateTier3, - COMPAT_CompactWindmills.mvWindmill); - - // HV Windmill - public static ShapedRecipeObject WM_HV = new ShapedRecipeObject(COMPAT_CompactWindmills.circuitTier4, - COMPAT_CompactWindmills.hvTransformer, COMPAT_CompactWindmills.circuitTier4, - COMPAT_CompactWindmills.plateTier4, COMPAT_CompactWindmills.evCasing, COMPAT_CompactWindmills.plateTier4, - COMPAT_CompactWindmills.plateTier4, COMPAT_CompactWindmills.rotor4, COMPAT_CompactWindmills.plateTier4, - COMPAT_CompactWindmills.hvWindmill); - - // EV Windmill - public static ShapedRecipeObject WM_EV = new ShapedRecipeObject(COMPAT_CompactWindmills.circuitTier5, - COMPAT_CompactWindmills.evTransformer, COMPAT_CompactWindmills.circuitTier5, - COMPAT_CompactWindmills.plateTier5, COMPAT_CompactWindmills.ivCasing, COMPAT_CompactWindmills.plateTier5, - COMPAT_CompactWindmills.plateTier5, COMPAT_CompactWindmills.rotor5, COMPAT_CompactWindmills.plateTier5, - COMPAT_CompactWindmills.evWindmill); - - public static void OreDict() { - COMPAT_CompactWindmills.run(); + //Change IC2 Upgrades + public static ItemStack kineticWind = ItemUtils.simpleMetaStack("IC2:blockKineticGenerator", 0, 1); + public static ItemStack shaftIron = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 11, 1); + public static ItemStack cableCopper = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 1367, 1); + public static String plateRubber = "ore:plateRubber"; + + //Machine Casings + public static ItemStack elvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 0, 1); + public static ItemStack lvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 1, 1); + public static ItemStack mvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 2, 1); + public static ItemStack hvCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 3, 1); + public static ItemStack evCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 4, 1); + public static ItemStack ivCasing = ItemUtils.simpleMetaStack("gregtech:gt.blockcasings", 5, 1); + + //GT Transformers + public static ItemStack elvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 20, 1); + public static ItemStack lvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 21, 1); + public static ItemStack mvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 22, 1); + public static ItemStack hvTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 23, 1); + public static ItemStack evTransformer = ItemUtils.simpleMetaStack("gregtech:gt.blockmachines", 24, 1); + + //Compact Windmills + public static ItemStack elvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 0, 1); + public static ItemStack lvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 1, 1); + public static ItemStack mvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 2, 1); + public static ItemStack hvWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 3, 1); + public static ItemStack evWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 4, 1); + + //Compact Rotors + public static ItemStack rotor2 = ItemUtils.getItemStack("CompactWindmills:WOOL", 1); + public static ItemStack rotor1 = ItemUtils.getItemStack("CompactWindmills:WOOD", 1); + public static ItemStack rotor3 = ItemUtils.getItemStack("CompactWindmills:ALLOY", 1); + public static ItemStack rotor4 = ItemUtils.getItemStack("CompactWindmills:CARBON", 1); + public static ItemStack rotor5 = ItemUtils.getItemStack("CompactWindmills:IRIDIUM", 1); + + //IC2 Rotors + public static ItemStack rotorIC1 = ItemUtils.getItemStack("IC2:itemwoodrotor", 1); + public static ItemStack rotorIC2 = ItemUtils.getItemStack("IC2:itemironrotor", 1); + public static ItemStack rotorIC3 = ItemUtils.getItemStack("IC2:itemsteelrotor", 1); + public static ItemStack rotorIC4 = ItemUtils.getItemStack("IC2:itemwcarbonrotor", 1); + public static ItemStack rotorBlade1 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 7, 1); + public static ItemStack rotorBlade2 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 8, 1); + public static ItemStack rotorBlade3 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 10, 1); + public static ItemStack rotorBlade4 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 9, 1); + + //Plates + public static String plateTier1 = "ore:plateMagnalium"; + public static String plateTier2 = "ore:plateStainlessSteel"; + public static String plateTier3 = "ore:plateTitanium"; + public static String plateTier4 = "ore:plateTungstenSteel"; + public static String plateTier5 = "ore:plateNichrome"; + public static String plateCarbon = "ore:plateAlloyCarbon"; + public static String plateAlloy = "ore:plateAlloyAdvanced"; + + //Circuits + public static String circuitTier1 = "ore:circuitGood"; + public static String circuitTier2 = "ore:circuitAdvanced"; + public static String circuitTier3 = "ore:circuitData"; + public static String circuitTier4 = "ore:circuitElite"; + public static String circuitTier5 = "ore:circuitMaster"; + + //Wooden Rotor + public static ShapedRecipeObject Wooden_Rotor = new ShapedRecipeObject( + rotorBlade1, "ore:plateAnyIron", "ore:plateAnyIron", + "ore:screwAluminium", rotorIC1, "ore:screwAluminium", + rotorBlade1, "plateAnyIron", rotorBlade1, + rotor1); + //Alloy Rotor + public static ShapedRecipeObject Alloy_Rotor = new ShapedRecipeObject( + plateAlloy, plateAlloy, plateAlloy, + plateAlloy, rotorIC3, plateAlloy, + plateAlloy,plateAlloy, plateAlloy, + rotor3); + //Carbon Rotor + public static ShapedRecipeObject Carbon_Rotor = new ShapedRecipeObject( + plateCarbon, rotorBlade4, plateCarbon, + rotorBlade4, rotor3, rotorBlade4, + plateCarbon, rotorBlade4, plateCarbon, + rotor4); + + //Kinetic Wind Turbine + public static ShapedRecipeObject KWT = new ShapedRecipeObject( + plateCarbon, shaftIron, plateCarbon, + cableCopper, mvCasing, cableCopper, + plateRubber, plateCarbon, plateRubber, + kineticWind); + + //ELV Windmill + public static ShapedRecipeObject WM_ELV = new ShapedRecipeObject( + + circuitTier1, elvTransformer, circuitTier1, + plateTier1, lvCasing, plateTier1, + plateTier1, rotor1, plateTier1, + elvWindmill); + + + //LV Windmill + public static ShapedRecipeObject WM_LV = new ShapedRecipeObject( + circuitTier2, lvTransformer, circuitTier2, + plateTier2, mvCasing, plateTier2, + plateTier2, rotor2, plateTier2, + lvWindmill); + + //MV Windmill + public static ShapedRecipeObject WM_MV = new ShapedRecipeObject( + circuitTier3, mvTransformer, circuitTier3, + plateTier3, hvCasing, plateTier3, + plateTier3, rotor3, plateTier3, + mvWindmill); + + //HV Windmill + public static ShapedRecipeObject WM_HV = new ShapedRecipeObject( + circuitTier4, hvTransformer, circuitTier4, + plateTier4, evCasing, plateTier4, + plateTier4, rotor4, plateTier4, + hvWindmill); + + //EV Windmill + public static ShapedRecipeObject WM_EV = new ShapedRecipeObject( + circuitTier5, evTransformer, circuitTier5, + plateTier5, ivCasing, plateTier5, + plateTier5, rotor5, plateTier5, + evWindmill); + + public static void OreDict(){ + run(); } - private static final void run() { - // RemoveRecipeQueue.add("CompactWindmills:WOOL"); - // RemoveRecipeQueue.add("CompactWindmills:WOOD"); - // RemoveRecipeQueue.add("CompactWindmills:ALLOY"); - // RemoveRecipeQueue.add("CompactWindmills:CARBON"); - // RemoveRecipeQueue.add("CompactWindmills:IRIDIUM"); - - // Remove Recipes - COMPAT_HANDLER.RemoveRecipeQueue.add(COMPAT_CompactWindmills.kineticWind); - COMPAT_HANDLER.RemoveRecipeQueue.add(COMPAT_CompactWindmills.elvWindmill); - COMPAT_HANDLER.RemoveRecipeQueue.add(COMPAT_CompactWindmills.lvWindmill); - COMPAT_HANDLER.RemoveRecipeQueue.add(COMPAT_CompactWindmills.mvWindmill); - COMPAT_HANDLER.RemoveRecipeQueue.add(COMPAT_CompactWindmills.hvWindmill); - COMPAT_HANDLER.RemoveRecipeQueue.add(COMPAT_CompactWindmills.evWindmill); - COMPAT_HANDLER.RemoveRecipeQueue.add(COMPAT_CompactWindmills.rotor1); - COMPAT_HANDLER.RemoveRecipeQueue.add(COMPAT_CompactWindmills.rotor3); - COMPAT_HANDLER.RemoveRecipeQueue.add(COMPAT_CompactWindmills.rotor4); - - // Add Recipes - COMPAT_HANDLER.AddRecipeQueue.add(COMPAT_CompactWindmills.Wooden_Rotor); - COMPAT_HANDLER.AddRecipeQueue.add(COMPAT_CompactWindmills.Alloy_Rotor); - COMPAT_HANDLER.AddRecipeQueue.add(COMPAT_CompactWindmills.Carbon_Rotor); - COMPAT_HANDLER.AddRecipeQueue.add(COMPAT_CompactWindmills.KWT); - COMPAT_HANDLER.AddRecipeQueue.add(COMPAT_CompactWindmills.WM_ELV); - COMPAT_HANDLER.AddRecipeQueue.add(COMPAT_CompactWindmills.WM_LV); - COMPAT_HANDLER.AddRecipeQueue.add(COMPAT_CompactWindmills.WM_MV); - COMPAT_HANDLER.AddRecipeQueue.add(COMPAT_CompactWindmills.WM_HV); - COMPAT_HANDLER.AddRecipeQueue.add(COMPAT_CompactWindmills.WM_EV); + private static final void run(){ + //RemoveRecipeQueue.add("CompactWindmills:WOOL"); + //RemoveRecipeQueue.add("CompactWindmills:WOOD"); + //RemoveRecipeQueue.add("CompactWindmills:ALLOY"); + //RemoveRecipeQueue.add("CompactWindmills:CARBON"); + //RemoveRecipeQueue.add("CompactWindmills:IRIDIUM"); + + //Remove Recipes + RemoveRecipeQueue.add(kineticWind); + RemoveRecipeQueue.add(elvWindmill); + RemoveRecipeQueue.add(lvWindmill); + RemoveRecipeQueue.add(mvWindmill); + RemoveRecipeQueue.add(hvWindmill); + RemoveRecipeQueue.add(evWindmill); + RemoveRecipeQueue.add(rotor1); + RemoveRecipeQueue.add(rotor3); + RemoveRecipeQueue.add(rotor4); + + //Add Recipes + AddRecipeQueue.add(Wooden_Rotor); + AddRecipeQueue.add(Alloy_Rotor); + AddRecipeQueue.add(Carbon_Rotor); + AddRecipeQueue.add(KWT); + AddRecipeQueue.add(WM_ELV); + AddRecipeQueue.add(WM_LV); + AddRecipeQueue.add(WM_MV); + AddRecipeQueue.add(WM_HV); + AddRecipeQueue.add(WM_EV); } } diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java index a53369335d..7a5389e37c 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java @@ -7,11 +7,11 @@ import net.minecraft.item.ItemStack; public class COMPAT_EnderIO { - public static void OreDict() { - COMPAT_EnderIO.run(); + public static void OreDict(){ + run(); } - - private static final void run() { + + private static final void run(){ ItemUtils.getItemForOreDict("EnderIO:itemAlloy", "ingotVibrantAlloy", "Vibrant Alloy Ingot", 2); GT_OreDictUnificator.registerOre("plateConductiveIron", new ItemStack(ModItems.itemPlateConductiveIron)); GT_OreDictUnificator.registerOre("plateDarkSteel", new ItemStack(ModItems.itemPlateDarkSteel)); @@ -22,5 +22,5 @@ public class COMPAT_EnderIO { GT_OreDictUnificator.registerOre("plateSoularium", new ItemStack(ModItems.itemPlateSoularium)); GT_OreDictUnificator.registerOre("plateVibrantAlloy", new ItemStack(ModItems.itemPlateVibrantAlloy)); } - + } diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java index 983000ab7d..d8ff219db7 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java @@ -8,22 +8,23 @@ import net.minecraft.item.ItemStack; public class COMPAT_ExtraUtils { - public static void OreDict() { + public static void OreDict(){ RECIPES_Tools.RECIPE_DivisionSigil = new ItemStack(ItemUtils.getItem("ExtraUtilities:divisionSigil")); - COMPAT_ExtraUtils.run(); + run(); } - private static final void run() { + private static final void run(){ ItemUtils.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0); - // GT_OreDictUnificator.registerOre("plateBedrockium", new - // ItemStack(ModItems.itemPlateBedrockium)); + //GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium)); - if (configSwitches.enableAlternativeDivisionSigilRecipe) { - // Division Sigil - RecipeUtils.recipeBuilder("plateNetherStar", "gemIridium", "plateNetherStar", "plateIridium", - RECIPES_Tools.craftingToolHardHammer, "plateIridium", "plateNetherStar", "gemIridium", - "plateNetherStar", RECIPES_Tools.RECIPE_DivisionSigil); + if (configSwitches.enableAlternativeDivisionSigilRecipe){ + //Division Sigil + RecipeUtils.recipeBuilder( + "plateNetherStar", "gemIridium", "plateNetherStar", + "plateIridium", RECIPES_Tools.craftingToolHardHammer, "plateIridium", + "plateNetherStar", "gemIridium", "plateNetherStar", + RECIPES_Tools.RECIPE_DivisionSigil); } } diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java index ab0afe762f..c1546bba63 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java @@ -1,52 +1,60 @@ package gtPlusPlus.core.common.compat; -import gtPlusPlus.core.handler.COMPAT_HANDLER; -import gtPlusPlus.core.lib.CORE.configSwitches; + +import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; import gtPlusPlus.core.lib.LoadedMods; +import gtPlusPlus.core.lib.CORE.configSwitches; import gtPlusPlus.core.recipe.ShapedRecipeObject; import gtPlusPlus.core.util.item.ItemUtils; import net.minecraft.item.ItemStack; + public class COMPAT_IC2 { - private static ItemStack itemCropnalyzer = ItemUtils.simpleMetaStack("IC2:itemCropnalyzer", 0, 1); - private static ItemStack itemSolarHelmet = ItemUtils.simpleMetaStack("IC2:itemSolarHelmet", 0, 1); - - public static ShapedRecipeObject Cropnalyzer = new ShapedRecipeObject("ore:cableGt02Copper", - "ore:cableGt02Copper", null, "minecraft:redstone", "ore:blockGlass", "minecraft:redstone", - "minecraft:redstone", "ore:circuitBasic", "minecraft:redstone", COMPAT_IC2.itemCropnalyzer); - public static ShapedRecipeObject SolarHelmet = new ShapedRecipeObject("ore:plateIron", "ore:plateIron", - "ore:plateIron", "ore:plateIron", "gregtech:gt.metaitem.01:32750", "ore:plateIron", - "ore:craftingWireCopper", "ore:craftingWireCopper", "ore:craftingWireCopper", COMPAT_IC2.itemSolarHelmet); - - public static void OreDict() { - // Get ItemStacks for results - /* - * itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1); - * itemSolarHelmet = UtilsItems.getItemStack("IC2:itemSolarHelmet", 1); - */ - COMPAT_IC2.run(); + private static ItemStack itemCropnalyzer = ItemUtils.simpleMetaStack("IC2:itemCropnalyzer", 0, 1); + private static ItemStack itemSolarHelmet = ItemUtils.simpleMetaStack("IC2:itemSolarHelmet", 0, 1); + + public static ShapedRecipeObject Cropnalyzer = new ShapedRecipeObject( + "ore:cableGt02Copper", "ore:cableGt02Copper", null, + "minecraft:redstone", "ore:blockGlass", "minecraft:redstone", + "minecraft:redstone", "ore:circuitBasic", "minecraft:redstone", + itemCropnalyzer); + public static ShapedRecipeObject SolarHelmet = new ShapedRecipeObject( + "ore:plateIron", "ore:plateIron", "ore:plateIron", + "ore:plateIron", "gregtech:gt.metaitem.01:32750", "ore:plateIron", + "ore:craftingWireCopper", "ore:craftingWireCopper", "ore:craftingWireCopper", + itemSolarHelmet); + + + + public static void OreDict(){ + //Get ItemStacks for results + /*itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1); + itemSolarHelmet = UtilsItems.getItemStack("IC2:itemSolarHelmet", 1); */ + run(); } - private static final void run() { - - if (configSwitches.disableIC2Recipes) { - - if (LoadedMods.Gregtech) { - // Fuck these right off. - COMPAT_HANDLER.RemoveRecipeQueue.add("IC2:itemCable"); - COMPAT_HANDLER.RemoveRecipeQueue.add("IC2:itemCable:1"); - COMPAT_HANDLER.RemoveRecipeQueue.add("IC2:itemCable:2"); - COMPAT_HANDLER.RemoveRecipeQueue.add("IC2:itemCable:3"); - COMPAT_HANDLER.RemoveRecipeQueue.add("IC2:itemCable:5"); - COMPAT_HANDLER.RemoveRecipeQueue.add("IC2:itemCable:6"); - COMPAT_HANDLER.RemoveRecipeQueue.add("IC2:itemCable:10"); - COMPAT_HANDLER.RemoveRecipeQueue.add("IC2:itemCable:13"); - // RemoveRecipeQueue.add(itemCropnalyzer); - // RemoveRecipeQueue.add(itemSolarHelmet); - - // AddRecipeQueue.add(Cropnalyzer); - // AddRecipeQueue.add(SolarHelmet); + private static final void run(){ + + if (configSwitches.disableIC2Recipes){ + + + + if (LoadedMods.Gregtech){ + //Fuck these right off. + RemoveRecipeQueue.add("IC2:itemCable"); + RemoveRecipeQueue.add("IC2:itemCable:1"); + RemoveRecipeQueue.add("IC2:itemCable:2"); + RemoveRecipeQueue.add("IC2:itemCable:3"); + RemoveRecipeQueue.add("IC2:itemCable:5"); + RemoveRecipeQueue.add("IC2:itemCable:6"); + RemoveRecipeQueue.add("IC2:itemCable:10"); + RemoveRecipeQueue.add("IC2:itemCable:13"); + //RemoveRecipeQueue.add(itemCropnalyzer); + //RemoveRecipeQueue.add(itemSolarHelmet); + + //AddRecipeQueue.add(Cropnalyzer); + //AddRecipeQueue.add(SolarHelmet); } } } diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java index c9d26f03c2..9e29458bce 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java @@ -4,12 +4,13 @@ import gtPlusPlus.core.util.item.ItemUtils; public class COMPAT_MorePlanets { - public static void OreDict() { - COMPAT_MorePlanets.run(); + + public static void OreDict(){ + run(); } - - private final static void run() { - // Metals + + private final static void run(){ + //Metals ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotFrozenIron", "Frozen Iron Ingot", 0); ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotAnyIron", "Frozen Iron Ingot", 0); ItemUtils.getItemForOreDict("MorePlanet:polongnius_item", "ingotPalladium", "Palladium Ingot", 5); @@ -19,20 +20,18 @@ public class COMPAT_MorePlanets { ItemUtils.getItemForOreDict("MorePlanet:diona_item", "ingotQuontonium", "Quontonium Ingot", 0); ItemUtils.getItemForOreDict("MorePlanet:diona_item", "ingotFronisium", "Fronisium Ingot", 1); ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "ingotSulfur", "Sulfur Ingot", 3); - ItemUtils.getItemForOreDict("MorePlanet:koentus_item", "ingotKoentusMeteoricIron", - "Koentus Meteoric Iron Ingot", 4); + ItemUtils.getItemForOreDict("MorePlanet:koentus_item", "ingotKoentusMeteoricIron", "Koentus Meteoric Iron Ingot", 4); ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMetallic", "Metallic Ingot", 2); - ItemUtils.getItemForOreDict("MorePlanet:polongnius_item", "ingotPolongiusMeteoricIron", - "Polongius Meteoric Iron Ingot", 4); + ItemUtils.getItemForOreDict("MorePlanet:polongnius_item", "ingotPolongiusMeteoricIron", "Polongius Meteoric Iron Ingot", 4); ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMeteoricSteel", "Meteoric Steel Ingot", 3); ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "dustSulfur", "Sulfur Dust", 2); - - // Gems + + //Gems ItemUtils.getItemForOreDict("MorePlanet:fronos_item", "gemBlackDiamond", "Black Diamond Gem", 2); ItemUtils.getItemForOreDict("MorePlanet:koentus_item", "gemWhiteCrystal", "White Crystal", 0); ItemUtils.getItemForOreDict("MorePlanet:nibiru_item", "gemRedCrystal", "Red Crystal", 0); ItemUtils.getItemForOreDict("MorePlanet:pluto_item", "gemXeonius", "Xeonius Gem", 0); ItemUtils.getItemForOreDict("MorePlanet:kapteyn-b_item", "gemUranium", "Uranium Gem", 1); } - + } diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java index eaa86ec8d7..d471535e81 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java @@ -6,12 +6,12 @@ import net.minecraft.item.ItemStack; public class COMPAT_PneumaticCraft { - public static void OreDict() { - COMPAT_PneumaticCraft.run(); + public static void OreDict(){ + run(); } - - private static final void run() { - GT_OreDictUnificator.registerOre("plateCompressedIron", new ItemStack(ModItems.itemPlateCompressedIron)); + + private static final void run(){ + GT_OreDictUnificator.registerOre("plateCompressedIron", new ItemStack(ModItems.itemPlateCompressedIron)); } - + } diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java index 95d92cdc0f..4db8006a89 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java @@ -6,13 +6,13 @@ import net.minecraft.item.ItemStack; public class COMPAT_RFTools { - public static void OreDict() { - COMPAT_RFTools.run(); + public static void OreDict(){ + run(); } - - private static final void run() { + + private static final void run(){ GT_OreDictUnificator.registerOre("plateDimensionShard", new ItemStack(ModItems.itemPlateDimensionShard)); - + } - + } diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java index 637c2aa23e..6d7f08b55d 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java @@ -6,13 +6,13 @@ import net.minecraft.item.ItemStack; public class COMPAT_SimplyJetpacks { - public static void OreDict() { - COMPAT_SimplyJetpacks.run(); + public static void OreDict(){ + run(); } - - private static final void run() { + + private static final void run(){ GT_OreDictUnificator.registerOre("plateEnrichedSoularium", new ItemStack(ModItems.itemPlateEnrichedSoularium)); - + } - + } diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java index 6eb96f74ed..b1b7464dd2 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java @@ -7,41 +7,37 @@ import gtPlusPlus.core.util.item.ItemUtils; public class COMPAT_Thaumcraft { - public static void OreDict() { - - if (configSwitches.enableThaumcraftShardUnification) { - COMPAT_Thaumcraft.run(); + public static void OreDict(){ + + if (configSwitches.enableThaumcraftShardUnification){ + run(); } } - private static final void run() { + private static final void run(){ - for (int i = 0; i <= 6; i++) { - // Utils.LOG_INFO(""+i); - ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard " + i, i); - GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStack("Thaumcraft:ItemShard:" + i, 1)); - ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard " + i, i); - GT_OreDictUnificator.registerOre("gemInfusedAnything", - ItemUtils.getItemStack("Thaumcraft:ItemShard:" + i, 1)); - // System.out.println("TC Shard registration count is: "+i); + for(int i=0; i<=6; i++){ + //Utils.LOG_INFO(""+i); + ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard "+i, i); + GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStack("Thaumcraft:ItemShard:"+i, 1)); + ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard "+i, i); + GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStack("Thaumcraft:ItemShard:"+i, 1)); + //System.out.println("TC Shard registration count is: "+i); } - if (LoadedMods.ForbiddenMagic) { - for (int i = 0; i <= 6; i++) { - // Utils.LOG_INFO(""+i); - ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard " + i, i); - GT_OreDictUnificator.registerOre("shardAny", - ItemUtils.getItemStack("ForbiddenMagic:NetherShard:" + i, 1)); - ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard " + i, i); - GT_OreDictUnificator.registerOre("gemInfusedAnything", - ItemUtils.getItemStack("ForbiddenMagic:NetherShard:" + i, 1)); - // System.out.println("TC Shard registration count is: "+i); + if (LoadedMods.ForbiddenMagic){ + for(int i=0; i<=6; i++){ + //Utils.LOG_INFO(""+i); + ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard "+i, i); + GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStack("ForbiddenMagic:NetherShard:"+i, 1)); + ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard "+i, i); + GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStack("ForbiddenMagic:NetherShard:"+i, 1)); + //System.out.println("TC Shard registration count is: "+i); } ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0); GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStack("ForbiddenMagic:GluttonyShard", 1)); ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0); - GT_OreDictUnificator.registerOre("gemInfusedAnything", - ItemUtils.getItemStack("ForbiddenMagic:GluttonyShard", 1)); + GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStack("ForbiddenMagic:GluttonyShard", 1)); } } |