diff --git a/src/main/java/forestry/api/apiculture/IBeeRoot.java b/src/main/java/forestry/api/apiculture/IBeeRoot.java index aef6797e9..1323eb600 100644 --- a/src/main/java/forestry/api/apiculture/IBeeRoot.java +++ b/src/main/java/forestry/api/apiculture/IBeeRoot.java @@ -7,17 +7,15 @@ package forestry.api.apiculture; import javax.annotation.Nullable; import java.util.ArrayList; -import java.util.Collection; +import java.util.List; +import com.mojang.authlib.GameProfile; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import com.mojang.authlib.GameProfile; - -import forestry.api.genetics.IAllele; -import forestry.api.genetics.ISpeciesRoot; - public interface IBeeRoot extends ISpeciesRoot { /** @@ -100,7 +98,7 @@ public interface IBeeRoot extends ISpeciesRoot { /* MUTATIONS */ @Override - Collection getMutations(boolean shuffle); + List getMutations(boolean shuffle); /* GAME MODE */ void resetBeekeepingMode(); diff --git a/src/main/java/forestry/api/arboriculture/ITreeRoot.java b/src/main/java/forestry/api/arboriculture/ITreeRoot.java index 1eb4be9b3..bd3c4c5ea 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeRoot.java +++ b/src/main/java/forestry/api/arboriculture/ITreeRoot.java @@ -8,18 +8,17 @@ package forestry.api.arboriculture; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; +import java.util.List; +import com.mojang.authlib.GameProfile; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosome; +import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import com.mojang.authlib.GameProfile; - -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosome; -import forestry.api.genetics.ISpeciesRoot; - public interface ITreeRoot extends ISpeciesRoot { @Override @@ -82,7 +81,7 @@ public interface ITreeRoot extends ISpeciesRoot { boolean setFruitBlock(World world, IAlleleFruit allele, float sappiness, BlockPos pos); /* GAME MODE */ - ArrayList getTreekeepingModes(); + List getTreekeepingModes(); ITreekeepingMode getTreekeepingMode(World world); @@ -98,6 +97,5 @@ public interface ITreeRoot extends ISpeciesRoot { /* MUTATIONS */ @Override - Collection getMutations(boolean shuffle); - + List getMutations(boolean shuffle); } diff --git a/src/main/java/forestry/api/genetics/ISpeciesRoot.java b/src/main/java/forestry/api/genetics/ISpeciesRoot.java index 4ea27083a..9b3caea73 100644 --- a/src/main/java/forestry/api/genetics/ISpeciesRoot.java +++ b/src/main/java/forestry/api/genetics/ISpeciesRoot.java @@ -138,13 +138,13 @@ public interface ISpeciesRoot { /** * @return All registered mutations. */ - Collection getMutations(boolean shuffle); + List getMutations(boolean shuffle); /** * @param other Allele to match mutations against. * @return All registered mutations the given allele is part of. */ - Collection getCombinations(IAllele other); + List getCombinations(IAllele other); /** * @since Forestry 3.7 diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java b/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java index 8445b5172..c0aff0bdb 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java @@ -7,18 +7,16 @@ package forestry.api.lepidopterology; import javax.annotation.Nullable; import java.util.ArrayList; -import java.util.Collection; +import java.util.List; +import com.mojang.authlib.GameProfile; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.ISpeciesRoot; import net.minecraft.entity.EntityLiving; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import com.mojang.authlib.GameProfile; - -import forestry.api.genetics.IAllele; -import forestry.api.genetics.ISpeciesRoot; - public interface IButterflyRoot extends ISpeciesRoot { @Override @@ -67,7 +65,7 @@ public interface IButterflyRoot extends ISpeciesRoot { /* MUTATIONS */ @Override - Collection getMutations(boolean shuffle); + List getMutations(boolean shuffle); @Nullable @Override diff --git a/src/main/java/forestry/apiculture/genetics/BeeRoot.java b/src/main/java/forestry/apiculture/genetics/BeeRoot.java index e4fea88a0..f34ebfa23 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeRoot.java +++ b/src/main/java/forestry/apiculture/genetics/BeeRoot.java @@ -12,8 +12,8 @@ package forestry.apiculture.genetics; import javax.annotation.Nullable; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; +import java.util.List; import java.util.Locale; import java.util.Map.Entry; @@ -249,10 +249,10 @@ public class BeeRoot extends SpeciesRoot implements IBeeRoot { /** * List of possible mutations on species alleles. */ - private static final ArrayList beeMutations = new ArrayList<>(); + private static final List beeMutations = new ArrayList<>(); @Override - public Collection getMutations(boolean shuffle) { + public List getMutations(boolean shuffle) { if (shuffle) { Collections.shuffle(beeMutations); } diff --git a/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java b/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java index 8443e1af7..a4d136587 100644 --- a/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java +++ b/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java @@ -13,17 +13,16 @@ package forestry.arboriculture.commands; import java.util.ArrayList; import java.util.List; -import net.minecraft.world.World; - import forestry.api.arboriculture.ITreekeepingMode; import forestry.api.arboriculture.TreeManager; import forestry.core.commands.ICommandModeHelper; +import net.minecraft.world.World; public class TreeModeHelper implements ICommandModeHelper { @Override public String[] getModeNames() { - ArrayList treekeepingModes = TreeManager.treeRoot.getTreekeepingModes(); + List treekeepingModes = TreeManager.treeRoot.getTreekeepingModes(); int modeStringCount = treekeepingModes.size(); List modeStrings = new ArrayList<>(modeStringCount); for (ITreekeepingMode mode : treekeepingModes) { diff --git a/src/main/java/forestry/core/genetics/SpeciesRoot.java b/src/main/java/forestry/core/genetics/SpeciesRoot.java index f5b3b0d00..9c1220ef0 100755 --- a/src/main/java/forestry/core/genetics/SpeciesRoot.java +++ b/src/main/java/forestry/core/genetics/SpeciesRoot.java @@ -20,14 +20,13 @@ import java.util.List; import java.util.Map; import java.util.Random; -import net.minecraft.item.ItemStack; - import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IChromosome; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; +import net.minecraft.item.ItemStack; public abstract class SpeciesRoot implements ISpeciesRoot { @@ -82,8 +81,8 @@ public abstract class SpeciesRoot implements ISpeciesRoot { /* MUTATIONS */ @Override - public Collection getCombinations(IAllele other) { - ArrayList combinations = new ArrayList<>(); + public List getCombinations(IAllele other) { + List combinations = new ArrayList<>(); for (IMutation mutation : getMutations(false)) { if (mutation.isPartner(other)) { combinations.add(mutation); diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java index c9aa9cb64..d1d1518ae 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java @@ -12,8 +12,8 @@ package forestry.lepidopterology.genetics; import javax.annotation.Nullable; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; +import java.util.List; import java.util.Map.Entry; import com.mojang.authlib.GameProfile; @@ -264,7 +264,7 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { } /* MUTATIONS */ - private static final ArrayList butterflyMutations = new ArrayList<>(); + private static final List butterflyMutations = new ArrayList<>(); @Override public void registerMutation(IMutation mutation) { @@ -282,7 +282,7 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { } @Override - public Collection getMutations(boolean shuffle) { + public List getMutations(boolean shuffle) { if (shuffle) { Collections.shuffle(butterflyMutations); }