From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java | 15 - src/main/java/gtPlusPlus/xmod/ic2/HandlerIC2.java | 15 + .../java/gtPlusPlus/xmod/ic2/item/IC2Items.java | 77 +++++ .../java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 77 ----- .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 357 --------------------- .../java/gtPlusPlus/xmod/ic2/recipe/RecipeIC2.java | 349 ++++++++++++++++++++ 6 files changed, 441 insertions(+), 449 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java create mode 100644 src/main/java/gtPlusPlus/xmod/ic2/HandlerIC2.java create mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/IC2Items.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java create mode 100644 src/main/java/gtPlusPlus/xmod/ic2/recipe/RecipeIC2.java (limited to 'src/main/java/gtPlusPlus/xmod/ic2') diff --git a/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java deleted file mode 100644 index 475d8d5feb..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java +++ /dev/null @@ -1,15 +0,0 @@ -package gtPlusPlus.xmod.ic2; - -import gtPlusPlus.xmod.ic2.item.IC2_Items; -import gtPlusPlus.xmod.ic2.recipe.RECIPE_IC2; - -public class HANDLER_IC2 { - - public static void preInit() { - IC2_Items.register(); - } - - public static void postInit() { - RECIPE_IC2.initRecipes(); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/HandlerIC2.java b/src/main/java/gtPlusPlus/xmod/ic2/HandlerIC2.java new file mode 100644 index 0000000000..ba3c1ae0de --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/ic2/HandlerIC2.java @@ -0,0 +1,15 @@ +package gtPlusPlus.xmod.ic2; + +import gtPlusPlus.xmod.ic2.item.IC2Items; +import gtPlusPlus.xmod.ic2.recipe.RecipeIC2; + +public class HandlerIC2 { + + public static void preInit() { + IC2Items.register(); + } + + public static void postInit() { + RecipeIC2.initRecipes(); + } +} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2Items.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2Items.java new file mode 100644 index 0000000000..7b6dbe5908 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2Items.java @@ -0,0 +1,77 @@ +package gtPlusPlus.xmod.ic2.item; + +import static gregtech.api.enums.Mods.EnderIO; + +import net.minecraft.item.ItemStack; + +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.item.base.CoreItem; +import gtPlusPlus.core.item.wearable.hazmat.ItemArmorHazmatEx; + +public class IC2Items { + + public static ItemStack rotor_Material_1; // Energetic Alloy + public static ItemStack rotor_Material_2; // TungstenSteel + public static ItemStack rotor_Material_3; // Vibrant Alloy + public static ItemStack rotor_Material_4; // Iridium + + public static ItemStack rotor_Blade_Material_1; + public static ItemStack rotor_Blade_Material_2; + public static ItemStack rotor_Blade_Material_3; + public static ItemStack rotor_Blade_Material_4; + + public static ItemStack shaft_Material_1; // Energetic Alloy + public static ItemStack shaft_Material_2; // TungstenSteel + public static ItemStack shaft_Material_3; // Vibrant Alloy + public static ItemStack shaft_Material_4; // Iridium + + private static final String[] mData1 = new String[] { "itemEnergeticRotorBlade", "itemMagnaliumRotorBlade" }; + private static final String[] mData2 = new String[] { "itemEnergeticShaft", "itemMagnaliumShaft" }; + private static final String[] mData3 = new String[] { "itemVibrantRotorBlade", "itemUltimetRotorBlade" }; + private static final String[] mData4 = new String[] { "itemVibrantShaft", "itemUltimetShaft" }; + + public static void register() { + + int aIndexEIO = (EnderIO.isModLoaded() ? 0 : 1); + + // Rotor Blades + rotor_Blade_Material_1 = new ItemStack( + new CoreItem(mData1[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); + rotor_Blade_Material_2 = new ItemStack( + new CoreItem( + "itemTungstenSteelRotorBlade", + AddToCreativeTab.tabMachines, + 16, + "A part for an advanced Kinetic Rotor")); + rotor_Blade_Material_3 = new ItemStack( + new CoreItem(mData3[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); + rotor_Blade_Material_4 = new ItemStack( + new CoreItem( + "itemIridiumRotorBlade", + AddToCreativeTab.tabMachines, + 16, + "A part for an advanced Kinetic Rotor")); + + // Rotor Shafts + shaft_Material_1 = new ItemStack( + new CoreItem(mData2[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); + shaft_Material_2 = new ItemStack( + new CoreItem( + "itemTungstenSteelShaft", + AddToCreativeTab.tabMachines, + 16, + "A part for an advanced Kinetic Rotor")); + shaft_Material_3 = new ItemStack( + new CoreItem(mData4[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); + shaft_Material_4 = new ItemStack( + new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); + + // Rotors + rotor_Material_1 = new ItemStack(new CustomKineticRotor(0)); + rotor_Material_2 = new ItemStack(new CustomKineticRotor(1)); + rotor_Material_3 = new ItemStack(new CustomKineticRotor(2)); + rotor_Material_4 = new ItemStack(new CustomKineticRotor(3)); + + ItemArmorHazmatEx.init(); + } +} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java deleted file mode 100644 index 3dacc657de..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java +++ /dev/null @@ -1,77 +0,0 @@ -package gtPlusPlus.xmod.ic2.item; - -import static gregtech.api.enums.Mods.EnderIO; - -import net.minecraft.item.ItemStack; - -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.item.wearable.hazmat.ItemArmorHazmatEx; - -public class IC2_Items { - - public static ItemStack rotor_Material_1; // Energetic Alloy - public static ItemStack rotor_Material_2; // TungstenSteel - public static ItemStack rotor_Material_3; // Vibrant Alloy - public static ItemStack rotor_Material_4; // Iridium - - public static ItemStack rotor_Blade_Material_1; - public static ItemStack rotor_Blade_Material_2; - public static ItemStack rotor_Blade_Material_3; - public static ItemStack rotor_Blade_Material_4; - - public static ItemStack shaft_Material_1; // Energetic Alloy - public static ItemStack shaft_Material_2; // TungstenSteel - public static ItemStack shaft_Material_3; // Vibrant Alloy - public static ItemStack shaft_Material_4; // Iridium - - private static final String[] mData1 = new String[] { "itemEnergeticRotorBlade", "itemMagnaliumRotorBlade" }; - private static final String[] mData2 = new String[] { "itemEnergeticShaft", "itemMagnaliumShaft" }; - private static final String[] mData3 = new String[] { "itemVibrantRotorBlade", "itemUltimetRotorBlade" }; - private static final String[] mData4 = new String[] { "itemVibrantShaft", "itemUltimetShaft" }; - - public static void register() { - - int aIndexEIO = (EnderIO.isModLoaded() ? 0 : 1); - - // Rotor Blades - rotor_Blade_Material_1 = new ItemStack( - new CoreItem(mData1[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); - rotor_Blade_Material_2 = new ItemStack( - new CoreItem( - "itemTungstenSteelRotorBlade", - AddToCreativeTab.tabMachines, - 16, - "A part for an advanced Kinetic Rotor")); - rotor_Blade_Material_3 = new ItemStack( - new CoreItem(mData3[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); - rotor_Blade_Material_4 = new ItemStack( - new CoreItem( - "itemIridiumRotorBlade", - AddToCreativeTab.tabMachines, - 16, - "A part for an advanced Kinetic Rotor")); - - // Rotor Shafts - shaft_Material_1 = new ItemStack( - new CoreItem(mData2[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); - shaft_Material_2 = new ItemStack( - new CoreItem( - "itemTungstenSteelShaft", - AddToCreativeTab.tabMachines, - 16, - "A part for an advanced Kinetic Rotor")); - shaft_Material_3 = new ItemStack( - new CoreItem(mData4[aIndexEIO], AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); - shaft_Material_4 = new ItemStack( - new CoreItem("itemIridiumShaft", AddToCreativeTab.tabMachines, 16, "A part for an advanced Kinetic Rotor")); - - // Rotors - rotor_Material_1 = new ItemStack(new CustomKineticRotor(0)); - rotor_Material_2 = new ItemStack(new CustomKineticRotor(1)); - rotor_Material_3 = new ItemStack(new CustomKineticRotor(2)); - rotor_Material_4 = new ItemStack(new CustomKineticRotor(3)); - - ItemArmorHazmatEx.init(); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java deleted file mode 100644 index dddcab86e6..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java +++ /dev/null @@ -1,357 +0,0 @@ -package gtPlusPlus.xmod.ic2.recipe; - -import static gregtech.api.enums.Mods.EnderIO; -import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.recipe.RecipeMaps.extruderRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gtPlusPlus.core.recipe.RECIPES_Tools.craftingToolHardHammer; -import static gtPlusPlus.core.recipe.RECIPES_Tools.craftingToolWrench; - -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.MaterialUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.ic2.item.IC2_Items; -import ic2.core.Ic2Items; - -public class RECIPE_IC2 { - - public static String plate_T1 = "plateEnergeticAlloy"; - public static String plate_T2 = "plateTungstenSteel"; - public static String plate_T3 = "plateVibrantAlloy"; - public static String plate_T4 = "plateAlloyIridium"; - - public static ItemStack block_T1 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.EnergeticAlloy, 1L); - public static ItemStack block_T2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L); - public static ItemStack block_T3 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.VibrantAlloy, 1L); - public static ItemStack block_T4 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L); - - public static ItemStack shaft_block_T1 = GT_OreDictUnificator.get(OrePrefixes.block, Materials.EnergeticAlloy, 1L); - public static ItemStack shaft_block_T2 = GT_OreDictUnificator.get(OrePrefixes.block, Materials.TungstenSteel, 1L); - public static ItemStack shaft_block_T3 = GT_OreDictUnificator.get(OrePrefixes.block, Materials.VibrantAlloy, 1L); - public static ItemStack shaft_block_T4 = GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iridium, 1L); - - public static String ingot_T1 = "ingotEnergeticAlloy"; - public static String ingot_T2 = "ingotTungstenSteel"; - public static String ingot_T3 = "ingotVibrantAlloy"; - public static String ingot_T4 = "ingotIridium"; - - public static String ring_T1 = "ringStainlessSteel"; - public static String ring_T2 = "ringTungstenSteel"; - public static String ring_T3 = "ringChrome"; - public static String ring_T4 = "ringOsmiridium"; - - private static ItemStack rotor_blade_T1 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_1.getItem()); - private static ItemStack rotor_blade_T2 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_2.getItem()); - private static ItemStack rotor_blade_T3 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_3.getItem()); - private static ItemStack rotor_blade_T4 = ItemUtils.getSimpleStack(IC2_Items.rotor_Blade_Material_4.getItem()); - - private static ItemStack shaft_T1 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_1.getItem()); - private static ItemStack shaft_T2 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_2.getItem()); - private static ItemStack shaft_T3 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_3.getItem()); - private static ItemStack shaft_T4 = ItemUtils.getSimpleStack(IC2_Items.shaft_Material_4.getItem()); - - private static ItemStack rotor_T1 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_1.getItem()); - private static ItemStack rotor_T2 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_2.getItem()); - private static ItemStack rotor_T3 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_3.getItem()); - private static ItemStack rotor_T4 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_4.getItem()); - - private static boolean checkForEnderIO() { - if (!EnderIO.isModLoaded()) { - 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"; - return true; - } - return false; - } - - public static void initRecipes() { - - checkForEnderIO(); - addAdvancedHazmat(); - - RecipeUtils.addShapedRecipe( - plate_T1, - plate_T1, - plate_T1, - plate_T1, - ring_T1, - plate_T1, - plate_T1, - plate_T1, - plate_T1, - rotor_blade_T1); - - RecipeUtils.addShapedRecipe( - plate_T2, - plate_T2, - plate_T2, - plate_T2, - ring_T2, - plate_T2, - plate_T2, - plate_T2, - plate_T2, - rotor_blade_T2); - - RecipeUtils.addShapedRecipe( - plate_T3, - plate_T3, - plate_T3, - plate_T3, - ring_T3, - plate_T3, - plate_T3, - plate_T3, - plate_T3, - rotor_blade_T3); - - RecipeUtils.addShapedRecipe( - plate_T4, - plate_T4, - plate_T4, - plate_T4, - ring_T4, - plate_T4, - plate_T4, - plate_T4, - plate_T4, - rotor_blade_T4); - - // Shaft Extruder Recipe - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Shape_Extruder_WindmillShaft.get(1L), - 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.DarkSteel), Character.valueOf('S'), - OrePrefixes.screw.get(Materials.DarkSteel) }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Shape_Extruder_WindmillShaft.get(1L), - 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), - 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) }); - Logger.INFO("Added recipe item for GT5 Extruder: Shaft Shape"); - - // Shaft Recipes - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9L, block_T1), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(shaft_T1) - .duration(2 * MINUTES + 8 * SECONDS) - .eut(250) - .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(1L, shaft_block_T1), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(shaft_T1) - .duration(2 * MINUTES + 8 * SECONDS) - .eut(250) - .addTo(extruderRecipes); - Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Energetic]"); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9L, block_T2), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(shaft_T2) - .duration(4 * MINUTES + 16 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(1L, shaft_block_T2), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(shaft_T2) - .duration(4 * MINUTES + 16 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(extruderRecipes); - - Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [TungstenSteel]"); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9L, block_T3), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(shaft_T3) - .duration(8 * MINUTES + 32 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(1L, shaft_block_T3), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(shaft_T3) - .duration(8 * MINUTES + 32 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(extruderRecipes); - Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]"); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9L, block_T4), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(shaft_T4) - .duration(17 * MINUTES + 4 * SECONDS) - .eut(4000) - .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(1L, shaft_block_T4), - GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) - .itemOutputs(shaft_T4) - .duration(17 * MINUTES + 4 * SECONDS) - .eut(4000) - .addTo(extruderRecipes); - Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Iridium]"); - - RecipeUtils.addShapedRecipe( - shaft_T1, - rotor_blade_T1, - craftingToolHardHammer, - rotor_blade_T1, - ring_T1, - rotor_blade_T1, - craftingToolWrench, - rotor_blade_T1, - shaft_T1, - rotor_T1); - - RecipeUtils.addShapedRecipe( - shaft_T2, - rotor_blade_T2, - craftingToolHardHammer, - rotor_blade_T2, - ring_T2, - rotor_blade_T2, - craftingToolWrench, - rotor_blade_T2, - shaft_T2, - rotor_T2); - - RecipeUtils.addShapedRecipe( - shaft_T3, - rotor_blade_T3, - craftingToolHardHammer, - rotor_blade_T3, - ring_T3, - rotor_blade_T3, - craftingToolWrench, - rotor_blade_T3, - shaft_T3, - rotor_T3); - - RecipeUtils.addShapedRecipe( - shaft_T4, - rotor_blade_T4, - craftingToolHardHammer, - rotor_blade_T4, - ring_T4, - rotor_blade_T4, - craftingToolWrench, - rotor_blade_T4, - shaft_T4, - rotor_T4); - } - - private static void addAdvancedHazmat() { - - ItemStack[] aBasicHazmatPieces = new ItemStack[] { Ic2Items.hazmatHelmet.copy(), - Ic2Items.hazmatChestplate.copy(), Ic2Items.hazmatLeggings.copy(), Ic2Items.hazmatBoots.copy() }; - - Material aRubber = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubber); - ItemStack aYellowWool = ItemUtils.getSimpleStack(Blocks.wool, 4, 1); - ItemStack aBlackWool = ItemUtils.getSimpleStack(Blocks.wool, 15, 1); - ItemStack aCoilIC2 = Ic2Items.coil; - ItemStack aPlateCobalt = CI.getTieredComponentOfMaterial(Materials.Cobalt, OrePrefixes.plate, 1); - ItemStack aGearSmallSteel = CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.gearGtSmall, 1); - ItemStack aGearSmallAluminium = CI - .getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGtSmall, 1); - ItemStack aGearPotin = ALLOY.TUMBAGA.getGear(1); - ItemStack aGearSiliconCarbide = ALLOY.SILICON_CARBIDE.getGear(1); - - GT_Values.RA.stdBuilder() - .itemInputs( - CI.getNumberedAdvancedCircuit(2), - aBasicHazmatPieces[0], - ItemUtils.getSimpleStack(aYellowWool, 16), - ItemUtils.getSimpleStack(aPlateCobalt, 4), - ItemUtils.getSimpleStack(aCoilIC2, 8), - ItemUtils.getSimpleStack(aGearSmallAluminium, 4)) - .itemOutputs(GregtechItemList.Armour_Hazmat_Advanced_Helmet.get(1)) - .fluidInputs(aRubber.getFluidStack(144 * 4)) - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - CI.getNumberedAdvancedCircuit(2), - aBasicHazmatPieces[1], - ItemUtils.getSimpleStack(aYellowWool, 64), - ItemUtils.getSimpleStack(aCoilIC2, 32), - ItemUtils.getSimpleStack(aPlateCobalt, 16), - ItemUtils.getSimpleStack(aGearSiliconCarbide, 8)) - .itemOutputs(GregtechItemList.Armour_Hazmat_Advanced_Chest.get(1)) - .fluidInputs(aRubber.getFluidStack(144 * 10)) - .duration(1 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - CI.getNumberedAdvancedCircuit(2), - aBasicHazmatPieces[2], - ItemUtils.getSimpleStack(aYellowWool, 32), - ItemUtils.getSimpleStack(aCoilIC2, 16), - ItemUtils.getSimpleStack(aPlateCobalt, 8), - ItemUtils.getSimpleStack(aGearSiliconCarbide, 4)) - .itemOutputs(GregtechItemList.Armour_Hazmat_Advanced_Legs.get(1)) - .fluidInputs(aRubber.getFluidStack(144 * 8)) - .duration(1 * MINUTES + 15 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - CI.getNumberedAdvancedCircuit(2), - aBasicHazmatPieces[3], - ItemUtils.getSimpleStack(aBlackWool, 16), - ItemUtils.getSimpleStack(aCoilIC2, 6), - ItemUtils.getSimpleStack(aGearSmallSteel, 8), - ItemUtils.getSimpleStack(aGearPotin, 4)) - .itemOutputs(GregtechItemList.Armour_Hazmat_Advanced_Boots.get(1)) - .fluidInputs(aRubber.getFluidStack(144 * 6)) - .duration(45 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); - - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RecipeIC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RecipeIC2.java new file mode 100644 index 0000000000..dc7a87d4dd --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RecipeIC2.java @@ -0,0 +1,349 @@ +package gtPlusPlus.xmod.ic2.recipe; + +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.extruderRecipes; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gtPlusPlus.core.recipe.RecipesTools.craftingToolHardHammer; +import static gtPlusPlus.core.recipe.RecipesTools.craftingToolWrench; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + +import gregtech.api.enums.GTValues; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.recipe.common.CI; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; +import gtPlusPlus.core.util.minecraft.RecipeUtils; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import gtPlusPlus.xmod.ic2.item.IC2Items; +import ic2.core.Ic2Items; + +public class RecipeIC2 { + + public static String plate_T1 = "plateEnergeticAlloy"; + public static String plate_T2 = "plateTungstenSteel"; + public static String plate_T3 = "plateVibrantAlloy"; + public static String plate_T4 = "plateAlloyIridium"; + + public static ItemStack block_T1 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.EnergeticAlloy, 1L); + public static ItemStack block_T2 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L); + public static ItemStack block_T3 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.VibrantAlloy, 1L); + public static ItemStack block_T4 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L); + + public static ItemStack shaft_block_T1 = GTOreDictUnificator.get(OrePrefixes.block, Materials.EnergeticAlloy, 1L); + public static ItemStack shaft_block_T2 = GTOreDictUnificator.get(OrePrefixes.block, Materials.TungstenSteel, 1L); + public static ItemStack shaft_block_T3 = GTOreDictUnificator.get(OrePrefixes.block, Materials.VibrantAlloy, 1L); + public static ItemStack shaft_block_T4 = GTOreDictUnificator.get(OrePrefixes.block, Materials.Iridium, 1L); + + public static String ingot_T1 = "ingotEnergeticAlloy"; + public static String ingot_T2 = "ingotTungstenSteel"; + public static String ingot_T3 = "ingotVibrantAlloy"; + public static String ingot_T4 = "ingotIridium"; + + public static String ring_T1 = "ringStainlessSteel"; + public static String ring_T2 = "ringTungstenSteel"; + public static String ring_T3 = "ringChrome"; + public static String ring_T4 = "ringOsmiridium"; + + private static ItemStack rotor_blade_T1 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_1.getItem()); + private static ItemStack rotor_blade_T2 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_2.getItem()); + private static ItemStack rotor_blade_T3 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_3.getItem()); + private static ItemStack rotor_blade_T4 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_4.getItem()); + + private static ItemStack shaft_T1 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_1.getItem()); + private static ItemStack shaft_T2 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_2.getItem()); + private static ItemStack shaft_T3 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_3.getItem()); + private static ItemStack shaft_T4 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_4.getItem()); + + private static ItemStack rotor_T1 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_1.getItem()); + private static ItemStack rotor_T2 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_2.getItem()); + private static ItemStack rotor_T3 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_3.getItem()); + private static ItemStack rotor_T4 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_4.getItem()); + + private static boolean checkForEnderIO() { + if (!EnderIO.isModLoaded()) { + plate_T1 = "plateMagnalium"; + plate_T2 = "plateTungstenSteel"; + plate_T3 = "plateUltimet"; + plate_T4 = "plateAlloyIridium"; + + block_T1 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Magnalium, 1L); + block_T2 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L); + block_T3 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Ultimet, 1L); + block_T4 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L); + + ingot_T1 = "ingotMagnalium"; + ingot_T2 = "ingotTungstenSteel"; + ingot_T3 = "ingotUltimet"; + ingot_T4 = "ingotIridium"; + return true; + } + return false; + } + + public static void initRecipes() { + + checkForEnderIO(); + addAdvancedHazmat(); + + RecipeUtils.addShapedRecipe( + plate_T1, + plate_T1, + plate_T1, + plate_T1, + ring_T1, + plate_T1, + plate_T1, + plate_T1, + plate_T1, + rotor_blade_T1); + + RecipeUtils.addShapedRecipe( + plate_T2, + plate_T2, + plate_T2, + plate_T2, + ring_T2, + plate_T2, + plate_T2, + plate_T2, + plate_T2, + rotor_blade_T2); + + RecipeUtils.addShapedRecipe( + plate_T3, + plate_T3, + plate_T3, + plate_T3, + ring_T3, + plate_T3, + plate_T3, + plate_T3, + plate_T3, + rotor_blade_T3); + + RecipeUtils.addShapedRecipe( + plate_T4, + plate_T4, + plate_T4, + plate_T4, + ring_T4, + plate_T4, + plate_T4, + plate_T4, + plate_T4, + rotor_blade_T4); + + // Shaft Extruder Recipe + GTModHandler.addCraftingRecipe( + GregtechItemList.Shape_Extruder_WindmillShaft.get(1L), + GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE, + new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, + Character.valueOf('X'), OrePrefixes.plate.get(Materials.DarkSteel), Character.valueOf('S'), + OrePrefixes.screw.get(Materials.DarkSteel) }); + GTModHandler.addCraftingRecipe( + GregtechItemList.Shape_Extruder_WindmillShaft.get(1L), + GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.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) }); + GTModHandler.addCraftingRecipe( + GregtechItemList.Shape_Extruder_WindmillShaft.get(1L), + GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.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) }); + Logger.INFO("Added recipe item for GT5 Extruder: Shaft Shape"); + + // Shaft Recipes + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9L, block_T1), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + .itemOutputs(shaft_T1) + .duration(2 * MINUTES + 8 * SECONDS) + .eut(250) + .addTo(extruderRecipes); + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1L, shaft_block_T1), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + .itemOutputs(shaft_T1) + .duration(2 * MINUTES + 8 * SECONDS) + .eut(250) + .addTo(extruderRecipes); + Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Energetic]"); + + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9L, block_T2), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + .itemOutputs(shaft_T2) + .duration(4 * MINUTES + 16 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(extruderRecipes); + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1L, shaft_block_T2), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + .itemOutputs(shaft_T2) + .duration(4 * MINUTES + 16 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(extruderRecipes); + + Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [TungstenSteel]"); + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9L, block_T3), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + .itemOutputs(shaft_T3) + .duration(8 * MINUTES + 32 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(extruderRecipes); + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1L, shaft_block_T3), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + .itemOutputs(shaft_T3) + .duration(8 * MINUTES + 32 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(extruderRecipes); + Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]"); + + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9L, block_T4), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + .itemOutputs(shaft_T4) + .duration(17 * MINUTES + 4 * SECONDS) + .eut(4000) + .addTo(extruderRecipes); + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1L, shaft_block_T4), GregtechItemList.Shape_Extruder_WindmillShaft.get(0L)) + .itemOutputs(shaft_T4) + .duration(17 * MINUTES + 4 * SECONDS) + .eut(4000) + .addTo(extruderRecipes); + Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Iridium]"); + + RecipeUtils.addShapedRecipe( + shaft_T1, + rotor_blade_T1, + craftingToolHardHammer, + rotor_blade_T1, + ring_T1, + rotor_blade_T1, + craftingToolWrench, + rotor_blade_T1, + shaft_T1, + rotor_T1); + + RecipeUtils.addShapedRecipe( + shaft_T2, + rotor_blade_T2, + craftingToolHardHammer, + rotor_blade_T2, + ring_T2, + rotor_blade_T2, + craftingToolWrench, + rotor_blade_T2, + shaft_T2, + rotor_T2); + + RecipeUtils.addShapedRecipe( + shaft_T3, + rotor_blade_T3, + craftingToolHardHammer, + rotor_blade_T3, + ring_T3, + rotor_blade_T3, + craftingToolWrench, + rotor_blade_T3, + shaft_T3, + rotor_T3); + + RecipeUtils.addShapedRecipe( + shaft_T4, + rotor_blade_T4, + craftingToolHardHammer, + rotor_blade_T4, + ring_T4, + rotor_blade_T4, + craftingToolWrench, + rotor_blade_T4, + shaft_T4, + rotor_T4); + } + + private static void addAdvancedHazmat() { + + ItemStack[] aBasicHazmatPieces = new ItemStack[] { Ic2Items.hazmatHelmet.copy(), + Ic2Items.hazmatChestplate.copy(), Ic2Items.hazmatLeggings.copy(), Ic2Items.hazmatBoots.copy() }; + + Material aRubber = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubber); + ItemStack aYellowWool = ItemUtils.getSimpleStack(Blocks.wool, 4, 1); + ItemStack aBlackWool = ItemUtils.getSimpleStack(Blocks.wool, 15, 1); + ItemStack aCoilIC2 = Ic2Items.coil; + ItemStack aPlateCobalt = CI.getTieredComponentOfMaterial(Materials.Cobalt, OrePrefixes.plate, 1); + ItemStack aGearSmallSteel = CI.getTieredComponentOfMaterial(Materials.Steel, OrePrefixes.gearGtSmall, 1); + ItemStack aGearSmallAluminium = CI + .getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGtSmall, 1); + ItemStack aGearPotin = MaterialsAlloy.TUMBAGA.getGear(1); + ItemStack aGearSiliconCarbide = MaterialsAlloy.SILICON_CARBIDE.getGear(1); + + GTValues.RA.stdBuilder() + .itemInputs( + CI.getNumberedAdvancedCircuit(2), + aBasicHazmatPieces[0], + ItemUtils.getSimpleStack(aYellowWool, 16), + ItemUtils.getSimpleStack(aPlateCobalt, 4), + ItemUtils.getSimpleStack(aCoilIC2, 8), + ItemUtils.getSimpleStack(aGearSmallAluminium, 4)) + .itemOutputs(GregtechItemList.Armour_Hazmat_Advanced_Helmet.get(1)) + .fluidInputs(aRubber.getFluidStack(144 * 4)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + CI.getNumberedAdvancedCircuit(2), + aBasicHazmatPieces[1], + ItemUtils.getSimpleStack(aYellowWool, 64), + ItemUtils.getSimpleStack(aCoilIC2, 32), + ItemUtils.getSimpleStack(aPlateCobalt, 16), + ItemUtils.getSimpleStack(aGearSiliconCarbide, 8)) + .itemOutputs(GregtechItemList.Armour_Hazmat_Advanced_Chest.get(1)) + .fluidInputs(aRubber.getFluidStack(144 * 10)) + .duration(1 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + CI.getNumberedAdvancedCircuit(2), + aBasicHazmatPieces[2], + ItemUtils.getSimpleStack(aYellowWool, 32), + ItemUtils.getSimpleStack(aCoilIC2, 16), + ItemUtils.getSimpleStack(aPlateCobalt, 8), + ItemUtils.getSimpleStack(aGearSiliconCarbide, 4)) + .itemOutputs(GregtechItemList.Armour_Hazmat_Advanced_Legs.get(1)) + .fluidInputs(aRubber.getFluidStack(144 * 8)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + CI.getNumberedAdvancedCircuit(2), + aBasicHazmatPieces[3], + ItemUtils.getSimpleStack(aBlackWool, 16), + ItemUtils.getSimpleStack(aCoilIC2, 6), + ItemUtils.getSimpleStack(aGearSmallSteel, 8), + ItemUtils.getSimpleStack(aGearPotin, 4)) + .itemOutputs(GregtechItemList.Armour_Hazmat_Advanced_Boots.get(1)) + .fluidInputs(aRubber.getFluidStack(144 * 6)) + .duration(45 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(assemblerRecipes); + + } +} -- cgit