Improve code readability in binnie.extrabees package and other packages

* Improve code readability in binnie.extrabees package and other packages
* Fix compile error after refactoring
This commit is contained in:
Alexander Kornilov authored and marcin212 committed 2017-04-29 13:43:35 +02:00
1 parent b609d6688f
commit c09ad04284
95 files changed
+3916 -3900

No files matched your search

@@ -1,19 +1,15 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.extrabees.genetics;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.AlleleManager;
import java.util.LinkedHashSet;
import binnie.extrabees.ExtraBees;
import forestry.api.apiculture.IAlleleBeeSpecies;
import java.util.Set;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IClassification;
public enum ExtraBeesBranch implements IClassification
{
import java.util.LinkedHashSet;
import java.util.Set;
public enum ExtraBeesBranch implements IClassification {
BARREN("Vacapis"),
HOSTILE("Infenapis"),
ROCKY("Monapis"),
@@ -44,59 +40,28 @@ public enum ExtraBeesBranch implements IClassification
QUANTUM("Quantapis"),
BOTANIA("Botaniapis");
protected IClassification parent;
private String uid;
private String scientific;
private Set<IAlleleBeeSpecies> speciesSet;
IClassification parent;
@Override
public String getUID() {
return "extrabees.genus." + this.uid;
}
@Override
public String getName() {
return ExtraBees.proxy.localise("branch." + this.toString().toLowerCase() + ".name");
}
@Override
public String getScientific() {
return this.scientific;
}
@Override
public String getDescription() {
return ExtraBees.proxy.localiseOrBlank("branch." + this.toString().toLowerCase() + ".desc");
}
private ExtraBeesBranch(final String scientific) {
this.uid = "";
this.scientific = "";
this.speciesSet = new LinkedHashSet<IAlleleBeeSpecies>();
ExtraBeesBranch(String scientific) {
this.scientific = scientific;
this.uid = this.toString().toLowerCase();
}
public void register() {
if (!this.speciesSet.isEmpty()) {
AlleleManager.alleleRegistry.registerClassification(this);
final IClassification parent = AlleleManager.alleleRegistry.getClassification("family.apidae");
if (parent != null) {
parent.addMemberGroup(this);
this.setParent(parent);
}
}
speciesSet = new LinkedHashSet<>();
uid = toString().toLowerCase();
}
public static void doInit() {
final IClassification frozenBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.frozen");
IClassification frozenBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.frozen");
if (frozenBranch != null) {
frozenBranch.addMemberSpecies(ExtraBeesSpecies.ARTIC);
ExtraBeesSpecies.ARTIC.setBranch(frozenBranch);
frozenBranch.addMemberSpecies(ExtraBeesSpecies.FREEZING);
ExtraBeesSpecies.FREEZING.setBranch(frozenBranch);
}
final IClassification agrarianBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.agrarian");
IClassification agrarianBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.agrarian");
if (agrarianBranch != null) {
agrarianBranch.addMemberSpecies(ExtraBeesSpecies.FARM);
ExtraBeesSpecies.FARM.setBranch(agrarianBranch);
@@ -104,7 +69,8 @@ public enum ExtraBeesBranch implements IClassification
ExtraBeesSpecies.THRIVING.setBranch(agrarianBranch);
ExtraBeesSpecies.BLOOMING.setBranch(agrarianBranch);
}
final IClassification boggyBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.boggy");
IClassification boggyBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.boggy");
if (boggyBranch != null) {
boggyBranch.addMemberSpecies(ExtraBeesSpecies.SWAMP);
boggyBranch.addMemberSpecies(ExtraBeesSpecies.BOGGY);
@@ -113,57 +79,68 @@ public enum ExtraBeesBranch implements IClassification
ExtraBeesSpecies.BOGGY.setBranch(boggyBranch);
ExtraBeesSpecies.FUNGAL.setBranch(boggyBranch);
}
final IClassification festiveBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.festive");
IClassification festiveBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.festive");
if (festiveBranch != null) {
festiveBranch.addMemberSpecies(ExtraBeesSpecies.CELEBRATORY);
ExtraBeesSpecies.CELEBRATORY.setBranch(festiveBranch);
}
final IClassification austereBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.austere");
IClassification austereBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.austere");
if (austereBranch != null) {
austereBranch.addMemberSpecies(ExtraBeesSpecies.HAZARDOUS);
ExtraBeesSpecies.HAZARDOUS.setBranch(austereBranch);
}
ExtraBeesBranch.FARMING.addMemberSpecies(ExtraBeesSpecies.ALCOHOL);
ExtraBeesBranch.FARMING.addMemberSpecies(ExtraBeesSpecies.MILK);
ExtraBeesBranch.FARMING.addMemberSpecies(ExtraBeesSpecies.COFFEE);
ExtraBeesBranch.FARMING.addMemberSpecies(ExtraBeesSpecies.CITRUS);
ExtraBeesBranch.FARMING.addMemberSpecies(ExtraBeesSpecies.MINT);
ExtraBeesBranch.FARMING.register();
ExtraBeesBranch.BARREN.addMemberSpecies(ExtraBeesSpecies.ARID);
ExtraBeesBranch.BARREN.addMemberSpecies(ExtraBeesSpecies.BARREN);
ExtraBeesBranch.BARREN.addMemberSpecies(ExtraBeesSpecies.DESOLATE);
ExtraBeesBranch.BARREN.addMemberSpecies(ExtraBeesSpecies.DECOMPOSING);
ExtraBeesBranch.BARREN.addMemberSpecies(ExtraBeesSpecies.GNAWING);
ExtraBeesBranch.BARREN.register();
ExtraBeesBranch.HOSTILE.addMemberSpecies(ExtraBeesSpecies.ROTTEN);
ExtraBeesBranch.HOSTILE.addMemberSpecies(ExtraBeesSpecies.BONE);
ExtraBeesBranch.HOSTILE.addMemberSpecies(ExtraBeesSpecies.CREEPER);
ExtraBeesBranch.HOSTILE.register();
ExtraBeesBranch.ROCKY.addMemberSpecies(ExtraBeesSpecies.ROCK);
ExtraBeesBranch.ROCKY.addMemberSpecies(ExtraBeesSpecies.STONE);
ExtraBeesBranch.ROCKY.addMemberSpecies(ExtraBeesSpecies.GRANITE);
ExtraBeesBranch.ROCKY.addMemberSpecies(ExtraBeesSpecies.MINERAL);
ExtraBeesBranch.ROCKY.register();
ExtraBeesBranch.METALLIC.addMemberSpecies(ExtraBeesSpecies.IRON);
ExtraBeesBranch.METALLIC.addMemberSpecies(ExtraBeesSpecies.COPPER);
ExtraBeesBranch.METALLIC.addMemberSpecies(ExtraBeesSpecies.TIN);
ExtraBeesBranch.METALLIC.addMemberSpecies(ExtraBeesSpecies.LEAD);
ExtraBeesBranch.METALLIC.register();
ExtraBeesBranch.METALLIC2.addMemberSpecies(ExtraBeesSpecies.NICKEL);
ExtraBeesBranch.METALLIC2.addMemberSpecies(ExtraBeesSpecies.ZINC);
ExtraBeesBranch.METALLIC2.addMemberSpecies(ExtraBeesSpecies.TUNGSTATE);
ExtraBeesBranch.METALLIC2.addMemberSpecies(ExtraBeesSpecies.TITANIUM);
ExtraBeesBranch.METALLIC2.register();
ExtraBeesBranch.ALLOY.addMemberSpecies(ExtraBeesSpecies.BRONZE);
ExtraBeesBranch.ALLOY.addMemberSpecies(ExtraBeesSpecies.BRASS);
ExtraBeesBranch.ALLOY.addMemberSpecies(ExtraBeesSpecies.STEEL);
ExtraBeesBranch.ALLOY.addMemberSpecies(ExtraBeesSpecies.INVAR);
ExtraBeesBranch.ALLOY.register();
ExtraBeesBranch.PRECIOUS.addMemberSpecies(ExtraBeesSpecies.SILVER);
ExtraBeesBranch.PRECIOUS.addMemberSpecies(ExtraBeesSpecies.GOLD);
ExtraBeesBranch.PRECIOUS.addMemberSpecies(ExtraBeesSpecies.ELECTRUM);
ExtraBeesBranch.PRECIOUS.addMemberSpecies(ExtraBeesSpecies.PLATINUM);
ExtraBeesBranch.PRECIOUS.register();
ExtraBeesBranch.MINERAL.addMemberSpecies(ExtraBeesSpecies.LAPIS);
ExtraBeesBranch.MINERAL.addMemberSpecies(ExtraBeesSpecies.SODALITE);
ExtraBeesBranch.MINERAL.addMemberSpecies(ExtraBeesSpecies.PYRITE);
@@ -171,12 +148,14 @@ public enum ExtraBeesBranch implements IClassification
ExtraBeesBranch.MINERAL.addMemberSpecies(ExtraBeesSpecies.CINNABAR);
ExtraBeesBranch.MINERAL.addMemberSpecies(ExtraBeesSpecies.SPHALERITE);
ExtraBeesBranch.MINERAL.register();
ExtraBeesBranch.GEMSTONE.addMemberSpecies(ExtraBeesSpecies.EMERALD);
ExtraBeesBranch.GEMSTONE.addMemberSpecies(ExtraBeesSpecies.RUBY);
ExtraBeesBranch.GEMSTONE.addMemberSpecies(ExtraBeesSpecies.SAPPHIRE);
ExtraBeesBranch.GEMSTONE.addMemberSpecies(ExtraBeesSpecies.OLIVINE);
ExtraBeesBranch.GEMSTONE.addMemberSpecies(ExtraBeesSpecies.DIAMOND);
ExtraBeesBranch.GEMSTONE.register();
ExtraBeesBranch.NUCLEAR.addMemberSpecies(ExtraBeesSpecies.UNSTABLE);
ExtraBeesBranch.NUCLEAR.addMemberSpecies(ExtraBeesSpecies.NUCLEAR);
ExtraBeesBranch.NUCLEAR.addMemberSpecies(ExtraBeesSpecies.RADIOACTIVE);
@@ -184,62 +163,75 @@ public enum ExtraBeesBranch implements IClassification
ExtraBeesBranch.NUCLEAR.addMemberSpecies(ExtraBeesSpecies.CYANITE);
ExtraBeesBranch.NUCLEAR.addMemberSpecies(ExtraBeesSpecies.BLUTONIUM);
ExtraBeesBranch.NUCLEAR.register();
ExtraBeesBranch.HISTORIC.addMemberSpecies(ExtraBeesSpecies.ANCIENT);
ExtraBeesBranch.HISTORIC.addMemberSpecies(ExtraBeesSpecies.PRIMEVAL);
ExtraBeesBranch.HISTORIC.addMemberSpecies(ExtraBeesSpecies.PREHISTORIC);
ExtraBeesBranch.HISTORIC.addMemberSpecies(ExtraBeesSpecies.RELIC);
ExtraBeesBranch.HISTORIC.register();
ExtraBeesBranch.FOSSILIZED.addMemberSpecies(ExtraBeesSpecies.COAL);
ExtraBeesBranch.FOSSILIZED.addMemberSpecies(ExtraBeesSpecies.RESIN);
ExtraBeesBranch.FOSSILIZED.addMemberSpecies(ExtraBeesSpecies.OIL);
ExtraBeesBranch.FOSSILIZED.addMemberSpecies(ExtraBeesSpecies.PEAT);
ExtraBeesBranch.FOSSILIZED.register();
ExtraBeesBranch.REFINED.addMemberSpecies(ExtraBeesSpecies.DISTILLED);
ExtraBeesBranch.REFINED.addMemberSpecies(ExtraBeesSpecies.FUEL);
ExtraBeesBranch.REFINED.addMemberSpecies(ExtraBeesSpecies.CREOSOTE);
ExtraBeesBranch.REFINED.addMemberSpecies(ExtraBeesSpecies.LATEX);
ExtraBeesBranch.REFINED.register();
ExtraBeesBranch.AQUATIC.addMemberSpecies(ExtraBeesSpecies.WATER);
ExtraBeesBranch.AQUATIC.addMemberSpecies(ExtraBeesSpecies.RIVER);
ExtraBeesBranch.AQUATIC.addMemberSpecies(ExtraBeesSpecies.OCEAN);
ExtraBeesBranch.AQUATIC.addMemberSpecies(ExtraBeesSpecies.INK);
ExtraBeesBranch.AQUATIC.register();
ExtraBeesBranch.SACCHARINE.addMemberSpecies(ExtraBeesSpecies.SWEET);
ExtraBeesBranch.SACCHARINE.addMemberSpecies(ExtraBeesSpecies.SUGAR);
ExtraBeesBranch.SACCHARINE.addMemberSpecies(ExtraBeesSpecies.FRUIT);
ExtraBeesBranch.SACCHARINE.addMemberSpecies(ExtraBeesSpecies.RIPENING);
ExtraBeesBranch.SACCHARINE.register();
ExtraBeesBranch.CLASSICAL.addMemberSpecies(ExtraBeesSpecies.MARBLE);
ExtraBeesBranch.CLASSICAL.addMemberSpecies(ExtraBeesSpecies.ROMAN);
ExtraBeesBranch.CLASSICAL.addMemberSpecies(ExtraBeesSpecies.GREEK);
ExtraBeesBranch.CLASSICAL.addMemberSpecies(ExtraBeesSpecies.CLASSICAL);
ExtraBeesBranch.CLASSICAL.register();
ExtraBeesBranch.VOLCANIC.addMemberSpecies(ExtraBeesSpecies.BASALT);
ExtraBeesBranch.VOLCANIC.addMemberSpecies(ExtraBeesSpecies.TEMPERED);
ExtraBeesBranch.VOLCANIC.addMemberSpecies(ExtraBeesSpecies.ANGRY);
ExtraBeesBranch.VOLCANIC.addMemberSpecies(ExtraBeesSpecies.VOLCANIC);
ExtraBeesBranch.VOLCANIC.addMemberSpecies(ExtraBeesSpecies.GLOWSTONE);
ExtraBeesBranch.VOLCANIC.register();
ExtraBeesBranch.VISCOUS.addMemberSpecies(ExtraBeesSpecies.VISCOUS);
ExtraBeesBranch.VISCOUS.addMemberSpecies(ExtraBeesSpecies.GLUTINOUS);
ExtraBeesBranch.VISCOUS.addMemberSpecies(ExtraBeesSpecies.STICKY);
ExtraBeesBranch.VISCOUS.register();
ExtraBeesBranch.VIRULENT.addMemberSpecies(ExtraBeesSpecies.MALICIOUS);
ExtraBeesBranch.VIRULENT.addMemberSpecies(ExtraBeesSpecies.INFECTIOUS);
ExtraBeesBranch.VIRULENT.addMemberSpecies(ExtraBeesSpecies.VIRULENT);
ExtraBeesBranch.VIRULENT.register();
ExtraBeesBranch.CAUSTIC.addMemberSpecies(ExtraBeesSpecies.CORROSIVE);
ExtraBeesBranch.CAUSTIC.addMemberSpecies(ExtraBeesSpecies.CAUSTIC);
ExtraBeesBranch.CAUSTIC.addMemberSpecies(ExtraBeesSpecies.ACIDIC);
ExtraBeesBranch.CAUSTIC.register();
ExtraBeesBranch.ENERGETIC.addMemberSpecies(ExtraBeesSpecies.EXCITED);
ExtraBeesBranch.ENERGETIC.addMemberSpecies(ExtraBeesSpecies.ENERGETIC);
ExtraBeesBranch.ENERGETIC.addMemberSpecies(ExtraBeesSpecies.ECSTATIC);
ExtraBeesBranch.ENERGETIC.register();
ExtraBeesBranch.SHADOW.addMemberSpecies(ExtraBeesSpecies.SHADOW);
ExtraBeesBranch.SHADOW.addMemberSpecies(ExtraBeesSpecies.DARKENED);
ExtraBeesBranch.SHADOW.addMemberSpecies(ExtraBeesSpecies.ABYSS);
ExtraBeesBranch.SHADOW.register();
ExtraBeesBranch.PRIMARY.addMemberSpecies(ExtraBeesSpecies.RED);
ExtraBeesBranch.PRIMARY.addMemberSpecies(ExtraBeesSpecies.YELLOW);
ExtraBeesBranch.PRIMARY.addMemberSpecies(ExtraBeesSpecies.BLUE);
@@ -248,6 +240,7 @@ public enum ExtraBeesBranch implements IClassification
ExtraBeesBranch.PRIMARY.addMemberSpecies(ExtraBeesSpecies.WHITE);
ExtraBeesBranch.PRIMARY.addMemberSpecies(ExtraBeesSpecies.BROWN);
ExtraBeesBranch.PRIMARY.register();
ExtraBeesBranch.SECONDARY.addMemberSpecies(ExtraBeesSpecies.ORANGE);
ExtraBeesBranch.SECONDARY.addMemberSpecies(ExtraBeesSpecies.CYAN);
ExtraBeesBranch.SECONDARY.addMemberSpecies(ExtraBeesSpecies.PURPLE);
@@ -256,19 +249,56 @@ public enum ExtraBeesBranch implements IClassification
ExtraBeesBranch.SECONDARY.addMemberSpecies(ExtraBeesSpecies.PINK);
ExtraBeesBranch.SECONDARY.addMemberSpecies(ExtraBeesSpecies.LIMEGREEN);
ExtraBeesBranch.SECONDARY.register();
ExtraBeesBranch.TERTIARY.addMemberSpecies(ExtraBeesSpecies.MAGENTA);
ExtraBeesBranch.TERTIARY.addMemberSpecies(ExtraBeesSpecies.LIGHTGRAY);
ExtraBeesBranch.TERTIARY.register();
ExtraBeesBranch.FTB.addMemberSpecies(ExtraBeesSpecies.JADED);
ExtraBeesBranch.FTB.register();
ExtraBeesBranch.QUANTUM.addMemberSpecies(ExtraBeesSpecies.UNUSUAL);
ExtraBeesBranch.QUANTUM.addMemberSpecies(ExtraBeesSpecies.SPATIAL);
ExtraBeesBranch.QUANTUM.addMemberSpecies(ExtraBeesSpecies.QUANTUM);
ExtraBeesBranch.QUANTUM.register();
ExtraBeesBranch.BOTANIA.addMemberSpecies(ExtraBeesSpecies.MYSTICAL);
ExtraBeesBranch.BOTANIA.register();
}
@Override
public String getUID() {
return "extrabees.genus." + uid;
}
@Override
public String getName() {
return ExtraBees.proxy.localise("branch." + toString().toLowerCase() + ".name");
}
@Override
public String getScientific() {
return scientific;
}
@Override
public String getDescription() {
return ExtraBees.proxy.localiseOrBlank("branch." + toString().toLowerCase() + ".desc");
}
public void register() {
if (speciesSet.isEmpty()) {
return;
}
AlleleManager.alleleRegistry.registerClassification(this);
IClassification parent = AlleleManager.alleleRegistry.getClassification("family.apidae");
if (parent != null) {
parent.addMemberGroup(this);
setParent(parent);
}
}
@Override
public IClassification.EnumClassLevel getLevel() {
return IClassification.EnumClassLevel.GENUS;
@@ -280,17 +310,17 @@ public enum ExtraBeesBranch implements IClassification
}
@Override
public void addMemberGroup(final IClassification group) {
public void addMemberGroup(IClassification group) {
}
@Override
public IAlleleSpecies[] getMemberSpecies() {
return this.speciesSet.toArray(new IAlleleSpecies[0]);
return speciesSet.toArray(new IAlleleSpecies[0]);
}
@Override
public void addMemberSpecies(final IAlleleSpecies species) {
this.speciesSet.add((IAlleleBeeSpecies) species);
public void addMemberSpecies(IAlleleSpecies species) {
speciesSet.add((IAlleleBeeSpecies) species);
if (species instanceof ExtraBeesSpecies) {
((ExtraBeesSpecies) species).setBranch(this);
}
@@ -298,11 +328,11 @@ public enum ExtraBeesBranch implements IClassification
@Override
public IClassification getParent() {
return this.parent;
return parent;
}
@Override
public void setParent(final IClassification parent) {
public void setParent(IClassification parent) {
this.parent = parent;
}
}