diff options
15 files changed, 276 insertions, 92 deletions
diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java index 46a577bf4b..6bad498027 100644 --- a/src/Java/miscutil/core/common/CommonProxy.java +++ b/src/Java/miscutil/core/common/CommonProxy.java @@ -43,6 +43,7 @@ public class CommonProxy { tOreStack = (ItemStack) i$.next(); } } + new Meta_GT_Proxy(); } } diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java index 9a54a9d04e..4b5c2613b2 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java @@ -12,6 +12,7 @@ import miscutil.core.util.Utils; import miscutil.core.util.fluid.FluidUtils; import miscutil.core.util.item.UtilsItems; import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; +import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; public class RECIPES_GREGTECH { @@ -150,4 +151,24 @@ public class RECIPES_GREGTECH { private static void registerSkookumChoocher(){ //GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), tBits, new Object[]{"fX", Character.valueOf('X'), OrePrefixes.toolHeadShovel.get(aMaterial)}); } + + private static void blastFurnaceRecipes(){ + GT_Values.RA.addBlastRecipe( + UtilsItems.getItemStackOfAmountFromOreDict("ingotTitanium", 1), + UtilsItems.getItemStackOfAmountFromOreDict("ingotUranium", 8), + GT_Values.NF, GT_Values.NF, + GT_OreDictUnificator.get(OrePrefixes.ingotHot, GT_Materials.Staballoy, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 1L), + (int) Math.max(GT_Materials.Staballoy.getMass() / 80L, 1L) * GT_Materials.Staballoy.mBlastFurnaceTemp, + 1000, GT_Materials.Staballoy.mBlastFurnaceTemp); + + GT_Values.RA.addBlastRecipe( + UtilsItems.getItemStackOfAmountFromOreDict("dustStaballoy", 1), + null, + GT_Values.NF, GT_Values.NF, + GT_OreDictUnificator.get(OrePrefixes.ingotHot, GT_Materials.Staballoy, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 1L), + (int) Math.max(GT_Materials.Staballoy.getMass() / 80L, 1L) * GT_Materials.Staballoy.mBlastFurnaceTemp, + 2000, GT_Materials.Staballoy.mBlastFurnaceTemp); + } }
\ No newline at end of file diff --git a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java index 4fd5b1fa77..4625263eee 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java +++ b/src/Java/miscutil/core/recipe/RECIPES_MachineComponents.java @@ -6,27 +6,13 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.recipe.UtilsRecipe; import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; -import net.minecraft.item.ItemStack; public class RECIPES_MachineComponents { - - //Outputs - static ItemStack RECIPE_Circuit_IV = GregtechItemList.Circuit_IV.get(1); - static ItemStack RECIPE_Circuit_LuV = GregtechItemList.Circuit_LuV.get(1); - static ItemStack RECIPE_Circuit_ZPM = GregtechItemList.Circuit_ZPM.get(1); - static ItemStack RECIPE_Circuit_Board_IV = GregtechItemList.Circuit_Board_IV.get(1); - static ItemStack RECIPE_Circuit_Board_LuV = GregtechItemList.Circuit_Board_LuV.get(1); - static ItemStack RECIPE_Circuit_Board_ZPM = GregtechItemList.Circuit_Board_ZPM.get(1); - static ItemStack RECIPE_Circuit_Parts_Crystal_Chip_IV = GregtechItemList.Circuit_Parts_Crystal_Chip_IV.get(1); - static ItemStack RECIPE_Circuit_Parts_Crystal_Chip_LuV = GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.get(1); - static ItemStack RECIPE_Circuit_Parts_Crystal_Chip_ZPM = GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.get(1); - static ItemStack RECIPE_Circuit_Parts_IV = GregtechItemList.Circuit_Parts_IV.get(1); - static ItemStack RECIPE_Circuit_Parts_LuV = GregtechItemList.Circuit_Parts_LuV.get(1); - static ItemStack RECIPE_Circuit_Parts_ZPM = GregtechItemList.Circuit_Parts_ZPM.get(1); - + //Wire static String wireTier6 = "wireGt08NiobiumTitanium"; static String wireTier7 = "wireGt08Osmium"; @@ -101,8 +87,10 @@ public class RECIPES_MachineComponents { static String craftingToolScrewdriver = "craftingToolScrewdriver"; public static final void RECIPES_LOAD(){ - Utils.LOG_INFO("Loading Recipes for the Various Circuits and their components."); - run(); + Utils.LOG_INFO("Loading Recipes for the Various Circuits and Machine components."); + if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ + run(); + } GregtechMachinePhase(); } @@ -283,12 +271,12 @@ public class RECIPES_MachineComponents { circuitTier10, plateTier10, plateTier10, RECIPE_CONSTANTS.sensor_MAX); - Utils.LOG_INFO("Done loading recipes for the Various circuit content."); + Utils.LOG_INFO("Done loading recipes for the Various machine components."); } private static void GregtechMachinePhase(){ - Utils.LOG_INFO("Adding Gregtech machine recipes for the components."); + Utils.LOG_INFO("Adding Gregtech machine recipes for the circuits."); GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), GregtechItemList.Circuit_Parts_Wiring_IV.get(4L, new Object[0]), GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]), 32, 256); GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), GregtechItemList.Circuit_Parts_Wiring_LuV.get(4L, new Object[0]), GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]), 64, 512); GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 2L), GregtechItemList.Circuit_Parts_Wiring_ZPM.get(4L, new Object[0]), GregtechItemList.Circuit_Board_ZPM.get(1L, new Object[0]), 96, 1024); diff --git a/src/Java/miscutil/core/recipe/RECIPES_Machines.java b/src/Java/miscutil/core/recipe/RECIPES_Machines.java index 70aa5a52a2..2e104f3e94 100644 --- a/src/Java/miscutil/core/recipe/RECIPES_Machines.java +++ b/src/Java/miscutil/core/recipe/RECIPES_Machines.java @@ -2,7 +2,6 @@ package miscutil.core.recipe; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; @@ -347,19 +346,19 @@ public class RECIPES_Machines { UtilsRecipe.addShapedGregtechRecipe( ItemList.Electric_Piston_EV, GregtechOrePrefixes.circuit.get(Materials.Ultimate), ItemList.Electric_Piston_EV, - ItemList.Electric_Motor_EV, ItemList.Hull_EV, ItemList.Electric_Motor_EV, - OrePrefixes.gearGt.get(Materials.Titanium), OrePrefixes.cableGt02.get(Materials.Aluminium), OrePrefixes.gearGt.get(Materials.Titanium), - GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0])); + ItemList.Electric_Motor_EV, machineCasing_EV, ItemList.Electric_Motor_EV, + "gearGtTitanium", "cableGt02Aluminium", "gearGtTitanium", + UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 793, 1)); UtilsRecipe.addShapedGregtechRecipe( ItemList.Electric_Piston_IV, GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic), ItemList.Electric_Piston_IV, - ItemList.Electric_Motor_IV, ItemList.Hull_IV, ItemList.Electric_Motor_IV, - OrePrefixes.gearGt.get(Materials.TungstenSteel), OrePrefixes.cableGt02.get(Materials.Platinum), OrePrefixes.gearGt.get(Materials.TungstenSteel), - GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0])); + ItemList.Electric_Motor_IV, machineCasing_IV, ItemList.Electric_Motor_IV, + "gearGtTungstenSteel", "cableGt02Platinum", "gearGtTungstenSteel", + UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 794, 1)); UtilsRecipe.addShapedGregtechRecipe( RECIPE_CONSTANTS.electricPiston_LuV, GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), RECIPE_CONSTANTS.electricPiston_LuV, - RECIPE_CONSTANTS.electricMotor_LuV, ItemList.Hull_LuV, RECIPE_CONSTANTS.electricMotor_LuV, - OrePrefixes.gearGt.get(Materials.Chrome), OrePrefixes.cableGt02.get(Materials.Tungsten), OrePrefixes.gearGt.get(Materials.Chrome), - GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0])); + RECIPE_CONSTANTS.electricMotor_LuV, machineCasing_LuV, RECIPE_CONSTANTS.electricMotor_LuV, + "gearGtChrome", "cableGt02Tungsten", "gearGtChrome", + UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 795, 1)); //Buffer Core UtilsRecipe.addShapedGregtechRecipe( diff --git a/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java b/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java index f5e180fccd..9bb1b24bd8 100644 --- a/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java +++ b/src/Java/miscutil/core/recipe/RECIPE_CONSTANTS.java @@ -8,79 +8,109 @@ import net.minecraft.item.ItemStack; public class RECIPE_CONSTANTS { //Machine Components - public static ItemStack electricMotor_LuV = GregtechItemList.Electric_Motor_LuV.get(1); - public static ItemStack electricMotor_ZPM = GregtechItemList.Electric_Motor_ZPM.get(1); - public static ItemStack electricMotor_UV = GregtechItemList.Electric_Motor_UV.get(1); - public static ItemStack electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); - public static ItemStack electricPump_LuV = GregtechItemList.Electric_Pump_LuV.get(1); - public static ItemStack electricPump_ZPM = GregtechItemList.Electric_Pump_ZPM.get(1); - public static ItemStack electricPump_UV = GregtechItemList.Electric_Pump_UV.get(1); - public static ItemStack electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); - public static ItemStack electricPiston_LuV = GregtechItemList.Electric_Piston_LuV.get(1); - public static ItemStack electricPiston_ZPM = GregtechItemList.Electric_Piston_ZPM.get(1); - public static ItemStack electricPiston_UV = GregtechItemList.Electric_Piston_UV.get(1); - public static ItemStack electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); - public static ItemStack robotArm_LuV = GregtechItemList.Robot_Arm_LuV.get(1); - public static ItemStack robotArm_ZPM = GregtechItemList.Robot_Arm_ZPM.get(1); - public static ItemStack robotArm_UV = GregtechItemList.Robot_Arm_UV.get(1); - public static ItemStack robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); - public static ItemStack conveyorModule_LuV = GregtechItemList.Conveyor_Module_LuV.get(1); - public static ItemStack conveyorModule_ZPM = GregtechItemList.Conveyor_Module_ZPM.get(1); - public static ItemStack conveyorModule_UV = GregtechItemList.Conveyor_Module_UV.get(1); - public static ItemStack conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); - public static ItemStack emitter_LuV = GregtechItemList.Emitter_LuV.get(1); - public static ItemStack emitter_ZPM = GregtechItemList.Emitter_ZPM.get(1); - public static ItemStack emitter_UV = GregtechItemList.Emitter_UV.get(1); - public static ItemStack emitter_MAX = GregtechItemList.Emitter_MAX.get(1); - public static ItemStack fieldGenerator_LuV = GregtechItemList.Field_Generator_LuV.get(1); - public static ItemStack fieldGenerator_ZPM = GregtechItemList.Field_Generator_ZPM.get(1); - public static ItemStack fieldGenerator_UV = GregtechItemList.Field_Generator_UV.get(1); - public static ItemStack fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); - public static ItemStack sensor_LuV = GregtechItemList.Sensor_LuV.get(1); - public static ItemStack sensor_ZPM = GregtechItemList.Sensor_ZPM.get(1); - public static ItemStack sensor_UV = GregtechItemList.Sensor_UV.get(1); - public static ItemStack sensor_MAX = GregtechItemList.Sensor_MAX.get(1); + public static ItemStack electricMotor_LuV; + public static ItemStack electricMotor_ZPM; + public static ItemStack electricMotor_UV; + public static ItemStack electricMotor_MAX; + public static ItemStack electricPump_LuV; + public static ItemStack electricPump_ZPM; + public static ItemStack electricPump_UV; + public static ItemStack electricPump_MAX; + public static ItemStack electricPiston_LuV; + public static ItemStack electricPiston_ZPM; + public static ItemStack electricPiston_UV ; + public static ItemStack electricPiston_MAX; + public static ItemStack robotArm_LuV; + public static ItemStack robotArm_ZPM; + public static ItemStack robotArm_UV; + public static ItemStack robotArm_MAX; + public static ItemStack conveyorModule_LuV; + public static ItemStack conveyorModule_ZPM; + public static ItemStack conveyorModule_UV; + public static ItemStack conveyorModule_MAX; + public static ItemStack emitter_LuV; + public static ItemStack emitter_ZPM; + public static ItemStack emitter_UV; + public static ItemStack emitter_MAX; + public static ItemStack fieldGenerator_LuV; + public static ItemStack fieldGenerator_ZPM; + public static ItemStack fieldGenerator_UV; + public static ItemStack fieldGenerator_MAX; + public static ItemStack sensor_LuV; + public static ItemStack sensor_ZPM; + public static ItemStack sensor_UV; + public static ItemStack sensor_MAX; public static void initialise(){ if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ registerGTExperimentalComponents(); } + else { + registerGTStandardComponents(); + } } private static void registerGTExperimentalComponents(){ - //Outputs //Machine Components electricMotor_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1); electricMotor_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1); electricMotor_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1); - electricPump_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32620, 1); electricPump_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32621, 1); electricPump_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32622, 1); - electricPiston_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1); electricPiston_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1); electricPiston_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1); - robotArm_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1); robotArm_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1); robotArm_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1); - conveyorModule_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1); conveyorModule_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1); conveyorModule_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1); - emitter_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1); emitter_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1); emitter_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1); - fieldGenerator_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1); fieldGenerator_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1); fieldGenerator_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1); - sensor_LuV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1); sensor_ZPM = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); sensor_UV = UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); } + + private static void registerGTStandardComponents(){ + electricMotor_LuV = GregtechItemList.Electric_Motor_LuV.get(1); + electricMotor_ZPM = GregtechItemList.Electric_Motor_ZPM.get(1); + electricMotor_UV = GregtechItemList.Electric_Motor_UV.get(1); + electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1); + electricPump_LuV = GregtechItemList.Electric_Pump_LuV.get(1); + electricPump_ZPM = GregtechItemList.Electric_Pump_ZPM.get(1); + electricPump_UV = GregtechItemList.Electric_Pump_UV.get(1); + electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1); + electricPiston_LuV = GregtechItemList.Electric_Piston_LuV.get(1); + electricPiston_ZPM = GregtechItemList.Electric_Piston_ZPM.get(1); + electricPiston_UV = GregtechItemList.Electric_Piston_UV.get(1); + electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1); + robotArm_LuV = GregtechItemList.Robot_Arm_LuV.get(1); + robotArm_ZPM = GregtechItemList.Robot_Arm_ZPM.get(1); + robotArm_UV = GregtechItemList.Robot_Arm_UV.get(1); + robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1); + conveyorModule_LuV = GregtechItemList.Conveyor_Module_LuV.get(1); + conveyorModule_ZPM = GregtechItemList.Conveyor_Module_ZPM.get(1); + conveyorModule_UV = GregtechItemList.Conveyor_Module_UV.get(1); + conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1); + emitter_LuV = GregtechItemList.Emitter_LuV.get(1); + emitter_ZPM = GregtechItemList.Emitter_ZPM.get(1); + emitter_UV = GregtechItemList.Emitter_UV.get(1); + emitter_MAX = GregtechItemList.Emitter_MAX.get(1); + fieldGenerator_LuV = GregtechItemList.Field_Generator_LuV.get(1); + fieldGenerator_ZPM = GregtechItemList.Field_Generator_ZPM.get(1); + fieldGenerator_UV = GregtechItemList.Field_Generator_UV.get(1); + fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1); + sensor_LuV = GregtechItemList.Sensor_LuV.get(1); + sensor_ZPM = GregtechItemList.Sensor_ZPM.get(1); + sensor_UV = GregtechItemList.Sensor_UV.get(1); + sensor_MAX = GregtechItemList.Sensor_MAX.get(1); + } } diff --git a/src/Java/miscutil/core/util/item/UtilsItems.java b/src/Java/miscutil/core/util/item/UtilsItems.java index d7661756ae..f8bf9fc029 100644 --- a/src/Java/miscutil/core/util/item/UtilsItems.java +++ b/src/Java/miscutil/core/util/item/UtilsItems.java @@ -1,6 +1,9 @@ package miscutil.core.util.item; import gregtech.api.util.GT_OreDictUnificator; + +import java.util.ArrayList; + import miscutil.core.item.base.BasicSpawnEgg; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; @@ -9,6 +12,7 @@ import miscutil.core.util.wrapper.var; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; public class UtilsItems { @@ -209,4 +213,11 @@ public class UtilsItems { GameRegistry.registerItem(itemSpawnEgg, "spawnEgg"+parSpawnName); } + public static ItemStack getItemStackOfAmountFromOreDict(String oredictName, int amount){ + ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName); + ItemStack temp = oreDictList.get(0); + ItemStack returnValue = new ItemStack(temp.getItem(), amount); + return returnValue; + } + } diff --git a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java index 47bbc0aa81..211e120247 100644 --- a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java +++ b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java @@ -4,22 +4,23 @@ import gregtech.api.util.GT_Config; import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import miscutil.core.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler; import miscutil.core.xmod.gregtech.common.items.MetaGeneratedGregtechItems; +import miscutil.core.xmod.gregtech.loaders.Processing_HotIngots; public class HANDLER_GT { public static GT_Config mMaterialProperties = null; public static void preInit(){ + new MetaGeneratedGregtechItems(); if (mMaterialProperties != null){ GT_Materials.init(mMaterialProperties); GregtechFluidHandler.run(); - new MetaGeneratedGregtechItems(); //new MetaGeneratedGregtechTools(); //new Processing_Ingot1(); //new Processing_Plate1(); //new Processing_Block(); } - + new Processing_HotIngots(); } public static void init(){ diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java index 67a3ff4332..75f4ecdcbc 100644 --- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -49,7 +49,7 @@ public enum GregtechOrePrefixes { * Ultimate (Tier 8) : Data Orb and Lapotronic Energy Orb * Infinite (Cheaty) */ - + ingotHot("Hot Ingots", "Hot ", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 16, 12), // A hot Ingot, which has to be cooled down by a Vacuum Freezer. ingot("Ingots", "", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 64, 11), // A regular Ingot. Introduced by Eloraam dustTiny("Tiny Dusts", "Tiny Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false, B[0] | B[1] | B[2] | B[3], M / 9, 64, 0), // 1/9th of a Dust. dustSmall("Small Dusts", "Small Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false, B[0] | B[1] | B[2] | B[3], M / 4, 64, 1), // 1/4th of a Dust. @@ -78,7 +78,13 @@ public enum GregtechOrePrefixes { chipset("Chipsets", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced by Buildcraft computer("Computers", "", "", true, true, false, false, true, false, false, false, false, false, 0, -1, 64, -1); // A whole Computer. "computerMaster" = ComputerCube - //public static volatile int VERSION = 508; + public static volatile int VERSION = 508; + + static { + + ingotHot.mHeatDamage = 3.0F; + + } public final ArrayList<ItemStack> mPrefixedItems = new ArrayList<ItemStack>(); public final short mTextureIndex; @@ -300,16 +306,26 @@ public enum GregtechOrePrefixes { */ Symbiotic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "IV Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 4), new TC_AspectStack(TC_Aspects.MACHINA, 4))), Neutronic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "LuV Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 6), new TC_AspectStack(TC_Aspects.MACHINA, 6))), - Quantum(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "ZPM Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 8), new TC_AspectStack(TC_Aspects.MACHINA, 8))); - - /*Advanced(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Advanced", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 4))), - Data(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Data", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 5))), - Elite(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Elite", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 6))), - Master(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Master", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 7))), - Ultimate(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Ultimate", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 8))), - Superconductor(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Superconductor", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 8))), - Infinite(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "Infinite", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray);*/ - + Quantum(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "ZPM Tier", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray, Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 8), new TC_AspectStack(TC_Aspects.MACHINA, 8))), + + + Staballoy(30, TextureSet.SET_ROUGH, 10.0F, 5120, 4, 1 | 2 | 16 | 32 | 64 | 128, 248, 255, 46, 0, "Staballoy", 0, 0, 1500, 2800, true, false, 1, 3, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Titanium, 1), new MaterialStack(Materials.Uranium, 9)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))), + Bedrockium(31, TextureSet.SET_FINE, 8.0F, 8196, 3, 1 | 2 | 16 | 32 | 64 | 128, 39, 39, 39, 0, "Bedrockium", 0, 0, -1, 0, false, false, 1, 5, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Carbon, 63), new MaterialStack(Materials.Carbon, 56)), Arrays.asList(new TC_AspectStack(TC_Aspects.VACUOS, 8), new TC_AspectStack(TC_Aspects.TUTAMEN, 3))), + BloodSteel(32, TextureSet.SET_METALLIC, 11.0F, 768, 4, 1 | 2 | 16 | 32 | 64 | 128, 142, 28, 0, 0, "Blood Steel", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Steel, 3)), Arrays.asList(new TC_AspectStack(TC_Aspects.VICTUS, 8), new TC_AspectStack(TC_Aspects.IGNIS, 3))), + VoidMetal(33, TextureSet.SET_METALLIC, 6.0F, 1280, 3, 1 | 2 | 16 | 32 | 64 | 128, 82, 17, 82, 0, "Void Metal", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack, Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTATIO, 5), new TC_AspectStack(TC_Aspects.VACUOS, 7))), + ConductiveIron(34, TextureSet.SET_METALLIC, 5.0F, 256, 2, 1 | 2, 164, 109, 100, 0, "Conductive Iron", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 6), new MaterialStack(Materials.Redstone, 2)), Arrays.asList(new TC_AspectStack(TC_Aspects.POTENTIA, 2), new TC_AspectStack(TC_Aspects.METALLUM, 2))), + ElectricalSteel(35, TextureSet.SET_METALLIC, 7.0F, 768, 3, 1 | 2 | 64 | 128, 194, 194, 194, 0, "Electrical Steel", 0, 0, 1811, 1000, true, false, 3, 1, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Iron, 3), new MaterialStack(Materials.Coal, 2), new MaterialStack(Materials.Silicon, 2)), Arrays.asList(new TC_AspectStack(TC_Aspects.MAGNETO, 2), new TC_AspectStack(TC_Aspects.ELECTRUM, 5))), + EnergeticAlloy(36, TextureSet.SET_SHINY, 5.0F, 512, 3, 1 | 2 | 64 | 128, 252, 152, 45, 0, "Energetic Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeOrange, 2, Arrays.asList(new MaterialStack(Materials.Gold, 3), new MaterialStack(Materials.Glowstone, 2), new MaterialStack(Materials.Redstone, 2)), Arrays.asList(new TC_AspectStack(TC_Aspects.POTENTIA, 4), new TC_AspectStack(TC_Aspects.LUX, 3))), + VibrantAlloy(37, TextureSet.SET_SHINY, 7.0F, 1280, 4, 1 | 2 | 64 | 128, 204, 242, 142, 0, "Vibrant Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeLime, 2, Arrays.asList(new MaterialStack(Materials.EnergeticAlloy, 1), new MaterialStack(Materials.EnderPearl, 3)), Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 5), new TC_AspectStack(TC_Aspects.TELUM, 4))), + PulsatingIron(38, TextureSet.SET_SHINY, 5.0F, 256, 2, 1 | 2 | 64 | 128, 50, 91, 21, 0, "Pulsating Iron", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.EnderPearl, 2)), Arrays.asList(new TC_AspectStack(TC_Aspects.ALIENIS, 3), new TC_AspectStack(TC_Aspects.METALLUM, 3))), + /* TODO*/ RedstoneAlloy(39, TextureSet.SET_METALLIC, 1.0F, 256, 2, 1|2|16|32|64, 178,34,34, 0, "Redstone Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.Redstone, 4))), + + //Needs more Use, I think. + Tantaloy60(40, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 213, 231, 237, 0, "Tantaloy 60", 0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))), + Tantaloy61(41, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 193, 211, 217, 0, "Tantaloy 61", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))); + + + /** * List of all Materials. */ diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java index 7eaeacf23d..eed3a228cd 100644 --- a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java +++ b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_Generic_Item.java @@ -10,6 +10,7 @@ import java.util.List; import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; import net.minecraft.block.BlockDispenser; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; @@ -168,6 +169,15 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem { else if (stack.getDisplayName().contains("MAX")){ HEX_OxFFFFFF = 0xff0000; } + else if (stack.getDisplayName().contains("Sodium")){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(0, 0, 150); + } + else if (stack.getDisplayName().contains("Cadmium")){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(50, 50, 60); + } + else if (stack.getDisplayName().contains("Lithium")){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(225, 220, 255); + } else { HEX_OxFFFFFF = 0xffffff; } diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java index f58120e06a..5a05800863 100644 --- a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java +++ b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import miscutil.core.util.Utils; import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour; import net.minecraft.dispenser.IBlockSource; import net.minecraft.entity.Entity; @@ -528,7 +529,7 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item imple } @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (stack.getDisplayName().contains("LuV")){ HEX_OxFFFFFF = 0xffffcc; } @@ -541,6 +542,15 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item imple else if (stack.getDisplayName().contains("MAX")){ HEX_OxFFFFFF = 0xff0000; } + else if (stack.getDisplayName().contains("Sodium")){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(0, 0, 150); + } + else if (stack.getDisplayName().contains("Cadmium")){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(50, 50, 60); + } + else if (stack.getDisplayName().contains("Lithium")){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(225, 220, 255); + } else { HEX_OxFFFFFF = 0xffffff; } diff --git a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java index b66c84bef8..c8eca07595 100644 --- a/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java +++ b/src/Java/miscutil/core/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java @@ -12,6 +12,7 @@ import gregtech.api.util.GT_Utility; import java.util.Arrays; import java.util.List; +import miscutil.core.util.Utils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -173,7 +174,7 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { } @Override - public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (stack.getDisplayName().contains("LuV")){ HEX_OxFFFFFF = 0xffffcc; } @@ -186,6 +187,15 @@ public abstract class Gregtech_MetaItem_X32 extends Gregtech_MetaItem { else if (stack.getDisplayName().contains("MAX")){ HEX_OxFFFFFF = 0xff6500; } + else if (stack.getDisplayName().contains("Sodium")){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(90, 90, 255); + } + else if (stack.getDisplayName().contains("Cadmium")){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(150, 150, 80); + } + else if (stack.getDisplayName().contains("Lithium")){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(225, 220, 255); + } else { HEX_OxFFFFFF = 0xffffff; } diff --git a/src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java b/src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java index 45930a3977..0da4b19ee7 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/Meta_GT_Proxy.java @@ -4,10 +4,12 @@ import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.Dyes; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; +import gregtech.common.GT_Proxy.OreDictEventContainer; import java.util.Arrays; import java.util.Collection; @@ -15,6 +17,7 @@ import java.util.HashSet; import java.util.Iterator; import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes; import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import miscutil.core.xmod.gregtech.api.objects.GregtechFluid; @@ -83,6 +86,16 @@ public class Meta_GT_Proxy { public final static HashSet<ItemStack> mRegisteredOres = new HashSet(10000); public final static Collection<GregtechOreDictEventContainer> mEvents = new HashSet(); + public Meta_GT_Proxy() { + Utils.LOG_INFO("GT_PROXY - initialized."); + for (String tOreName : OreDictionary.getOreNames()) { + ItemStack tOreStack; + for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$.hasNext(); registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { + tOreStack = (ItemStack) i$.next(); + } + } + } + public static Fluid addFluid(String aName, String aLocalized, GT_Materials aMaterial, int aState, int aTemperatureK) { return addFluid(aName, aLocalized, aMaterial, aState, aTemperatureK, null, null, 0); } @@ -326,7 +339,24 @@ public class Meta_GT_Proxy { // System.out.println("Thingy Name: "+ aOre.mEvent.Name+ " !!!Unknown 'Thingy' detected!!! This Object seems to probably not follow a valid OreDictionary Convention, or I missed a Convention. Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me."); } } - + + private static final void registerRecipes(OreDictEventContainer aOre) { + if ((aOre.mEvent.Ore == null) || (aOre.mEvent.Ore.getItem() == null)) { + return; + } + if (aOre.mEvent.Ore.stackSize != 1) { + aOre.mEvent.Ore.stackSize = 1; + } + if (aOre.mPrefix != null) { + if (!aOre.mPrefix.isIgnored(aOre.mMaterial)) { + aOre.mPrefix.processOre(aOre.mMaterial == null ? Materials._NULL : aOre.mMaterial, aOre.mEvent.Name, aOre.mModID, + GT_Utility.copyAmount(1L, new Object[]{aOre.mEvent.Ore})); + } + } else { + // System.out.println("Thingy Name: "+ aOre.mEvent.Name+ " !!!Unknown 'Thingy' detected!!! This Object seems to probably not follow a valid OreDictionary Convention, or I missed a Convention. Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me."); + } + } + public static void registerUnificationEntries() { GregTech_API.sUnification.mConfig.save(); GregTech_API.sUnification.mConfig.load(); @@ -334,7 +364,7 @@ public class Meta_GT_Proxy { for (GregtechOreDictEventContainer tOre : mEvents) { if ((!(tOre.mEvent.Ore.getItem() instanceof MetaGeneratedGregtechItems)) && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable) && (tOre.mMaterial != null)) { - if (GregtechOreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) { + if (GregtechOreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) { GregtechOreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true); } else { GregtechOreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); @@ -382,7 +412,7 @@ public class Meta_GT_Proxy { this.mModID = ((aModID == null) || (aModID.equals("UNKNOWN")) ? null : aModID); } } - + public static boolean areWeUsingGregtech5uExperimental(){ int version = GregTech_API.VERSION; if (version == 508){ diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java index f3194c3742..e0c1376d45 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java @@ -73,7 +73,6 @@ extends GregtechMeta_MultiBlockBase { "1x Input Bus", "1x Output Bus", "1x [EV] Energy Hatch (Can be higher Tier) [Blue]", - "Needs a Turbine Item (inside controller GUI)", "Centrifuge Casings for the rest (16 at least)",}; } @@ -152,6 +151,7 @@ extends GregtechMeta_MultiBlockBase { for (; i < machines; i++) { if (!tRecipe.isRecipeInputEqual(true, tFluids, tInputs)) { if (i == 0) { + Utils.LOG_INFO("false 1"); return false; } break; @@ -220,9 +220,11 @@ extends GregtechMeta_MultiBlockBase { this.mOutputFluids = new FluidStack[]{tFOut}; updateSlots(); //recipesComplete++; + Utils.LOG_INFO("true 1"); return true; } } + Utils.LOG_INFO("false 2"); return false; } diff --git a/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_HotIngots.java b/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_HotIngots.java new file mode 100644 index 0000000000..070ce08ce0 --- /dev/null +++ b/src/Java/miscutil/core/xmod/gregtech/loaders/Processing_HotIngots.java @@ -0,0 +1,23 @@ +package miscutil.core.xmod.gregtech.loaders; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; +import miscutil.core.util.Utils; +import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes; +import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; +import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; +import net.minecraft.item.ItemStack; + +public class Processing_HotIngots implements Interface_OreRecipeRegistrator { + public Processing_HotIngots() { + Utils.LOG_INFO("Generating Hot Ingot."); + GregtechOrePrefixes.ingotHot.add(this); + } + + @Override + public void registerOre(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + GT_Values.RA.addVacuumFreezerRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), (int) Math.max(aMaterial.getMass() * 3L, 1L)); + } +} diff --git a/src/Java/miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java b/src/Java/miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java index a871f5c513..5a22a82950 100644 --- a/src/Java/miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java +++ b/src/Java/miscutil/core/xmod/ic2/recipe/RECIPE_IC2.java @@ -7,6 +7,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; +import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; import miscutil.core.util.recipe.UtilsRecipe; @@ -46,6 +47,25 @@ public class RECIPE_IC2 { private static ItemStack rotor_T3 = UtilsItems.getSimpleStack(IC2_Items.rotor_Material_3.getItem()); private static ItemStack rotor_T4 = UtilsItems.getSimpleStack(IC2_Items.rotor_Material_4.getItem()); + private static void checkForEnderIO(){ + if(!LoadedMods.EnderIO){ + plate_T1 = "plateMagnalium"; + plate_T2 = "plateTungstenSteel"; + plate_T3 = "plateUltimet"; + plate_T4 = "plateAlloyIridium"; + + block_T1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Magnalium, 1L); + block_T2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L); + block_T3 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Ultimet, 1L); + block_T4 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L); + + ingot_T1 = "ingotMagnalium"; + ingot_T2 = "ingotTungstenSteel"; + ingot_T3 = "ingotUltimet"; + ingot_T4 = "ingotIridium"; + } + } + public static void initRecipes(){ //Rotor Blade Recipes @@ -75,15 +95,27 @@ public class RECIPE_IC2 { //Shaft Extruder Recipe GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, Character.valueOf('X'), OrePrefixes.plate.get(Materials.DarkIron), Character.valueOf('S'), OrePrefixes.screw.get(Materials.DarkIron)}); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('S'), OrePrefixes.screw.get(Materials.TungstenSteel)}); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_WindmillShaft.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, Character.valueOf('X'), OrePrefixes.plate.get(Materials.Molybdenum), Character.valueOf('S'), OrePrefixes.screw.get(Materials.Molybdenum)}); Utils.LOG_INFO("Added recipe item for GT5 Extruder: Shaft Shape"); //Shaft Recipes GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T1), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T1, 2560, 250); - Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Energetic]"); + if (LoadedMods.EnderIO){ + Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Energetic]"); + } + else { + Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Magnalium]"); + } GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T2), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T2, 5120, 500); Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [TungstenSteel]"); GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T3), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T3, 10240, 2000); - Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]"); + if (LoadedMods.EnderIO){ + Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]"); + } + else { + Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Ultimet]"); + } GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(9L, block_T4), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]), shaft_T4, 20480, 4000); Utils.LOG_INFO("Added recipe for GT5 Extruder: Windmill Shaft [Iridium]"); |