From db5daf9e3d8d7c8a8cff98e3476d052e686bc3e9 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 21 Nov 2015 21:50:38 -0800 Subject: [PATCH] Tidy species code --- .../genetics/alleles/AlleleBeeSpecies.java | 7 ------ .../genetics/alleles/AlleleTreeSpecies.java | 9 ------- .../core/genetics/alleles/AlleleSpecies.java | 24 +++++-------------- .../genetics/AlleleButterflySpecies.java | 1 - 4 files changed, 6 insertions(+), 35 deletions(-) diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java index d2f429829..4234ee7d9 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java @@ -26,7 +26,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpeciesCustom; import forestry.api.apiculture.IBeeGenome; @@ -42,7 +41,6 @@ import forestry.apiculture.genetics.DefaultBeeIconColourProvider; import forestry.apiculture.genetics.DefaultBeeIconProvider; import forestry.apiculture.genetics.JubilanceDefault; import forestry.core.genetics.alleles.AlleleSpecies; -import forestry.core.utils.GeneticsUtil; import forestry.core.utils.ItemStackUtil; public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpeciesCustom { @@ -116,11 +114,6 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies } /* RESEARCH */ - @Override - public int getComplexity() { - return GeneticsUtil.getResearchComplexity(this, EnumBeeChromosome.SPECIES); - } - @Override public float getResearchSuitability(ItemStack itemstack) { if (itemstack == null) { diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java index 03c8d8c62..26bdeb4e2 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java @@ -22,7 +22,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleTreeSpeciesCustom; import forestry.api.arboriculture.IGermlingIconProvider; import forestry.api.arboriculture.ILeafIconProvider; @@ -34,10 +33,8 @@ import forestry.api.genetics.IClassification; import forestry.api.genetics.IFruitFamily; import forestry.core.genetics.alleles.AlleleSpecies; import forestry.core.render.TextureManager; -import forestry.core.utils.GeneticsUtil; public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeciesCustom, IIconProvider { - private final ITreeGenerator generator; private final IGermlingIconProvider germlingIconProvider; private final ILeafIconProvider leafIconProvider; @@ -70,12 +67,6 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci return this; } - /* RESEARCH */ - @Override - public int getComplexity() { - return GeneticsUtil.getResearchComplexity(this, EnumTreeChromosome.SPECIES); - } - /* OTHER */ @Override public EnumPlantType getPlantType() { diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java index fea7c438d..551ba2781 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java @@ -32,12 +32,11 @@ import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.apiculture.items.ItemRegistryApiculture; +import forestry.core.utils.GeneticsUtil; import forestry.core.utils.ItemStackUtil; import forestry.plugins.PluginApiculture; -import forestry.plugins.PluginManager; public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCustom { - private final String binomial; private final String authority; private final String description; @@ -95,8 +94,12 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCust } @Override - public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) { + public int getComplexity() { + return GeneticsUtil.getResearchComplexity(this, getRoot().getKaryotypeKey()); + } + @Override + public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) { ItemStack research = null; if (world.rand.nextFloat() < ((float) 10 / bountyLevel)) { Collection combinations = getRoot().getCombinations(this); @@ -111,7 +114,6 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCust } else { return ItemStackUtil.EMPTY_STACK_ARRAY; } - } @Override @@ -184,20 +186,6 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCust return this; } - @Deprecated - @SuppressWarnings("unchecked") - public T setTemperatureDeprecated(EnumTemperature temperature) { - climate = temperature; - return (T) this; - } - - @Deprecated - @SuppressWarnings("unchecked") - public T setHumidityDeprecated(EnumHumidity humidity) { - this.humidity = humidity; - return (T) this; - } - @Override @SideOnly(Side.CLIENT) public abstract IIconProvider getIconProvider(); diff --git a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java index 11182277d..fd5444778 100755 --- a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java +++ b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java @@ -36,7 +36,6 @@ import forestry.api.lepidopterology.IButterflyRoot; import forestry.core.genetics.alleles.AlleleSpecies; public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButterflySpeciesCustom { - private final String texture; private final Color serumColour; private float rarity = 0.1f;