diff options
author | Raven Szewczyk <git@eigenraven.me> | 2023-04-01 20:06:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-01 19:06:12 +0000 |
commit | b088958c9f6935d356b6c087c8e8106b400aa24f (patch) | |
tree | be608fac08ba158f1226a4fb9f5b1ed459bac2a9 /src/main/java/gregtech/loaders/misc | |
parent | e52cd9c3458584e58073df5cd9cde1302994f266 (diff) | |
download | GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.gz GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.bz2 GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.zip |
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
Diffstat (limited to 'src/main/java/gregtech/loaders/misc')
3 files changed, 98 insertions, 216 deletions
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<GT_BeeDefinition>() { + }, 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<GT_BeeDefinition>() { + }, 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<GT_BeeDefinition>() { + }, 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<GT_BeeDefinition>() { + 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<GT_BeeDefinition>() { + }, 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<GT_BeeDefinition>() { + }, 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<GT_BeeDefinition>() { + }, 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<GT_BeeDefinition>() { + }, 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<GT_BeeDefinition>() { + }, 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<GT_BeeDefinition>() { + }, 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<GT_BeeDefinition>() { + }, 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"); |