Improve code readability in binnie.botany package

This commit is contained in:
kordum authored and mezz committed 2017-04-28 17:45:38 -07:00
1 parent e05bf8bb7b
commit b609d6688f
93 files changed
+3594 -3838

No files matched your search

@@ -1,80 +1,62 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.botany.genetics;
import forestry.api.genetics.ISpeciesType;
import binnie.botany.api.EnumFlowerChromosome;
import forestry.api.genetics.IChromosomeType;
import net.minecraft.world.WorldSavedData;
import binnie.botany.api.IBotanistTracker;
import com.mojang.authlib.GameProfile;
import forestry.api.genetics.IMutation;
import java.util.Collections;
import java.util.Collection;
import java.util.Random;
import binnie.botany.api.IFlowerGenome;
import net.minecraft.world.World;
import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound;
import binnie.botany.Botany;
import forestry.api.genetics.IIndividual;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.botany.api.EnumFlowerStage;
import binnie.botany.api.IAlleleFlowerSpecies;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.AlleleManager;
import java.util.HashMap;
import binnie.botany.api.IBotanistTracker;
import binnie.botany.api.IColourMix;
import net.minecraft.item.ItemStack;
import java.util.Map;
import binnie.botany.api.IFlowerMutation;
import binnie.botany.api.IFlower;
import binnie.botany.api.IFlowerGenome;
import binnie.botany.api.IFlowerMutation;
import binnie.botany.api.IFlowerRoot;
import com.mojang.authlib.GameProfile;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesType;
import forestry.core.genetics.SpeciesRoot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
import binnie.botany.api.IFlowerRoot;
import forestry.core.genetics.SpeciesRoot;
public class FlowerHelper extends SpeciesRoot implements IFlowerRoot {
public static int flowerSpeciesCount = -1;
public static ArrayList<IFlower> flowerTemplates = new ArrayList<>();
public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
{
public static int flowerSpeciesCount;
static final String UID = "rootFlowers";
public static ArrayList<IFlower> flowerTemplates;
private static ArrayList<IFlowerMutation> flowerMutations;
Map<ItemStack, IFlower> conversions;
private static ArrayList<IColourMix> colourMixes;
protected static String UID = "rootFlowers";
private static ArrayList<IFlowerMutation> flowerMutations = new ArrayList<>();
private static ArrayList<IColourMix> colourMixes = new ArrayList<>();
protected Map<ItemStack, IFlower> conversions;
public FlowerHelper() {
this.conversions = new HashMap<ItemStack, IFlower>();
conversions = new HashMap<>();
}
@Override
public String getUID() {
return "rootFlowers";
return UID;
}
@Override
public int getSpeciesCount() {
if (FlowerHelper.flowerSpeciesCount < 0) {
FlowerHelper.flowerSpeciesCount = 0;
for (final Map.Entry<String, IAllele> entry : AlleleManager.alleleRegistry.getRegisteredAlleles().entrySet()) {
for (Map.Entry<String, IAllele> entry : AlleleManager.alleleRegistry.getRegisteredAlleles().entrySet()) {
if (entry.getValue() instanceof IAlleleFlowerSpecies && ((IAlleleFlowerSpecies) entry.getValue()).isCounted()) {
++FlowerHelper.flowerSpeciesCount;
FlowerHelper.flowerSpeciesCount++;
}
}
}
@@ -82,78 +64,95 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
}
@Override
public boolean isMember(final ItemStack stack) {
return stack != null && this.getStageType(stack) != EnumFlowerStage.NONE;
public boolean isMember(ItemStack stack) {
return stack != null
&& getStageType(stack) != EnumFlowerStage.NONE;
}
@Override
public boolean isMember(final ItemStack stack, final int type) {
return this.getStageType(stack).ordinal() == type;
public boolean isMember(ItemStack stack, int type) {
return getStageType(stack).ordinal() == type;
}
@Override
public boolean isMember(final IIndividual individual) {
public boolean isMember(IIndividual individual) {
return individual instanceof IFlower;
}
@Override
public ItemStack getMemberStack(final IIndividual flower, final int type) {
if (!this.isMember(flower)) {
public ItemStack getMemberStack(IIndividual flower, int type) {
if (!isMember(flower)) {
return null;
}
Item flowerItem = Botany.flowerItem;
if (type == EnumFlowerStage.SEED.ordinal()) {
flowerItem = Botany.seed;
}
if (type == EnumFlowerStage.POLLEN.ordinal()) {
flowerItem = Botany.pollen;
}
if (flowerItem != Botany.flowerItem) {
((IFlower) flower).setAge(0);
}
final NBTTagCompound nbttagcompound = new NBTTagCompound();
NBTTagCompound nbttagcompound = new NBTTagCompound();
flower.writeToNBT(nbttagcompound);
final ItemStack flowerStack = new ItemStack(flowerItem);
ItemStack flowerStack = new ItemStack(flowerItem);
flowerStack.setTagCompound(nbttagcompound);
return flowerStack;
}
@Override
public EnumFlowerStage getStageType(final ItemStack stack) {
return (stack == null) ? EnumFlowerStage.NONE : ((stack.getItem() == Botany.flowerItem) ? EnumFlowerStage.FLOWER : ((stack.getItem() == Botany.pollen) ? EnumFlowerStage.POLLEN : ((stack.getItem() == Botany.seed) ? EnumFlowerStage.SEED : EnumFlowerStage.NONE)));
public EnumFlowerStage getStageType(ItemStack stack) {
if (stack == null) {
return EnumFlowerStage.NONE;
}
if (stack.getItem() == Botany.flowerItem) {
return EnumFlowerStage.FLOWER;
}
if (stack.getItem() == Botany.pollen) {
return EnumFlowerStage.POLLEN;
}
if (stack.getItem() == Botany.seed) {
return EnumFlowerStage.SEED;
}
return EnumFlowerStage.NONE;
}
@Override
public IFlower getMember(final ItemStack stack) {
if (!this.isMember(stack)) {
public IFlower getMember(ItemStack stack) {
if (!isMember(stack)) {
return null;
}
return new Flower(stack.getTagCompound());
}
@Override
public IFlower getFlower(final World world, final IFlowerGenome genome) {
public IFlower getFlower(World world, IFlowerGenome genome) {
return new Flower(genome, 2);
}
@Override
public IFlowerGenome templateAsGenome(final IAllele[] template) {
return new FlowerGenome(this.templateAsChromosomes(template));
public IFlowerGenome templateAsGenome(IAllele[] template) {
return new FlowerGenome(templateAsChromosomes(template));
}
@Override
public IFlowerGenome templateAsGenome(final IAllele[] templateActive, final IAllele[] templateInactive) {
return new FlowerGenome(this.templateAsChromosomes(templateActive, templateInactive));
public IFlowerGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive) {
return new FlowerGenome(templateAsChromosomes(templateActive, templateInactive));
}
@Override
public IFlower templateAsIndividual(final IAllele[] template) {
return new Flower(this.templateAsGenome(template), 2);
public IFlower templateAsIndividual(IAllele[] template) {
return new Flower(templateAsGenome(template), 2);
}
@Override
public IFlower templateAsIndividual(final IAllele[] templateActive, final IAllele[] templateInactive) {
return new Flower(this.templateAsGenome(templateActive, templateInactive), 2);
public IFlower templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive) {
return new Flower(templateAsGenome(templateActive, templateInactive), 2);
}
@Override
@@ -162,21 +161,21 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
}
@Override
public void registerTemplate(final IAllele[] template) {
this.registerTemplate(template[0].getUID(), template);
public void registerTemplate(IAllele[] template) {
registerTemplate(template[0].getUID(), template);
}
@Override
public void registerTemplate(final String identifier, final IAllele[] template) {
FlowerHelper.flowerTemplates.add(new Flower(this.templateAsGenome(template), 2));
if (!this.speciesTemplates.containsKey(identifier)) {
this.speciesTemplates.put(identifier, template);
public void registerTemplate(String identifier, IAllele[] template) {
FlowerHelper.flowerTemplates.add(new Flower(templateAsGenome(template), 2));
if (!speciesTemplates.containsKey(identifier)) {
speciesTemplates.put(identifier, template);
}
}
@Override
public IAllele[] getTemplate(final String identifier) {
return this.speciesTemplates.get(identifier);
public IAllele[] getTemplate(String identifier) {
return speciesTemplates.get(identifier);
}
@Override
@@ -185,12 +184,12 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
}
@Override
public IAllele[] getRandomTemplate(final Random rand) {
return this.speciesTemplates.values().toArray(new IAllele[0][])[rand.nextInt(this.speciesTemplates.values().size())];
public IAllele[] getRandomTemplate(Random rand) {
return speciesTemplates.values().toArray(new IAllele[0][])[rand.nextInt(speciesTemplates.values().size())];
}
@Override
public Collection<IFlowerMutation> getMutations(final boolean shuffle) {
public Collection<IFlowerMutation> getMutations(boolean shuffle) {
if (shuffle) {
Collections.shuffle(FlowerHelper.flowerMutations);
}
@@ -198,22 +197,18 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
}
@Override
public void registerMutation(final IMutation mutation) {
if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getTemplate()[0].getUID())) {
return;
}
if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele0().getUID())) {
return;
}
if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele1().getUID())) {
public void registerMutation(IMutation mutation) {
if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getTemplate()[0].getUID()) ||
AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele0().getUID()) ||
AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele1().getUID())) {
return;
}
FlowerHelper.flowerMutations.add((IFlowerMutation) mutation);
}
@Override
public IBotanistTracker getBreedingTracker(final World world, final GameProfile player) {
final String filename = "BotanistTracker." + ((player == null) ? "common" : player.getId());
public IBotanistTracker getBreedingTracker(World world, GameProfile player) {
String filename = "BotanistTracker." + ((player == null) ? "common" : player.getId());
BotanistTracker tracker = (BotanistTracker) world.loadItemData(BotanistTracker.class, filename);
if (tracker == null) {
tracker = new BotanistTracker(filename);
@@ -223,7 +218,7 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
}
@Override
public IIndividual getMember(final NBTTagCompound compound) {
public IIndividual getMember(NBTTagCompound compound) {
return new Flower(compound);
}
@@ -243,15 +238,15 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
}
@Override
public void addConversion(final ItemStack itemstack, final IAllele[] template) {
final IFlower flower = this.getFlower(null, this.templateAsGenome(template));
this.conversions.put(itemstack, flower);
public void addConversion(ItemStack stack, IAllele[] template) {
IFlower flower = getFlower(null, templateAsGenome(template));
conversions.put(stack, flower);
}
@Override
public IFlower getConversion(final ItemStack itemstack) {
for (final Map.Entry<ItemStack, IFlower> entry : this.conversions.entrySet()) {
if (entry.getKey().isItemEqual(itemstack)) {
public IFlower getConversion(ItemStack stack) {
for (Map.Entry<ItemStack, IFlower> entry : conversions.entrySet()) {
if (entry.getKey().isItemEqual(stack)) {
return (IFlower) entry.getValue().copy();
}
}
@@ -259,28 +254,21 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot
}
@Override
public void registerColourMix(final IColourMix colourMix) {
FlowerHelper.colourMixes.add(colourMix);
public void registerColourMix(IColourMix colorMix) {
FlowerHelper.colourMixes.add(colorMix);
}
@Override
public Collection<IColourMix> getColourMixes(final boolean shuffle) {
public Collection<IColourMix> getColourMixes(boolean shuffle) {
if (shuffle) {
Collections.shuffle(FlowerHelper.colourMixes);
}
return FlowerHelper.colourMixes;
}
static {
FlowerHelper.flowerSpeciesCount = -1;
FlowerHelper.flowerTemplates = new ArrayList<IFlower>();
FlowerHelper.flowerMutations = new ArrayList<IFlowerMutation>();
FlowerHelper.colourMixes = new ArrayList<IColourMix>();
}
// ??
@Override
public ISpeciesType getType(ItemStack itemstack) {
public ISpeciesType getType(ItemStack stack) {
return null;
}
}