Some reformat code for 1.11.2 source (#84)

* Optimized imports

* Some code reformat

* Some refactoring and code reformat

* Some code reformat
This commit is contained in:
Alexander Kornilov authored and mezz committed 2017-06-01 00:48:08 -07:00
1 parent 886c36a308
commit c3809fbc27
508 files changed
+6677 -6238

No files matched your search

@@ -1,9 +1,23 @@
package binnie.botany.genetics;
import binnie.botany.Botany;
import binnie.botany.api.*;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.botany.api.EnumFlowerStage;
import binnie.botany.api.IAlleleFlowerSpecies;
import binnie.botany.api.IBotanistTracker;
import binnie.botany.api.IColourMix;
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.*;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlyzerPlugin;
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;
@@ -11,15 +25,20 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
public class FlowerRoot extends SpeciesRoot implements IFlowerRoot {
public static int flowerSpeciesCount = -1;
static final String UID = "rootFlowers";
public static int flowerSpeciesCount = -1;
public static ArrayList<IFlower> flowerTemplates = new ArrayList<>();
private static ArrayList<IFlowerMutation> flowerMutations = new ArrayList<>();
Map<ItemStack, IFlower> conversions;
private static ArrayList<IColourMix> colourMixes = new ArrayList<>();
Map<ItemStack, IFlower> conversions;
public FlowerRoot() {
this.conversions = new HashMap<>();
@@ -227,7 +246,6 @@ public class FlowerRoot extends SpeciesRoot implements IFlowerRoot {
return EnumFlowerChromosome.SPECIES;
}
@Override
public void addConversion(final ItemStack itemstack, final IAllele[] template) {
final IFlower flower = this.getFlower(this.templateAsGenome(template));
@@ -257,5 +275,4 @@ public class FlowerRoot extends SpeciesRoot implements IFlowerRoot {
}
return FlowerRoot.colourMixes;
}
}