diff options
author | boubou19 <miisterunknown@gmail.com> | 2024-01-13 11:30:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-13 11:30:04 +0100 |
commit | 5505b6b15a86c185bf57d16fce2e2067c7aa6e8f (patch) | |
tree | ca9447b7b7018c0fcc5f13d07de4db65a110f400 /src/main/java/gregtech | |
parent | 6b481e98d5be69fc1f7bf3ee427266e01f125a4b (diff) | |
download | GT5-Unofficial-5505b6b15a86c185bf57d16fce2e2067c7aa6e8f.tar.gz GT5-Unofficial-5505b6b15a86c185bf57d16fce2e2067c7aa6e8f.tar.bz2 GT5-Unofficial-5505b6b15a86c185bf57d16fce2e2067c7aa6e8f.zip |
Cleanup a bit the GT_Achievements class (#2450)
* more readable code
* move all equals comparisons to a switch
* spotless
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r-- | src/main/java/gregtech/loaders/misc/GT_Achievements.java | 488 |
1 files changed, 157 insertions, 331 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index fd48dc5801..8d30240012 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -550,278 +550,121 @@ public class GT_Achievements { issueAchievement(player, "bronze"); } } - if (stack.getUnlocalizedName() - .startsWith("gt.metaitem.")) { - switch (stack.getUnlocalizedName()) { - 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"); - } - 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"); + switch (stack.getUnlocalizedName()) { + 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"); + } + 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"); + case "ic2.blockCrop" -> issueAchievement(player, "crops"); + case "ic2.itemPartCircuit" -> issueAchievement(player, "gtbasiccircuit"); + case "ic2.itemPartCircuitAdv" -> issueAchievement(player, "stepforward"); + case "gt.blockmachines.boiler.solar" -> issueAchievement(player, "simplyeco"); + case "gt.blockmachines.boiler.bronze" -> issueAchievement(player, "firststeam"); + case "gt.blockmachines.boiler.steel" -> issueAchievement(player, "highpressure"); + case "gt.blockmachines.bronzemachine.macerator" -> { + issueAchievement(player, "macerator"); + issueAchievement(player, "buildMacerator"); + } + case "gt.blockmachines.bronzemachine.alloysmelter.tier.3" -> issueAchievement(player, "buildIndFurnace"); + case "gt.blockmachines.bronzemachine.alloysmelter" -> { + issueAchievement(player, "alloysmelter"); + issueAchievement(player, "buildElecFurnace"); + } + + case "gt.blockmachines.bronzemachine.extractor" -> { + issueAchievement(player, "extract"); + issueAchievement(player, "buildCompressor"); + issueAchievement(player, "buildExtractor"); } - } else if (stack.getUnlocalizedName() - .equals("ic2.blockCrop")) { - issueAchievement(player, "crops"); + case "gt.blockmachines.basicmachine.pump.tier.03" -> issueAchievement(player, "slurp"); + case "gt.blockmachines.multimachine.blastfurnace" -> issueAchievement(player, "ebf"); + case "gt.blockmachines.hatch.energy.tier.02" -> issueAchievement(player, "upgradeebf"); + case "gt.blockmachines.multimachine.multifurnace" -> issueAchievement(player, "highpowersmelt"); + case "gt.blockmachines.hatch.energy.tier.01" -> issueAchievement(player, "energyhatch"); + case "gt.blockmachines.multimachine.processingarray" -> issueAchievement(player, "factory"); + case "gt.blockmachines.basicgenerator.magicenergyconverter.tier.01" -> issueAchievement(player, "magic"); + case "gt.blockmachines.basicgenerator.magicenergyabsorber.tier.03" -> issueAchievement(player, "highmage"); + case "gt.blockmachines.basicgenerator.plasmagenerator.tier.07" -> issueAchievement( + player, + "fullefficiency"); + case "gt.blockmachines.multimachine.largeturbine" -> issueAchievement(player, "muchsteam"); + case "gt.blockmachines.multimachine.largehpturbine" -> issueAchievement(player, "efficientsteam"); + case "gt.blockmachines.multimachine.cleanroom" -> issueAchievement(player, "gtcleanroom"); + case "gt.neutronreflector" -> issueAchievement(player, "reflect"); + case "gt.blockcasings5.1" -> issueAchievement(player, "upgrade"); + case "gt.blockcasings5.2" -> issueAchievement(player, "upgrade2"); + case "gt.blockcasings5.3" -> issueAchievement(player, "upgrade3"); + case "gt.blockcasings5.4" -> issueAchievement(player, "upgrade4"); + case "gt.blockcasings5.5" -> issueAchievement(player, "upgrade5"); + case "gt.blockcasings5.6" -> issueAchievement(player, "over9000"); + case "gt.blockcasings.15" -> issueAchievement(player, "conducting"); + } + + if (stack.getUnlocalizedName() + .startsWith("gt.blockmachines.")) { + if (stack.getUnlocalizedName() + .startsWith("gt.blockmachines.basicmachine.arcfurnace.tier.")) { + issueAchievement(player, "recycling"); } else if (stack.getUnlocalizedName() - .equals("ic2.itemPartCircuit")) { - issueAchievement(player, "gtbasiccircuit"); + .startsWith("gt.blockmachines.basicmachine.disassembler.tier.")) { + issueAchievement(player, "repair"); + + } + + else if (stack.getUnlocalizedName() + .startsWith("gt.blockmachines.automation.superbuffer.tier.")) { + issueAchievement(player, "superbuffer"); } else if (stack.getUnlocalizedName() - .equals("ic2.itemPartCircuitAdv")) { - issueAchievement(player, "stepforward"); + .startsWith("gt.blockmachines.quantum.tank.tier.")) { + issueAchievement(player, "whereistheocean"); } else if (stack.getUnlocalizedName() - .startsWith("gt.blockmachines.")) { - if (stack.getUnlocalizedName() - .startsWith("gt.blockmachines.basicmachine.arcfurnace.tier.")) { - issueAchievement(player, "recycling"); + .startsWith("gt.blockmachines.quantum.chest.tier.")) { + issueAchievement(player, "newstorage"); + } else if (stack.getUnlocalizedName() + .startsWith("gt.blockmachines.basicmachine.hammer.tier.")) { + issueAchievement(player, "cheapermac"); } else if (stack.getUnlocalizedName() - .startsWith("gt.blockmachines.basicmachine.disassembler.tier.")) { - issueAchievement(player, "repair"); + .startsWith("gt.blockmachines.automation.chestbuffer.tier.")) { + issueAchievement(player, "buffer"); + issueAchievement(player, "buildBatBox"); + if (stack.getUnlocalizedName() + .startsWith("gt.blockmachines.automation.chestbuffer.tier.3")) { + issueAchievement(player, "buildMFE"); + } } else if (stack.getUnlocalizedName() - .equals("gt.blockmachines.boiler.solar")) { - issueAchievement(player, "simplyeco"); + .startsWith("gt.blockmachines.basicgenerator.steamturbine.tier.")) { + issueAchievement(player, "steampower"); + issueAchievement(player, "buildGenerator"); } else if (stack.getUnlocalizedName() - .equals("gt.blockmachines.boiler.bronze")) { - issueAchievement(player, "firststeam"); + .startsWith("gt.blockmachines.basicmachine.assembler.tier.")) { + issueAchievement(player, "avengers"); } else if (stack.getUnlocalizedName() - .equals("gt.blockmachines.boiler.steel")) { - issueAchievement(player, "highpressure"); + .startsWith("gt.blockmachines.batterybuffer.")) { + issueAchievement(player, "batterys"); } else if (stack.getUnlocalizedName() - .equals("gt.blockmachines.bronzemachine.macerator")) { - issueAchievement(player, "macerator"); - issueAchievement(player, "buildMacerator"); + .startsWith("gt.blockmachines.basicmachine.amplifab.tier.")) { + issueAchievement(player, "amplifier"); } else if (stack.getUnlocalizedName() - .equals("gt.blockmachines.bronzemachine.alloysmelter")) { - issueAchievement(player, "alloysmelter"); - issueAchievement(player, "buildElecFurnace"); - if (stack.getUnlocalizedName() - .equals( - "gt.blockmachines.bronzemachine.alloysmelter.tier.3")) { - issueAchievement(player, "buildIndFurnace"); - } + .startsWith("gt.blockmachines.basicmachine.massfab.tier.")) { + issueAchievement(player, "universal"); + issueAchievement(player, "buildMassFab"); } else if (stack.getUnlocalizedName() - .equals("gt.blockmachines.bronzemachine.extractor")) { - issueAchievement(player, "extract"); - issueAchievement(player, "buildCompressor"); - issueAchievement(player, "buildExtractor"); + .startsWith("gt.blockmachines.basicgenerator.naquadah.tier.")) { + issueAchievement(player, "alienpower"); } else if (stack.getUnlocalizedName() .startsWith( - "gt.blockmachines.automation.superbuffer.tier.")) { - issueAchievement(player, "superbuffer"); - } else - if (stack.getUnlocalizedName() - .startsWith("gt.blockmachines.quantum.tank.tier.")) { - issueAchievement(player, "whereistheocean"); - } else if (stack.getUnlocalizedName() - .startsWith( - "gt.blockmachines.quantum.chest.tier.")) { - issueAchievement(player, "newstorage"); - } else - if (stack.getUnlocalizedName() - .startsWith( - "gt.blockmachines.basicmachine.hammer.tier.")) { - issueAchievement(player, "cheapermac"); - } else - if (stack.getUnlocalizedName() - .startsWith( - "gt.blockmachines.automation.chestbuffer.tier.")) { - issueAchievement(player, "buffer"); - issueAchievement( - player, - "buildBatBox"); - if (stack.getUnlocalizedName() - .startsWith( - "gt.blockmachines.automation.chestbuffer.tier.3")) { - issueAchievement( - player, - "buildMFE"); - } - } else - if (stack.getUnlocalizedName() - .startsWith( - "gt.blockmachines.basicgenerator.steamturbine.tier.")) { - issueAchievement( - player, - "steampower"); - issueAchievement( - player, - "buildGenerator"); - } else - if (stack.getUnlocalizedName() - .equals( - "gt.blockmachines.basicmachine.pump.tier.03")) { - issueAchievement( - player, - "slurp"); - } else - if (stack.getUnlocalizedName() - .startsWith( - "gt.blockmachines.basicmachine.assembler.tier.")) { - issueAchievement( - player, - "avengers"); - } else - if (stack.getUnlocalizedName() - .equals( - "gt.blockmachines.multimachine.blastfurnace")) { - issueAchievement( - player, - "ebf"); - } else - if (stack - .getUnlocalizedName() - .startsWith( - "gt.blockmachines.batterybuffer.")) { - issueAchievement( - player, - "batterys"); - } else - if (stack - .getUnlocalizedName() - .equals( - "gt.blockmachines.hatch.energy.tier.02")) { - issueAchievement( - player, - "upgradeebf"); - } else - if (stack - .getUnlocalizedName() - .equals( - "gt.blockmachines.multimachine.multifurnace")) { - issueAchievement( - player, - "highpowersmelt"); - } else - if (stack - .getUnlocalizedName() - .equals( - "gt.blockmachines.hatch.energy.tier.01")) { - issueAchievement( - player, - "energyhatch"); - } else - if (stack - .getUnlocalizedName() - .equals( - "gt.blockmachines.multimachine.processingarray")) { - issueAchievement( - player, - "factory"); - } else - if (stack - .getUnlocalizedName() - .equals( - "gt.blockmachines.basicgenerator.magicenergyconverter.tier.01")) { - issueAchievement( - player, - "magic"); - } else - if (stack - .getUnlocalizedName() - .equals( - "gt.blockmachines.basicgenerator.magicenergyabsorber.tier.03")) { - issueAchievement( - player, - "highmage"); - } else - if (stack - .getUnlocalizedName() - .startsWith( - "gt.blockmachines.basicmachine.amplifab.tier.")) { - issueAchievement( - player, - "amplifier"); - } else - if (stack - .getUnlocalizedName() - .startsWith( - "gt.blockmachines.basicmachine.massfab.tier.")) { - issueAchievement( - player, - "universal"); - issueAchievement( - player, - "buildMassFab"); - } else - if (stack - .getUnlocalizedName() - .startsWith( - "gt.blockmachines.basicgenerator.naquadah.tier.")) { - issueAchievement( - player, - "alienpower"); - } else - if (stack - .getUnlocalizedName() - .startsWith( - "gt.blockmachines.basicmachine.replicator.tier.")) { - issueAchievement( - player, - "replication"); - } else - if (stack - .getUnlocalizedName() - .equals( - "gt.blockmachines.basicgenerator.plasmagenerator.tier.07")) { - issueAchievement( - player, - "fullefficiency"); - } else - if (stack - .getUnlocalizedName() - .equals( - "gt.blockmachines.multimachine.largeturbine")) { - issueAchievement( - player, - "muchsteam"); - } else - if (stack - .getUnlocalizedName() - .equals( - "gt.blockmachines.multimachine.largehpturbine")) { - issueAchievement( - player, - "efficientsteam"); - } else - if (stack - .getUnlocalizedName() - .equals( - "gt.blockmachines.multimachine.cleanroom")) { - issueAchievement( - player, - "gtcleanroom"); - } - } else if (stack.getUnlocalizedName() - .equals("gt.neutronreflector")) { - issueAchievement(player, "reflect"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings5.1")) { - issueAchievement(player, "upgrade"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings5.2")) { - issueAchievement(player, "upgrade2"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings5.3")) { - issueAchievement(player, "upgrade3"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings5.4")) { - issueAchievement(player, "upgrade4"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings5.5")) { - issueAchievement(player, "upgrade5"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings5.6")) { - issueAchievement(player, "over9000"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings.15")) { - issueAchievement(player, "conducting"); - } + "gt.blockmachines.basicmachine.replicator.tier.")) { + issueAchievement(player, "replication"); + } + } } @SubscribeEvent @@ -891,80 +734,63 @@ public class GT_Achievements { } } // GT_FML_LOGGER.info(stack.getUnlocalizedName()); - if (stack.getUnlocalizedName() - .startsWith("gt.metaitem.")) { - switch (stack.getUnlocalizedName()) { - 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")) { - issueAchievement(player, "newfuel"); - } else if ((stack.getItem() == Ic2Items.quantumBodyarmor.getItem()) - || (stack.getItem() == Ic2Items.quantumBoots.getItem()) - || (stack.getItem() == Ic2Items.quantumHelmet.getItem()) - || (stack.getItem() == Ic2Items.quantumLeggings.getItem())) { - issueAchievement(player, "buildQArmor"); - } else if (stack.getUnlocalizedName() - .equals("ic2.itemPartCircuitAdv")) { - issueAchievement(player, "stepforward"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings5.1")) { - issueAchievement(player, "upgrade"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings5.2")) { - issueAchievement(player, "upgrade2"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings5.3")) { - issueAchievement(player, "upgrade3"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings5.4")) { - issueAchievement(player, "upgrade4"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings5.5")) { - issueAchievement(player, "upgrade5"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings5.6")) { - issueAchievement(player, "over9000"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockcasings.15")) { - issueAchievement(player, "conducting"); - } - if (player.capabilities.isCreativeMode && stack.getUnlocalizedName() - .equals("gt.metaitem.01.32761")) { // Debug Scanner pickup shows all assline recipes. - for (GT_Recipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) { - issueAchievement( - player, - recipe.getOutput(0) - .getUnlocalizedName()); - recipe.mHidden = false; + switch (stack.getUnlocalizedName()) { + 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"); + case "gt.Thoriumcell" -> issueAchievement(player, "newfuel"); + case "ic2.itemPartCircuitAdv" -> issueAchievement(player, "stepforward"); + case "gt.blockcasings5.1" -> issueAchievement(player, "upgrade"); + case "gt.blockcasings5.2" -> issueAchievement(player, "upgrade2"); + case "gt.blockcasings5.3" -> issueAchievement(player, "upgrade3"); + case "gt.blockcasings5.4" -> issueAchievement(player, "upgrade4"); + case "gt.blockcasings5.5" -> issueAchievement(player, "upgrade5"); + case "gt.blockcasings5.6" -> issueAchievement(player, "over9000"); + case "gt.blockcasings.15" -> issueAchievement(player, "conducting"); + case "gt.metaitem.01.32761" -> { // Debug Scanner pickup shows all assline recipes. + if (player.capabilities.isCreativeMode) { + for (GT_Recipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) { + issueAchievement( + player, + recipe.getOutput(0) + .getUnlocalizedName()); + recipe.mHidden = false; + } + } } } + + if ((stack.getItem() == Ic2Items.quantumBodyarmor.getItem()) + || (stack.getItem() == Ic2Items.quantumBoots.getItem()) + || (stack.getItem() == Ic2Items.quantumHelmet.getItem()) + || (stack.getItem() == Ic2Items.quantumLeggings.getItem())) { + issueAchievement(player, "buildQArmor"); + } + for (GT_Recipe recipe : RecipeMaps.assemblylineVisualRecipes.getAllRecipes()) { if (recipe.getOutput(0) .getUnlocalizedName() |