diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
18 files changed, 312 insertions, 444 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index c9345964f1..212459ab9c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -127,20 +127,14 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist } switch (aMaterial.mName) { - case "Mercury": - System.err.println( - "'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto Greg :)"); - break; - case "Iron": - case "WroughtIron": - case "Steel": - GT_Values.RA.addAssemblerRecipe( - ItemList.IC2_Compressed_Coal_Ball.get(8L), - GT_Utility.copyAmount(1L, aStack), - ItemList.IC2_Compressed_Coal_Chunk.get(1L), - 400, - 4); - break; + case "Mercury" -> System.err.println( + "'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto Greg :)"); + case "Iron", "WroughtIron", "Steel" -> GT_Values.RA.addAssemblerRecipe( + ItemList.IC2_Compressed_Coal_Ball.get(8L), + GT_Utility.copyAmount(1L, aStack), + ItemList.IC2_Compressed_Coal_Chunk.get(1L), + 400, + 4); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index e088330204..c7c92b8daf 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -25,7 +25,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aPrefix) { - case cell: + case cell -> { if (aMaterial == Materials.Empty) { GT_ModHandler.removeRecipeByOutputDelayed(aStack); if (aModName.equalsIgnoreCase("AtomicScience")) { @@ -145,8 +145,8 @@ public class ProcessingCell implements IOreRecipeRegistrator { } } } - break; - case cellPlasma: + } + case cellPlasma -> { if (aMaterial == Materials.Empty) { GT_ModHandler.removeRecipeByOutputDelayed(aStack); } else { @@ -159,12 +159,11 @@ public class ProcessingCell implements IOreRecipeRegistrator { 4); GT_Values.RA.addVacuumFreezerRecipe( GT_Utility.copyAmount(1L, aStack), - gregtech.api.util.GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), (int) Math.max(aMaterial.getMass() * 2L, 1L)); } - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java index 643d6af903..ec380c5c32 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java @@ -19,22 +19,12 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi ItemStack aStack) { if (gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && aModName.equals("gregtech")) return; switch (aMaterial.mName) { - case "Good": - case "Data": - case "Elite": - case "Master": - case "Ultimate": - case "Superconductor": - case "Infinite": - case "Bio": - if (!gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && !aModName.equals("gregtech")) + case "Good", "Data", "Elite", "Master", "Ultimate", "Superconductor", "Infinite", "Bio" -> { + if (!GT_OreDictUnificator.isBlacklisted(aStack) && !aModName.equals("gregtech")) GT_ModHandler.removeRecipeByOutputDelayed(aStack); - break; - case "Primitive": - case "Advanced": - GT_ModHandler.removeRecipeByOutputDelayed(aStack); - break; - case "Basic": + } + case "Primitive", "Advanced" -> GT_ModHandler.removeRecipeByOutputDelayed(aStack); + case "Basic" -> { GT_ModHandler.removeRecipeByOutputDelayed(aStack); GT_ModHandler.addCraftingRecipe( aStack, @@ -47,7 +37,7 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.addShapelessCraftingRecipe( GT_ModHandler.getIC2Item("electronicCircuit", 1L), new Object[] { ItemList.Circuit_Integrated.getWildcard(1L) }); - break; + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index 8ff11d5121..e56888c64f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -23,25 +23,20 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aOreDictName) { - case "craftingQuartz": - GT_Values.RA.addAssemblerRecipe( - new ItemStack(Blocks.redstone_torch, 3, 32767), - GT_Utility.copyAmount(1L, aStack), - Materials.Concrete.getMolten(144L), - new ItemStack(net.minecraft.init.Items.comparator, 1, 0), - 800, - 1); - break; - case "craftingWireCopper": - case "craftingWireTin": - GT_Values.RA.addAssemblerRecipe( - ItemList.Circuit_Basic.get(1L), - GT_Utility.copyAmount(1L, aStack), - GT_ModHandler.getIC2Item("frequencyTransmitter", 1L), - 800, - 1); - break; - case "craftingLensBlue": + case "craftingQuartz" -> GT_Values.RA.addAssemblerRecipe( + new ItemStack(Blocks.redstone_torch, 3, 32767), + GT_Utility.copyAmount(1L, aStack), + Materials.Concrete.getMolten(144L), + new ItemStack(net.minecraft.init.Items.comparator, 1, 0), + 800, + 1); + case "craftingWireCopper", "craftingWireTin" -> GT_Values.RA.addAssemblerRecipe( + ItemList.Circuit_Basic.get(1L), + GT_Utility.copyAmount(1L, aStack), + GT_ModHandler.getIC2Item("frequencyTransmitter", 1L), + 800, + 1); + case "craftingLensBlue" -> { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), @@ -89,8 +84,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 2400, 500000, true); - break; - case "craftingLensYellow": + } + case "craftingLensYellow" -> { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), @@ -138,8 +133,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 300, 30720, true); - break; - case "craftingLensOrange": + } + case "craftingLensOrange" -> { GT_Values.RA.addLaserEngraverRecipe( ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack), @@ -168,8 +163,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 300, 4096, false); - break; - case "craftingLensCyan": + } + case "craftingLensCyan" -> { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), @@ -217,8 +212,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 150, 30720, true); - break; - case "craftingLensRed": + } + case "craftingLensRed" -> { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L), GT_Utility.copyAmount(0L, aStack), @@ -266,8 +261,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 1500, 122880, true); - break; - case "craftingLensGreen": + } + case "craftingLensGreen" -> { GT_Values.RA.addLaserEngraverRecipe( ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), GT_Utility.copyAmount(0L, aStack), @@ -317,8 +312,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 1200, 30720, true); - break; - case "craftingLensWhite": + } + case "craftingLensWhite" -> { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), @@ -331,7 +326,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 19), 2000, 1920); - GT_Values.RA.addLaserEngraverRecipe( new ItemStack(Blocks.sandstone, 1, 2), GT_Utility.copyAmount(0L, aStack), @@ -391,7 +385,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 150, 30720, true); - break; + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java index 79c5ca9874..d280492e01 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java @@ -23,7 +23,7 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist boolean aSpecialRecipeReq2 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING); switch (aPrefix) { - case crateGtDust: + case crateGtDust -> { GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L)), ItemList.Crate_Empty.get(1L), @@ -40,8 +40,8 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), GT_Proxy.tBits, new Object[] { "Xc", 'X', OrePrefixes.crateGtDust.get(aMaterial) }); - break; - case crateGtIngot: + } + case crateGtIngot -> { GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L)), ItemList.Crate_Empty.get(1L), @@ -58,8 +58,8 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), GT_Proxy.tBits, new Object[] { "Xc", 'X', OrePrefixes.crateGtIngot.get(aMaterial) }); - break; - case crateGtGem: + } + case crateGtGem -> { GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L)), ItemList.Crate_Empty.get(1L), @@ -76,8 +76,8 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), GT_Proxy.tBits, new Object[] { "Xc", 'X', OrePrefixes.crateGtGem.get(aMaterial) }); - break; - case crateGtPlate: + } + case crateGtPlate -> { GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L)), ItemList.Crate_Empty.get(1L), @@ -94,9 +94,8 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), GT_Proxy.tBits, new Object[] { "Xc", 'X', OrePrefixes.crateGtPlate.get(aMaterial) }); - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java index 2a6678c485..4d582564f4 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java @@ -22,7 +22,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr gregtech.api.util.GT_Utility.copyAmount(8L, aStack), ItemList.IC2_PlantballCompressed.get(1L)); switch (aOreDictName) { - case "cropTea": + case "cropTea" -> { GT_Values.RA.addBrewingRecipe(aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.tea"), false); GT_Values.RA.addBrewingRecipe( aStack, @@ -30,8 +30,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .getFluid(), FluidRegistry.getFluid("potion.tea"), false); - break; - case "cropGrape": + } + case "cropGrape" -> { GT_Values.RA.addBrewingRecipe( aStack, FluidRegistry.WATER, @@ -43,18 +43,14 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .getFluid(), FluidRegistry.getFluid("potion.grapejuice"), false); - break; - case "cropChilipepper": - GT_ModHandler.addPulverisationRecipe( - aStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)); - break; - case "cropCoffee": - GT_ModHandler.addPulverisationRecipe( - aStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)); - break; - case "cropPotato": + } + case "cropChilipepper" -> GT_ModHandler.addPulverisationRecipe( + aStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)); + case "cropCoffee" -> GT_ModHandler.addPulverisationRecipe( + aStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)); + case "cropPotato" -> { GT_Values.RA.addSlicerRecipe( aStack, ItemList.Shape_Slicer_Flat.get(0L), @@ -78,8 +74,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .getFluid(), FluidRegistry.getFluid("potion.potatojuice"), true); - break; - case "cropLemon": + } + case "cropLemon" -> { GT_Values.RA.addSlicerRecipe( aStack, ItemList.Shape_Slicer_Flat.get(0L), @@ -102,31 +98,25 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr FluidRegistry.getFluid("potion.vodka"), FluidRegistry.getFluid("potion.leninade"), true); - break; - case "cropTomato": - GT_Values.RA.addSlicerRecipe( - aStack, - ItemList.Shape_Slicer_Flat.get(0L), - ItemList.Food_Sliced_Tomato.get(4L), - 64, - 4); - break; - case "cropCucumber": - GT_Values.RA.addSlicerRecipe( - aStack, - ItemList.Shape_Slicer_Flat.get(0L), - ItemList.Food_Sliced_Cucumber.get(4L), - 64, - 4); - break; - case "cropOnion": - GT_Values.RA.addSlicerRecipe( - aStack, - ItemList.Shape_Slicer_Flat.get(0L), - ItemList.Food_Sliced_Onion.get(4L), - 64, - 4); - break; + } + case "cropTomato" -> GT_Values.RA.addSlicerRecipe( + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Tomato.get(4L), + 64, + 4); + case "cropCucumber" -> GT_Values.RA.addSlicerRecipe( + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Cucumber.get(4L), + 64, + 4); + case "cropOnion" -> GT_Values.RA.addSlicerRecipe( + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Onion.get(4L), + 64, + 4); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java index 77d20209b8..627cdc10d8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java @@ -20,7 +20,7 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aPrefix) { - case crushedCentrifuged: + case crushedCentrifuged -> { GT_Values.RA.addForgeHammerRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), @@ -35,8 +35,8 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR 1L), 10, false); - break; - case crushedPurified: + } + case crushedPurified -> { GT_ModHandler.addThermalCentrifugeRecipe( GT_Utility.copyAmount(1L, aStack), new int[] { 10000, 1111 }, @@ -50,55 +50,35 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR OrePrefixes.dust, GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L)); - ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L); if (tGem != null) { switch (aMaterial.mName) { - case "Tanzanite": - case "Sapphire": - case "Olivine": - case "GreenSapphire": - case "Opal": - case "Amethyst": - case "Emerald": - case "Ruby": - case "Amber": - case "Diamond": - case "FoolsRuby": - case "BlueTopaz": - case "GarnetRed": - case "Topaz": - case "Jasper": - case "GarnetYellow": - GT_Values.RA.addSifterRecipe( - GT_Utility.copyAmount(1L, aStack), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), - tGem, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, - new int[] { 300, 1200, 4500, 1400, 2800, 3500 }, - 800, - 16); - break; - default: - GT_Values.RA.addSifterRecipe( - GT_Utility.copyAmount(1L, aStack), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), - tGem, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, - new int[] { 100, 400, 1500, 2000, 4000, 5000 }, - 800, - 16); + case "Tanzanite", "Sapphire", "Olivine", "GreenSapphire", "Opal", "Amethyst", "Emerald", "Ruby", "Amber", "Diamond", "FoolsRuby", "BlueTopaz", "GarnetRed", "Topaz", "Jasper", "GarnetYellow" -> GT_Values.RA.addSifterRecipe( + GT_Utility.copyAmount(1L, aStack), + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, + GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, + new int[] { 300, 1200, 4500, 1400, 2800, 3500 }, + 800, + 16); + default -> GT_Values.RA.addSifterRecipe( + GT_Utility.copyAmount(1L, aStack), + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, + GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, + new int[] { 100, 400, 1500, 2000, 4000, 5000 }, + 800, + 16); } } - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 8df5270399..9be8efb946 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -32,7 +32,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aPrefix) { - case dust: + case dust -> { if (aMaterial.mFuelPower > 0) GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aStack), null, @@ -59,7 +59,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr null); } } - ItemStack tDustStack; if ((null != (tDustStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))) && (!aMaterial.contains(SubTag.NO_SMELTING))) { @@ -111,7 +110,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)); } } - if ((aMaterial.mMaterialList.size() > 0) && ((aMaterial.mExtraData & 0x3) != 0)) { long tItemAmount = 0L; long tCapsuleCount = 0L; @@ -157,11 +155,10 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr int tList_sS = tList.size(); for (int i = 0; i < tList_sS; i++) { if ((!ItemList.Cell_Air.isStackEqual(tList.get(i))) - && ((tFluid = GT_Utility.getFluidForFilledItem((ItemStack) tList.get(i), true)) - != null)) { + && ((tFluid = GT_Utility.getFluidForFilledItem(tList.get(i), true)) != null)) { tFluid.amount *= tList.get(i).stackSize; tCapsuleCount -= GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( - (ItemStack) tList.get(i)); + tList.get(i)); tList.remove(i); break; } @@ -171,12 +168,12 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr tCapsuleCount > 0L ? ItemList.Cell_Empty.get(tCapsuleCount) : null, null, tFluid, - tList.size() < 1 ? null : (ItemStack) tList.get(0), - tList.size() < 2 ? null : (ItemStack) tList.get(1), - tList.size() < 3 ? null : (ItemStack) tList.get(2), - tList.size() < 4 ? null : (ItemStack) tList.get(3), - tList.size() < 5 ? null : (ItemStack) tList.get(4), - tList.size() < 6 ? null : (ItemStack) tList.get(5), + tList.size() < 1 ? null : tList.get(0), + tList.size() < 2 ? null : tList.get(1), + tList.size() < 3 ? null : tList.get(2), + tList.size() < 4 ? null : tList.get(3), + tList.size() < 5 ? null : tList.get(4), + tList.size() < 6 ? null : tList.get(5), null, (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), Math.min(4, tList.size()) * 30); @@ -186,12 +183,12 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr tCapsuleCount > 0L ? ItemList.Cell_Empty.get(tCapsuleCount) : null, null, tFluid, - tList.size() < 1 ? null : (ItemStack) tList.get(0), - tList.size() < 2 ? null : (ItemStack) tList.get(1), - tList.size() < 3 ? null : (ItemStack) tList.get(2), - tList.size() < 4 ? null : (ItemStack) tList.get(3), - tList.size() < 5 ? null : (ItemStack) tList.get(4), - tList.size() < 6 ? null : (ItemStack) tList.get(5), + tList.size() < 1 ? null : tList.get(0), + tList.size() < 2 ? null : tList.get(1), + tList.size() < 3 ? null : tList.get(2), + tList.size() < 4 ? null : tList.get(3), + tList.size() < 5 ? null : tList.get(4), + tList.size() < 6 ? null : tList.get(5), null, (int) Math.max(1L, Math.abs(aMaterial.getMass() * 4L * tItemAmount)), Math.min(4, tList.size()) * 5); @@ -227,7 +224,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr 24, false); } - switch (aMaterial.mName) { case "NULL": break; @@ -309,15 +305,12 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)); } - break; - case dustPure: - case dustImpure: - case dustRefined: - Materials tByProduct = (Materials) GT_Utility.selectItemInList( + } + case dustPure, dustImpure, dustRefined -> { + Materials tByProduct = GT_Utility.selectItemInList( aPrefix == OrePrefixes.dustRefined ? 2 : aPrefix == OrePrefixes.dustPure ? 1 : 0, aMaterial, aMaterial.mOreByProducts); - if (aPrefix == OrePrefixes.dustPure) { if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_GOLD)) GT_Values.RA.addElectromagneticSeparatorRecipe( @@ -361,7 +354,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.addAutoclaveRecipe( GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(2), - gregtech.api.util.GT_ModHandler.getDistilledWater(100L), + GT_ModHandler.getDistilledWater(100L), GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), 9500, 1500, @@ -377,7 +370,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr 24, false); } - ItemStack tImpureStack = GT_OreDictUnificator.get( OrePrefixes.dustTiny, tByProduct, @@ -479,8 +471,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr (int) Math.max(1L, aMaterial.getMass() * 8L), 5); } - break; - case dustSmall: + } + case dustSmall -> { GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(4L, aStack), ItemList.Schematic_Dust.get(0L), @@ -499,8 +491,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr null); } } - break; - case dustTiny: + } + case dustTiny -> { GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(9L, aStack), ItemList.Schematic_Dust.get(0L), @@ -519,14 +511,13 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr null); } } - if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMELTING)) { + if (!aMaterial.contains(SubTag.NO_SMELTING)) { if (aMaterial.mBlastFurnaceRequired) { GT_ModHandler.removeFurnaceSmelting(aStack); } } - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java index 27a11896f6..ae606caaab 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java @@ -20,7 +20,7 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aOreDictName) { - case "foodCheese": + case "foodCheese" -> { GT_Values.RA.addSlicerRecipe( aStack, ItemList.Shape_Slicer_Flat.get(0L), @@ -28,15 +28,14 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr 64, 4); GT_OreDictUnificator.addItemData(aStack, new gregtech.api.objects.ItemData(Materials.Cheese, 3628800L)); - break; - case "foodDough": + } + case "foodDough" -> { GT_ModHandler.removeFurnaceSmelting(aStack); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Food_Flat_Dough.get(1L), 16, 4); - GT_Values.RA.addMixerRecipe( aStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L), @@ -67,7 +66,6 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr ItemList.Food_Dough_Chocolate.get(2L), 32, 8); - GT_Values.RA.addFormingPressRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Mold_Bun.get(0L), @@ -86,6 +84,7 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr ItemList.Food_Raw_Baguette.get(1L), 384, 4); + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java index c1e767b9b5..ed0fa7fe94 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java @@ -22,7 +22,7 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aPrefix) { - case gearGt: + case gearGt -> { GT_ModHandler.removeRecipeByOutputDelayed(aStack); if (aMaterial.mStandardMoltenFluid != null) if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { @@ -36,21 +36,17 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aMaterial.mName) { - case "Wood": - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "SPS", "PsP", "SPS", 'P', OrePrefixes.plank.get(aMaterial), 'S', - OrePrefixes.stick.get(aMaterial) }); - break; - case "Stone": - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "SPS", "PfP", "SPS", 'P', OrePrefixes.stoneSmooth, 'S', - new ItemStack(Blocks.stone_button, 1, 32767) }); - break; - default: + case "Wood" -> GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "SPS", "PsP", "SPS", 'P', OrePrefixes.plank.get(aMaterial), 'S', + OrePrefixes.stick.get(aMaterial) }); + case "Stone" -> GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "SPS", "PfP", "SPS", 'P', OrePrefixes.stoneSmooth, 'S', + new ItemStack(Blocks.stone_button, 1, 32767) }); + default -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), @@ -58,10 +54,11 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr new Object[] { "SPS", "PwP", "SPS", 'P', OrePrefixes.plate.get(aMaterial), 'S', OrePrefixes.stick.get(aMaterial) }); } + } } } - break; - case gearGtSmall: + } + case gearGtSmall -> { if (aMaterial.mStandardMoltenFluid != null) if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( @@ -74,19 +71,15 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aMaterial.mName) { - case "Wood": - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "P ", " s", 'P', OrePrefixes.plank.get(aMaterial) }); - break; - case "Stone": - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "P ", " f", 'P', OrePrefixes.stoneSmooth }); - break; - default: + case "Wood" -> GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "P ", " s", 'P', OrePrefixes.plank.get(aMaterial) }); + case "Stone" -> GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "P ", " f", 'P', OrePrefixes.stoneSmooth }); + default -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), @@ -94,11 +87,11 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr new Object[] { " S ", "hPx", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial) }); } + } } } - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 5bc183a1da..04ef7c4731 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -35,7 +35,7 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra boolean aFuelPower = aMaterial.mFuelPower > 0; switch (aPrefix) { - case gem: + case gem -> { if (aFuelPower) { GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aStack), @@ -96,7 +96,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra (int) Math.max(aMaterialMass * 9L, 1L), calculateRecipeEU(aMaterial, 96)); } - if (aNoWorking) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_Values.RA.addLatheRecipe( @@ -135,8 +134,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra break; case "Coal": case "Charcoal": - if (gregtech.api.GregTech_API.sRecipeFile.get( - gregtech.api.enums.ConfigCategories.Recipes.disabledrecipes, + if (GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, "torchesFromCoal", false)) { GT_ModHandler.removeRecipeDelayed( @@ -160,8 +159,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 30); } for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver - // Recipe - // adder + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -170,8 +169,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 1200, 480); } - break; - case gemChipped: + } + case gemChipped -> { if (aFuelPower) GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aStack), null, @@ -201,8 +200,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra } } for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver - // Recipe - // adder + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -211,8 +210,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 600, 30); } - break; - case gemExquisite: + } + case gemExquisite -> { if (aFuelPower) GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aStack), null, @@ -230,8 +229,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), 64, 16); - break; - case gemFlawed: + } + case gemFlawed -> { if (aFuelPower) GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aStack), null, @@ -266,8 +265,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 64, 16); for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver - // Recipe - // adder + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -276,8 +275,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 600, 120); } - break; - case gemFlawless: + } + case gemFlawless -> { if (aFuelPower) GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aStack), null, @@ -314,8 +313,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 64, 16); for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver - // Recipe - // adder + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -324,9 +323,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 2400, 2000); } - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java index 31c75fbcbb..baa760dd3b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java @@ -21,8 +21,7 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aMaterial.mName) { - case "Diamond": - case "Glass": + case "Diamond", "Glass" -> { GT_Values.RA.addLatheRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), @@ -35,15 +34,13 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), 2400, 16); - break; - case "ChromaticGlass": - GT_Values.RA.addCompressorRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), - GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), - 600 * 20, - 1966080); - break; - default: + } + case "ChromaticGlass" -> GT_Values.RA.addCompressorRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), + GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), + 600 * 20, + 1966080); + default -> { GT_Values.RA.addLatheRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), @@ -64,6 +61,7 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr aStack, TextureFactory.of(Textures.BlockIcons.MACHINE_CASINGS[2][0], lensCoverTexture), new gregtech.common.covers.GT_Cover_Lens(aMaterial.mColor.mIndex, lensCoverTexture)); + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index ca585feab6..cba50285a6 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -15,7 +15,7 @@ import gregtech.api.util.GT_Utility; public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistrator { - private ArrayList<Materials> mAlreadyListedOres = new ArrayList(1000); + private ArrayList<Materials> mAlreadyListedOres = new ArrayList<>(1000); public ProcessingOre() { for (OrePrefixes tPrefix : OrePrefixes.values()) if ((tPrefix.name() @@ -114,7 +114,7 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra aMaterial.mOreMultiplier * aMultiplier); } - ArrayList<ItemStack> tByProductStacks = new ArrayList(); + ArrayList<ItemStack> tByProductStacks = new ArrayList<>(); for (Materials tMat : aMaterial.mOreByProducts) { ItemStack tByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); @@ -140,7 +140,7 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra gregtech.api.util.GT_Recipe.GT_Recipe_Map.sByProductList.addFakeRecipe( false, new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ore, aMaterial, aOreStack, 1L) }, - (ItemStack[]) tByProductStacks.toArray(new ItemStack[0]), + tByProductStacks.toArray(new ItemStack[0]), null, null, null, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java index c9c7b25419..58f0c6e29b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java @@ -31,11 +31,7 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aPrefix) { - case pipeHuge: - case pipeLarge: - case pipeMedium: - case pipeSmall: - case pipeTiny: + case pipeHuge, pipeLarge, pipeMedium, pipeSmall, pipeTiny -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( @@ -80,23 +76,17 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "DhD", "D D", "DwD", 'D', OrePrefixes.plateDouble.get(aMaterial) }); } - break; - case pipeRestrictiveHuge: - case pipeRestrictiveLarge: - case pipeRestrictiveMedium: - case pipeRestrictiveSmall: - case pipeRestrictiveTiny: - RA.addAssemblerRecipe( - GT_OreDictUnificator.get(aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true), - GT_OreDictUnificator.get( - OrePrefixes.ring, - Materials.Steel, - aPrefix.mSecondaryMaterial.mAmount / OrePrefixes.ring.mMaterialAmount), - GT_Utility.copyAmount(1L, aStack), - (int) (aPrefix.mSecondaryMaterial.mAmount * 400L / OrePrefixes.ring.mMaterialAmount), - 4); - break; - case pipeQuadruple: + } + case pipeRestrictiveHuge, pipeRestrictiveLarge, pipeRestrictiveMedium, pipeRestrictiveSmall, pipeRestrictiveTiny -> RA.addAssemblerRecipe( + GT_OreDictUnificator.get(aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true), + GT_OreDictUnificator.get( + OrePrefixes.ring, + Materials.Steel, + aPrefix.mSecondaryMaterial.mAmount / OrePrefixes.ring.mMaterialAmount), + GT_Utility.copyAmount(1L, aStack), + (int) (aPrefix.mSecondaryMaterial.mAmount * 400L / OrePrefixes.ring.mMaterialAmount), + 4); + case pipeQuadruple -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( @@ -105,15 +95,14 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr new Object[] { "MM ", "MM ", " ", 'M', GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1) }); } - RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 4), GT_Utility.getIntegratedCircuit(9), GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1), 60, calculateRecipeEU(aMaterial, 4)); - break; - case pipeNonuple: + } + case pipeNonuple -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( @@ -127,16 +116,14 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr false, true) }); } - RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 9), GT_Utility.getIntegratedCircuit(9), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, aMaterial, 1), 60, calculateRecipeEU(aMaterial, 8)); - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index 0fa3ac1082..da12900bfd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -55,32 +55,15 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist final long aMaterialMass = aMaterial.getMass(); switch (aPrefix) { - case plate: - registerPlate(aMaterial, aStack, aNoSmashing); - break; - case plateDouble: - registerPlateDouble(aMaterial, aStack, aNoSmashing, aMaterialMass); - break; - case plateTriple: - registerPlateTriple(aMaterial, aStack, aNoSmashing, aMaterialMass); - break; - case plateQuadruple: - registerPlateQuadruple(aMaterial, aStack, aNoSmashing, aMaterialMass, aNoWorking); - break; - case plateQuintuple: - registerPlateQuintuple(aMaterial, aStack, aNoSmashing, aMaterialMass); - break; - case plateDense: - registerPlateDense(aMaterial, aStack, aNoSmashing, aMaterialMass); - break; - case itemCasing: - registerItemCasing(aPrefix, aMaterial, aStack, aNoSmashing); - break; - case plateAlloy: - registerPlateAlloy(aOreDictName, aStack); - break; - default: - break; + case plate -> registerPlate(aMaterial, aStack, aNoSmashing); + case plateDouble -> registerPlateDouble(aMaterial, aStack, aNoSmashing, aMaterialMass); + case plateTriple -> registerPlateTriple(aMaterial, aStack, aNoSmashing, aMaterialMass); + case plateQuadruple -> registerPlateQuadruple(aMaterial, aStack, aNoSmashing, aMaterialMass, aNoWorking); + case plateQuintuple -> registerPlateQuintuple(aMaterial, aStack, aNoSmashing, aMaterialMass); + case plateDense -> registerPlateDense(aMaterial, aStack, aNoSmashing, aMaterialMass); + case itemCasing -> registerItemCasing(aPrefix, aMaterial, aStack, aNoSmashing); + case plateAlloy -> registerPlateAlloy(aOreDictName, aStack); + default -> {} } } @@ -478,14 +461,13 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist private void registerPlateAlloy(final String aOreDictName, final ItemStack aStack) { switch (aOreDictName) { - case "plateAlloyCarbon": + case "plateAlloyCarbon" -> { RA.addAssemblerRecipe( GT_ModHandler.getIC2Item("generator", 1L), GT_Utility.copyAmount(4L, aStack), GT_ModHandler.getIC2Item("windMill", 1L), 6400, 8); - GT_ModHandler.addAlloySmelterRecipe( GT_Utility.copyAmount(1L, aStack), new ItemStack(Blocks.glass, 3, W), @@ -493,7 +475,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist 400, 4, false); - GT_ModHandler.addAlloySmelterRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Glass.getDust(3), @@ -501,10 +482,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist 400, 4, false); - - break; - - case "plateAlloyAdvanced": + } + case "plateAlloyAdvanced" -> { GT_ModHandler.addAlloySmelterRecipe( GT_Utility.copyAmount(1L, aStack), new ItemStack(Blocks.glass, 3, W), @@ -512,7 +491,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist 400, 4, false); - GT_ModHandler.addAlloySmelterRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Glass.getDust(3), @@ -520,18 +498,12 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist 400, 4, false); - - break; - - case "plateAlloyIridium": + } + case "plateAlloyIridium" -> // Remove IC2 Shaped recipe for Iridium Reinforced Plate GT_ModHandler.removeRecipeByOutputDelayed(aStack); - - break; - - default: - break; + default -> {} } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 011bdf3bc8..aa12ca42ea 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -243,55 +243,55 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Extruder_Sword.get(0L, new Object[0]), + ItemList.Shape_Extruder_Sword.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(3L, aStack), - ItemList.Shape_Extruder_Pickaxe.get(0L, new Object[0]), + ItemList.Shape_Extruder_Pickaxe.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 3L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Shovel.get(0L, new Object[0]), + ItemList.Shape_Extruder_Shovel.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 1L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(3L, aStack), - ItemList.Shape_Extruder_Axe.get(0L, new Object[0]), + ItemList.Shape_Extruder_Axe.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 3L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Extruder_Hoe.get(0L, new Object[0]), + ItemList.Shape_Extruder_Hoe.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(6L, aStack), - ItemList.Shape_Extruder_Hammer.get(0L, new Object[0]), + ItemList.Shape_Extruder_Hammer.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 6L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Extruder_File.get(0L, new Object[0]), + ItemList.Shape_Extruder_File.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Extruder_Saw.get(0L, new Object[0]), + ItemList.Shape_Extruder_Saw.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(4L, aStack), - ItemList.Shape_Extruder_Gear.get(0L, new Object[0]), + ItemList.Shape_Extruder_Gear.get(0L), GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 5L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); @@ -328,7 +328,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } switch (aMaterial.mSmeltInto.mName) { - case "Glass": + case "Glass" -> { GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Bottle.get(0L), @@ -341,8 +341,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi new ItemStack(Items.glass_bottle, 1), tAmount * 64, 4); - break; - case "Steel": + } + case "Steel" -> { GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Cell.get(0L), @@ -361,9 +361,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("casingadviron", tAmount * 3), tAmount * 128, 1 * tVoltageMultiplier); - break; - case "Iron": - case "WroughtIron": + } + case "Iron", "WroughtIron" -> { GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Cell.get(0L), @@ -388,8 +387,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi new ItemStack(Blocks.anvil, 1, 0), tAmount * 512, 4 * tVoltageMultiplier); - break; - case "Tin": + } + case "Tin" -> { GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Extruder_Cell.get(0L), @@ -408,8 +407,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("casingtin", tAmount * 3), tAmount * 128, 1 * tVoltageMultiplier); - break; - case "Lead": + } + case "Lead" -> { if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L), @@ -422,9 +421,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("casinglead", tAmount * 3), tAmount * 128, 1 * tVoltageMultiplier); - break; - case "Copper": - case "AnnealedCopper": + } + case "Copper", "AnnealedCopper" -> { if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L), @@ -437,8 +435,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("casingcopper", tAmount * 3), tAmount * 128, 1 * tVoltageMultiplier); - break; - case "Bronze": + } + case "Bronze" -> { if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L), @@ -451,8 +449,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("casingbronze", tAmount * 3), tAmount * 128, 1 * tVoltageMultiplier); - break; - case "Gold": + } + case "Gold" -> { if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L), @@ -465,15 +463,14 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("casinggold", tAmount * 3), tAmount * 128, 1 * tVoltageMultiplier); - break; - case "Polytetrafluoroethylene": // Recipe for cells from PTFE, why is it here? + } + case "Polytetrafluoroethylene" -> // Recipe for cells from PTFE, why is it here? GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Cell.get(0L), ItemList.Cell_Empty.get(tAmount * 4), tAmount * 128, 30); - break; } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java index 31260c1308..178a5f9e77 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java @@ -43,7 +43,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg && !aMaterial.contains(SubTag.NO_WORKING); boolean aNoWorking = aMaterial.contains(SubTag.NO_WORKING); switch (aPrefix) { - case toolHeadArrow: + case toolHeadArrow -> { if (aMaterial.mStandardMoltenFluid != null) if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( @@ -64,8 +64,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg new Object[] { (aMaterial.contains(SubTag.WOOD) ? 115 : 'x') + "Pf", 'P', OrePrefixes.plate.get(aMaterial) }); } - break; - case toolHeadAxe: + } + case toolHeadAxe -> { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.AXE, @@ -96,8 +96,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), GT_Proxy.tBits, new Object[] { "GG ", "G ", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); - break; - case toolHeadBuzzSaw: + } + case toolHeadBuzzSaw -> { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.BUZZSAW_LV, @@ -228,8 +228,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.toolHeadBuzzSaw, aMaterial, 1L), GT_Proxy.tBits, new Object[] { "wXh", "X X", "fXx", 'X', OrePrefixes.plate.get(aMaterial) }); - break; - case toolHeadChainsaw: + } + case toolHeadChainsaw -> { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.CHAINSAW_LV, @@ -361,8 +361,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { "SRS", "XhX", "SRS", 'X', OrePrefixes.plate.get(aMaterial), 'S', OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel) }); - break; - case toolHeadDrill: + } + case toolHeadDrill -> { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.DRILL_LV, @@ -557,8 +557,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg calculateRecipeEU(aMaterial, (int) GT_Values.VP[2])); } } - break; - case toolHeadFile: + } + case toolHeadFile -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( @@ -586,7 +586,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg } } } - GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial, 1L), @@ -600,9 +599,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg null), 200, calculateRecipeEU(aMaterial, 120)); - - break; - case toolHeadHoe: + } + case toolHeadHoe -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( @@ -635,8 +633,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), GT_Proxy.tBits, new Object[] { "GG ", "f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); - break; - case toolHeadPickaxe: + } + case toolHeadPickaxe -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( @@ -659,7 +657,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { "GGG", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); } - GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), @@ -673,9 +670,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg null), 200, 120); - - break; - case toolHeadPlow: + } + case toolHeadPlow -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( @@ -697,7 +693,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { "GG", "GG", " f", 'G', OrePrefixes.gem.get(aMaterial) }); } - GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), @@ -711,9 +706,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg null), 200, calculateRecipeEU(aMaterial, 120)); - - break; - case toolHeadSaw: + } + case toolHeadSaw -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( @@ -736,7 +730,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { "GGf", 'G', OrePrefixes.gem.get(aMaterial) }); } - GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), @@ -750,9 +743,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg null), 200, calculateRecipeEU(aMaterial, 120)); - - break; - case toolHeadSense: + } + case toolHeadSense -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( @@ -775,7 +767,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { "GGG", " f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); } - GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), @@ -789,9 +780,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg null), 200, calculateRecipeEU(aMaterial, 120)); - - break; - case toolHeadShovel: + } + case toolHeadShovel -> { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.SHOVEL, @@ -822,8 +812,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), GT_Proxy.tBits, new Object[] { "fG", 'G', OrePrefixes.gem.get(aMaterial) }); - break; - case toolHeadSword: + } + case toolHeadSword -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( @@ -846,7 +836,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { " G", "fG", 'G', OrePrefixes.gem.get(aMaterial) }); } - GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), @@ -860,8 +849,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg null), 200, calculateRecipeEU(aMaterial, 120)); - break; - case toolHeadUniversalSpade: + } + case toolHeadUniversalSpade -> { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.UNIVERSALSPADE, @@ -889,8 +878,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), GT_Proxy.tBits, new Object[] { "fX", 'X', OrePrefixes.toolHeadShovel.get(aMaterial) }); - break; - case toolHeadWrench: + } + case toolHeadWrench -> { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.WRENCH_LV, @@ -1152,9 +1141,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg new Object[] { "hXW", "XRX", "WXd", 'X', OrePrefixes.plate.get(aMaterial), 'S', OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel), 'W', OrePrefixes.screw.get(Materials.Steel) }); - break; - case toolHeadHammer: - case toolHeadMallet: + } + case toolHeadHammer, toolHeadMallet -> { GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), @@ -1216,8 +1204,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { "II ", "IIh", "II ", 'P', OrePrefixes.plate.get(aMaterial), 'I', OrePrefixes.ingot.get(aMaterial) }); - break; - case turbineBlade: + } + case turbineBlade -> { GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 4L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Magnalium, 1L), @@ -1242,7 +1230,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(176, 1, aMaterial, aMaterial, null), 1280, calculateRecipeEU(aMaterial, 6400)); - if (aSpecialRecipeReq2) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( @@ -1261,9 +1248,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg 200, calculateRecipeEU(aMaterial, 60)); } - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index c991fdd149..3ae77f5b91 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -49,10 +49,10 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr int cableWidth; OrePrefixes correspondingCable; switch (aPrefix) { - case wireGt01: + case wireGt01 -> { cableWidth = 1; correspondingCable = OrePrefixes.cableGt01; - if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) { + if (!aMaterial.contains(SubTag.NO_SMASHING)) { GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L), @@ -104,8 +104,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L), 500, calculateRecipeEU(aMaterial, 8)); - break; - case wireGt02: + } + case wireGt02 -> { cableWidth = 2; correspondingCable = OrePrefixes.cableGt02; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -116,8 +116,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Utility.copyAmount(1L, aStack), new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); } - break; - case wireGt04: + } + case wireGt04 -> { cableWidth = 4; correspondingCable = OrePrefixes.cableGt04; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -132,8 +132,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Utility.copyAmount(1L, aStack), new Object[] { OrePrefixes.wireGt02.get(aMaterial), OrePrefixes.wireGt02.get(aMaterial) }); } - break; - case wireGt08: + } + case wireGt08 -> { cableWidth = 8; correspondingCable = OrePrefixes.cableGt08; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -150,8 +150,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Utility.copyAmount(1L, aStack), new Object[] { OrePrefixes.wireGt04.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); } - break; - case wireGt12: + } + case wireGt12 -> { cableWidth = 12; correspondingCable = OrePrefixes.cableGt12; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -162,8 +162,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Utility.copyAmount(1L, aStack), new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); } - break; - case wireGt16: + } + case wireGt16 -> { cableWidth = 16; correspondingCable = OrePrefixes.cableGt16; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -182,13 +182,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr AE2addNewAttunement(aStack); } } - break; - default: + } + default -> { GT_Log.err.println( "OrePrefix " + aPrefix.name() + " cannot be registered as a cable for Material " + aMaterial.mName); return; + } } int costMultiplier = cableWidth / 4 + 1; |