From 76719d65a90d98e228a914774d3b11ed9f01ac8e Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Mon, 4 Sep 2023 03:05:22 +0100 Subject: Clean-up v2 (#729) * Remove test items from NEI with no texture * Add number formatting to hand pumps * Remove heavy plates (no recipes & completely unused). * Remove helium generator (no texture, no recipe) * Remove fire pit and fire starter (no use, no recipe, no textures) * Remove giant chicken and associated unused stuff, has no texture and is unobtainable. Used to be relevant but isn't anymore. * Remove villagers with silly trades like 1 motor + 1 hull = 1 hull. Why? * Remove trade bench, no recipe, missing textures. Unused. * Remove farm processors, no texture, no recipe. Unused. * Remove MAX tier components, these exist in GT now, have no recipe here and are unused. * Hide untextured light block from NEI * Update buildscript * Remove unused backpacks, no recipe and contains dupe bugs. Bad. * Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable. * Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable. part 2 * Remove dragon catcher (what?), no texture, no recipe, unused. * Remove empty item, does nothing, has no recipe, no idea why it is here. * Empty item v2 removal * Revert "Empty item v2 removal" This reverts commit 75bcd3ccfaf55bbfe2c12b2e4167d5c37636030d. * Revert "Remove empty item, does nothing, has no recipe, no idea why it is here." This reverts commit e41a9f484392776331c58530ab1faa5ef978ef36. * Remove debug square. No recipe, unused. * Number formatting overflow covers * Remove JVM garbage collection block. Unused, no recipe. * Remove nanotubes, no recipe for them. Unused. * Remove "git" item, doesn't seem to work. Has no recipe. * Remove uncraftable food with awful textures. * Remove "bat king" mob, unused content. Does not spawn. * Remove uncraftable doors with bad textures. Unused content. * Remove uncraftable, unlocalised redstone stuff that crashes game when placed. * Remove weird spawner item. No recipe, does not exist in world. * Remove sunnarium bit, no recipe, no usage. * Remove unused modularity table and some misc uncraftable, unused items. * Remove Interconnecting Storage Crate, no recipe, unused. * Delete worse debug power gen, this already exists as part of GT. Unneeded duplication. * Delete unused placeholder circuit * Delete uncraftable generator hatches. * Spotless * Remove XP tank thing, unused and uncraftable. * Remove null item, this fluid registry only seemed to register one null fluid. All others exist? * Remove EU -> RF battery. Unused in GTNH. * Remove some shelf nonsense, why is this in this mod? * Remove some weird random tools. These have no realistic usage in GTNH. * Remove firemaker. Useless in GTNH. * Removed helium blob. Deprecated item, not used anymore, uncraftable. * spotlessApply (#730) Co-authored-by: GitHub GTNH Actions <> * Stop modulators generating unused blocks with no textures * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove some weird methods and uncraftable mining parts, probably part of deprecated multiblock. * spotlessApply (#732) Co-authored-by: GitHub GTNH Actions <> * Remove gem shards, unused. * Remove unused atoms * Remove unused gum * Remove unused elements/materials * Bye bye * Remove some unused reflection stuff * Remove control cores, obsolete now. * Remove mob killing thing with no texture and no recipe. * Remove uncraftable covers * Remove pizza gloves * Net and rope removal, unused * Remove force crop * Removal of some old event stuff * Remove unused nuclear chem items * Remove player safe, mostly because of the horrible event code that was intercepting every block break. I can't see any real usage of this via discord. * Remove Force material and associated other nonsense. Also remove some nuclear chem stuff. * Remove force for realsies * Skookum Chooker purge. * Remove some enderio compat, these plates/dusts are added via GT5 anyway now. This is obsolete. * spotlessApply (#733) Co-authored-by: GitHub GTNH Actions <> * Unused textures * Bump dep * Revert "Remove force for realsies" This reverts commit 0d288912a99f9dabce56d2a2623d4d3510f4804e. * Revert "Remove Force material and associated other nonsense. Also remove some nuclear chem stuff." This reverts commit 3455e6e916defe1f2aef923be6f9696a6cf3095b. * Remove nuclear items that are unused * spotlessApply (#734) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Connor Colenso Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 37 ----- .../gtPlusPlus/core/recipe/RECIPES_General.java | 64 --------- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 156 +-------------------- .../java/gtPlusPlus/core/recipe/RECIPES_Tools.java | 84 ----------- 4 files changed, 2 insertions(+), 339 deletions(-) (limited to 'src/main/java/gtPlusPlus/core/recipe') 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,33 +1092,7 @@ 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), @@ -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); - } } -- cgit