From 0e631830d7408710e0ced3dfc35f6fa3f3756773 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Mon, 4 Apr 2016 17:32:59 +1000 Subject: Added in an Iron Blast furnace, to give an alternative to the Bronze one. Takes 5-6x longer, Uses 3x fuel, but is far cheaper to make. --- src/Java/miscutil/core/block/ModBlocks.java | 6 + src/Java/miscutil/core/common/CommonProxy.java | 6 +- .../handler/registration/RECIPES_Machines.java | 26 ++- .../core/handler/registration/RECIPES_Tools.java | 177 +++++++++++++++++++++ .../handler/registration/RegistrationHandler.java | 25 +++ src/Java/miscutil/core/item/tool/Loader_TOOLS.java | 177 --------------------- src/Java/miscutil/core/util/ItemUtils.java | 83 +++++----- 7 files changed, 279 insertions(+), 221 deletions(-) create mode 100644 src/Java/miscutil/core/handler/registration/RECIPES_Tools.java create mode 100644 src/Java/miscutil/core/handler/registration/RegistrationHandler.java delete mode 100644 src/Java/miscutil/core/item/tool/Loader_TOOLS.java (limited to 'src/Java/miscutil/core') diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java index 991b35ad14..b2abe86b7d 100644 --- a/src/Java/miscutil/core/block/ModBlocks.java +++ b/src/Java/miscutil/core/block/ModBlocks.java @@ -3,6 +3,7 @@ package miscutil.core.block; import miscutil.core.block.antigrief.TowerDevice; import miscutil.core.creativetabs.AddToCreativeTab; import miscutil.core.util.Utils; +import miscutil.gregtech.metatileentity.implementations.GregtechMetaCasingBlocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import cpw.mods.fml.common.registry.GameRegistry; @@ -12,8 +13,10 @@ public final class ModBlocks { //Blood Steel public static Block blockBloodSteel; public static Block blockStaballoy; + //public static Block blockIronPlatedBricks; public static Block blockToolBuilder; public static Block blockGriefSaver; + public static Block blockCasingsMisc; //public static Block blockBloodSteelChest; @@ -70,6 +73,9 @@ public final class ModBlocks { //Staballoy Block GameRegistry.registerBlock(blockStaballoy = new BasicBlock("blockStaballoy", Material.iron), "blockStaballoy"); + + //Casing Blocks + blockCasingsMisc = new GregtechMetaCasingBlocks(); //Blood Steel Block //Name, Material, Hardness, Resistance, Light level, Tool, tool level, sound //GameRegistry.registerBlock(blockToolBuilder = new AdvancedBlock("blockToolBuilder", Material.circuits, TMCreativeTabs.tabMachines, 1F, 5F, 0F, "pickaxe", 1, Block.soundTypeWood), "blockToolBuilder"); diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java index 32dc0c8c11..a4a08c90c8 100644 --- a/src/Java/miscutil/core/common/CommonProxy.java +++ b/src/Java/miscutil/core/common/CommonProxy.java @@ -5,9 +5,8 @@ import static miscutil.core.lib.LoadedMods.Gregtech; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.block.ModBlocks; import miscutil.core.gui.ModGUI; -import miscutil.core.handler.registration.RECIPES_Machines; +import miscutil.core.handler.registration.RegistrationHandler; import miscutil.core.item.ModItems; -import miscutil.core.item.tool.Loader_TOOLS; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; import miscutil.core.tileentities.ModTileEntities; @@ -67,8 +66,7 @@ public class CommonProxy { public void init(FMLInitializationEvent e) { - Loader_TOOLS.run(); - RECIPES_Machines.RECIPES_LOAD(); + RegistrationHandler.run(); } diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java index 2c6f6505c9..d2108b7d7b 100644 --- a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java +++ b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java @@ -11,6 +11,8 @@ public class RECIPES_Machines { //Outputs //static ItemStack RECIPE_BufferCore_ULV = new ItemStack(GregtechEnergyBuffer.itemBufferCore); static ItemStack RECIPE_SteamCondenser = GregtechItemList.Condensor_MAX.get(1); + static ItemStack RECIPE_IronBlastFurnace = GregtechItemList.Machine_Iron_BlastFurnace.get(1); + static ItemStack RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(1); static ItemStack RECIPE_Buffer_ULV = GregtechItemList.Energy_Buffer_1by1_ULV.get(1); static ItemStack RECIPE_Buffer_LV = GregtechItemList.Energy_Buffer_1by1_LV.get(1); static ItemStack RECIPE_Buffer_MV = GregtechItemList.Energy_Buffer_1by1_MV.get(1); @@ -21,6 +23,7 @@ public class RECIPES_Machines { static ItemStack RECIPE_Buffer_ZPM = GregtechItemList.Energy_Buffer_1by1_ZPM.get(1); static ItemStack RECIPE_Buffer_UV = GregtechItemList.Energy_Buffer_1by1_UV.get(1); static ItemStack RECIPE_Buffer_MAX = GregtechItemList.Energy_Buffer_1by1_MAX.get(1); + //Buffer Cores static ItemStack RECIPE_BufferCore_ULV = Utils.getItemStack("miscutils:item.itemBufferCore1", 1); @@ -102,6 +105,10 @@ public class RECIPES_Machines { //gregtech:gt.metaitem.01:32611 static ItemStack pump_MV = ItemList.Electric_Pump_MV.get(1); + //Lava Boiler + static ItemStack boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1); + static ItemStack blockBricks = Utils.getItemStack("minecraft:brick_block", 1); + //Batteries static String batteryBasic = "batteryBasic"; static String batteryAdvanced = "batteryAdvanced"; @@ -152,7 +159,7 @@ public class RECIPES_Machines { circuitData, batteryElite, circuitData, plateTier5, cableTier5, plateTier5, RECIPE_BufferCore_EV); - + ItemUtils.recipeBuilder( plateTier6, cableTier6, plateTier6, circuitData, batteryElite, circuitElite, @@ -253,13 +260,28 @@ public class RECIPES_Machines { RECIPE_Buffer_MAX); - + //Steam Condenser ItemUtils.recipeBuilder( pipeLargeCopper, pipeHugeSteel, pipeLargeCopper, plateEnergeticAlloy, pump_MV, plateEnergeticAlloy, plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy, RECIPE_SteamCondenser); + //Iron BF + ItemUtils.recipeBuilder( + "plateDoubleAnyIron", "craftingFurnace", "plateDoubleAnyIron", + boiler_Coal, machineCasing_ULV, boiler_Coal, + "plateDoubleAnyIron", "bucketLava", "plateDoubleAnyIron", + RECIPE_IronBlastFurnace); + + //Iron plated Bricks + ItemUtils.recipeBuilder( + "plateAnyIron", RECIPES_Tools.craftingToolHardHammer, "plateAnyIron", + "plateAnyIron", blockBricks, "plateAnyIron", + "plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron", + RECIPE_IronPlatedBricks); + + Utils.LOG_INFO("Done loading recipes for the Various machine blocks."); diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Tools.java b/src/Java/miscutil/core/handler/registration/RECIPES_Tools.java new file mode 100644 index 0000000000..b40327fceb --- /dev/null +++ b/src/Java/miscutil/core/handler/registration/RECIPES_Tools.java @@ -0,0 +1,177 @@ +package miscutil.core.handler.registration; + +import miscutil.core.item.ModItems; +import miscutil.core.util.ItemUtils; +import miscutil.core.util.Utils; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +public class RECIPES_Tools { + + //Outputs + static ItemStack RECIPE_StaballoyPickaxe = new ItemStack(ModItems.itemStaballoyPickaxe); + static ItemStack RECIPE_StaballoyAxe = new ItemStack(ModItems.itemStaballoyAxe); + static ItemStack RECIPE_SandstoneHammer = new ItemStack(ModItems.itemSandstoneHammer); + static ItemStack RECIPE_StaballoyIngot = new ItemStack(ModItems.itemIngotStaballoy); + static ItemStack RECIPE_SandStone = new ItemStack(Blocks.sandstone, 2); + static ItemStack RECIPE_Sand = new ItemStack(Blocks.sand, 4); + + static ItemStack RECIPE_DivisionSigil = new ItemStack(Utils.getItem("ExtraUtilities:divisionSigil")); + + //MC Items + static Item Apple = Items.apple; + + //MC Blocks + static Block CobbleStone = Blocks.cobblestone; + static Block Dirt = Blocks.dirt; + static Block Sand = Blocks.sand; + static Block Gravel = Blocks.gravel; + static Block Sandstone = Blocks.sandstone; + + //null + static String empty = " "; + + //Batteries + static String batteryBasic = "batteryBasic"; + static String batteryAdvanced = "batteryAdvanced"; + static String batteryElite = "batteryElite"; + static String batteryMaster = "batteryMaster"; + static String batteryUltimate = "batteryUltimate"; + + //Circuits + static String circuitPrimitive = "circuitPrimitive"; + static String circuitBasic = "circuitBasic"; + static String circuitGood = "circuitGood"; + static String circuitAdvanced = "circuitAdvanced"; + static String circuitElite = "circuitElite"; + static String circuitMaster = "circuitMaster"; + static String circuitUltimate = "circuitUltimate"; + + //Cables + static String cableGt01Electrum = "cableGt01Electrum"; + static String cableGt02Electrum = "cableGt02Electrum"; + static String cableGt01RedstoneAlloy = "cableGt01RedstoneAlloy"; + static String cableGt02RedstoneAlloy = "cableGt02RedstoneAlloy"; + static String cableGt01Copper = "cableGt01Copper"; + static String cableGt02Copper = "cableGt02Copper"; + static String cableGt01AnnealedCopper = "cableGt01AnnealedCopper"; + static String cableGt02AnnealedCopper = "cableGt02AnnealedCopper"; + + //Rods + static String stickStaballoy= "stickStaballoy"; + static String stickTitanium= "stickTitanium"; + static String stickIron= "stickIron"; + static String stickGold= "stickGold"; + static String stickSilver= "stickSilver"; + static String stickSteel= "stickSteel"; + static String stickBronze= "stickBronze"; + static String stickTungsten= "stickTungsten"; + static String stickRedAlloy= "stickRedAlloy"; + static String stickInvar= "stickInvar"; + static String stickElectrum= "stickElectrum"; + static String stickElectricalSteel= "stickElectricalSteel"; + + //Plates + static String plateStaballoy= "plateStaballoy"; + static String plateTitanium= "plateTitanium"; + static String plateIron= "plateIron"; + static String plateGold= "plateGold"; + static String plateSilver= "plateSilver"; + static String plateSteel= "plateSteel"; + static String plateBronze= "plateBronze"; + static String plateTungsten= "plateTungsten"; + static String plateRedAlloy= "plateRedAlloy"; + static String plateInvar= "plateInvar"; + static String plateElectrum= "plateElectrum"; + static String plateElectricalSteel= "plateElectricalSteel"; + + //Ingots + static String ingotStaballoy= "ingotStaballoy"; + static String ingotTitanium= "ingotTitanium"; + static String ingotIron= "ingotIron"; + static String ingotGold= "ingotGold"; + static String ingotSilver= "ingotSilver"; + static String ingotSteel= "ingotSteel"; + static String ingotBronze= "ingotBronze"; + static String ingotTungsten= "ingotTungsten"; + static String ingotRedAlloy= "ingotRedAlloy"; + static String ingotInvar= "ingotInvar"; + static String ingotElectrum= "ingotElectrum"; + static String ingotUranium= "ingotUranium"; + static String ingotElectricalSteel= "ingotElectricalSteel"; + + //Crafting Tools + static String craftingToolHardHammer = "craftingToolHardHammer"; + static String craftingToolSoftHammer = "craftingToolSoftHammer"; + static String craftingToolFile = "craftingToolFile"; + static String craftingToolSaw = "craftingToolSaw"; + static String craftingToolPickaxe = "craftingToolPickaxe"; + static String craftingToolWrench = "craftingToolWrench"; + static String craftingToolCrowbar = "craftingToolCrowbar"; + static String craftingToolKnife = "craftingToolKnife"; + static String craftingToolScrewdriver = "craftingToolScrewdriver"; + + static ItemStack sandHammer = new ItemStack (ModItems.itemSandstoneHammer, 1, OreDictionary.WILDCARD_VALUE); + static String craftingToolSandHammer = "craftingToolSandHammer"; + + public static final void RECIPES_LOAD(){ + + //plateStaballoy = new ItemStack(ModItems.itemPlateStaballoy); + //ingotStaballoy = new ItemStack(ModItems.itemIngotStaballoy); + + //Pickaxes + run(); + + } + + private static void run(){ + //Staballoy Pickaxe + ItemUtils.recipeBuilder( + plateStaballoy, plateStaballoy, ingotStaballoy, + craftingToolFile, stickTungsten, craftingToolHardHammer, + craftingToolWrench, stickTungsten, craftingToolHardHammer, + RECIPE_StaballoyPickaxe); + + //Staballoy Axe + ItemUtils.recipeBuilder( + plateStaballoy, ingotStaballoy, craftingToolHardHammer, + plateStaballoy, stickTungsten, craftingToolHardHammer, + craftingToolFile, stickTungsten, craftingToolWrench, + RECIPE_StaballoyAxe); + + //Cobble to Sand + ItemUtils.recipeBuilder( + CobbleStone, CobbleStone, CobbleStone, + CobbleStone, sandHammer, CobbleStone, + CobbleStone, CobbleStone, CobbleStone, + RECIPE_Sand); + + //Sand to Sandstone + ItemUtils.recipeBuilder( + Sand, Sand, Sand, + Sand, sandHammer, Sand, + Sand, Sand, Sand, + RECIPE_SandStone); + + //Sandstone Hammer + ItemUtils.recipeBuilder( + plateElectrum, ingotElectrum, plateElectrum, + craftingToolScrewdriver, stickBronze, craftingToolHardHammer, + null, stickSteel, null, + RECIPE_SandstoneHammer); + + //Division Sigil + ItemUtils.recipeBuilder( + "plateNetherStar", "gemIridium", "plateNetherStar", + "plateIridium", craftingToolHardHammer, "plateIridium", + "plateNetherStar", "gemIridium", "plateNetherStar", + RECIPE_DivisionSigil); + + + } + +} diff --git a/src/Java/miscutil/core/handler/registration/RegistrationHandler.java b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java new file mode 100644 index 0000000000..8c66bb1cc9 --- /dev/null +++ b/src/Java/miscutil/core/handler/registration/RegistrationHandler.java @@ -0,0 +1,25 @@ +package miscutil.core.handler.registration; + +import miscutil.core.util.Utils; + +public class RegistrationHandler { + + public static int recipesSuccess = 0; + public static int recipesFailed = 0; + + public static void run(){ + init(); + } + + private final static void init(){ + RECIPES_Tools.RECIPES_LOAD(); + RECIPES_Machines.RECIPES_LOAD(); + try { + Thread.sleep(10); + } catch (InterruptedException e) { + Utils.LOG_INFO(e.toString()); + } + Utils.LOG_INFO("Loaded: "+recipesSuccess+" Failed: "+recipesFailed); + } + +} diff --git a/src/Java/miscutil/core/item/tool/Loader_TOOLS.java b/src/Java/miscutil/core/item/tool/Loader_TOOLS.java deleted file mode 100644 index bd917df75f..0000000000 --- a/src/Java/miscutil/core/item/tool/Loader_TOOLS.java +++ /dev/null @@ -1,177 +0,0 @@ -package miscutil.core.item.tool; - -import miscutil.core.item.ModItems; -import miscutil.core.util.ItemUtils; -import miscutil.core.util.Utils; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -public class Loader_TOOLS { - - //Outputs - static ItemStack RECIPE_StaballoyPickaxe = new ItemStack(ModItems.itemStaballoyPickaxe); - static ItemStack RECIPE_StaballoyAxe = new ItemStack(ModItems.itemStaballoyAxe); - static ItemStack RECIPE_SandstoneHammer = new ItemStack(ModItems.itemSandstoneHammer); - static ItemStack RECIPE_StaballoyIngot = new ItemStack(ModItems.itemIngotStaballoy); - static ItemStack RECIPE_SandStone = new ItemStack(Blocks.sandstone, 2); - static ItemStack RECIPE_Sand = new ItemStack(Blocks.sand, 4); - - static ItemStack RECIPE_DivisionSigil = new ItemStack(Utils.getItem("ExtraUtilities:divisionSigil")); - - //MC Items - static Item Apple = Items.apple; - - //MC Blocks - static Block CobbleStone = Blocks.cobblestone; - static Block Dirt = Blocks.dirt; - static Block Sand = Blocks.sand; - static Block Gravel = Blocks.gravel; - static Block Sandstone = Blocks.sandstone; - - //null - static String empty = " "; - - //Batteries - static String batteryBasic = "batteryBasic"; - static String batteryAdvanced = "batteryAdvanced"; - static String batteryElite = "batteryElite"; - static String batteryMaster = "batteryMaster"; - static String batteryUltimate = "batteryUltimate"; - - //Circuits - static String circuitPrimitive = "circuitPrimitive"; - static String circuitBasic = "circuitBasic"; - static String circuitGood = "circuitGood"; - static String circuitAdvanced = "circuitAdvanced"; - static String circuitElite = "circuitElite"; - static String circuitMaster = "circuitMaster"; - static String circuitUltimate = "circuitUltimate"; - - //Cables - static String cableGt01Electrum = "cableGt01Electrum"; - static String cableGt02Electrum = "cableGt02Electrum"; - static String cableGt01RedstoneAlloy = "cableGt01RedstoneAlloy"; - static String cableGt02RedstoneAlloy = "cableGt02RedstoneAlloy"; - static String cableGt01Copper = "cableGt01Copper"; - static String cableGt02Copper = "cableGt02Copper"; - static String cableGt01AnnealedCopper = "cableGt01AnnealedCopper"; - static String cableGt02AnnealedCopper = "cableGt02AnnealedCopper"; - - //Rods - static String stickStaballoy= "stickStaballoy"; - static String stickTitanium= "stickTitanium"; - static String stickIron= "stickIron"; - static String stickGold= "stickGold"; - static String stickSilver= "stickSilver"; - static String stickSteel= "stickSteel"; - static String stickBronze= "stickBronze"; - static String stickTungsten= "stickTungsten"; - static String stickRedAlloy= "stickRedAlloy"; - static String stickInvar= "stickInvar"; - static String stickElectrum= "stickElectrum"; - static String stickElectricalSteel= "stickElectricalSteel"; - - //Plates - static String plateStaballoy= "plateStaballoy"; - static String plateTitanium= "plateTitanium"; - static String plateIron= "plateIron"; - static String plateGold= "plateGold"; - static String plateSilver= "plateSilver"; - static String plateSteel= "plateSteel"; - static String plateBronze= "plateBronze"; - static String plateTungsten= "plateTungsten"; - static String plateRedAlloy= "plateRedAlloy"; - static String plateInvar= "plateInvar"; - static String plateElectrum= "plateElectrum"; - static String plateElectricalSteel= "plateElectricalSteel"; - - //Ingots - static String ingotStaballoy= "ingotStaballoy"; - static String ingotTitanium= "ingotTitanium"; - static String ingotIron= "ingotIron"; - static String ingotGold= "ingotGold"; - static String ingotSilver= "ingotSilver"; - static String ingotSteel= "ingotSteel"; - static String ingotBronze= "ingotBronze"; - static String ingotTungsten= "ingotTungsten"; - static String ingotRedAlloy= "ingotRedAlloy"; - static String ingotInvar= "ingotInvar"; - static String ingotElectrum= "ingotElectrum"; - static String ingotUranium= "ingotUranium"; - static String ingotElectricalSteel= "ingotElectricalSteel"; - - //Crafting Tools - static String craftingToolHardHammer = "craftingToolHardHammer"; - static String craftingToolSoftHammer = "craftingToolSoftHammer"; - static String craftingToolFile = "craftingToolFile"; - static String craftingToolSaw = "craftingToolSaw"; - static String craftingToolPickaxe = "craftingToolPickaxe"; - static String craftingToolWrench = "craftingToolWrench"; - static String craftingToolCrowbar = "craftingToolCrowbar"; - static String craftingToolKnife = "craftingToolKnife"; - static String craftingToolScrewdriver = "craftingToolScrewdriver"; - - static ItemStack sandHammer = new ItemStack (ModItems.itemSandstoneHammer, 1, OreDictionary.WILDCARD_VALUE); - static String craftingToolSandHammer = "craftingToolSandHammer"; - - public static final void run(){ - - //plateStaballoy = new ItemStack(ModItems.itemPlateStaballoy); - //ingotStaballoy = new ItemStack(ModItems.itemIngotStaballoy); - - //Pickaxes - registerPickaxes(); - - } - - private static void registerPickaxes(){ - //Staballoy Pickaxe - ItemUtils.recipeBuilder( - plateStaballoy, plateStaballoy, ingotStaballoy, - craftingToolFile, stickTungsten, craftingToolHardHammer, - craftingToolWrench, stickTungsten, craftingToolHardHammer, - RECIPE_StaballoyPickaxe); - - //Staballoy Axe - ItemUtils.recipeBuilder( - plateStaballoy, ingotStaballoy, craftingToolHardHammer, - plateStaballoy, stickTungsten, craftingToolHardHammer, - craftingToolFile, stickTungsten, craftingToolWrench, - RECIPE_StaballoyAxe); - - //Cobble to Sand - ItemUtils.recipeBuilder( - CobbleStone, CobbleStone, CobbleStone, - CobbleStone, sandHammer, CobbleStone, - CobbleStone, CobbleStone, CobbleStone, - RECIPE_Sand); - - //Sand to Sandstone - ItemUtils.recipeBuilder( - Sand, Sand, Sand, - Sand, sandHammer, Sand, - Sand, Sand, Sand, - RECIPE_SandStone); - - //Sandstone Hammer - ItemUtils.recipeBuilder( - plateElectrum, ingotElectrum, plateElectrum, - craftingToolScrewdriver, stickBronze, craftingToolHardHammer, - null, stickSteel, null, - RECIPE_SandstoneHammer); - - //Division Sigil - ItemUtils.recipeBuilder( - "plateNetherStar", "gemIridium", "plateNetherStar", - "plateIridium", craftingToolHardHammer, "plateIridium", - "plateNetherStar", "gemIridium", "plateNetherStar", - RECIPE_DivisionSigil); - - - } - -} diff --git a/src/Java/miscutil/core/util/ItemUtils.java b/src/Java/miscutil/core/util/ItemUtils.java index e2c07aa104..f6403f8d2e 100644 --- a/src/Java/miscutil/core/util/ItemUtils.java +++ b/src/Java/miscutil/core/util/ItemUtils.java @@ -2,6 +2,7 @@ package miscutil.core.util; import java.util.ArrayList; +import miscutil.core.handler.registration.RegistrationHandler; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -12,35 +13,35 @@ public class ItemUtils { public static ItemStack getItemStackOfItem(Boolean modToCheck, String mod_itemname_meta){ if (modToCheck){ try{ - Item em = null; - - Item em1 = Utils.getItem(mod_itemname_meta); - Utils.LOG_WARNING("Found: "+em1.toString()); - if (!em1.equals(null)){ - em = em1; - } - else { - em = null; + Item em = null; + + Item em1 = Utils.getItem(mod_itemname_meta); + Utils.LOG_WARNING("Found: "+em1.toString()); + if (!em1.equals(null)){ + em = em1; + } + else { + em = null; + return null; + } + if (!em.equals(null)){ + ItemStack returnStack = new ItemStack(em,1,16); + return returnStack; + } + Utils.LOG_WARNING(mod_itemname_meta+" not found."); return null; - } - if (!em.equals(null)){ - ItemStack returnStack = new ItemStack(em,1,16); - return returnStack; - } - Utils.LOG_WARNING(mod_itemname_meta+" not found."); - return null; } catch (NullPointerException e) { Utils.LOG_ERROR(mod_itemname_meta+" not found. [NULL]"); return null; - } + } } return null; } public static void recipeBuilder(Object slot_1, Object slot_2, Object slot_3, Object slot_4, Object slot_5, Object slot_6, Object slot_7, Object slot_8, Object slot_9, ItemStack resultItem){ - + ArrayList validSlots = new ArrayList(); - + //, String lineFirst, String lineSecond, String lineThird Utils.LOG_INFO("Trying to add a recipe for "+resultItem.toString()); String a,b,c,d,e,f,g,h,i; @@ -63,8 +64,8 @@ public class ItemUtils { Utils.LOG_WARNING(h); if (slot_9 == null){ i = " ";} else { i = "9";validSlots.add('9');validSlots.add(slot_9);} Utils.LOG_WARNING(i); - - + + Utils.LOG_ERROR("_______"); String lineOne = a+b+c; Utils.LOG_ERROR("|"+a+"|"+b+"|"+c+"|"); @@ -75,7 +76,7 @@ public class ItemUtils { String lineThree = g+h+i; Utils.LOG_ERROR("|"+g+"|"+h+"|"+i+"|"); Utils.LOG_ERROR("_______"); - + validSlots.add(0, lineOne); validSlots.add(1, lineTwo); validSlots.add(2, lineThree); @@ -111,46 +112,52 @@ public class ItemUtils { } } } - + try { - Utils.LOG_WARNING("validSlots to array: "+validSlots.toArray()); + /*Utils.LOG_WARNING("validSlots to array: "+validSlots.toArray()); Object[] validSlotsArray = (Object[]) validSlots.toArray(); - + for(int j = 0; j < validSlotsArray.length; j++) { Utils.LOG_ERROR(""+validSlotsArray[j]); - } + }*/ + + GameRegistry.addRecipe(new ShapedOreRecipe(resultItem.copy(), (Object[]) validSlots.toArray())); + Utils.LOG_INFO("Success! Added a recipe for "+resultItem.toString()); + RegistrationHandler.recipesSuccess++; + /*try { try { try { - try { - GameRegistry.addRecipe(new ShapedOreRecipe(resultItem.copy(), (Object[]) validSlots.toArray())); - Utils.LOG_INFO("Success! Added a recipe for "+resultItem.toString()); - } - catch (ClassCastException r){ + //Code + } + catch (NullPointerException | ClassCastException r){ Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+resultItem.getUnlocalizedName()); + RegistrationHandler.recipesFailed++; r.printStackTrace(); - System.exit(1); + //System.exit(1); } } catch (NullPointerException o){ - + Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+resultItem.getUnlocalizedName()); o.printStackTrace(); - System.exit(1); + RegistrationHandler.recipesFailed++; + //System.exit(1); } } catch (ClassCastException r){ Utils.LOG_WARNING("@@@: Casting to ObjectArray Failed :("); - } + }*/ } - catch(NullPointerException k){ + catch(NullPointerException | ClassCastException k){ k.getMessage(); k.getClass(); k.printStackTrace(); k.getLocalizedMessage(); Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+resultItem.getUnlocalizedName()); - System.exit(1); + RegistrationHandler.recipesFailed++; + //System.exit(1); } } - + } -- cgit