From c0a22f4a287fd9fe87f140e53bcc2fc1e446fb6d Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 17 Jun 2016 12:58:01 -0700 Subject: [PATCH] Split mutationCustom into mutationBuilder and Mutation Remove EntityBee Update MutationConditionRequiresResource to use blockState --- gradle.properties | 2 +- .../api/apiculture/IAlleleBeeSpecies.java | 8 -- ...onCustom.java => IBeeMutationBuilder.java} | 7 +- .../api/apiculture/IBeeMutationFactory.java | 4 +- ...nCustom.java => ITreeMutationBuilder.java} | 7 +- .../arboriculture/ITreeMutationFactory.java | 4 +- ...ationCustom.java => IMutationBuilder.java} | 29 +++--- ...om.java => IButterflyMutationBuilder.java} | 7 +- .../IButterflyMutationFactory.java | 4 +- .../apiculture/entities/EntityBee.java | 94 ------------------- .../apiculture/genetics/BeeDefinition.java | 4 +- .../apiculture/genetics/BeeMutation.java | 12 ++- .../genetics/BeeMutationFactory.java | 10 +- .../genetics/alleles/AlleleBeeSpecies.java | 5 - .../apiculture/render/RenderBeeEntity.java | 44 --------- .../genetics/TreeDefinition.java | 4 +- .../arboriculture/genetics/TreeMutation.java | 12 ++- .../genetics/TreeMutationFactory.java | 10 +- .../core/genetics/mutations/Mutation.java | 10 +- .../MutationConditionRequiresResource.java | 25 ++--- .../genetics/ButterflyDefinition.java | 4 +- .../genetics/ButterflyMutation.java | 15 ++- .../genetics/ButterflyMutationFactory.java | 10 +- .../genetics/MothDefinition.java | 4 +- 24 files changed, 102 insertions(+), 233 deletions(-) rename src/main/java/forestry/api/apiculture/{IBeeMutationCustom.java => IBeeMutationBuilder.java} (69%) rename src/main/java/forestry/api/arboriculture/{ITreeMutationCustom.java => ITreeMutationBuilder.java} (69%) rename src/main/java/forestry/api/genetics/{IMutationCustom.java => IMutationBuilder.java} (56%) rename src/main/java/forestry/api/lepidopterology/{IButterflyMutationCustom.java => IButterflyMutationBuilder.java} (67%) delete mode 100755 src/main/java/forestry/apiculture/entities/EntityBee.java delete mode 100644 src/main/java/forestry/apiculture/render/RenderBeeEntity.java diff --git a/gradle.properties b/gradle.properties index 6c147e416..1f061de5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ ic2_version=2.5.5-ex19 version_major=5 version_minor=0 -version_patch=17 +version_patch=18 diff --git a/src/main/java/forestry/api/apiculture/IAlleleBeeSpecies.java b/src/main/java/forestry/api/apiculture/IAlleleBeeSpecies.java index 6501d7260..307a33c84 100644 --- a/src/main/java/forestry/api/apiculture/IAlleleBeeSpecies.java +++ b/src/main/java/forestry/api/apiculture/IAlleleBeeSpecies.java @@ -50,12 +50,4 @@ public interface IAlleleBeeSpecies extends IAlleleSpecies { @SideOnly(Side.CLIENT) void registerModels(Item item, IModelManager manager); - - /** - * @deprecated since Forestry 3.6. - * @return Path of the texture to use for entity rendering. - */ - @Deprecated - String getEntityTexture(); - } diff --git a/src/main/java/forestry/api/apiculture/IBeeMutationCustom.java b/src/main/java/forestry/api/apiculture/IBeeMutationBuilder.java similarity index 69% rename from src/main/java/forestry/api/apiculture/IBeeMutationCustom.java rename to src/main/java/forestry/api/apiculture/IBeeMutationBuilder.java index d97a839a1..72f2cc89b 100644 --- a/src/main/java/forestry/api/apiculture/IBeeMutationCustom.java +++ b/src/main/java/forestry/api/apiculture/IBeeMutationBuilder.java @@ -5,8 +5,9 @@ ******************************************************************************/ package forestry.api.apiculture; -import forestry.api.genetics.IMutationCustom; - -public interface IBeeMutationCustom extends IBeeMutation, IMutationCustom { +import forestry.api.genetics.IMutationBuilder; +public interface IBeeMutationBuilder extends IMutationBuilder { + @Override + IBeeMutation build(); } diff --git a/src/main/java/forestry/api/apiculture/IBeeMutationFactory.java b/src/main/java/forestry/api/apiculture/IBeeMutationFactory.java index 315a4c6f1..d5508d31f 100644 --- a/src/main/java/forestry/api/apiculture/IBeeMutationFactory.java +++ b/src/main/java/forestry/api/apiculture/IBeeMutationFactory.java @@ -11,7 +11,7 @@ public interface IBeeMutationFactory { /** * Creates a new bee mutation. * Automatically registered with BeeManager.beeRoot.registerMutation() - * See IBeeMutationCustom and IMutationCustom for adding additional properties to the returned mutation. + * See IBeeMutationBuilder and IMutationBuilder for adding additional properties to the returned mutation. * * @param parentBee0 A parent bee for this mutation * @param parentBee1 A parent bee for this mutation @@ -19,5 +19,5 @@ public interface IBeeMutationFactory { * @param chance The chance that breeding the two parent bees will result in this mutation * @return a new bee mutation. */ - IBeeMutationCustom createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance); + IBeeMutationBuilder createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance); } diff --git a/src/main/java/forestry/api/arboriculture/ITreeMutationCustom.java b/src/main/java/forestry/api/arboriculture/ITreeMutationBuilder.java similarity index 69% rename from src/main/java/forestry/api/arboriculture/ITreeMutationCustom.java rename to src/main/java/forestry/api/arboriculture/ITreeMutationBuilder.java index b4d2075ad..73556e4e3 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeMutationCustom.java +++ b/src/main/java/forestry/api/arboriculture/ITreeMutationBuilder.java @@ -5,8 +5,9 @@ ******************************************************************************/ package forestry.api.arboriculture; -import forestry.api.genetics.IMutationCustom; - -public interface ITreeMutationCustom extends ITreeMutation, IMutationCustom { +import forestry.api.genetics.IMutationBuilder; +public interface ITreeMutationBuilder extends IMutationBuilder { + @Override + ITreeMutation build(); } diff --git a/src/main/java/forestry/api/arboriculture/ITreeMutationFactory.java b/src/main/java/forestry/api/arboriculture/ITreeMutationFactory.java index a6cf802fc..9673dee3e 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeMutationFactory.java +++ b/src/main/java/forestry/api/arboriculture/ITreeMutationFactory.java @@ -11,7 +11,7 @@ public interface ITreeMutationFactory { /** * Creates a new tree mutation. * Automatically registered with TreeManager.treeRoot.registerMutation() - * See ITreeMutationCustom and IMutationCustom for adding additional properties to the returned mutation. + * See ITreeMutationBuilder and IMutationBuilder for adding additional properties to the returned mutation. * * @param parentTree0 A parent tree for this mutation * @param parentTree1 A parent tree for this mutation @@ -19,5 +19,5 @@ public interface ITreeMutationFactory { * @param chance The chance that breeding the two parent trees will result in this mutation * @return a new tree mutation. */ - ITreeMutationCustom createMutation(IAlleleTreeSpecies parentTree0, IAlleleTreeSpecies parentTree1, IAllele[] result, int chance); + ITreeMutationBuilder createMutation(IAlleleTreeSpecies parentTree0, IAlleleTreeSpecies parentTree1, IAllele[] result, int chance); } diff --git a/src/main/java/forestry/api/genetics/IMutationCustom.java b/src/main/java/forestry/api/genetics/IMutationBuilder.java similarity index 56% rename from src/main/java/forestry/api/genetics/IMutationCustom.java rename to src/main/java/forestry/api/genetics/IMutationBuilder.java index 786eef316..d5877fb86 100644 --- a/src/main/java/forestry/api/genetics/IMutationCustom.java +++ b/src/main/java/forestry/api/genetics/IMutationBuilder.java @@ -6,6 +6,7 @@ package forestry.api.genetics; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraftforge.common.BiomeDictionary; @@ -13,40 +14,42 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; /** Set custom mutation requirements */ -public interface IMutationCustom extends IMutation { +public interface IMutationBuilder { + IMutation build(); + /** Prevent this mutation from being shown in the analyzers */ - IMutationCustom setIsSecret(); + IMutationBuilder setIsSecret(); /** Require a specific temperature for this mutation to occur */ - IMutationCustom restrictTemperature(EnumTemperature temperature); + IMutationBuilder restrictTemperature(EnumTemperature temperature); - IMutationCustom restrictTemperature(EnumTemperature minTemperature, EnumTemperature maxTemperature); + IMutationBuilder restrictTemperature(EnumTemperature minTemperature, EnumTemperature maxTemperature); /** Require a specific humidity for this mutation to occur */ - IMutationCustom restrictHumidity(EnumHumidity humidity); + IMutationBuilder restrictHumidity(EnumHumidity humidity); - IMutationCustom restrictHumidity(EnumHumidity minHumidity, EnumHumidity maxHumidity); + IMutationBuilder restrictHumidity(EnumHumidity minHumidity, EnumHumidity maxHumidity); /** * Restrict this mutation to certain types of biomes. * @param types The types of biomes this mutation can occur. */ - IMutationCustom restrictBiomeType(BiomeDictionary.Type... types); + IMutationBuilder restrictBiomeType(BiomeDictionary.Type... types); /** Restrict the days of the year that this mutation can occur */ - IMutationCustom restrictDateRange(int startMonth, int startDay, int endMonth, int endDay); + IMutationBuilder restrictDateRange(int startMonth, int startDay, int endMonth, int endDay); /** Restrict the time of day that this mutation can occur */ - IMutationCustom requireDay(); + IMutationBuilder requireDay(); - IMutationCustom requireNight(); + IMutationBuilder requireNight(); /** Require a specific resource to be under the location of the mutation */ - IMutationCustom requireResource(Block block, int meta); + IMutationBuilder requireResource(IBlockState requiredBlockState); - IMutationCustom requireResource(String oreDictName); + IMutationBuilder requireResource(String oreDictName); /** Require some other custom mutation condition */ - IMutationCustom addMutationCondition(IMutationCondition mutationCondition); + IMutationBuilder addMutationCondition(IMutationCondition mutationCondition); } diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyMutationCustom.java b/src/main/java/forestry/api/lepidopterology/IButterflyMutationBuilder.java similarity index 67% rename from src/main/java/forestry/api/lepidopterology/IButterflyMutationCustom.java rename to src/main/java/forestry/api/lepidopterology/IButterflyMutationBuilder.java index f615c0347..e20e76a4a 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyMutationCustom.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyMutationBuilder.java @@ -5,8 +5,9 @@ ******************************************************************************/ package forestry.api.lepidopterology; -import forestry.api.genetics.IMutationCustom; - -public interface IButterflyMutationCustom extends IButterflyMutation, IMutationCustom { +import forestry.api.genetics.IMutationBuilder; +public interface IButterflyMutationBuilder extends IMutationBuilder { + @Override + IButterflyMutation build(); } diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyMutationFactory.java b/src/main/java/forestry/api/lepidopterology/IButterflyMutationFactory.java index 6446b288b..35e94d80f 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyMutationFactory.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyMutationFactory.java @@ -11,7 +11,7 @@ public interface IButterflyMutationFactory { /** * Creates a new butterfly mutation. * Automatically registered with ButterflyManager.butterflyRoot.registerMutation() - * See IButterflyMutationCustom and IMutationCustom for adding additional properties to the returned mutation. + * See IButterflyMutationBuilder and IMutationBuilder for adding additional properties to the returned mutation. * * @param parentButterfly0 A parent butterfly for this mutation * @param parentButterfly1 A parent butterfly for this mutation @@ -19,5 +19,5 @@ public interface IButterflyMutationFactory { * @param chance The chance that breeding the two parent butterfly's will result in this mutation * @return a new butterfly mutation. */ - IButterflyMutationCustom createMutation(IAlleleButterflySpecies parentButterfly0, IAlleleButterflySpecies parentButterfly1, IAllele[] result, int chance); + IButterflyMutationBuilder createMutation(IAlleleButterflySpecies parentButterfly0, IAlleleButterflySpecies parentButterfly1, IAllele[] result, int chance); } diff --git a/src/main/java/forestry/apiculture/entities/EntityBee.java b/src/main/java/forestry/apiculture/entities/EntityBee.java deleted file mode 100755 index 13d8cca7f..000000000 --- a/src/main/java/forestry/apiculture/entities/EntityBee.java +++ /dev/null @@ -1,94 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.apiculture.entities; - -import net.minecraft.entity.EntityCreature; -import net.minecraft.entity.passive.IAnimals; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBee; -import forestry.core.config.Constants; -import forestry.core.render.ForestryResource; - -public class EntityBee extends EntityCreature implements IAnimals { - - private static final String DEFAULT_TEXTURE = Constants.TEXTURE_PATH_ENTITIES + "/bees/honeyBee.png"; - - private IBee contained; - private IAlleleBeeSpecies species; - private EnumBeeType type = EnumBeeType.DRONE; - - private String beeTexture = DEFAULT_TEXTURE; - private long lastUpdate; - - public EntityBee(World world) { - super(world); - } - - private void resetAppearance() { - beeTexture = species.getEntityTexture(); - } - - public EntityBee setIndividual(IBee bee) { - if (bee != null) { - contained = bee; - } else { - contained = BeeManager.beeRoot.templateAsIndividual(BeeManager.beeRoot.getDefaultTemplate()); - } - - //isImmuneToFire = contained.getGenome().getFireResist(); - setSpecies(contained.getGenome().getPrimary()); - //dataWatcher.updateObject(DATAWATCHER_ID_SPECIES, species.getUID()); - //dataWatcher.updateObject(DATAWATCHER_ID_SCALE, (int)(contained.getSize() * 100)); - return this; - } - - public IBee getBee() { - return contained; - } - - public EntityBee setType(EnumBeeType type) { - this.type = type; - return this; - } - - public EnumBeeType getType() { - return type; - } - - public EntityBee setSpecies(IAlleleBeeSpecies species) { - this.species = species; - resetAppearance(); - lastUpdate = worldObj.getTotalWorldTime(); - return this; - } - - @SideOnly(Side.CLIENT) - private ResourceLocation textureResource; - private long lastTextureUpdate; - - @SideOnly(Side.CLIENT) - public ResourceLocation getTexture() { - if (textureResource == null || lastTextureUpdate != lastUpdate) { - textureResource = new ForestryResource(beeTexture); - } - - return textureResource; - } - -} diff --git a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java index ce6e12c90..533fc6ed0 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java @@ -29,7 +29,7 @@ import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IAlleleBeeSpeciesBuilder; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeMutationCustom; +import forestry.api.apiculture.IBeeMutationBuilder; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; @@ -1035,7 +1035,7 @@ public enum BeeDefinition implements IBeeDefinition { BeeManager.beeRoot.registerTemplate(template); } - protected final IBeeMutationCustom registerMutation(BeeDefinition parent1, BeeDefinition parent2, int chance) { + protected final IBeeMutationBuilder registerMutation(BeeDefinition parent1, BeeDefinition parent2, int chance) { return BeeManager.beeMutationFactory.createMutation(parent1.species, parent2.species, getTemplate(), chance); } diff --git a/src/main/java/forestry/apiculture/genetics/BeeMutation.java b/src/main/java/forestry/apiculture/genetics/BeeMutation.java index 55c46db4c..2351458e2 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeMutation.java +++ b/src/main/java/forestry/apiculture/genetics/BeeMutation.java @@ -18,17 +18,23 @@ import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; -import forestry.api.apiculture.IBeeMutationCustom; +import forestry.api.apiculture.IBeeMutation; +import forestry.api.apiculture.IBeeMutationBuilder; import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.IAllele; import forestry.core.genetics.mutations.Mutation; -public class BeeMutation extends Mutation implements IBeeMutationCustom { +public class BeeMutation extends Mutation implements IBeeMutation, IBeeMutationBuilder { public BeeMutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance) { super(bee0, bee1, result, chance); } - + + @Override + public IBeeMutation build() { + return this; + } + @Override public IBeeRoot getRoot() { return BeeManager.beeRoot; diff --git a/src/main/java/forestry/apiculture/genetics/BeeMutationFactory.java b/src/main/java/forestry/apiculture/genetics/BeeMutationFactory.java index 2013e75d2..ba0696ed8 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeMutationFactory.java +++ b/src/main/java/forestry/apiculture/genetics/BeeMutationFactory.java @@ -12,16 +12,16 @@ package forestry.apiculture.genetics; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBeeMutationCustom; +import forestry.api.apiculture.IBeeMutationBuilder; import forestry.api.apiculture.IBeeMutationFactory; import forestry.api.genetics.IAllele; public class BeeMutationFactory implements IBeeMutationFactory { @Override - public IBeeMutationCustom createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance) { - IBeeMutationCustom mutation = new BeeMutation(parentBee0, parentBee1, result, chance); - BeeManager.beeRoot.registerMutation(mutation); - return mutation; + public IBeeMutationBuilder createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance) { + BeeMutation beeMutation = new BeeMutation(parentBee0, parentBee1, result, chance); + BeeManager.beeRoot.registerMutation(beeMutation); + return beeMutation; } } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java index e517dcf9d..6208b09b1 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java @@ -195,9 +195,4 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies public int getSpriteColour(int renderPass) { return beeSpriteColourProvider.getSpriteColour(renderPass); } - - @Override - public String getEntityTexture() { - return null; - } } diff --git a/src/main/java/forestry/apiculture/render/RenderBeeEntity.java b/src/main/java/forestry/apiculture/render/RenderBeeEntity.java deleted file mode 100644 index 2c773fa77..000000000 --- a/src/main/java/forestry/apiculture/render/RenderBeeEntity.java +++ /dev/null @@ -1,44 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.apiculture.render; - -import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; -import net.minecraft.util.ResourceLocation; - -import forestry.apiculture.entities.EntityBee; -import forestry.core.proxy.Proxies; - -public class RenderBeeEntity extends RenderLiving { - - private final ModelBee beeModel; - - public RenderBeeEntity() { - super(Proxies.common.getClientInstance().getRenderManager(), new ModelBee(), 0.15f); - beeModel = (ModelBee) mainModel; - } - - private void renderBee(EntityBee entity, double posX, double posY, double posZ, float par8, float par9) { - beeModel.setType(entity.getType()); - this.doRender(entity, posX, posY, posZ, par8, par9); - } - - @Override - public void doRender(EntityLiving entity, double x, double y, double z, float entityYaw, float partialTicks) { - renderBee((EntityBee) entity, x, y, z, entityYaw, partialTicks); - } - - @Override - protected ResourceLocation getEntityTexture(Entity entity) { - return ((EntityBee) entity).getTexture(); - } -} diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java index bd0c41d8f..bfafe7c64 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java @@ -39,7 +39,7 @@ import forestry.api.arboriculture.ILeafSpriteProvider; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenerator; import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.ITreeMutationCustom; +import forestry.api.arboriculture.ITreeMutationBuilder; import forestry.api.arboriculture.IWoodProvider; import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; @@ -1056,7 +1056,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe TreeManager.treeRoot.registerTemplate(template); } - protected final ITreeMutationCustom registerMutation(TreeDefinition parent1, TreeDefinition parent2, int chance) { + protected final ITreeMutationBuilder registerMutation(TreeDefinition parent1, TreeDefinition parent2, int chance) { return TreeManager.treeMutationFactory.createMutation(parent1.species, parent2.species, getTemplate(), chance); } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java index 7bb1845a0..51f280ab1 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java @@ -15,18 +15,24 @@ import net.minecraft.world.World; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.ITreeMutationCustom; +import forestry.api.arboriculture.ITreeMutation; +import forestry.api.arboriculture.ITreeMutationBuilder; import forestry.api.arboriculture.ITreeRoot; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; import forestry.core.genetics.mutations.Mutation; -public class TreeMutation extends Mutation implements ITreeMutationCustom { +public class TreeMutation extends Mutation implements ITreeMutation, ITreeMutationBuilder { public TreeMutation(IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, IAllele[] template, int chance) { super(allele0, allele1, template, chance); } - + + @Override + public ITreeMutation build() { + return this; + } + @Override public ITreeRoot getRoot() { return TreeManager.treeRoot; diff --git a/src/main/java/forestry/arboriculture/genetics/TreeMutationFactory.java b/src/main/java/forestry/arboriculture/genetics/TreeMutationFactory.java index 23af72f92..b18a68f41 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeMutationFactory.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeMutationFactory.java @@ -11,7 +11,7 @@ package forestry.arboriculture.genetics; import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.ITreeMutationCustom; +import forestry.api.arboriculture.ITreeMutationBuilder; import forestry.api.arboriculture.ITreeMutationFactory; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; @@ -19,9 +19,9 @@ import forestry.api.genetics.IAllele; public class TreeMutationFactory implements ITreeMutationFactory { @Override - public ITreeMutationCustom createMutation(IAlleleTreeSpecies parent0, IAlleleTreeSpecies parent1, IAllele[] result, int chance) { - ITreeMutationCustom mutation = new TreeMutation(parent0, parent1, result, chance); - TreeManager.treeRoot.registerMutation(mutation); - return mutation; + public ITreeMutationBuilder createMutation(IAlleleTreeSpecies parent0, IAlleleTreeSpecies parent1, IAllele[] result, int chance) { + TreeMutation treeMutation = new TreeMutation(parent0, parent1, result, chance); + TreeManager.treeRoot.registerMutation(treeMutation); + return treeMutation; } } diff --git a/src/main/java/forestry/core/genetics/mutations/Mutation.java b/src/main/java/forestry/core/genetics/mutations/Mutation.java index fa55ba242..8c96b903c 100644 --- a/src/main/java/forestry/core/genetics/mutations/Mutation.java +++ b/src/main/java/forestry/core/genetics/mutations/Mutation.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -25,10 +26,11 @@ import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IGenome; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.IMutationBuilder; import forestry.api.genetics.IMutationCondition; -import forestry.api.genetics.IMutationCustom; -public abstract class Mutation implements IMutationCustom { +public abstract class Mutation implements IMutation, IMutationBuilder { private final int chance; @@ -107,8 +109,8 @@ public abstract class Mutation implements IMutationCustom { } @Override - public Mutation requireResource(Block block, int meta) { - IMutationCondition mutationCondition = new MutationConditionRequiresResource(block, meta); + public Mutation requireResource(IBlockState blockState) { + IMutationCondition mutationCondition = new MutationConditionRequiresResource(blockState); return addMutationCondition(mutationCondition); } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java index 18bcc0849..e344efe8a 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java @@ -10,9 +10,7 @@ ******************************************************************************/ package forestry.core.genetics.mutations; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -25,30 +23,25 @@ import forestry.core.utils.Translator; public class MutationConditionRequiresResource implements IMutationCondition { - private final ItemStack blockRequired; + private final IBlockState requiredBlockState; - public MutationConditionRequiresResource(Block block, int meta) { - blockRequired = new ItemStack(block, 1, meta); + public MutationConditionRequiresResource(IBlockState requiredBlockState) { + this.requiredBlockState = requiredBlockState; } @Override public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { - Block block; - int meta; - int i = 1; + IBlockState blockState; do { - BlockPos blockPos = new BlockPos(pos.getX(), pos.getY() - i, pos.getY()); - IBlockState blockState = world.getBlockState(blockPos); - block = blockState.getBlock(); - meta = block.getMetaFromState(blockState); - i++; - } while (block instanceof IBeeHousing); + pos = pos.down(); + blockState = world.getBlockState(pos); + } while (blockState.getBlock() instanceof IBeeHousing); - return ItemStackUtil.equals(block, meta, blockRequired) ? 1 : 0; + return this.requiredBlockState == blockState ? 1 : 0; } @Override public String getDescription() { - return Translator.translateToLocalFormatted("for.mutation.condition.resource", blockRequired.getDisplayName()); + return Translator.translateToLocalFormatted("for.mutation.condition.resource", requiredBlockState.getBlock().getLocalizedName()); } } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java index f2f995b21..5f4ebb6d5 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java @@ -26,7 +26,7 @@ import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyGenome; -import forestry.api.lepidopterology.IButterflyMutationCustom; +import forestry.api.lepidopterology.IButterflyMutationBuilder; import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; @@ -351,7 +351,7 @@ public enum ButterflyDefinition implements IButterflyDefinition { } - protected final IButterflyMutationCustom registerMutation(IButterflyDefinition parent1, IButterflyDefinition parent2, int chance) { + protected final IButterflyMutationBuilder registerMutation(IButterflyDefinition parent1, IButterflyDefinition parent2, int chance) { IAlleleButterflySpecies species1 = null; IAlleleButterflySpecies species2 = null; if(parent1 instanceof ButterflyDefinition){ diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyMutation.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyMutation.java index cf634ff20..37b8da304 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyMutation.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyMutation.java @@ -10,22 +10,29 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; +import net.minecraft.world.World; + import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IGenome; import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.ButterflyManager; -import forestry.api.lepidopterology.IButterflyMutationCustom; +import forestry.api.lepidopterology.IButterflyMutation; +import forestry.api.lepidopterology.IButterflyMutationBuilder; import forestry.api.lepidopterology.IButterflyNursery; import forestry.core.genetics.mutations.Mutation; -import net.minecraft.world.World; -public class ButterflyMutation extends Mutation implements IButterflyMutationCustom { +public class ButterflyMutation extends Mutation implements IButterflyMutation, IButterflyMutationBuilder { protected ButterflyMutation(IAlleleSpecies species0, IAlleleSpecies species1, IAllele[] template, int chance) { super(species0, species1, template, chance); } - + + @Override + public IButterflyMutation build() { + return this; + } + @Override public float getChance(World world, IButterflyNursery housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { float processedChance = super.getChance(world, housing.getCoordinates(), allele0, allele1, genome0, genome1); diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyMutationFactory.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyMutationFactory.java index 1489f36f2..14e927ac3 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyMutationFactory.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyMutationFactory.java @@ -13,16 +13,16 @@ package forestry.lepidopterology.genetics; import forestry.api.genetics.IAllele; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IAlleleButterflySpecies; -import forestry.api.lepidopterology.IButterflyMutationCustom; +import forestry.api.lepidopterology.IButterflyMutationBuilder; import forestry.api.lepidopterology.IButterflyMutationFactory; public class ButterflyMutationFactory implements IButterflyMutationFactory { @Override - public IButterflyMutationCustom createMutation(IAlleleButterflySpecies parentButterfly0, IAlleleButterflySpecies parentButterfly1, IAllele[] result, int chance) { - IButterflyMutationCustom mutation = new ButterflyMutation(parentButterfly0, parentButterfly1, result, chance); - ButterflyManager.butterflyRoot.registerMutation(mutation); - return mutation; + public IButterflyMutationBuilder createMutation(IAlleleButterflySpecies parentButterfly0, IAlleleButterflySpecies parentButterfly1, IAllele[] result, int chance) { + ButterflyMutation butterflyMutation = new ButterflyMutation(parentButterfly0, parentButterfly1, result, chance); + ButterflyManager.butterflyRoot.registerMutation(butterflyMutation); + return butterflyMutation; } } diff --git a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java index c289067e4..426eb2e57 100644 --- a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java @@ -25,7 +25,7 @@ import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyGenome; -import forestry.api.lepidopterology.IButterflyMutationCustom; +import forestry.api.lepidopterology.IButterflyMutationBuilder; import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; @@ -113,7 +113,7 @@ public enum MothDefinition implements IButterflyDefinition { } - protected final IButterflyMutationCustom registerMutation(IButterflyDefinition parent1, IButterflyDefinition parent2, int chance) { + protected final IButterflyMutationBuilder registerMutation(IButterflyDefinition parent1, IButterflyDefinition parent2, int chance) { IAlleleButterflySpecies species1 = null; IAlleleButterflySpecies species2 = null; if(parent1 instanceof MothDefinition){