From b088958c9f6935d356b6c087c8e8106b400aa24f Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 1 Apr 2023 20:06:12 +0100 Subject: Jabel, Generic injection and mostly automatic code cleanup (#1829) * Enable Jabel&Generic injection, fix type error caused by this * add missing <> * Infer generic types automatically * Parametrize cast types * Use enhanced for loops * Unnecessary boxing * Unnecessary unboxing * Use Objects.equals * Explicit type can be replaced with `<>` * Collapse identical catch blocks * Add SafeVarargs where applicable * Anonymous type can be replaced with lambda * Use List.sort directly * Lambda can be a method reference * Statement lambda can be an expression lambda * Use string switches * Instanceof pattern matching * Text block can be used * Migrate to enhanced switch * Java style array declarations * Unnecessary toString() * More unnecessary String conversions * Unnecessary modifiers * Unnecessary semicolons * Fix duplicate conditions * Extract common code from if branches * Replace switches with ifs for 1-2 cases * Inner class may be static * Minor performance issues * Replace string appending in loops with string builders * Fix IntelliJ using the wrong empty list method * Use Long.compare * Generic arguments: getSubItems * Generic arguments: getSubBlocks * Raw types warnings * Fix remaining missing generics * Too weak variable type leads to unnecessary cast * Redundant type casts * Redundant array length check * Redundant vararg arrays * Manual min/max implementations * A couple missed inspections * Goodbye explosion power ternary ladder * Apply spotless * Get rid of the other two big ternary ladders * Binary search explosion power * Don't overcomplicate things --- .../gregtech/loaders/misc/GT_Achievements.java | 179 ++++++--------------- .../gregtech/loaders/misc/GT_BeeDefinition.java | 133 ++++++--------- src/main/java/gregtech/loaders/misc/GT_Bees.java | 2 +- .../loaders/oreprocessing/ProcessingBlock.java | 22 +-- .../loaders/oreprocessing/ProcessingCell.java | 13 +- .../loaders/oreprocessing/ProcessingCircuit.java | 22 +-- .../loaders/oreprocessing/ProcessingCrafting.java | 60 ++++--- .../loaders/oreprocessing/ProcessingCrate.java | 19 ++- .../loaders/oreprocessing/ProcessingCrop.java | 74 ++++----- .../oreprocessing/ProcessingCrushedOre.java | 74 ++++----- .../loaders/oreprocessing/ProcessingDust.java | 61 +++---- .../loaders/oreprocessing/ProcessingFood.java | 9 +- .../loaders/oreprocessing/ProcessingGear.java | 61 ++++--- .../loaders/oreprocessing/ProcessingGem.java | 44 +++-- .../loaders/oreprocessing/ProcessingLens.java | 20 ++- .../loaders/oreprocessing/ProcessingOre.java | 6 +- .../loaders/oreprocessing/ProcessingPipe.java | 45 ++---- .../loaders/oreprocessing/ProcessingPlate.java | 58 ++----- .../loaders/oreprocessing/ProcessingShaping.java | 55 +++---- .../loaders/oreprocessing/ProcessingToolHead.java | 84 ++++------ .../loaders/oreprocessing/ProcessingWire.java | 29 ++-- .../loaders/postload/GT_BlockResistanceLoader.java | 10 +- .../gregtech/loaders/postload/GT_PostLoad.java | 2 +- .../postload/chains/GT_PCBFactoryRecipes.java | 42 ++--- .../postload/recipes/ElectrolyzerRecipes.java | 4 +- .../preload/GT_Loader_Item_Block_And_Fluid.java | 4 +- 26 files changed, 442 insertions(+), 690 deletions(-) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 7970dd695f..c7ca40e111 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -390,9 +390,8 @@ public class GT_Achievements { AchievementPage.registerAchievementPage( new AchievementPage( "GregTech 5", - (Achievement[]) this.achievementList.values() - .toArray( - new Achievement[this.achievementList.size()]))); + this.achievementList.values() + .toArray(new Achievement[0]))); MinecraftForge.EVENT_BUS.register(this); FMLCommonHandler.instance() .bus() @@ -425,7 +424,7 @@ public class GT_Achievements { boolean special) { if (!GT_Mod.gregtechproxy.mAchievements) { return null; - } ; + } Achievement achievement = new Achievement( textId, textId, @@ -481,12 +480,12 @@ public class GT_Achievements { if (entityplayer == null || !GT_Mod.gregtechproxy.mAchievements) { return; } - entityplayer.triggerAchievement((StatBase) this.achievementList.get(textId)); + entityplayer.triggerAchievement(this.achievementList.get(textId)); } public Achievement getAchievement(String textId) { if (this.achievementList.containsKey(textId)) { - return (Achievement) this.achievementList.get(textId); + return this.achievementList.get(textId); } return null; } @@ -533,24 +532,12 @@ public class GT_Achievements { } switch (fluid.getFluid() .getUnlocalizedName()) { - case "fluid.plasma.helium": - issueAchievement(player, "fusion"); - break; - case "fluid.molten.europium": - issueAchievement(player, "advancing"); - break; - case "fluid.molten.naquadah": - issueAchievement(player, "stargateliquid"); - break; - case "fluid.molten.americium": - issueAchievement(player, "tothelimit"); - break; - case "fluid.molten.neutronium": - issueAchievement(player, "denseaspossible"); - break; - case "fluid.plasma.nitrogen": - issueAchievement(player, "higherefficency"); - break; + case "fluid.plasma.helium" -> issueAchievement(player, "fusion"); + case "fluid.molten.europium" -> issueAchievement(player, "advancing"); + case "fluid.molten.naquadah" -> issueAchievement(player, "stargateliquid"); + case "fluid.molten.americium" -> issueAchievement(player, "tothelimit"); + case "fluid.molten.neutronium" -> issueAchievement(player, "denseaspossible"); + case "fluid.plasma.nitrogen" -> issueAchievement(player, "higherefficency"); } } @@ -570,34 +557,18 @@ public class GT_Achievements { if (stack.getUnlocalizedName() .startsWith("gt.metaitem.")) { switch (stack.getUnlocalizedName()) { - case "gt.metaitem.01.2300": - issueAchievement(player, "bronze"); - break; - case "gt.metaitem.01.32700": - issueAchievement(player, "smallparts"); - break; - case "gt.metaitem.01.32702": - issueAchievement(player, "bettercircuits"); - break; - case "gt.metaitem.01.23354": - issueAchievement(player, "magneticiron"); - break; - case "gt.metaitem.01.32600": + case "gt.metaitem.01.2300" -> issueAchievement(player, "bronze"); + case "gt.metaitem.01.32700" -> issueAchievement(player, "smallparts"); + case "gt.metaitem.01.32702" -> issueAchievement(player, "bettercircuits"); + case "gt.metaitem.01.23354" -> issueAchievement(player, "magneticiron"); + case "gt.metaitem.01.32600" -> { issueAchievement(player, "lvmotor"); issueAchievement(player, "buildCable"); - break; - case "gt.metaitem.01.32610": - issueAchievement(player, "pumpcover"); - break; - case "gt.metaitem.01.32630": - issueAchievement(player, "transport"); - break; - case "gt.metaitem.01.32650": - issueAchievement(player, "complexmachines"); - break; - case "gt.metaitem.01.32670": - issueAchievement(player, "hightech"); - break; + } + case "gt.metaitem.01.32610" -> issueAchievement(player, "pumpcover"); + case "gt.metaitem.01.32630" -> issueAchievement(player, "transport"); + case "gt.metaitem.01.32650" -> issueAchievement(player, "complexmachines"); + case "gt.metaitem.01.32670" -> issueAchievement(player, "hightech"); } } else if (stack.getUnlocalizedName() .equals("ic2.blockCrop")) { @@ -943,87 +914,33 @@ public class GT_Achievements { if (stack.getUnlocalizedName() .startsWith("gt.metaitem.")) { switch (stack.getUnlocalizedName()) { - case "gt.metaitem.02.32500": - issueAchievement(player, "havestlead"); - break; - case "gt.metaitem.02.32501": - issueAchievement(player, "havestsilver"); - break; - case "gt.metaitem.02.32503": - issueAchievement(player, "havestiron"); - break; - case "gt.metaitem.02.32504": - issueAchievement(player, "havestgold"); - break; - case "gt.metaitem.02.32530": - issueAchievement(player, "havestcopper"); - break; - case "gt.metaitem.02.32540": - issueAchievement(player, "havesttin"); - break; - case "gt.metaitem.02.32510": - issueAchievement(player, "havestoil"); - break; - case "gt.metaitem.02.32511": - issueAchievement(player, "havestemeralds"); - break; - case "gt.metaitem.03.32082": - issueAchievement(player, "energyflow"); - break; - case "gt.metaitem.01.32702": - issueAchievement(player, "bettercircuits"); - break; - case "gt.metaitem.01.32707": - issueAchievement(player, "datasaving"); - break; - case "gt.metaitem.01.32597": - issueAchievement(player, "orbs"); - break; - case "gt.metaitem.01.32599": - issueAchievement(player, "thatspower"); - break; - case "gt.metaitem.01.32598": - issueAchievement(player, "luck"); - break; - case "gt.metaitem.01.32749": - issueAchievement(player, "closeit"); - break; - case "gt.metaitem.01.32730": - issueAchievement(player, "manipulation"); - break; - case "gt.metaitem.01.32729": - issueAchievement(player, "filterregulate"); - break; - case "gt.metaitem.01.32605": - issueAchievement(player, "whatnow"); - break; - case "gt.metaitem.01.32736": - issueAchievement(player, "zpmage"); - break; - case "gt.metaitem.01.32737": - issueAchievement(player, "uvage"); - break; - case "gt.metaitem.03.32030": - issueAchievement(player, "gtmonosilicon"); - break; - case "gt.metaitem.03.32036": - issueAchievement(player, "gtlogicwafer"); - break; - case "gt.metaitem.01.32701": - issueAchievement(player, "gtlogiccircuit"); - break; - case "gt.metaitem.03.32085": - issueAchievement(player, "gtquantumprocessor"); - break; - case "gt.metaitem.03.32089": - issueAchievement(player, "gtcrystalprocessor"); - break; - case "gt.metaitem.03.32092": - issueAchievement(player, "gtwetware"); - break; - case "gt.metaitem.03.32095": - issueAchievement(player, "gtwetmain"); - break; + case "gt.metaitem.02.32500" -> issueAchievement(player, "havestlead"); + case "gt.metaitem.02.32501" -> issueAchievement(player, "havestsilver"); + case "gt.metaitem.02.32503" -> issueAchievement(player, "havestiron"); + case "gt.metaitem.02.32504" -> issueAchievement(player, "havestgold"); + case "gt.metaitem.02.32530" -> issueAchievement(player, "havestcopper"); + case "gt.metaitem.02.32540" -> issueAchievement(player, "havesttin"); + case "gt.metaitem.02.32510" -> issueAchievement(player, "havestoil"); + case "gt.metaitem.02.32511" -> issueAchievement(player, "havestemeralds"); + case "gt.metaitem.03.32082" -> issueAchievement(player, "energyflow"); + case "gt.metaitem.01.32702" -> issueAchievement(player, "bettercircuits"); + case "gt.metaitem.01.32707" -> issueAchievement(player, "datasaving"); + case "gt.metaitem.01.32597" -> issueAchievement(player, "orbs"); + case "gt.metaitem.01.32599" -> issueAchievement(player, "thatspower"); + case "gt.metaitem.01.32598" -> issueAchievement(player, "luck"); + case "gt.metaitem.01.32749" -> issueAchievement(player, "closeit"); + case "gt.metaitem.01.32730" -> issueAchievement(player, "manipulation"); + case "gt.metaitem.01.32729" -> issueAchievement(player, "filterregulate"); + case "gt.metaitem.01.32605" -> issueAchievement(player, "whatnow"); + case "gt.metaitem.01.32736" -> issueAchievement(player, "zpmage"); + case "gt.metaitem.01.32737" -> issueAchievement(player, "uvage"); + case "gt.metaitem.03.32030" -> issueAchievement(player, "gtmonosilicon"); + case "gt.metaitem.03.32036" -> issueAchievement(player, "gtlogicwafer"); + case "gt.metaitem.01.32701" -> issueAchievement(player, "gtlogiccircuit"); + case "gt.metaitem.03.32085" -> issueAchievement(player, "gtquantumprocessor"); + case "gt.metaitem.03.32089" -> issueAchievement(player, "gtcrystalprocessor"); + case "gt.metaitem.03.32092" -> issueAchievement(player, "gtwetware"); + case "gt.metaitem.03.32095" -> issueAchievement(player, "gtwetmain"); } } else if (stack.getUnlocalizedName() .equals("gt.Thoriumcell")) { diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index c6ac61d95c..84260a32fa 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -1063,7 +1063,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock")); - }, new Consumer() { + }, new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1633,33 +1633,31 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); - }, template -> AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition), - new Consumer() { + }, template -> AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition), new Consumer<>() { - @Override - public void accept(GT_BeeDefinition dis) { - IBeeMutationCustom tMutation = dis.registerMutation(MARS, TITANIUM, 9); - tMutation.requireResource(GregTech_API.sBlockMetal2, 12); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(29, "Mars")); // Mars Dim - } - }), + @Override + public void accept(GT_BeeDefinition dis) { + IBeeMutationCustom tMutation = dis.registerMutation(MARS, TITANIUM, 9); + tMutation.requireResource(GregTech_API.sBlockMetal2, 12); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(29, "Mars")); // Mars Dim + } + }), LEDOX(GT_BranchDefinition.SPACE, "Ledox", false, new Color(0x0000CD), new Color(0x0074FF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.10f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LEDOX), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setHasEffect(); - }, template -> AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "freezing")), - new Consumer() { + }, template -> AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "freezing")), new Consumer<>() { - @Override - public void accept(GT_BeeDefinition dis) { - IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, LEAD, 7); - if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Ledox"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa")); // Europa Dim - } - }), + @Override + public void accept(GT_BeeDefinition dis) { + IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, LEAD, 7); + if (NewHorizonsCoreMod.isModLoaded()) + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Ledox"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa")); // Europa Dim + } + }), CALLISTOICE(GT_BranchDefinition.SPACE, "CallistoIce", false, new Color(0x0074FF), new Color(0x1EB1FF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.10f); @@ -1668,7 +1666,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(ICY); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "freezing")), - new Consumer() { + new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1677,7 +1675,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.CallistoColdIce"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(45, "Callisto")); // Callisto - // Dim + // Dim } }), MYTRYL(GT_BranchDefinition.SPACE, "Mytryl", false, new Color(0xDAA520), new Color(0xF26404), beeSpecies -> { @@ -1687,7 +1685,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, template -> {}, new Consumer() { + }, template -> {}, new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1704,7 +1702,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, template -> {}, new Consumer() { + }, template -> {}, new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1720,7 +1718,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(COLD); beeSpecies.setHasEffect(); - }, template -> {}, new Consumer() { + }, template -> {}, new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1738,7 +1736,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, template -> {}, new Consumer() { + }, template -> {}, new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1747,7 +1745,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.MysteriousCrystal"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus - // Dim + // Dim } }), BLACKPLUTONIUM(GT_BranchDefinition.SPACE, "BlackPlutonium", false, new Color(0x000000), new Color(0x323232), @@ -1758,7 +1756,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(HELLISH); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, template -> {}, new Consumer() { + }, template -> {}, new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1776,7 +1774,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, template -> AlleleHelper.instance.set(template, SPEED, GT_Bees.speedBlinding), new Consumer() { + }, template -> AlleleHelper.instance.set(template, SPEED, GT_Bees.speedBlinding), new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -2137,7 +2135,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HELLISH); - }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), new Consumer() { + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -2630,68 +2628,35 @@ public enum GT_BeeDefinition implements IBeeDefinition { } static IAlleleBeeEffect getEffect(byte modid, String name) { - String s; - switch (modid) { - case EXTRABEES: - s = "extrabees.effect." + name; - break; - case GENDUSTRY: - s = "gendustry.effect." + name; - break; - case MAGICBEES: - s = "magicbees.effect" + name; - break; - case GREGTECH: - s = "gregtech.effect" + name; - break; - default: - s = "forestry.effect" + name; - break; - } + String s = switch (modid) { + case EXTRABEES -> "extrabees.effect." + name; + case GENDUSTRY -> "gendustry.effect." + name; + case MAGICBEES -> "magicbees.effect" + name; + case GREGTECH -> "gregtech.effect" + name; + default -> "forestry.effect" + name; + }; return (IAlleleBeeEffect) AlleleManager.alleleRegistry.getAllele(s); } static IAlleleFlowers getFlowers(byte modid, String name) { - String s; - switch (modid) { - case EXTRABEES: - s = "extrabees.flower." + name; - break; - case GENDUSTRY: - s = "gendustry.flower." + name; - break; - case MAGICBEES: - s = "magicbees.flower" + name; - break; - case GREGTECH: - s = "gregtech.flower" + name; - break; - default: - s = "forestry.flowers" + name; - break; - } + String s = switch (modid) { + case EXTRABEES -> "extrabees.flower." + name; + case GENDUSTRY -> "gendustry.flower." + name; + case MAGICBEES -> "magicbees.flower" + name; + case GREGTECH -> "gregtech.flower" + name; + default -> "forestry.flowers" + name; + }; return (IAlleleFlowers) AlleleManager.alleleRegistry.getAllele(s); } private static IAlleleBeeSpecies getSpecies(byte modid, String name) { - String s; - switch (modid) { - case EXTRABEES: - s = "extrabees.species." + name; - break; - case GENDUSTRY: - s = "gendustry.bee." + name; - break; - case MAGICBEES: - s = "magicbees.species" + name; - break; - case GREGTECH: - s = "gregtech.species" + name; - break; - default: - s = "forestry.species" + name; - break; - } + String s = switch (modid) { + case EXTRABEES -> "extrabees.species." + name; + case GENDUSTRY -> "gendustry.bee." + name; + case MAGICBEES -> "magicbees.species" + name; + case GREGTECH -> "gregtech.species" + name; + default -> "forestry.species" + name; + }; IAlleleBeeSpecies ret = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele(s); if (ret == null) { ret = NAQUADRIA.species; diff --git a/src/main/java/gregtech/loaders/misc/GT_Bees.java b/src/main/java/gregtech/loaders/misc/GT_Bees.java index c79702d72e..aba1fefc1b 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Bees.java +++ b/src/main/java/gregtech/loaders/misc/GT_Bees.java @@ -72,7 +72,7 @@ public class GT_Bees { noWork = new AlleleFloat("speedUnproductive", 0, false); superSpeed = new AlleleFloat("speedAccelerated", 4F, false); - speedBlinding = (IAlleleFloat) AlleleManager.alleleRegistry.getAllele("magicbees.speedBlinding") == null + speedBlinding = AlleleManager.alleleRegistry.getAllele("magicbees.speedBlinding") == null ? new AlleleFloat("speedBlinding", 2f, false) : (IAlleleFloat) AlleleManager.alleleRegistry.getAllele("magicbees.speedBlinding"); 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/oreprocess