diff options
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | src/Java/miscutil/MiscUtils.java | 2 | ||||
| -rw-r--r-- | src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java | 11 | ||||
| -rw-r--r-- | src/Java/miscutil/core/lib/CORE.java | 2 | ||||
| -rw-r--r-- | src/Java/miscutil/core/lib/LoadedMods.java | 3 | ||||
| -rw-r--r-- | src/Java/miscutil/core/recipe/RECIPES_Machines.java | 627 | ||||
| -rw-r--r-- | src/Java/miscutil/core/recipe/RECIPES_Shapeless.java | 10 | ||||
| -rw-r--r-- | src/Java/miscutil/core/recipe/RECIPES_Tools.java | 180 |
8 files changed, 435 insertions, 402 deletions
diff --git a/build.gradle b/build.gradle index 1eadb1aa8e..ccd26eabd3 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ sourceCompatibility = 1.7 targetCompatibility = 1.7 archivesBaseName = "MiscUtils" -version = "1.2.0" +version = "1.2.2" minecraft.version = "1.7.10-10.13.4.1448-1.7.10" task sourceJar(type: Jar) { diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java index 46ed16be36..7291d03fed 100644 --- a/src/Java/miscutil/MiscUtils.java +++ b/src/Java/miscutil/MiscUtils.java @@ -6,6 +6,7 @@ import java.awt.event.ActionListener; import miscutil.core.commands.CommandMath; import miscutil.core.common.CommonProxy; import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; @@ -33,6 +34,7 @@ implements ActionListener @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { + Utils.LOG_INFO("Loading "+CORE.MODID+" V"+CORE.VERSION); proxy.registerTileEntities(); proxy.registerRenderThings(); proxy.preInit(event); diff --git a/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java index 04fa966f0d..ae398e130e 100644 --- a/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java +++ b/src/Java/miscutil/core/common/compat/COMPAT_ExtraUtils.java @@ -2,18 +2,29 @@ package miscutil.core.common.compat; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.item.ModItems; +import miscutil.core.recipe.RECIPES_Tools; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.item.ItemStack; public class COMPAT_ExtraUtils { public static void OreDict(){ + RECIPES_Tools.RECIPE_DivisionSigil = new ItemStack(UtilsItems.getItem("ExtraUtilities:divisionSigil")); run(); + } private static final void run(){ UtilsItems.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0); GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium)); + + //Division Sigil + UtilsRecipe.recipeBuilder( + "plateNetherStar", "gemIridium", "plateNetherStar", + "plateIridium", RECIPES_Tools.craftingToolHardHammer, "plateIridium", + "plateNetherStar", "gemIridium", "plateNetherStar", + RECIPES_Tools.RECIPE_DivisionSigil); } } diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index 910c6376ea..35eac45e26 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -15,7 +15,7 @@ public class CORE { public static final String name = "Misc. Utils"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.2.0"; + public static final String VERSION = "1.2.2"; public static final boolean DEBUG = false; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/miscutil/core/lib/LoadedMods.java index efce85b11a..019ac09b89 100644 --- a/src/Java/miscutil/core/lib/LoadedMods.java +++ b/src/Java/miscutil/core/lib/LoadedMods.java @@ -33,8 +33,9 @@ public class LoadedMods { if (Gregtech){ try { CORE.sRecipeAdder = CORE.RA = new GregtechRecipeAdder(); + Utils.LOG_INFO("Created a Gregtech recipe handler."); } catch (NullPointerException e){ - + Utils.LOG_INFO("Could NOT create a Gregtech recipe handler."); } } diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java index ef57d44f44..8acc0d39bc 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java +++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java @@ -101,22 +101,22 @@ public class RECIPES_Machines { //Machine Casings - static ItemStack machineCasing_ULV = ItemList.Casing_ULV.get(1); - static ItemStack machineCasing_LV = ItemList.Casing_LV.get(1); - static ItemStack machineCasing_MV = ItemList.Casing_MV.get(1); - static ItemStack machineCasing_HV = ItemList.Casing_HV.get(1); - static ItemStack machineCasing_EV = ItemList.Casing_EV.get(1); - static ItemStack machineCasing_IV = ItemList.Casing_IV.get(1); - static ItemStack machineCasing_LuV = ItemList.Casing_LuV.get(1); - static ItemStack machineCasing_ZPM = ItemList.Casing_ZPM.get(1); - static ItemStack machineCasing_UV = ItemList.Casing_UV.get(1); - static ItemStack machineCasing_MAX = ItemList.Casing_MAX.get(1); - + static ItemStack machineCasing_ULV; + static ItemStack machineCasing_LV; + static ItemStack machineCasing_MV; + static ItemStack machineCasing_HV; + static ItemStack machineCasing_EV; + static ItemStack machineCasing_IV; + static ItemStack machineCasing_LuV; + static ItemStack machineCasing_ZPM; + static ItemStack machineCasing_UV; + static ItemStack machineCasing_MAX; + //Gearbox Casings - static ItemStack gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); - static ItemStack gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1); - static ItemStack gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1); - static ItemStack gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1); + static ItemStack gearboxCasing_Tier_1; + static ItemStack gearboxCasing_Tier_2; + static ItemStack gearboxCasing_Tier_3; + static ItemStack gearboxCasing_Tier_4; //Cables static String cableGt02Electrum = "cableGt02Electrum"; @@ -136,7 +136,7 @@ public class RECIPES_Machines { static String pipeHugeTitanium="pipeHugeTitanium"; //Lava Boiler - static ItemStack boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1); + static ItemStack boiler_Coal; static ItemStack blockBricks = UtilsItems.getItemStack("minecraft:brick_block", 1); //Batteries @@ -157,49 +157,49 @@ public class RECIPES_Machines { static String circuitUltimate = "circuitUltimate"; //Machine Components - static ItemStack electricMotor_LV = ItemList.Electric_Motor_LV.get(1); - static ItemStack electricMotor_MV = ItemList.Electric_Motor_MV.get(1); - static ItemStack electricMotor_HV = ItemList.Electric_Motor_HV.get(1); - static ItemStack electricMotor_EV = ItemList.Electric_Motor_EV.get(1); - static ItemStack electricMotor_IV = ItemList.Electric_Motor_IV.get(1); - static ItemStack electricPump_LV = ItemList.Electric_Pump_LV.get(1); - static ItemStack electricPump_MV = ItemList.Electric_Pump_MV.get(1); - static ItemStack electricPump_HV = ItemList.Electric_Pump_HV.get(1); - static ItemStack electricPump_EV = ItemList.Electric_Pump_EV.get(1); - static ItemStack electricPump_IV = ItemList.Electric_Pump_IV.get(1); - static ItemStack electricPiston_LV = ItemList.Electric_Piston_LV.get(1); - static ItemStack electricPiston_MV = ItemList.Electric_Piston_MV.get(1); - static ItemStack electricPiston_HV = ItemList.Electric_Piston_HV.get(1); - static ItemStack electricPiston_EV = ItemList.Electric_Piston_EV.get(1); - static ItemStack electricPiston_IV = ItemList.Electric_Piston_IV.get(1); - static ItemStack robotArm_LV = ItemList.Robot_Arm_LV.get(1); - static ItemStack robotArm_MV = ItemList.Robot_Arm_MV.get(1); - static ItemStack robotArm_HV = ItemList.Robot_Arm_HV.get(1); - static ItemStack robotArm_EV = ItemList.Robot_Arm_EV.get(1); - static ItemStack robotArm_IV = ItemList.Robot_Arm_IV.get(1); - static ItemStack conveyorModule_LV = ItemList.Conveyor_Module_LV.get(1); - static ItemStack conveyorModule_MV = ItemList.Conveyor_Module_MV.get(1); - static ItemStack conveyorModule_HV = ItemList.Conveyor_Module_HV.get(1); - static ItemStack conveyorModule_EV = ItemList.Conveyor_Module_EV.get(1); - static ItemStack conveyorModule_IV = ItemList.Conveyor_Module_IV.get(1); - static ItemStack emitter_LV = ItemList.Emitter_LV.get(1); - static ItemStack emitter_MV = ItemList.Emitter_MV.get(1); - static ItemStack emitter_HV = ItemList.Emitter_HV.get(1); - static ItemStack emitter_EV = ItemList.Emitter_EV.get(1); - static ItemStack emitter_IV = ItemList.Emitter_IV.get(1); - static ItemStack fieldGenerator_LV = ItemList.Field_Generator_LV.get(1); - static ItemStack fieldGenerator_MV = ItemList.Field_Generator_MV.get(1); - static ItemStack fieldGenerator_HV = ItemList.Field_Generator_HV.get(1); - static ItemStack fieldGenerator_EV = ItemList.Field_Generator_EV.get(1); - static ItemStack fieldGenerator_IV = ItemList.Field_Generator_IV.get(1); - static ItemStack sensor_LV = ItemList.Sensor_LV.get(1); - static ItemStack sensor_MV = ItemList.Sensor_MV.get(1); - static ItemStack sensor_HV = ItemList.Sensor_HV.get(1); - static ItemStack sensor_EV = ItemList.Sensor_EV.get(1); - static ItemStack sensor_IV = ItemList.Sensor_IV.get(1); - + static ItemStack electricMotor_LV; + static ItemStack electricMotor_MV; + static ItemStack electricMotor_HV; + static ItemStack electricMotor_EV; + static ItemStack electricMotor_IV; + static ItemStack electricPump_LV; + static ItemStack electricPump_MV; + static ItemStack electricPump_HV; + static ItemStack electricPump_EV; + static ItemStack electricPump_IV; + static ItemStack electricPiston_LV; + static ItemStack electricPiston_MV; + static ItemStack electricPiston_HV; + static ItemStack electricPiston_EV; + static ItemStack electricPiston_IV; + static ItemStack robotArm_LV; + static ItemStack robotArm_MV; + static ItemStack robotArm_HV; + static ItemStack robotArm_EV; + static ItemStack robotArm_IV; + static ItemStack conveyorModule_LV; + static ItemStack conveyorModule_MV; + static ItemStack conveyorModule_HV; + static ItemStack conveyorModule_EV; + static ItemStack conveyorModule_IV; + static ItemStack emitter_LV; + static ItemStack emitter_MV; + static ItemStack emitter_HV; + static ItemStack emitter_EV; + static ItemStack emitter_IV; + static ItemStack fieldGenerator_LV; + static ItemStack fieldGenerator_MV; + static ItemStack fieldGenerator_HV; + static ItemStack fieldGenerator_EV; + static ItemStack fieldGenerator_IV; + static ItemStack sensor_LV; + static ItemStack sensor_MV; + static ItemStack sensor_HV; + static ItemStack sensor_EV; + static ItemStack sensor_IV; + //Misc - static ItemStack INPUT_RCCokeOvenBlock = UtilsItems.getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1); + static ItemStack INPUT_RCCokeOvenBlock; @@ -210,250 +210,277 @@ public class RECIPES_Machines { run(); Utils.LOG_INFO("Loading Recipes for the Various machine blocks."); } - + private static void run(){ - //Staballoy Dust - TEMP - UtilsRecipe.recipeBuilder("dustTitanium", "dustUranium", "dustUranium", - "dustUranium", "dustUranium", "dustUranium", - "dustUranium", "dustUranium", "dustUranium", - RECIPES_Shapeless.dustStaballoy); - - //Buffer Core - UtilsRecipe.recipeBuilder( - plateTier1, cableTier1, plateTier1, - circuitPrimitive, batteryBasic, circuitPrimitive, - plateTier1, cableTier1, plateTier1, - RECIPE_BufferCore_ULV); - UtilsRecipe.recipeBuilder( - plateTier2, cableTier2, plateTier2, - circuitBasic, batteryBasic, circuitBasic, - plateTier2, cableTier2, plateTier2, - RECIPE_BufferCore_LV); - UtilsRecipe.recipeBuilder( - plateTier3, cableTier3, plateTier3, - circuitGood, batteryAdvanced, circuitGood, - plateTier3, cableTier3, plateTier3, - RECIPE_BufferCore_MV); - UtilsRecipe.recipeBuilder( - plateTier4, cableTier4, plateTier4, - circuitAdvanced, batteryAdvanced, circuitAdvanced, - plateTier4, cableTier4, plateTier4, - RECIPE_BufferCore_HV); - UtilsRecipe.recipeBuilder( - plateTier5, cableTier5, plateTier5, - circuitData, batteryElite, circuitData, - plateTier5, cableTier5, plateTier5, - RECIPE_BufferCore_EV); - - UtilsRecipe.recipeBuilder( - plateTier6, cableTier6, plateTier6, - circuitData, batteryElite, circuitElite, - plateTier6, cableTier6, plateTier6, - RECIPE_BufferCore_IV); - UtilsRecipe.recipeBuilder( - plateTier7, cableTier7, plateTier7, - circuitElite, batteryMaster, circuitElite, - plateTier7, cableTier7, plateTier7, - RECIPE_BufferCore_LuV); - UtilsRecipe.recipeBuilder( - plateTier8, cableTier8, plateTier8, - circuitMaster, batteryMaster, circuitMaster, - plateTier8, cableTier8, plateTier8, - RECIPE_BufferCore_ZPM); - UtilsRecipe.recipeBuilder( - plateTier9, cableTier9, plateTier9, - circuitMaster, batteryUltimate, circuitUltimate, - plateTier9, cableTier9, plateTier9, - RECIPE_BufferCore_UV); - UtilsRecipe.recipeBuilder( - plateTier10, cableTier10, plateTier10, - circuitUltimate, batteryUltimate, circuitUltimate, - plateTier10, cableTier10, plateTier10, - RECIPE_BufferCore_MAX); - - - - - - - - - - - - - //Battery Buffer #1 - UtilsRecipe.recipeBuilder( - wireTier1, RECIPE_BufferCore_ULV, wireTier1, - wireTier1, machineCasing_ULV, wireTier1, - circuitPrimitive, null, circuitPrimitive, - RECIPE_Buffer_ULV); - - //Battery Buffer - UtilsRecipe.recipeBuilder( - wireTier2, RECIPE_BufferCore_LV, wireTier2, - wireTier2, machineCasing_LV, wireTier2, - circuitPrimitive, circuitBasic, circuitPrimitive, - RECIPE_Buffer_LV); - //Battery Buffer - UtilsRecipe.recipeBuilder( - wireTier3, RECIPE_BufferCore_MV, wireTier3, - wireTier3, machineCasing_MV, wireTier3, - circuitBasic, circuitGood, circuitBasic, - RECIPE_Buffer_MV); - //Battery Buffer - UtilsRecipe.recipeBuilder( - wireTier4, RECIPE_BufferCore_HV, wireTier4, - wireTier4, machineCasing_HV, wireTier4, - circuitGood, circuitAdvanced, circuitGood, - RECIPE_Buffer_HV); - //Battery Buffer - UtilsRecipe.recipeBuilder( - wireTier5, RECIPE_BufferCore_EV, wireTier5, - wireTier5, machineCasing_EV, wireTier5, - circuitAdvanced, circuitElite, circuitAdvanced, - RECIPE_Buffer_EV); - //Battery Buffer - UtilsRecipe.recipeBuilder( - wireTier6, RECIPE_BufferCore_IV, wireTier6, - wireTier6, machineCasing_IV, wireTier6, - circuitElite, circuitMaster, circuitElite, - RECIPE_Buffer_IV); - //Battery Buffer - UtilsRecipe.recipeBuilder( - wireTier7, RECIPE_BufferCore_LuV, wireTier7, - wireTier7, machineCasing_LuV, wireTier7, - circuitMaster, circuitElite, circuitMaster, - RECIPE_Buffer_LuV); - //Battery Buffer - UtilsRecipe.recipeBuilder( - wireTier8, RECIPE_BufferCore_ZPM, wireTier8, - wireTier8, machineCasing_ZPM, wireTier8, - circuitMaster, circuitUltimate, circuitMaster, - RECIPE_Buffer_ZPM); - //Battery Buffer - UtilsRecipe.recipeBuilder( - wireTier9, RECIPE_BufferCore_UV, wireTier9, - wireTier9, machineCasing_UV, wireTier9, - circuitUltimate, circuitMaster, circuitUltimate, - RECIPE_Buffer_UV); - //Battery Buffer - UtilsRecipe.recipeBuilder( - wireTier10, RECIPE_BufferCore_MAX, wireTier10, - wireTier10, machineCasing_MAX, wireTier10, - circuitUltimate, plateTier11, circuitUltimate, - RECIPE_Buffer_MAX); - - - //Steam Condenser - UtilsRecipe.recipeBuilder( - pipeLargeCopper, pipeHugeSteel, pipeLargeCopper, - plateEnergeticAlloy, electricPump_HV, plateEnergeticAlloy, - plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy, - RECIPE_SteamCondenser); - - //Iron BF - UtilsRecipe.recipeBuilder( - "plateDoubleAnyIron", "craftingFurnace", "plateDoubleAnyIron", - boiler_Coal, machineCasing_ULV, boiler_Coal, - "plateDoubleAnyIron", "bucketLava", "plateDoubleAnyIron", - RECIPE_IronBlastFurnace); - - //Iron plated Bricks - UtilsRecipe.recipeBuilder( - "plateAnyIron", RECIPES_Tools.craftingToolHardHammer, "plateAnyIron", - "plateAnyIron", blockBricks, "plateAnyIron", - "plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron", - RECIPE_IronPlatedBricks); - - - - - //Industrial Centrifuge - UtilsRecipe.recipeBuilder( - circuitElite, pipeHugeStainlessSteel, circuitElite, - plateTier6, electricPump_EV, plateTier6, - plateTier8, machineCasing_EV, plateTier8, - RECIPE_IndustrialCentrifugeController); - - //Centrifuge Casing - UtilsRecipe.recipeBuilder( - plateTier6, "stickElectrum", plateTier6, - plateTier8, "stickElectrum", plateTier8, - plateTier6, "stickElectrum", plateTier6, - RECIPE_IndustrialCentrifugeCasing); - - //Industrial Coke Oven - UtilsRecipe.recipeBuilder( - plateCobalt, circuitAdvanced, plateCobalt, - machineCasing_HV, INPUT_RCCokeOvenBlock, machineCasing_HV, - plateCobalt, circuitAdvanced, plateCobalt, - RECIPE_IndustrialCokeOvenController); - - //Coke Oven Frame Casing - UtilsRecipe.recipeBuilder( - plateTier8, rodTier8, plateTier8, - rodTier8, "frameGtCobalt", rodTier8, - plateTier8, rodTier8, plateTier8, - RECIPE_IndustrialCokeOvenFrame); - - //Coke Oven Coil 1 - UtilsRecipe.recipeBuilder( - plateBronze, plateBronze, plateBronze, - "frameGtBronze", gearboxCasing_Tier_1, "frameGtBronze", - plateBronze, plateBronze, plateBronze, - RECIPE_IndustrialCokeOvenCasingA); - - //Coke Oven Coil 2 - UtilsRecipe.recipeBuilder( - plateSteel, plateSteel, plateSteel, - "frameGtSteel", gearboxCasing_Tier_2, "frameGtSteel", - plateSteel, plateSteel, plateSteel, - RECIPE_IndustrialCokeOvenCasingB); - - - - - - - - - - - - - - - - - - - + initModItems(); + } + + private static void initModItems(){ + if (LoadedMods.Gregtech){ + RECIPES_Shapeless.dustStaballoy = UtilsItems.getItemStackWithMeta(LoadedMods.Gregtech, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 1); + machineCasing_ULV = ItemList.Casing_ULV.get(1); + machineCasing_LV = ItemList.Casing_LV.get(1); + machineCasing_MV = ItemList.Casing_MV.get(1); + machineCasing_HV = ItemList.Casing_HV.get(1); + machineCasing_EV = ItemList.Casing_EV.get(1); + machineCasing_IV = ItemList.Casing_IV.get(1); + machineCasing_LuV = ItemList.Casing_LuV.get(1); + machineCasing_ZPM = ItemList.Casing_ZPM.get(1); + machineCasing_UV = ItemList.Casing_UV.get(1); + machineCasing_MAX = ItemList.Casing_MAX.get(1); + + //Gearbox Casings + gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); + gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1); + gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1); + gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1); + + //Lava Boiler + boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1); + + //Batteries + batteryBasic = "batteryBasic"; + batteryAdvanced = "batteryAdvanced"; + batteryElite = "batteryElite"; + batteryMaster = "batteryMaster"; + batteryUltimate = "batteryUltimate"; + + //Circuits + circuitPrimitive = "circuitPrimitive"; + circuitBasic = "circuitBasic"; + circuitGood = "circuitGood"; + circuitAdvanced = "circuitAdvanced"; + circuitData = "circuitData"; + circuitElite = "circuitElite"; + circuitMaster = "circuitMaster"; + circuitUltimate = "circuitUltimate"; + + //Machine Components + electricMotor_LV = ItemList.Electric_Motor_LV.get(1); + electricMotor_MV = ItemList.Electric_Motor_MV.get(1); + electricMotor_HV = ItemList.Electric_Motor_HV.get(1); + electricMotor_EV = ItemList.Electric_Motor_EV.get(1); + electricMotor_IV = ItemList.Electric_Motor_IV.get(1); + electricPump_LV = ItemList.Electric_Pump_LV.get(1); + electricPump_MV = ItemList.Electric_Pump_MV.get(1); + electricPump_HV = ItemList.Electric_Pump_HV.get(1); + electricPump_EV = ItemList.Electric_Pump_EV.get(1); + electricPump_IV = ItemList.Electric_Pump_IV.get(1); + electricPiston_LV = ItemList.Electric_Piston_LV.get(1); + electricPiston_MV = ItemList.Electric_Piston_MV.get(1); + electricPiston_HV = ItemList.Electric_Piston_HV.get(1); + electricPiston_EV = ItemList.Electric_Piston_EV.get(1); + electricPiston_IV = ItemList.Electric_Piston_IV.get(1); + robotArm_LV = ItemList.Robot_Arm_LV.get(1); + robotArm_MV = ItemList.Robot_Arm_MV.get(1); + robotArm_HV = ItemList.Robot_Arm_HV.get(1); + robotArm_EV = ItemList.Robot_Arm_EV.get(1); + robotArm_IV = ItemList.Robot_Arm_IV.get(1); + conveyorModule_LV = ItemList.Conveyor_Module_LV.get(1); + conveyorModule_MV = ItemList.Conveyor_Module_MV.get(1); + conveyorModule_HV = ItemList.Conveyor_Module_HV.get(1); + conveyorModule_EV = ItemList.Conveyor_Module_EV.get(1); + conveyorModule_IV = ItemList.Conveyor_Module_IV.get(1); + emitter_LV = ItemList.Emitter_LV.get(1); + emitter_MV = ItemList.Emitter_MV.get(1); + emitter_HV = ItemList.Emitter_HV.get(1); + emitter_EV = ItemList.Emitter_EV.get(1); + emitter_IV = ItemList.Emitter_IV.get(1); + fieldGenerator_LV = ItemList.Field_Generator_LV.get(1); + fieldGenerator_MV = ItemList.Field_Generator_MV.get(1); + fieldGenerator_HV = ItemList.Field_Generator_HV.get(1); + fieldGenerator_EV = ItemList.Field_Generator_EV.get(1); + fieldGenerator_IV = ItemList.Field_Generator_IV.get(1); + sensor_LV = ItemList.Sensor_LV.get(1); + sensor_MV = ItemList.Sensor_MV.get(1); + sensor_HV = ItemList.Sensor_HV.get(1); + sensor_EV = ItemList.Sensor_EV.get(1); + sensor_IV = ItemList.Sensor_IV.get(1);} + + if(LoadedMods.Railcraft){ + //Misc + INPUT_RCCokeOvenBlock = UtilsItems.getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1); + } + runModRecipes(); + } + + private static void runModRecipes(){ + if (LoadedMods.Gregtech){ + //Staballoy Dust - TEMP + UtilsRecipe.recipeBuilder("dustTitanium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium", + "dustUranium", "dustUranium", "dustUranium", + RECIPES_Shapeless.dustStaballoy); + //Buffer Core + UtilsRecipe.recipeBuilder( + plateTier1, cableTier1, plateTier1, + circuitPrimitive, batteryBasic, circuitPrimitive, + plateTier1, cableTier1, plateTier1, + RECIPE_BufferCore_ULV); + UtilsRecipe.recipeBuilder( + plateTier2, cableTier2, plateTier2, + circuitBasic, batteryBasic, circuitBasic, + plateTier2, cableTier2, plateTier2, + RECIPE_BufferCore_LV); + UtilsRecipe.recipeBuilder( + plateTier3, cableTier3, plateTier3, + circuitGood, batteryAdvanced, circuitGood, + plateTier3, cableTier3, plateTier3, + RECIPE_BufferCore_MV); + UtilsRecipe.recipeBuilder( + plateTier4, cableTier4, plateTier4, + circuitAdvanced, batteryAdvanced, circuitAdvanced, + plateTier4, cableTier4, plateTier4, + RECIPE_BufferCore_HV); + UtilsRecipe.recipeBuilder( + plateTier5, cableTier5, plateTier5, + circuitData, batteryElite, circuitData, + plateTier5, cableTier5, plateTier5, + RECIPE_BufferCore_EV); + UtilsRecipe.recipeBuilder( + plateTier6, cableTier6, plateTier6, + circuitData, batteryElite, circuitElite, + plateTier6, cableTier6, plateTier6, + RECIPE_BufferCore_IV); + UtilsRecipe.recipeBuilder( + plateTier7, cableTier7, plateTier7, + circuitElite, batteryMaster, circuitElite, + plateTier7, cableTier7, plateTier7, + RECIPE_BufferCore_LuV); + UtilsRecipe.recipeBuilder( + plateTier8, cableTier8, plateTier8, + circuitMaster, batteryMaster, circuitMaster, + plateTier8, cableTier8, plateTier8, + RECIPE_BufferCore_ZPM); + UtilsRecipe.recipeBuilder( + plateTier9, cableTier9, plateTier9, + circuitMaster, batteryUltimate, circuitUltimate, + plateTier9, cableTier9, plateTier9, + RECIPE_BufferCore_UV); + UtilsRecipe.recipeBuilder( + plateTier10, cableTier10, plateTier10, + circuitUltimate, batteryUltimate, circuitUltimate, + plateTier10, cableTier10, plateTier10, + RECIPE_BufferCore_MAX); + + + UtilsRecipe.recipeBuilder( + wireTier1, RECIPE_BufferCore_ULV, wireTier1, + wireTier1, machineCasing_ULV, wireTier1, + circuitPrimitive, null, circuitPrimitive, + RECIPE_Buffer_ULV); + UtilsRecipe.recipeBuilder( + wireTier2, RECIPE_BufferCore_LV, wireTier2, + wireTier2, machineCasing_LV, wireTier2, + circuitPrimitive, circuitBasic, circuitPrimitive, + RECIPE_Buffer_LV); + UtilsRecipe.recipeBuilder( + wireTier3, RECIPE_BufferCore_MV, wireTier3, + wireTier3, machineCasing_MV, wireTier3, + circuitBasic, circuitGood, circuitBasic, + RECIPE_Buffer_MV); + UtilsRecipe.recipeBuilder( + wireTier4, RECIPE_BufferCore_HV, wireTier4, + wireTier4, machineCasing_HV, wireTier4, + circuitGood, circuitAdvanced, circuitGood, + RECIPE_Buffer_HV); + UtilsRecipe.recipeBuilder( + wireTier5, RECIPE_BufferCore_EV, wireTier5, + wireTier5, machineCasing_EV, wireTier5, + circuitAdvanced, circuitElite, circuitAdvanced, + RECIPE_Buffer_EV); + UtilsRecipe.recipeBuilder( + wireTier6, RECIPE_BufferCore_IV, wireTier6, + wireTier6, machineCasing_IV, wireTier6, + circuitElite, circuitMaster, circuitElite, + RECIPE_Buffer_IV); + UtilsRecipe.recipeBuilder( + wireTier7, RECIPE_BufferCore_LuV, wireTier7, + wireTier7, machineCasing_LuV, wireTier7, + circuitMaster, circuitElite, circuitMaster, + RECIPE_Buffer_LuV); + UtilsRecipe.recipeBuilder( + wireTier8, RECIPE_BufferCore_ZPM, wireTier8, + wireTier8, machineCasing_ZPM, wireTier8, + circuitMaster, circuitUltimate, circuitMaster, + RECIPE_Buffer_ZPM); + UtilsRecipe.recipeBuilder( + wireTier9, RECIPE_BufferCore_UV, wireTier9, + wireTier9, machineCasing_UV, wireTier9, + circuitUltimate, circuitMaster, circuitUltimate, + RECIPE_Buffer_UV); + UtilsRecipe.recipeBuilder( + wireTier10, RECIPE_BufferCore_MAX, wireTier10, + wireTier10, machineCasing_MAX, wireTier10, + circuitUltimate, plateTier11, circuitUltimate, + RECIPE_Buffer_MAX); + + + //Steam Condenser + UtilsRecipe.recipeBuilder( + pipeLargeCopper, pipeHugeSteel, pipeLargeCopper, + plateEnergeticAlloy, electricPump_HV, plateEnergeticAlloy, + plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy, + RECIPE_SteamCondenser); + + //Iron BF + UtilsRecipe.recipeBuilder( + "plateDoubleAnyIron", "craftingFurnace", "plateDoubleAnyIron", + boiler_Coal, machineCasing_ULV, boiler_Coal, + "plateDoubleAnyIron", "bucketLava", "plateDoubleAnyIron", + RECIPE_IronBlastFurnace); + + //Iron plated Bricks + UtilsRecipe.recipeBuilder( + "plateAnyIron", RECIPES_Tools.craftingToolHardHammer, "plateAnyIron", + "plateAnyIron", blockBricks, "plateAnyIron", + "plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron", + RECIPE_IronPlatedBricks); + + //Industrial Centrifuge + UtilsRecipe.recipeBuilder( + circuitElite, pipeHugeStainlessSteel, circuitElite, + plateTier6, electricPump_EV, plateTier6, + plateTier8, machineCasing_EV, plateTier8, + RECIPE_IndustrialCentrifugeController); + + //Centrifuge Casing + UtilsRecipe.recipeBuilder( + plateTier6, "stickElectrum", plateTier6, + plateTier8, "stickElectrum", plateTier8, + plateTier6, "stickElectrum", plateTier6, + RECIPE_IndustrialCentrifugeCasing); + + //Industrial Coke Oven + UtilsRecipe.recipeBuilder( + plateCobalt, circuitAdvanced, plateCobalt, + machineCasing_HV, INPUT_RCCokeOvenBlock, machineCasing_HV, + plateCobalt, circuitAdvanced, plateCobalt, + RECIPE_IndustrialCokeOvenController); + + //Coke Oven Frame Casing + UtilsRecipe.recipeBuilder( + plateTier8, rodTier8, plateTier8, + rodTier8, "frameGtCobalt", rodTier8, + plateTier8, rodTier8, plateTier8, + RECIPE_IndustrialCokeOvenFrame); + + //Coke Oven Coil 1 + UtilsRecipe.recipeBuilder( + plateBronze, plateBronze, plateBronze, + "frameGtBronze", gearboxCasing_Tier_1, "frameGtBronze", + plateBronze, plateBronze, plateBronze, + RECIPE_IndustrialCokeOvenCasingA); + + //Coke Oven Coil 2 + UtilsRecipe.recipeBuilder( + plateSteel, plateSteel, plateSteel, + "frameGtSteel", gearboxCasing_Tier_2, "frameGtSteel", + plateSteel, plateSteel, plateSteel, + RECIPE_IndustrialCokeOvenCasingB); + } Utils.LOG_INFO("Done loading recipes for the Various machine blocks."); - - - - - - - - - - - - - - - - - - - - - - - - } + } } diff --git a/src/Java/miscutil/core/recipe/RECIPES_Shapeless.java b/src/Java/miscutil/core/recipe/RECIPES_Shapeless.java index 756955bb1a..f969e18b19 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_Shapeless.java +++ b/src/Java/miscutil/core/recipe/RECIPES_Shapeless.java @@ -3,13 +3,12 @@ package miscutil.core.recipe; import gregtech.api.enums.ItemList; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; -import miscutil.core.util.item.UtilsItems; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.item.ItemStack; public class RECIPES_Shapeless { - static ItemStack dustStaballoy = UtilsItems.getItemStackWithMeta(LoadedMods.Gregtech, "gregtech:gt.metaitem.01", "Staballoy Dust", 2319, 1); + static ItemStack dustStaballoy; //Circuits static String circuitPrimitive = "circuitPrimitive"; @@ -20,7 +19,7 @@ public class RECIPES_Shapeless { static String circuitElite = "circuitElite"; static String circuitMaster = "circuitMaster"; static String circuitUltimate = "circuitUltimate"; - static ItemStack gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); + static ItemStack gearboxCasing_Tier_1; public static final void RECIPES_LOAD(){ //run(); @@ -28,6 +27,10 @@ public class RECIPES_Shapeless { } private static void run(){ + //Gregtech items + if (LoadedMods.Gregtech){ + gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); + UtilsRecipe.shapelessBuilder(dustStaballoy, "dustTitanium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", "dustUranium", @@ -37,6 +40,7 @@ public class RECIPES_Shapeless { circuitPrimitive, circuitPrimitive, circuitPrimitive, circuitPrimitive, circuitPrimitive, circuitPrimitive, circuitPrimitive, circuitPrimitive, circuitPrimitive); + } } } diff --git a/src/Java/miscutil/core/recipe/RECIPES_Tools.java b/src/Java/miscutil/core/recipe/RECIPES_Tools.java index 80919c961f..c712122330 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_Tools.java +++ b/src/Java/miscutil/core/recipe/RECIPES_Tools.java @@ -1,7 +1,6 @@ package miscutil.core.recipe; import miscutil.core.item.ModItems; -import miscutil.core.util.item.UtilsItems; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -13,117 +12,114 @@ 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); + public static ItemStack RECIPE_StaballoyPickaxe = new ItemStack(ModItems.itemStaballoyPickaxe); + public static ItemStack RECIPE_StaballoyAxe = new ItemStack(ModItems.itemStaballoyAxe); + public static ItemStack RECIPE_SandstoneHammer = new ItemStack(ModItems.itemSandstoneHammer); + public static ItemStack RECIPE_StaballoyIngot = new ItemStack(ModItems.itemIngotStaballoy); + public static ItemStack RECIPE_SandStone = new ItemStack(Blocks.sandstone, 2); + public static ItemStack RECIPE_Sand = new ItemStack(Blocks.sand, 4); - static ItemStack RECIPE_DivisionSigil = new ItemStack(UtilsItems.getItem("ExtraUtilities:divisionSigil")); + public static ItemStack RECIPE_DivisionSigil; //MC Items - static Item Apple = Items.apple; + public 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; + public static Block CobbleStone = Blocks.cobblestone; + public static Block Dirt = Blocks.dirt; + public static Block Sand = Blocks.sand; + public static Block Gravel = Blocks.gravel; + public static Block Sandstone = Blocks.sandstone; //null - static String empty = " "; + public static String empty = " "; //Batteries - static String batteryBasic = "batteryBasic"; - static String batteryAdvanced = "batteryAdvanced"; - static String batteryElite = "batteryElite"; - static String batteryMaster = "batteryMaster"; - static String batteryUltimate = "batteryUltimate"; + public static String batteryBasic = "batteryBasic"; + public static String batteryAdvanced = "batteryAdvanced"; + public static String batteryElite = "batteryElite"; + public static String batteryMaster = "batteryMaster"; + public 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"; + public static String circuitPrimitive = "circuitPrimitive"; + public static String circuitBasic = "circuitBasic"; + public static String circuitGood = "circuitGood"; + public static String circuitAdvanced = "circuitAdvanced"; + public static String circuitElite = "circuitElite"; + public static String circuitMaster = "circuitMaster"; + public 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"; + public static String cableGt01Electrum = "cableGt01Electrum"; + public static String cableGt02Electrum = "cableGt02Electrum"; + public static String cableGt01RedstoneAlloy = "cableGt01RedstoneAlloy"; + public static String cableGt02RedstoneAlloy = "cableGt02RedstoneAlloy"; + public static String cableGt01Copper = "cableGt01Copper"; + public static String cableGt02Copper = "cableGt02Copper"; + public static String cableGt01AnnealedCopper = "cableGt01AnnealedCopper"; + public 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"; + public static String stickStaballoy= "stickStaballoy"; + public static String stickTitanium= "stickTitanium"; + public static String stickIron= "stickIron"; + public static String stickGold= "stickGold"; + public static String stickSilver= "stickSilver"; + public static String stickSteel= "stickSteel"; + public static String stickBronze= "stickBronze"; + public static String stickTungsten= "stickTungsten"; + public static String stickRedAlloy= "stickRedAlloy"; + public static String stickInvar= "stickInvar"; + public static String stickElectrum= "stickElectrum"; + public 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"; + public static String plateStaballoy= "plateStaballoy"; + public static String plateTitanium= "plateTitanium"; + public static String plateIron= "plateIron"; + public static String plateGold= "plateGold"; + public static String plateSilver= "plateSilver"; + public static String plateSteel= "plateSteel"; + public static String plateBronze= "plateBronze"; + public static String plateTungsten= "plateTungsten"; + public static String plateRedAlloy= "plateRedAlloy"; + public static String plateInvar= "plateInvar"; + public static String plateElectrum= "plateElectrum"; + public 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"; + public static String ingotStaballoy= "ingotStaballoy"; + public static String ingotTitanium= "ingotTitanium"; + public static String ingotIron= "ingotIron"; + public static String ingotGold= "ingotGold"; + public static String ingotSilver= "ingotSilver"; + public static String ingotSteel= "ingotSteel"; + public static String ingotBronze= "ingotBronze"; + public static String ingotTungsten= "ingotTungsten"; + public static String ingotRedAlloy= "ingotRedAlloy"; + public static String ingotInvar= "ingotInvar"; + public static String ingotElectrum= "ingotElectrum"; + public static String ingotUranium= "ingotUranium"; + public 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 String craftingToolHardHammer = "craftingToolHardHammer"; + public static String craftingToolSoftHammer = "craftingToolSoftHammer"; + public static String craftingToolFile = "craftingToolFile"; + public static String craftingToolSaw = "craftingToolSaw"; + public static String craftingToolPickaxe = "craftingToolPickaxe"; + public static String craftingToolWrench = "craftingToolWrench"; + public static String craftingToolCrowbar = "craftingToolCrowbar"; + public static String craftingToolKnife = "craftingToolKnife"; + public static String craftingToolScrewdriver = "craftingToolScrewdriver"; + + public static ItemStack sandHammer = new ItemStack (ModItems.itemSandstoneHammer, 1, OreDictionary.WILDCARD_VALUE); + public static String craftingToolSandHammer = "craftingToolSandHammer"; public static final void RECIPES_LOAD(){ - //plateStaballoy = new ItemStack(ModItems.itemPlateStaballoy); - //ingotStaballoy = new ItemStack(ModItems.itemIngotStaballoy); - //Pickaxes run(); } @@ -162,15 +158,7 @@ public class RECIPES_Tools { plateElectrum, ingotElectrum, plateElectrum, craftingToolScrewdriver, stickBronze, craftingToolHardHammer, null, stickSteel, null, - RECIPE_SandstoneHammer); - - //Division Sigil - UtilsRecipe.recipeBuilder( - "plateNetherStar", "gemIridium", "plateNetherStar", - "plateIridium", craftingToolHardHammer, "plateIridium", - "plateNetherStar", "gemIridium", "plateNetherStar", - RECIPE_DivisionSigil); - + RECIPE_SandstoneHammer); } |