diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/recipe')
4 files changed, 2 insertions, 339 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 87bd3ef8c4..57a2ed8345 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1092,34 +1092,8 @@ public class RECIPES_GREGTECH { GregtechItemList.Bomb_Cast.get(4), 30, 120); - addAR( - ItemUtils.getSimpleStack(Items.redstone, 32), - ItemUtils.getSimpleStack(ModItems.itemRope, 16), - Materials.Glue.getFluid(500), - ItemUtils.getSimpleStack(ModItems.itemDetCable, 24), - 30, - 120); - - /* - * addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16), - * ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null, - * GregtechItemList.Casing_Power_SubStation.get(4), 80, 120); - */ - - /* - * CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] { GregtechItemList.Casing_Multi_Use.get(1), - * ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1), - * ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 8), CI.sensor_HV, CI.emitter_HV, - * CI.fieldGenerator_HV, }, null, ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame), 20*20, 2048); - */ CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemRope, 6), ItemUtils.getGregtechCircuit(6) }, - null, - ItemUtils.getSimpleStack(ModBlocks.blockNet, 2), - 1 * 20, - 8); - CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { ItemUtils.getSimpleStack(CI.explosiveITNT, 2), ItemUtils.getSimpleStack(CI.explosiveTNT, 4), ELEMENT.getInstance().SULFUR.getDust(2), ELEMENT.getInstance().IRON.getFrameBox(1) }, @@ -1261,17 +1235,6 @@ public class RECIPES_GREGTECH { ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1), 20 * 60 * 10, (int) GT_Values.V[7]); - - // Supreme Pizza Gloves - CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { ItemUtils.getGregtechCircuit(19), ItemUtils.getSimpleStack(ModItems.itemRope, 32), - ItemUtils.getItemStackOfAmountFromOreDict("gearGtSmallWroughtIron", 8), - ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", 32), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2) }, - FluidUtils.getFluidStack("molten.rubber", 2000), - ItemUtils.getSimpleStack(ModItems.itemPersonalFireProofDevice), - 20 * 60 * 5, - 30); } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java index b3371fc815..154ec9b940 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -266,70 +266,6 @@ public class RECIPES_General { Logger.INFO("Added a recipe for Wither Cages."); } - /* - * Logger.RECIPE("[Inspection] Xp Converter"); if (RecipeUtils.addShapedRecipe( - * getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), - * getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1), - * getSimpleStack(Items.nether_star), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1), - * getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), - * getSimpleStack(Items.experience_bottle), ItemUtils.getSimpleStack(ModBlocks.blockXpConverter, 1))){ - * Logger.INFO("Added a recipe for XP Converter."); } - */ - - // Rope/Fiber/Net - if (RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1), - ItemUtils.getSimpleStack(Items.reeds) }, - ItemUtils.getSimpleStack(ModItems.itemFiber, 16))) { - Logger.INFO("Added a recipe for Fiber."); - } - - if (RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1), - ItemUtils.getSimpleStack(Blocks.sapling) }, - ItemUtils.getSimpleStack(ModItems.itemFiber, 32))) { - Logger.INFO("Added a recipe for Fiber."); - } - - if (RecipeUtils.addShapedRecipe( - null, - ItemUtils.getSimpleStack(ModItems.itemFiber, 1), - null, - ItemUtils.getSimpleStack(ModItems.itemFiber, 1), - CI.craftingToolKnife, - ItemUtils.getSimpleStack(ModItems.itemFiber, 1), - null, - ItemUtils.getSimpleStack(ModItems.itemFiber, 1), - null, - ItemUtils.getSimpleStack(ModItems.itemRope, 3))) { - Logger.INFO("Added a recipe for Rope."); - } - - Logger.RECIPE("[Inspection] Net"); - if (RecipeUtils.addShapedRecipe( - ItemUtils.getSimpleStack(ModItems.itemRope, 1), - ItemUtils.getSimpleStack(ModItems.itemRope, 1), - ItemUtils.getSimpleStack(ModItems.itemRope, 1), - ItemUtils.getSimpleStack(ModItems.itemRope, 1), - ItemUtils.getSimpleStack(ModItems.itemRope, 1), - ItemUtils.getSimpleStack(ModItems.itemRope, 1), - null, - null, - null, - ItemUtils.getSimpleStack(ModBlocks.blockNet, 2))) { - Logger.INFO("Added a recipe for Nets."); - } - - // Slow Builders Ring - CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { ItemUtils.getSimpleStack(Blocks.ice, 8), - ItemUtils.getSimpleStack(ModBlocks.blockNet, 8), ItemUtils.getSimpleStack(Blocks.vine, 8), - ALLOY.TUMBAGA.getRing(1), }, - FluidUtils.getWater(1000), // Fluid - ItemUtils.getItemStackFromFQRN("miscutils:SlowBuildingRing", 1), // Output - 20 * 30, // Dur - 16); // Eu - // Magic Feather CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { ItemUtils.getSimpleStack(Items.feather, 64), diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 6a738158de..bd75847153 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1,18 +1,9 @@ package gtPlusPlus.core.recipe; -import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.enums.Mods.COFHCore; -import static gregtech.api.enums.Mods.EternalSingularity; -import static gregtech.api.enums.Mods.GoodGenerator; -import static gregtech.api.enums.Mods.GregTech; -import static gregtech.api.enums.Mods.Railcraft; -import static gregtech.api.enums.Mods.RemoteIO; -import static gregtech.api.enums.Mods.ZTones; - -import net.minecraft.block.Block; +import static gregtech.api.enums.Mods.*; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -39,19 +30,15 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MISC_MATERIALS; -import gtPlusPlus.core.material.Material; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.everglades.dimension.Dimension_Everglades; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.covers.CoverManager; import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; -import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem; public class RECIPES_Machines { @@ -241,13 +228,11 @@ public class RECIPES_Machines { initModItems(); tieredMachineHulls(); - controlCores(); energyCores(); wirelessChargers(); largeArcFurnace(); industrialVacuumFurnace(); fakeMachineCasingCovers(); - ztonesCoverRecipes(); overflowValveCovers(); superBuses(); roundRobinators(); @@ -1195,16 +1180,6 @@ public class RECIPES_Machines { GregtechItemList.Energy_Buffer_RF_Convertor.get(1)); } - // Egg Box - CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(3), - ItemUtils.getSimpleStack(Items.egg, 64), ItemUtils.getSimpleStack(ModItems.itemRope, 32), - CI.getPlate(4, 8) }, - FluidUtils.getFluidStack("mobessence", 4096), - ItemUtils.getSimpleStack(ModBlocks.blockEggBox, 1), - 20 * 60, - 480); - // Flask Configurator CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.getNumberedAdvancedCircuit(8), CI.getTieredMachineHull(2), @@ -2400,35 +2375,6 @@ public class RECIPES_Machines { RECIPE_SaltPlantController); } - // Shelves - RecipeUtils.addShapedGregtechRecipe( - "screwWood", - "plateWood", - "screwWood", - CI.craftingToolHammer_Hard, - "frameGtWood", - CI.craftingToolHammer_Soft, - "plateWood", - "plateWood", - "plateWood", - GregtechItemList.GT4_Shelf.get(2)); - - RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { GregtechItemList.GT4_Shelf.get(1) }, - GregtechItemList.GT4_Shelf_Compartment.get(1)); - RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { GregtechItemList.GT4_Shelf_Compartment.get(1) }, - GregtechItemList.GT4_Shelf_Desk.get(1)); - RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { GregtechItemList.GT4_Shelf_Desk.get(1) }, - GregtechItemList.GT4_Shelf_Iron.get(1)); - RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { GregtechItemList.GT4_Shelf_Iron.get(1) }, - GregtechItemList.GT4_Shelf_FileCabinet.get(1)); - RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { GregtechItemList.GT4_Shelf_FileCabinet.get(1) }, - GregtechItemList.GT4_Shelf.get(1)); - // Cyclotron if (CORE.ConfigSwitches.enableMultiblock_Cyclotron) { RECIPE_CyclotronController = GregtechItemList.COMET_Cyclotron.get(1); @@ -2975,76 +2921,6 @@ public class RECIPES_Machines { Logger.INFO("Done loading recipes for the Various machine blocks."); } - private static void controlCores() { - - Material[] aMat_A = new Material[] { ALLOY.POTIN, ALLOY.ZIRCONIUM_CARBIDE, ALLOY.TANTALLOY_61, - ALLOY.INCONEL_792, ALLOY.STABALLOY, ALLOY.TALONITE, ALLOY.HASTELLOY_N, ALLOY.HG1223, ALLOY.LAFIUM, - ALLOY.PIKYONIUM }; - Material[] aMat_B = new Material[] { ALLOY.TUMBAGA, ALLOY.SILICON_CARBIDE, ALLOY.EGLIN_STEEL, ALLOY.NICHROME, - ALLOY.TUNGSTEN_CARBIDE, ALLOY.STELLITE, ALLOY.HASTELLOY_C276, ALLOY.NITINOL_60, ALLOY.ZERON_100, - ALLOY.CINOBITE }; - - Item aBaseCore = ModItems.itemControlCore; - ItemStack[] aInputPrevTier = new ItemStack[] { - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore2", 1), - ItemUtils.simpleMetaStack(aBaseCore, 0, 1), ItemUtils.simpleMetaStack(aBaseCore, 1, 1), - ItemUtils.simpleMetaStack(aBaseCore, 2, 1), ItemUtils.simpleMetaStack(aBaseCore, 3, 1), - ItemUtils.simpleMetaStack(aBaseCore, 4, 1), ItemUtils.simpleMetaStack(aBaseCore, 5, 1), - ItemUtils.simpleMetaStack(aBaseCore, 6, 1), ItemUtils.simpleMetaStack(aBaseCore, 7, 1), - ItemUtils.simpleMetaStack(aBaseCore, 8, 1), }; - ItemStack[] aOutput = new ItemStack[] { ItemUtils.simpleMetaStack(aBaseCore, 0, 1), - ItemUtils.simpleMetaStack(aBaseCore, 1, 1), ItemUtils.simpleMetaStack(aBaseCore, 2, 1), - ItemUtils.simpleMetaStack(aBaseCore, 3, 1), ItemUtils.simpleMetaStack(aBaseCore, 4, 1), - ItemUtils.simpleMetaStack(aBaseCore, 5, 1), ItemUtils.simpleMetaStack(aBaseCore, 6, 1), - ItemUtils.simpleMetaStack(aBaseCore, 7, 1), ItemUtils.simpleMetaStack(aBaseCore, 8, 1), - ItemUtils.simpleMetaStack(aBaseCore, 9, 1), }; - - CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { CI.machineHull_HV, aOutput[1], aMat_A[1].getGear(2), aMat_B[2].getPlateDouble(8), - ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore" + ("1"), 2), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 5) }, - aMat_B[3].getFluidStack(144 * 8), // Input Fluid - GregtechItemList.Hatch_Control_Core.get(1), - 60 * 20 * 5, - MaterialUtils.getVoltageForTier(3)); - - for (int i = 0; i < 10; i++) { - ItemStack aPlateStack = aMat_A[i].getPlateDouble(8); - ItemStack aGearStack = aMat_B[i].getGear(2); - ItemStack aRodStack = aMat_A[i].getLongRod(8); - ItemStack aScrewStack = aMat_B[i].getScrew(32); - - if (!ItemUtils.checkForInvalidItems(aPlateStack)) { - aPlateStack = aMat_A[i].getPlate(16); - if (!ItemUtils.checkForInvalidItems(aPlateStack)) { - aPlateStack = aMat_B[i].getPlateDouble(8); - if (!ItemUtils.checkForInvalidItems(aPlateStack)) { - aPlateStack = aMat_B[i].getPlate(16); - } - } - } - if (!ItemUtils.checkForInvalidItems(aGearStack)) { - aGearStack = aMat_A[i].getGear(4); - } - if (!ItemUtils.checkForInvalidItems(aRodStack)) { - aRodStack = aMat_B[i].getLongRod(16); - } - if (!ItemUtils.checkForInvalidItems(aScrewStack)) { - aScrewStack = aMat_A[i].getScrew(32); - } - - CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { CI.getEnergyCore(i, 4), aPlateStack, aGearStack, aRodStack, aScrewStack, - ItemUtils.getItemStackOfAmountFromOreDict( - CI.getTieredCircuitOreDictName((int) (4 + Math.ceil((double) i / (double) 2))), - i * 2) }, - CI.getTieredFluid(i, 144 * 4 * (i + 1)), // Input Fluid - aOutput[i], - 60 * 20 * 1 * (i + 1), - MaterialUtils.getVoltageForTier(i)); - } - } - private static void energyCores() { ItemStack[] aBufferOutput = new ItemStack[] { RECIPE_Buffer_ULV, RECIPE_Buffer_LV, RECIPE_Buffer_MV, @@ -3369,34 +3245,6 @@ public class RECIPES_Machines { } } - private static void ztonesCoverRecipes() { - if (!ZTones.isModLoaded()) { - return; - } - Class ModBlocksClass = ReflectionUtils.getClass("com.riciJak.Ztones.init.ModBlocks"); - Block agon = ReflectionUtils.getFieldValue(ReflectionUtils.getField(ModBlocksClass, "agonBlock")); - Block korp = ReflectionUtils.getFieldValue(ReflectionUtils.getField(ModBlocksClass, "korpBlock")); - Block jelt = ReflectionUtils.getFieldValue(ReflectionUtils.getField(ModBlocksClass, "jeltBlock")); - Block bitt = ReflectionUtils.getFieldValue(ReflectionUtils.getField(ModBlocksClass, "bittBlock")); - Block iszm = ReflectionUtils.getFieldValue(ReflectionUtils.getField(ModBlocksClass, "iszmBlock")); - - // "agon", "iszm", "korp", "jelt", "bitt" - - ItemStack[] aBlocks = new ItemStack[] { ItemUtils.getSimpleStack(agon), ItemUtils.getSimpleStack(iszm), - ItemUtils.getSimpleStack(korp), ItemUtils.getSimpleStack(jelt), ItemUtils.getSimpleStack(bitt) }; - MetaCustomCoverItem[] aCovers = new MetaCustomCoverItem[] { CoverManager.Cover_Agon, CoverManager.Cover_Iszm, - CoverManager.Cover_Korp, CoverManager.Cover_Jelt, CoverManager.Cover_Bitt }; - - ItemStack aInputs[][] = new ItemStack[5][16]; - ItemStack aOutputs[][] = new ItemStack[5][16]; - for (int a = 0; a < 5; a++) { - for (int i = 0; i < 16; i++) { - aInputs[a][i] = ItemUtils.simpleMetaStack(aBlocks[a].getItem(), i, 1); - aOutputs[a][i] = ItemUtils.simpleMetaStack(aCovers[a], i, 9); - } - } - } - private static void superBuses() { GregtechItemList[] mSuperBusesInput = new GregtechItemList[] { GregtechItemList.Hatch_SuperBus_Input_ULV, GregtechItemList.Hatch_SuperBus_Input_LV, GregtechItemList.Hatch_SuperBus_Input_MV, diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java index 54deeab3a8..229b7cc045 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java @@ -5,22 +5,15 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; public class RECIPES_Tools { // Outputs - 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); - public static ItemStack RECIPE_FireStarter = ItemUtils.getSimpleStack(ModItems.itemBasicFireMaker); public static ItemStack RECIPE_DivisionSigil; @@ -118,85 +111,8 @@ public class RECIPES_Tools { 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 ItemStack personalCloakingDevice = ItemUtils.getSimpleStack(ModItems.itemPersonalCloakingDevice); public static String plateDoubleNiChrome = "plateDoubleNichrome"; public static String plateIridiumAlloy = "plateAlloyIridium"; - public static final void loadRecipes() { - - run(); - } - - private static void run() { - // Staballoy Pickaxe - RecipeUtils.addShapedRecipe( - plateStaballoy, - plateStaballoy, - ingotStaballoy, - craftingToolFile, - stickTungsten, - craftingToolHardHammer, - craftingToolWrench, - stickTungsten, - craftingToolHardHammer, - RECIPE_StaballoyPickaxe); - - // Staballoy Axe - RecipeUtils.addShapedRecipe( - plateStaballoy, - ingotStaballoy, - craftingToolHardHammer, - plateStaballoy, - stickTungsten, - craftingToolHardHammer, - craftingToolFile, - stickTungsten, - craftingToolWrench, - RECIPE_StaballoyAxe); - - // Cobble to Sand - RecipeUtils.addShapedRecipe( - CobbleStone, - CobbleStone, - CobbleStone, - CobbleStone, - sandHammer, - CobbleStone, - CobbleStone, - CobbleStone, - CobbleStone, - RECIPE_Sand); - - // Sand to Sandstone - RecipeUtils.addShapedRecipe(Sand, Sand, Sand, Sand, sandHammer, Sand, Sand, Sand, Sand, RECIPE_SandStone); - - // Sandstone Hammer - RecipeUtils.addShapedRecipe( - plateElectrum, - ingotElectrum, - plateElectrum, - craftingToolScrewdriver, - stickBronze, - craftingToolHardHammer, - null, - stickSteel, - null, - RECIPE_SandstoneHammer); - - // Basic Firemaker - RecipeUtils.addShapedRecipe( - "cropWheat", - "cropWheat", - "cropWheat", - ItemUtils.getSimpleStack(Items.string), - stickWood, - ItemUtils.getSimpleStack(Items.string), - "cropWheat", - "cropWheat", - "cropWheat", - RECIPE_FireStarter); - } } |