diff options
| author | boubou19 <miisterunknown@gmail.com> | 2024-06-26 18:10:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-26 18:10:36 +0200 |
| commit | 25cf7d918f7c1b93d137757f4236846066f520d5 (patch) | |
| tree | 7b866d8a2c0961e2153bd58aeb984145042facd9 /src/main/java/gtPlusPlus/xmod | |
| parent | 6b89b3b942366ccbfff258e9f67eba6b3b5c0377 (diff) | |
| download | GT5-Unofficial-25cf7d918f7c1b93d137757f4236846066f520d5.tar.gz GT5-Unofficial-25cf7d918f7c1b93d137757f4236846066f520d5.tar.bz2 GT5-Unofficial-25cf7d918f7c1b93d137757f4236846066f520d5.zip | |
Remove crates (#2687)
* remove crates
* Add placeholder oreprefix
To be used in cases where a prefix is removed that isnt at the end of a
list. Causes blank items for existing items
* spotless
---------
Co-authored-by: Caedis <Caedis@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java | 135 |
1 files changed, 74 insertions, 61 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index 3185810495..655b242c04 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -171,70 +171,83 @@ public enum GregtechOrePrefixes { if (this.name() .startsWith("ore")) { getTcAspectStack(TC_Aspects.TERRA.name(), 1).addToAspectList(this.mAspects); - } else if (this.name() + return; + } + if (this.name() .startsWith("wire") || this.name() .startsWith("cable")) { - getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects); - } else - if (this.name() - .startsWith("dust")) { - getTcAspectStack(TC_Aspects.PERDITIO.name(), 1).addToAspectList(this.mAspects); - } else if (this.name() - .startsWith("crushed")) { - getTcAspectStack(TC_Aspects.PERFODIO.name(), 1).addToAspectList(this.mAspects); - } else if (this.name() - .startsWith("ingot") - || this.name() - .startsWith("nugget")) { - getTcAspectStack(TC_Aspects.METALLUM.name(), 1).addToAspectList(this.mAspects); - } else - if (this.name() - .startsWith("armor")) { - getTcAspectStack(TC_Aspects.TUTAMEN.name(), 1).addToAspectList(this.mAspects); - } else if (this.name() - .startsWith("stone")) { - getTcAspectStack(TC_Aspects.TERRA.name(), 1).addToAspectList(this.mAspects); - } else if (this.name() - .startsWith("pipe")) { - getTcAspectStack(TC_Aspects.ITER.name(), 1).addToAspectList(this.mAspects); - } else if (this.name() - .startsWith("gear")) { - getTcAspectStack(TC_Aspects.MOTUS.name(), 1).addToAspectList(this.mAspects); - getTcAspectStack(TC_Aspects.MACHINA.name(), 1) - .addToAspectList(this.mAspects); - } else if (this.name() - .startsWith("frame") - || this.name() - .startsWith("plate")) { - getTcAspectStack(TC_Aspects.FABRICO.name(), 1) - .addToAspectList(this.mAspects); - } else - if (this.name() - .startsWith("tool")) { - getTcAspectStack(TC_Aspects.INSTRUMENTUM.name(), 2) - .addToAspectList(this.mAspects); - } else if (this.name() - .startsWith("gem") - || this.name() - .startsWith("crystal") - || this.name() - .startsWith("lens")) { - getTcAspectStack(TC_Aspects.VITREUS.name(), 1) - .addToAspectList(this.mAspects); - } else - if (this.name() - .startsWith("crate")) { - getTcAspectStack(TC_Aspects.ITER.name(), 2) - .addToAspectList(this.mAspects); - } else if (this.name() - .startsWith("circuit")) { - getTcAspectStack("COGNITIO", 1); - } else if (this.name() - .startsWith("battery")) { - getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1) - .addToAspectList(this.mAspects); - } + getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects); + return; + } + if (this.name() + .startsWith("dust")) { + getTcAspectStack(TC_Aspects.PERDITIO.name(), 1).addToAspectList(this.mAspects); + return; + } + if (this.name() + .startsWith("crushed")) { + getTcAspectStack(TC_Aspects.PERFODIO.name(), 1).addToAspectList(this.mAspects); + return; + } + if (this.name() + .startsWith("ingot") + || this.name() + .startsWith("nugget")) { + getTcAspectStack(TC_Aspects.METALLUM.name(), 1).addToAspectList(this.mAspects); + return; + } + if (this.name() + .startsWith("armor")) { + getTcAspectStack(TC_Aspects.TUTAMEN.name(), 1).addToAspectList(this.mAspects); + return; + } + if (this.name() + .startsWith("stone")) { + getTcAspectStack(TC_Aspects.TERRA.name(), 1).addToAspectList(this.mAspects); + return; + } + if (this.name() + .startsWith("pipe")) { + getTcAspectStack(TC_Aspects.ITER.name(), 1).addToAspectList(this.mAspects); + return; + } + if (this.name() + .startsWith("gear")) { + getTcAspectStack(TC_Aspects.MOTUS.name(), 1).addToAspectList(this.mAspects); + getTcAspectStack(TC_Aspects.MACHINA.name(), 1).addToAspectList(this.mAspects); + return; + } + if (this.name() + .startsWith("frame") + || this.name() + .startsWith("plate")) { + getTcAspectStack(TC_Aspects.FABRICO.name(), 1).addToAspectList(this.mAspects); + return; + } + if (this.name() + .startsWith("tool")) { + getTcAspectStack(TC_Aspects.INSTRUMENTUM.name(), 2).addToAspectList(this.mAspects); + return; + } + if (this.name() + .startsWith("gem") + || this.name() + .startsWith("crystal") + || this.name() + .startsWith("lens")) { + getTcAspectStack(TC_Aspects.VITREUS.name(), 1).addToAspectList(this.mAspects); + return; + } + if (this.name() + .startsWith("circuit")) { + getTcAspectStack("COGNITIO", 1); + return; + } + if (this.name() + .startsWith("battery")) { + getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects); + } } public static GregtechOrePrefixes getOrePrefix(final String aOre) { |