From 339bbbe0f707fe7c48ba88da590abb51ee175db0 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 27 Feb 2016 13:27:23 +0100 Subject: [PATCH] Cleanup, Fix Allele Propertys --- .../java/forestry/api/arboriculture/IAlleleFruit.java | 4 ++-- .../api/arboriculture/IAlleleTreeSpecies.java | 3 ++- .../java/forestry/api/genetics/IAlleleComparable.java | 11 +++++++++++ .../arboriculture/blocks/BlockForestryLeaves.java | 1 - .../arboriculture/genetics/alleles/AlleleFruit.java | 5 +++++ .../genetics/alleles/AlleleTreeSpecies.java | 5 +++++ .../core/blocks/propertys/PropertyAllele.java | 4 ++-- .../java/forestry/core/proxy/ProxyRenderClient.java | 2 -- 8 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 src/main/java/forestry/api/genetics/IAlleleComparable.java diff --git a/src/main/java/forestry/api/arboriculture/IAlleleFruit.java b/src/main/java/forestry/api/arboriculture/IAlleleFruit.java index 717c286a1..ec6ebbcf5 100644 --- a/src/main/java/forestry/api/arboriculture/IAlleleFruit.java +++ b/src/main/java/forestry/api/arboriculture/IAlleleFruit.java @@ -5,12 +5,12 @@ ******************************************************************************/ package forestry.api.arboriculture; -import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleComparable; /** * Simple allele encapsulating an {@link IFruitProvider}. */ -public interface IAlleleFruit extends IAllele { +public interface IAlleleFruit extends IAlleleComparable { IFruitProvider getProvider(); diff --git a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java index cebf793da..d6afcb3b0 100644 --- a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java +++ b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java @@ -14,10 +14,11 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IModelManager; +import forestry.api.genetics.IAlleleComparable; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IFruitFamily; -public interface IAlleleTreeSpecies extends IAlleleSpecies { +public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleComparable { @Override ITreeRoot getRoot(); diff --git a/src/main/java/forestry/api/genetics/IAlleleComparable.java b/src/main/java/forestry/api/genetics/IAlleleComparable.java new file mode 100644 index 000000000..31744e0e1 --- /dev/null +++ b/src/main/java/forestry/api/genetics/IAlleleComparable.java @@ -0,0 +1,11 @@ +package forestry.api.genetics; + +public interface IAlleleComparable> extends IAllele, Comparable { + + /** + * To campare the allele for the propertys + */ + @Override + int compareTo(A o); + +} diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index 6e96144e0..00f1b9546 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -72,7 +72,6 @@ import forestry.core.blocks.propertys.UnlistedBlockAccess; import forestry.core.blocks.propertys.UnlistedBlockPos; import forestry.core.proxy.Proxies; import forestry.core.utils.ItemStackUtil; -import forestry.plugins.PluginArboriculture; public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityProvider, IShearable, IGrowable, IItemModelRegister { diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java index a50918c97..5df190a4d 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java @@ -96,5 +96,10 @@ public class AlleleFruit extends AlleleCategorized implements IAlleleFruit { public String getModID() { return getProvider().getModID(); } + + @Override + public int compareTo(IAlleleFruit o) { + return 0; + } } diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java index 89e0a97dc..e4902b2cf 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java @@ -139,5 +139,10 @@ public class AlleleTreeSpecies extends AlleleSpecies implements public IModelProvider getModelProvider() { return null; } + + @Override + public int compareTo(IAlleleTreeSpecies o) { + return 0; + } } diff --git a/src/main/java/forestry/core/blocks/propertys/PropertyAllele.java b/src/main/java/forestry/core/blocks/propertys/PropertyAllele.java index cc386a031..0ff320a9f 100644 --- a/src/main/java/forestry/core/blocks/propertys/PropertyAllele.java +++ b/src/main/java/forestry/core/blocks/propertys/PropertyAllele.java @@ -12,9 +12,9 @@ package forestry.core.blocks.propertys; import net.minecraft.block.properties.IProperty; -import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleComparable; -public abstract class PropertyAllele> implements IProperty { +public abstract class PropertyAllele> implements IProperty { protected final String name; diff --git a/src/main/java/forestry/core/proxy/ProxyRenderClient.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java index 0efd91b27..00fc3b35c 100644 --- a/src/main/java/forestry/core/proxy/ProxyRenderClient.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -36,8 +36,6 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.b3d.B3DLoader; import net.minecraftforge.client.model.obj.OBJLoader; -import net.minecraftforge.fml.client.FMLClientHandler; - import forestry.apiculture.entities.EntityFXBee; import forestry.apiculture.render.ParticleRenderer; import forestry.apiculture.render.TextureHabitatLocator;