diff options
author | boubou19 <miisterunknown@gmail.com> | 2024-08-17 20:37:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-17 18:37:02 +0000 |
commit | b11f636564c23ceead60854fce444816f31f4bd4 (patch) | |
tree | 60d7c88ac0c03b5686aabef467cf345836821951 /src/main/java/gregtech/loaders/postload | |
parent | 431eab817d4725e4105d0614a3ce1bf6f4e8eb48 (diff) | |
download | GT5-Unofficial-b11f636564c23ceead60854fce444816f31f4bd4.tar.gz GT5-Unofficial-b11f636564c23ceead60854fce444816f31f4bd4.tar.bz2 GT5-Unofficial-b11f636564c23ceead60854fce444816f31f4bd4.zip |
Do some recipe cleanup once again (#2897)
* remove unused config "HardCoreCableLoss"
* remove unused config "DisableIC2Cables"
* remove unused booleans
* Spotless apply for branch sort_recipes for #2897 (#2898)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
* remove unused config "NerfCombs"
* remove unused config "NerfCrops"
* remove unused config "ArcSmeltIntoAnnealedWrought"
* remove unused boolean
* remove unused config "online"
* remove unused stuff
* remove unused config "HardMachineCasings"
* remove unused config "NerfDustCrafting"
* exit early
* remove unused config "harderstone"
* decouple recipes from machine registration for
alloy smelter, arc furnace, assembler, autoclave, bending machine, canner, printer, recycler, sifter, slicer, thermal centrifuge, unpackager, wiremill
* decouple recipes from machine registration for
microwave, polarizer,plasma arc furnace, oven, ore washer, mixer, microwave
* decouple recipes from machine registration for
forming press, laser engraver, lathe, macerator, matter amplifier
* decouple recipes from machine registration for
centrifuge, extruder, fermenter, fluid canner, fluid extractor, fluid heater, fluid solidifier, forge hammer
* decouple recipes from machine registration for
chemical bath, chemical reactor, circuit assembler, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator,
extractor
* spotless apply
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/loaders/postload')
6 files changed, 304 insertions, 570 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java b/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java index 204d8f53a0..b122646c92 100644 --- a/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java @@ -8,7 +8,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemPickaxe; -import gregtech.GT_Mod; import gregtech.api.util.GT_Utility; public class GT_BlockResistanceLoader implements Runnable { @@ -16,14 +15,6 @@ public class GT_BlockResistanceLoader implements Runnable { @Override @SuppressWarnings("unchecked") public void run() { - if (GT_Mod.gregtechproxy.mHardRock) { - Blocks.stone.setHardness(16.0F); - Blocks.brick_block.setHardness(32.0F); - Blocks.hardened_clay.setHardness(32.0F); - Blocks.stained_hardened_clay.setHardness(32.0F); - Blocks.cobblestone.setHardness(12.0F); - Blocks.stonebrick.setHardness(24.0F); - } Blocks.stone.setResistance(10.0F); Blocks.cobblestone.setResistance(10.0F); Blocks.stonebrick.setResistance(10.0F); diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index 04591f11e7..fff50aff2f 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -1295,73 +1295,38 @@ public class GT_CraftingRecipeLoader implements Runnable { new Object[] { OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.Coal), OrePrefixes.dust.get(Materials.Coal) }); } - if (GT_Mod.gregtechproxy.mNerfDustCrafting) { - GT_ModHandler.removeRecipeByOutputDelayed(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 1L)); - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 3L), - bits_no_remove_buffered, - new Object[] { OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.Zinc) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Brass, 9L), - bits_no_remove_buffered, - new Object[] { OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Zinc) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 3L), - bits_no_remove_buffered, - new Object[] { OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.Tin) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Bronze, 9L), - bits_no_remove_buffered, - new Object[] { OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tin) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Invar, 9L), - bits_no_remove_buffered, - new Object[] { OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.Iron), - OrePrefixes.dust.get(Materials.Nickel) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cupronickel, 6L), - bits_no_remove_buffered, - new Object[] { OrePrefixes.dust.get(Materials.Nickel), OrePrefixes.dust.get(Materials.AnyCopper) }); - } else { - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 4L), - bits_no_remove_buffered, - new Object[] { OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.Zinc) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 3L), - bits_no_remove_buffered, - new Object[] { OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Zinc) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 4L), - bits_no_remove_buffered, - new Object[] { OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper), - OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.Tin) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 3L), - bits_no_remove_buffered, - new Object[] { OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tetrahedrite), - OrePrefixes.dust.get(Materials.Tin) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Invar, 3L), - bits_no_remove_buffered, - new Object[] { OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.Iron), - OrePrefixes.dust.get(Materials.Nickel) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 2L), - bits_no_remove_buffered, - new Object[] { OrePrefixes.dust.get(Materials.Nickel), OrePrefixes.dust.get(Materials.AnyCopper) }); - } + GT_ModHandler.removeRecipeByOutputDelayed(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 1L)); + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 3L), + bits_no_remove_buffered, + new Object[] { OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper), + OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.Zinc) }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Brass, 9L), + bits_no_remove_buffered, + new Object[] { OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tetrahedrite), + OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Zinc) }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 3L), + bits_no_remove_buffered, + new Object[] { OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.AnyCopper), + OrePrefixes.dust.get(Materials.AnyCopper), OrePrefixes.dust.get(Materials.Tin) }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Bronze, 9L), + bits_no_remove_buffered, + new Object[] { OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tetrahedrite), + OrePrefixes.dust.get(Materials.Tetrahedrite), OrePrefixes.dust.get(Materials.Tin) }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Invar, 9L), + bits_no_remove_buffered, + new Object[] { OrePrefixes.dust.get(Materials.Iron), OrePrefixes.dust.get(Materials.Iron), + OrePrefixes.dust.get(Materials.Nickel) }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cupronickel, 6L), + bits_no_remove_buffered, + new Object[] { OrePrefixes.dust.get(Materials.Nickel), OrePrefixes.dust.get(Materials.AnyCopper) }); + GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RoseGold, 4L), bits_no_remove_buffered, @@ -1539,188 +1504,178 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addShapelessCraftingRecipe(tItem, new Object[] { tItem }); } - if (GT_Mod.gregtechproxy.mDisableIC2Cables) { - - List<ItemStack> iToRemoveAndHide = Arrays.stream( + List<ItemStack> iToRemoveAndHide = Arrays + .stream( new String[] { "copperCableItem", "insulatedCopperCableItem", "goldCableItem", "insulatedGoldCableItem", "insulatedIronCableItem", "glassFiberCableItem", "tinCableItem", "ironCableItem", "insulatedTinCableItem", "detectorCableItem", "splitterCableItem", "electrolyzer", "cutter" }) - .map(x -> GT_ModHandler.getIC2Item(x, 1L)) - .collect(Collectors.toList()); - - if (NotEnoughItems.isModLoaded()) { - iToRemoveAndHide.forEach(item -> { - codechicken.nei.api.API.hideItem(item); - GT_ModHandler.removeRecipeByOutputDelayed(item); - }); - } + .map(x -> GT_ModHandler.getIC2Item(x, 1L)) + .collect(Collectors.toList()); + + if (NotEnoughItems.isModLoaded()) { + iToRemoveAndHide.forEach(item -> { + codechicken.nei.api.API.hideItem(item); + GT_ModHandler.removeRecipeByOutputDelayed(item); + }); + } - Arrays.stream( + Arrays + .stream( new String[] { "batBox", "mfeUnit", "lvTransformer", "mvTransformer", "hvTransformer", "evTransformer", "cesuUnit", "luminator", "teleporter", "energyOMat", "advBattery", "boatElectric", "cropnalyzer", "coil", "powerunit", "powerunitsmall", "remote", "odScanner", "ovScanner", "solarHelmet", "staticBoots", "ecMeter", "obscurator", "overclockerUpgrade", "transformerUpgrade", "energyStorageUpgrade", "ejectorUpgrade", "suBattery", "frequencyTransmitter", "pullingUpgrade" }) - .map(x -> GT_ModHandler.getIC2Item(x, 1L)) - .forEach(GT_ModHandler::removeRecipeByOutputDelayed); - - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("batBox", 1L), - bits_no_remove_buffered, - new Object[] { "PCP", "BBB", "PPP", 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'P', - OrePrefixes.plank.get(Materials.Wood), 'B', OrePrefixes.battery.get(Materials.LV) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("mfeUnit", 1L), - bits_no_remove_buffered, - new Object[] { "CEC", "EME", "CEC", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'E', - OrePrefixes.battery.get(Materials.IV), 'M', GT_ModHandler.getIC2Item("machine", 1L) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("lvTransformer", 1L), - bits_no_remove_buffered, - new Object[] { "PCP", "POP", "PCP", 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'O', - GT_ModHandler.getIC2Item("coil", 1L), 'P', OrePrefixes.plank.get(Materials.Wood) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("mvTransformer", 1L), - bits_no_remove_buffered, - new Object[] { "CMC", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'M', - GT_ModHandler.getIC2Item("machine", 1L) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("hvTransformer", 1L), - bits_no_remove_buffered, - new Object[] { " C ", "IMB", " C ", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'M', - GT_ModHandler.getIC2Item("mvTransformer", 1L), 'I', OrePrefixes.circuit.get(Materials.LV), 'B', - OrePrefixes.battery.get(Materials.HV) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("evTransformer", 1L), - bits_no_remove_buffered, - new Object[] { " C ", "IMB", " C ", 'C', OrePrefixes.cableGt01.get(Materials.Aluminium), 'M', - GT_ModHandler.getIC2Item("hvTransformer", 1L), 'I', OrePrefixes.circuit.get(Materials.HV), 'B', - OrePrefixes.battery.get(Materials.LuV) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("cesuUnit", 1L), - bits_no_remove_buffered, - new Object[] { "PCP", "BBB", "PPP", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'P', - OrePrefixes.plate.get(Materials.Bronze), 'B', OrePrefixes.battery.get(Materials.HV) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("teleporter", 1L), - bits_no_remove_buffered, - new Object[] { "GFG", "CMC", "GDG", 'C', OrePrefixes.cableGt01.get(Materials.Platinum), 'G', - OrePrefixes.circuit.get(Materials.HV), 'D', OrePrefixes.gem.get(Materials.Diamond), 'M', - GT_ModHandler.getIC2Item("machine", 1L), 'F', - GT_ModHandler.getIC2Item("frequencyTransmitter", 1L) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("energyOMat", 1L), - bits_no_remove_buffered, - new Object[] { "RBR", "CMC", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'R', - OrePrefixes.dust.get(Materials.Redstone), 'B', OrePrefixes.battery.get(Materials.LV), 'M', - GT_ModHandler.getIC2Item("machine", 1L) }); + .map(x -> GT_ModHandler.getIC2Item(x, 1L)) + .forEach(GT_ModHandler::removeRecipeByOutputDelayed); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("boatElectric", 1L), - bits_no_remove_buffered, - new Object[] { "CCC", "XWX", aTextIron2, 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'X', - OrePrefixes.plate.get(Materials.Iron), 'W', GT_ModHandler.getIC2Item("waterMill", 1L) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("cropnalyzer", 1L), - bits_no_remove_buffered, - new Object[] { "CC ", "RGR", "RIR", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'R', - OrePrefixes.dust.get(Materials.Redstone), 'G', OrePrefixes.block.get(Materials.Glass), 'I', - OrePrefixes.circuit.get(Materials.LV) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("coil", 1L), - bits_no_remove_buffered, - new Object[] { "CCC", "CXC", "CCC", 'C', OrePrefixes.wireGt01.get(Materials.Copper), 'X', - OrePrefixes.ingot.get(Materials.AnyIron) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("powerunit", 1L), - bits_no_remove_buffered, - new Object[] { "BCA", "BIM", "BCA", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'B', - OrePrefixes.battery.get(Materials.LV), 'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I', - OrePrefixes.circuit.get(Materials.LV), 'M', GT_ModHandler.getIC2Item("elemotor", 1L) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("powerunitsmall", 1L), - bits_no_remove_buffered, - new Object[] { " CA", "BIM", " CA", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'B', - OrePrefixes.battery.get(Materials.LV), 'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I', - OrePrefixes.circuit.get(Materials.LV), 'M', GT_ModHandler.getIC2Item("elemotor", 1L) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("remote", 1L), - bits_no_remove_buffered, - new Object[] { " C ", "TLT", " F ", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'L', - OrePrefixes.dust.get(Materials.Lapis), 'T', GT_ModHandler.getIC2Item("casingtin", 1L), 'F', - GT_ModHandler.getIC2Item("frequencyTransmitter", 1L) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("odScanner", 1L), - bits_no_remove_buffered, - new Object[] { "PGP", "CBC", "WWW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'G', - OrePrefixes.dust.get(Materials.Glowstone), 'B', OrePrefixes.battery.get(Materials.HV), 'C', - OrePrefixes.circuit.get(Materials.HV), 'P', GT_ModHandler.getIC2Item("casinggold", 1L) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("ovScanner", 1L), - bits_no_remove_buffered, - new Object[] { "PDP", "GCG", "WSW", 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', - OrePrefixes.dust.get(Materials.Glowstone), 'D', OrePrefixes.battery.get(Materials.IV), 'C', - OrePrefixes.circuit.get(Materials.HV), 'P', GT_ModHandler.getIC2Item("casinggold", 1L), 'S', - GT_ModHandler.getIC2Item("odScanner", 1L) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("staticBoots", 1L), - bits_no_remove_buffered, - new Object[] { "I I", "IWI", "CCC", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'I', - OrePrefixes.ingot.get(Materials.Iron), 'W', new ItemStack(Blocks.wool) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("ecMeter", 1L), - bits_no_remove_buffered, - new Object[] { " G ", "CIC", "C C", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'G', - OrePrefixes.dust.get(Materials.Glowstone), 'I', OrePrefixes.circuit.get(Materials.LV) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("obscurator", 1L), - bits_no_remove_buffered, - new Object[] { "RER", "CAC", "RRR", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'R', - OrePrefixes.dust.get(Materials.Redstone), 'E', OrePrefixes.battery.get(Materials.HV), 'A', - OrePrefixes.circuit.get(Materials.HV) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("overclockerUpgrade", 1L), - bits_no_remove_buffered, - new Object[] { "CCC", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'C', - GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 1), 'E', - OrePrefixes.circuit.get(Materials.LV) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("transformerUpgrade", 1L), - bits_no_remove_buffered, - new Object[] { "GGG", "WTW", "GEG", 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'T', - GT_ModHandler.getIC2Item("mvTransformer", 1L), 'E', OrePrefixes.circuit.get(Materials.LV), 'G', - OrePrefixes.block.get(Materials.Glass) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("energyStorageUpgrade", 1L), - bits_no_remove_buffered, - new Object[] { "PPP", "WBW", "PEP", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E', - OrePrefixes.circuit.get(Materials.LV), 'P', OrePrefixes.plank.get(Materials.Wood), 'B', - OrePrefixes.battery.get(Materials.LV) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("ejectorUpgrade", 1L), - bits_no_remove_buffered, - new Object[] { "PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E', - OrePrefixes.circuit.get(Materials.LV), 'P', new ItemStack(Blocks.piston), 'H', - new ItemStack(Blocks.hopper) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("suBattery", 1L), - bits_no_remove_buffered, - new Object[] { "W", "C", "R", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'C', - OrePrefixes.dust.get(Materials.HydratedCoal), 'R', OrePrefixes.dust.get(Materials.Redstone) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("pullingUpgrade", 1L), - bits_no_remove_buffered, - new Object[] { "PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'P', - new ItemStack(Blocks.sticky_piston), 'R', new ItemStack(Blocks.hopper), 'E', - OrePrefixes.circuit.get(Materials.LV) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("batBox", 1L), + bits_no_remove_buffered, + new Object[] { "PCP", "BBB", "PPP", 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'P', + OrePrefixes.plank.get(Materials.Wood), 'B', OrePrefixes.battery.get(Materials.LV) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("mfeUnit", 1L), + bits_no_remove_buffered, + new Object[] { "CEC", "EME", "CEC", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'E', + OrePrefixes.battery.get(Materials.IV), 'M', GT_ModHandler.getIC2Item("machine", 1L) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("lvTransformer", 1L), + bits_no_remove_buffered, + new Object[] { "PCP", "POP", "PCP", 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'O', + GT_ModHandler.getIC2Item("coil", 1L), 'P', OrePrefixes.plank.get(Materials.Wood) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("mvTransformer", 1L), + bits_no_remove_buffered, + new Object[] { "CMC", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'M', + GT_ModHandler.getIC2Item("machine", 1L) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("hvTransformer", 1L), + bits_no_remove_buffered, + new Object[] { " C ", "IMB", " C ", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'M', + GT_ModHandler.getIC2Item("mvTransformer", 1L), 'I', OrePrefixes.circuit.get(Materials.LV), 'B', + OrePrefixes.battery.get(Materials.HV) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("evTransformer", 1L), + bits_no_remove_buffered, + new Object[] { " C ", "IMB", " C ", 'C', OrePrefixes.cableGt01.get(Materials.Aluminium), 'M', + GT_ModHandler.getIC2Item("hvTransformer", 1L), 'I', OrePrefixes.circuit.get(Materials.HV), 'B', + OrePrefixes.battery.get(Materials.LuV) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("cesuUnit", 1L), + bits_no_remove_buffered, + new Object[] { "PCP", "BBB", "PPP", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'P', + OrePrefixes.plate.get(Materials.Bronze), 'B', OrePrefixes.battery.get(Materials.HV) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("teleporter", 1L), + bits_no_remove_buffered, + new Object[] { "GFG", "CMC", "GDG", 'C', OrePrefixes.cableGt01.get(Materials.Platinum), 'G', + OrePrefixes.circuit.get(Materials.HV), 'D', OrePrefixes.gem.get(Materials.Diamond), 'M', + GT_ModHandler.getIC2Item("machine", 1L), 'F', GT_ModHandler.getIC2Item("frequencyTransmitter", 1L) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("energyOMat", 1L), + bits_no_remove_buffered, + new Object[] { "RBR", "CMC", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'R', + OrePrefixes.dust.get(Materials.Redstone), 'B', OrePrefixes.battery.get(Materials.LV), 'M', + GT_ModHandler.getIC2Item("machine", 1L) }); - } else { - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("glassFiberCableItem", 1L), - bits_no_remove_buffered, - new Object[] { "GGG", "EDE", "GGG", 'G', new ItemStack(Blocks.glass, 1, 32767), 'D', - OrePrefixes.dust.get(Materials.Silver), 'E', ItemList.IC2_Energium_Dust.get(1L) }); - } + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("boatElectric", 1L), + bits_no_remove_buffered, + new Object[] { "CCC", "XWX", aTextIron2, 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'X', + OrePrefixes.plate.get(Materials.Iron), 'W', GT_ModHandler.getIC2Item("waterMill", 1L) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("cropnalyzer", 1L), + bits_no_remove_buffered, + new Object[] { "CC ", "RGR", "RIR", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'R', + OrePrefixes.dust.get(Materials.Redstone), 'G', OrePrefixes.block.get(Materials.Glass), 'I', + OrePrefixes.circuit.get(Materials.LV) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("coil", 1L), + bits_no_remove_buffered, + new Object[] { "CCC", "CXC", "CCC", 'C', OrePrefixes.wireGt01.get(Materials.Copper), 'X', + OrePrefixes.ingot.get(Materials.AnyIron) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("powerunit", 1L), + bits_no_remove_buffered, + new Object[] { "BCA", "BIM", "BCA", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'B', + OrePrefixes.battery.get(Materials.LV), 'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I', + OrePrefixes.circuit.get(Materials.LV), 'M', GT_ModHandler.getIC2Item("elemotor", 1L) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("powerunitsmall", 1L), + bits_no_remove_buffered, + new Object[] { " CA", "BIM", " CA", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'B', + OrePrefixes.battery.get(Materials.LV), 'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I', + OrePrefixes.circuit.get(Materials.LV), 'M', GT_ModHandler.getIC2Item("elemotor", 1L) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("remote", 1L), + bits_no_remove_buffered, + new Object[] { " C ", "TLT", " F ", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'L', + OrePrefixes.dust.get(Materials.Lapis), 'T', GT_ModHandler.getIC2Item("casingtin", 1L), 'F', + GT_ModHandler.getIC2Item("frequencyTransmitter", 1L) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("odScanner", 1L), + bits_no_remove_buffered, + new Object[] { "PGP", "CBC", "WWW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'G', + OrePrefixes.dust.get(Materials.Glowstone), 'B', OrePrefixes.battery.get(Materials.HV), 'C', + OrePrefixes.circuit.get(Materials.HV), 'P', GT_ModHandler.getIC2Item("casinggold", 1L) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("ovScanner", 1L), + bits_no_remove_buffered, + new Object[] { "PDP", "GCG", "WSW", 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', + OrePrefixes.dust.get(Materials.Glowstone), 'D', OrePrefixes.battery.get(Materials.IV), 'C', + OrePrefixes.circuit.get(Materials.HV), 'P', GT_ModHandler.getIC2Item("casinggold", 1L), 'S', + GT_ModHandler.getIC2Item("odScanner", 1L) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("staticBoots", 1L), + bits_no_remove_buffered, + new Object[] { "I I", "IWI", "CCC", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'I', + OrePrefixes.ingot.get(Materials.Iron), 'W', new ItemStack(Blocks.wool) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("ecMeter", 1L), + bits_no_remove_buffered, + new Object[] { " G ", "CIC", "C C", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'G', + OrePrefixes.dust.get(Materials.Glowstone), 'I', OrePrefixes.circuit.get(Materials.LV) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("obscurator", 1L), + bits_no_remove_buffered, + new Object[] { "RER", "CAC", "RRR", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'R', + OrePrefixes.dust.get(Materials.Redstone), 'E', OrePrefixes.battery.get(Materials.HV), 'A', + OrePrefixes.circuit.get(Materials.HV) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("overclockerUpgrade", 1L), + bits_no_remove_buffered, + new Object[] { "CCC", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'C', + GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 1), 'E', OrePrefixes.circuit.get(Materials.LV) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("transformerUpgrade", 1L), + bits_no_remove_buffered, + new Object[] { "GGG", "WTW", "GEG", 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'T', + GT_ModHandler.getIC2Item("mvTransformer", 1L), 'E', OrePrefixes.circuit.get(Materials.LV), 'G', + OrePrefixes.block.get(Materials.Glass) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("energyStorageUpgrade", 1L), + bits_no_remove_buffered, + new Object[] { "PPP", "WBW", "PEP", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E', + OrePrefixes.circuit.get(Materials.LV), 'P', OrePrefixes.plank.get(Materials.Wood), 'B', + OrePrefixes.battery.get(Materials.LV) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("ejectorUpgrade", 1L), + bits_no_remove_buffered, + new Object[] { "PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E', + OrePrefixes.circuit.get(Materials.LV), 'P', new ItemStack(Blocks.piston), 'H', + new ItemStack(Blocks.hopper) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("suBattery", 1L), + bits_no_remove_buffered, + new Object[] { "W", "C", "R", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'C', + OrePrefixes.dust.get(Materials.HydratedCoal), 'R', OrePrefixes.dust.get(Materials.Redstone) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("pullingUpgrade", 1L), + bits_no_remove_buffered, + new Object[] { "PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'P', + new ItemStack(Blocks.sticky_piston), 'R', new ItemStack(Blocks.hopper), 'E', + OrePrefixes.circuit.get(Materials.LV) }); if (NotEnoughItems.isModLoaded()) { codechicken.nei.api.API.hideItem(GT_ModHandler.getIC2Item("reactorUraniumSimple", 1L, 1)); diff --git a/src/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java b/src/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java index b4621df6b6..6d466abaa9 100644 --- a/src/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java @@ -4,7 +4,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import gregtech.GT_Mod; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -57,10 +56,6 @@ public class GT_ScrapboxDropLoader implements Runnable { GT_ModHandler.addScrapboxDrop(1.8F, ItemList.Circuit_Board_Basic.get(1L)); GT_ModHandler.addScrapboxDrop(0.4F, ItemList.Circuit_Board_Advanced.get(1L)); GT_ModHandler.addScrapboxDrop(0.2F, ItemList.Circuit_Board_Elite.get(1L)); - if (!GT_Mod.gregtechproxy.mDisableIC2Cables) { - GT_ModHandler.addScrapboxDrop(2.0F, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)); - GT_ModHandler.addScrapboxDrop(0.4F, GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L)); - } GT_ModHandler.addScrapboxDrop(0.9F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L)); GT_ModHandler.addScrapboxDrop(0.8F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L)); GT_ModHandler.addScrapboxDrop(0.8F, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L)); diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 50f87606fa..1b4f3e3396 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -2690,216 +2690,107 @@ public class AssemblerRecipes implements Runnable { .eut(16) .addTo(assemblerRecipes); - if (GT_Mod.gregtechproxy.mHardMachineCasings) { - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 2), - ItemList.Casing_ULV.get(1)) - .itemOutputs(ItemList.Hull_ULV.get(1)) - .fluidInputs(Materials.Plastic.getMolten(288)) - .duration(1 * SECONDS + 5 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 2), - ItemList.Casing_LV.get(1)) - .itemOutputs(ItemList.Hull_LV.get(1)) - .fluidInputs(Materials.Plastic.getMolten(288)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2), - ItemList.Casing_MV.get(1)) - .itemOutputs(ItemList.Hull_MV.get(1)) - .fluidInputs(Materials.Plastic.getMolten(288)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 2), - ItemList.Casing_MV.get(1)) - .itemOutputs(ItemList.Hull_MV.get(1)) - .fluidInputs(Materials.Plastic.getMolten(288)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 2), - ItemList.Casing_HV.get(1)) - .itemOutputs(ItemList.Hull_HV.get(1)) - .fluidInputs(Materials.Plastic.getMolten(288)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), - ItemList.Casing_EV.get(1)) - .itemOutputs(ItemList.Hull_EV.get(1)) - .fluidInputs(Materials.Plastic.getMolten(288)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 2), - ItemList.Casing_IV.get(1)) - .itemOutputs(ItemList.Hull_IV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2), - ItemList.Casing_LuV.get(1)) - .itemOutputs(ItemList.Hull_LuV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2), - ItemList.Casing_ZPM.get(1)) - .itemOutputs(ItemList.Hull_ZPM.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getMolten(288)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), - ItemList.Casing_UV.get(1)) - .itemOutputs(ItemList.Hull_UV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getMolten(288)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 2), - ItemList.Casing_MAX.get(1)) - .itemOutputs(ItemList.Hull_MAX.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getMolten(288)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - } else { - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 2), - ItemList.Casing_ULV.get(1)) - .itemOutputs(ItemList.Hull_ULV.get(1)) - .duration(1 * SECONDS + 5 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 2), ItemList.Casing_ULV.get(1)) + .itemOutputs(ItemList.Hull_ULV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(288)) + .duration(1 * SECONDS + 5 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 2), - ItemList.Casing_LV.get(1)) - .itemOutputs(ItemList.Hull_LV.get(1)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 2), ItemList.Casing_LV.get(1)) + .itemOutputs(ItemList.Hull_LV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(288)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2), - ItemList.Casing_MV.get(1)) - .itemOutputs(ItemList.Hull_MV.get(1)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2), ItemList.Casing_MV.get(1)) + .itemOutputs(ItemList.Hull_MV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(288)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 2), - ItemList.Casing_MV.get(1)) - .itemOutputs(ItemList.Hull_MV.get(1)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 2), + ItemList.Casing_MV.get(1)) + .itemOutputs(ItemList.Hull_MV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(288)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 2), - ItemList.Casing_HV.get(1)) - .itemOutputs(ItemList.Hull_HV.get(1)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 2), ItemList.Casing_HV.get(1)) + .itemOutputs(ItemList.Hull_HV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(288)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), - ItemList.Casing_EV.get(1)) - .itemOutputs(ItemList.Hull_EV.get(1)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), + ItemList.Casing_EV.get(1)) + .itemOutputs(ItemList.Hull_EV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(288)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 2), - ItemList.Casing_IV.get(1)) - .itemOutputs(ItemList.Hull_IV.get(1)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 2), + ItemList.Casing_IV.get(1)) + .itemOutputs(ItemList.Hull_IV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2), - ItemList.Casing_LuV.get(1)) - .itemOutputs(ItemList.Hull_LuV.get(1)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2), + ItemList.Casing_LuV.get(1)) + .itemOutputs(ItemList.Hull_LuV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2), - ItemList.Casing_ZPM.get(1)) - .itemOutputs(ItemList.Hull_ZPM.get(1)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2), + ItemList.Casing_ZPM.get(1)) + .itemOutputs(ItemList.Hull_ZPM.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(288)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), - ItemList.Casing_UV.get(1)) - .itemOutputs(ItemList.Hull_UV.get(1)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), + ItemList.Casing_UV.get(1)) + .itemOutputs(ItemList.Hull_UV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(288)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 2), - ItemList.Casing_MAX.get(1)) - .itemOutputs(ItemList.Hull_MAX.get(1)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 2), + ItemList.Casing_MAX.get(1)) + .itemOutputs(ItemList.Hull_MAX.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(288)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -3041,43 +2932,6 @@ public class AssemblerRecipes implements Runnable { .eut(20) .addTo(assemblerRecipes); - if (!GT_Mod.gregtechproxy.mDisableIC2Cables) { - GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getIC2Item("tinCableItem", 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1)) - .itemOutputs(GT_ModHandler.getIC2Item("insulatedTinCableItem", 1)) - .duration(1 * SECONDS) - .eut(20) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getIC2Item("copperCableItem", 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1)) - .itemOutputs(GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1)) - .duration(1 * SECONDS) - .eut(20) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getIC2Item("goldCableItem", 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2)) - .itemOutputs(GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1)) - .duration(2 * SECONDS) - .eut(20) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getIC2Item("ironCableItem", 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 3)) - .itemOutputs(GT_ModHandler.getIC2Item("insulatedIronCableItem", 1)) - .duration(3 * SECONDS) - .eut(20) - .addTo(assemblerRecipes); - } GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Wood, 1), diff --git a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java index e69af249ee..6fc53a5675 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java @@ -1,7 +1,6 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; -import static gregtech.api.recipe.RecipeMaps.extractorRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; @@ -9,7 +8,6 @@ import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -127,43 +125,30 @@ public class CropProcessingRecipes implements Runnable { boolean aMainOutput) { if (tCrop == null || aMaterial == null || GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1) == null) return; - if (GT_Mod.gregtechproxy.mNerfedCrops) { - FluidStack fluidOutputChemReactor = aMaterialOut.mOreByProducts.isEmpty() ? null - : aMaterialOut.mOreByProducts.get(0) - .getMolten(144); - GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); - recipeBuilder - .itemInputs( - GT_Utility.copyAmount(9, tCrop), - GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4)) - .fluidInputs(Materials.Water.getFluid(1000)); - if (fluidOutputChemReactor != null) { - recipeBuilder.fluidOutputs(fluidOutputChemReactor); - } - recipeBuilder.duration(4 * SECONDS + 16 * TICKS) - .eut(24) - .addTo(UniversalChemical); + FluidStack fluidOutputChemReactor = aMaterialOut.mOreByProducts.isEmpty() ? null + : aMaterialOut.mOreByProducts.get(0) + .getMolten(144); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(16, tCrop)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1)) - .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10)))) - .duration((int) (aMaterial.getMass() * 128)) - .eut(384) - .addTo(autoclaveRecipes); - - } else { - if (aMainOutput) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, tCrop)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1)) - .duration(15 * SECONDS) - .eut(2) - .addTo(extractorRecipes); - } + GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); + recipeBuilder + .itemInputs(GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4)) + .fluidInputs(Materials.Water.getFluid(1000)); + if (fluidOutputChemReactor != null) { + recipeBuilder.fluidOutputs(fluidOutputChemReactor); } + recipeBuilder.duration(4 * SECONDS + 16 * TICKS) + .eut(24) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(16, tCrop)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1)) + .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10)))) + .duration((int) (aMaterial.getMass() * 128)) + .eut(384) + .addTo(autoclaveRecipes); } public void addProcess(ItemStack tCrop, Materials aMaterial, int chance) { diff --git a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java index 017a8e6582..b91163619b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java @@ -2,13 +2,11 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.recipe.RecipeMaps.wiremillRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeRegistrator.registerWiremillRecipes; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; @@ -39,49 +37,5 @@ public class WiremillRecipes implements Runnable { .duration(10 * SECONDS) .eut(16) .addTo(wiremillRecipes); - - if (!GT_Mod.gregtechproxy.mDisableIC2Cables) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1L)) - .itemOutputs(GT_ModHandler.getIC2Item("copperCableItem", 3L)) - .duration(5 * SECONDS) - .eut(2) - .addTo(wiremillRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnnealedCopper, 1L)) - .itemOutputs(GT_ModHandler.getIC2Item("copperCableItem", 3L)) - .duration(5 * SECONDS) - .eut(2) - .addTo(wiremillRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 1L)) - .itemOutputs(GT_ModHandler.getIC2Item("tinCableItem", 4L)) - .duration(7 * SECONDS + 10 * TICKS) - .eut(1) - .addTo(wiremillRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L)) - .itemOutputs(GT_ModHandler.getIC2Item("ironCableItem", 6L)) - .duration(10 * SECONDS) - .eut(2) - .addTo(wiremillRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L)) - .itemOutputs(GT_ModHandler.getIC2Item("ironCableItem", 6L)) - .duration(10 * SECONDS) - .eut(2) - .addTo(wiremillRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) - .itemOutputs(GT_ModHandler.getIC2Item("goldCableItem", 6L)) - .duration(10 * SECONDS) - .eut(1) - .addTo(wiremillRecipes); - } } } |