diff --git a/src/main/java/forestry/api/apiculture/DefaultBeeListener.java b/src/main/java/forestry/api/apiculture/DefaultBeeListener.java index 5efda20d1..8e76cf28d 100644 --- a/src/main/java/forestry/api/apiculture/DefaultBeeListener.java +++ b/src/main/java/forestry/api/apiculture/DefaultBeeListener.java @@ -5,7 +5,7 @@ ******************************************************************************/ package forestry.api.apiculture; -import forestry.api.arboriculture.ITree; +import forestry.api.genetics.IIndividual; /** * Easily extendable default IBeeListener. @@ -24,7 +24,7 @@ public class DefaultBeeListener implements IBeeListener { } @Override - public boolean onPollenRetrieved(ITree pollen) { + public boolean onPollenRetrieved(IIndividual pollen) { return false; } diff --git a/src/main/java/forestry/api/apiculture/BeeChromosome.java b/src/main/java/forestry/api/apiculture/EnumBeeChromosome.java similarity index 88% rename from src/main/java/forestry/api/apiculture/BeeChromosome.java rename to src/main/java/forestry/api/apiculture/EnumBeeChromosome.java index d3862be25..b92e1fc05 100644 --- a/src/main/java/forestry/api/apiculture/BeeChromosome.java +++ b/src/main/java/forestry/api/apiculture/EnumBeeChromosome.java @@ -5,7 +5,6 @@ ******************************************************************************/ package forestry.api.apiculture; -import javax.annotation.Nonnull; import java.util.Locale; import forestry.api.genetics.IAllele; @@ -23,7 +22,7 @@ import forestry.api.genetics.ISpeciesRoot; * * @author SirSengir */ -public enum BeeChromosome implements IChromosomeType { +public enum EnumBeeChromosome implements IChromosomeType { /** * Species of the bee. Alleles here must implement {@link IAlleleBeeSpecies}. */ @@ -76,34 +75,25 @@ public enum BeeChromosome implements IChromosomeType { * Determines the bee's effect. */ EFFECT(IAlleleBeeEffect.class); - - @Nonnull + private final Class alleleClass; - BeeChromosome(@Nonnull Class alleleClass) { + EnumBeeChromosome(Class alleleClass) { this.alleleClass = alleleClass; } - @Nonnull @Override public Class getAlleleClass() { return alleleClass; } - @Nonnull @Override public String getName() { return this.toString().toLowerCase(Locale.ENGLISH); } - @Nonnull @Override - public ISpeciesRoot getSpeciesRoot() { + public ISpeciesRoot getSpeciesRoot() { return BeeManager.beeRoot; } - - @Override - public byte getUid() { - return (byte) ordinal(); - } } diff --git a/src/main/java/forestry/api/apiculture/IAlleleBeeSpecies.java b/src/main/java/forestry/api/apiculture/IAlleleBeeSpecies.java index cea816c32..d77bbb8d3 100644 --- a/src/main/java/forestry/api/apiculture/IAlleleBeeSpecies.java +++ b/src/main/java/forestry/api/apiculture/IAlleleBeeSpecies.java @@ -15,7 +15,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; -public interface IAlleleBeeSpecies extends IAlleleSpecies { +public interface IAlleleBeeSpecies extends IAlleleSpecies { /** * @return the IBeeRoot diff --git a/src/main/java/forestry/api/apiculture/IAlleleBeeSpeciesBuilder.java b/src/main/java/forestry/api/apiculture/IAlleleBeeSpeciesCustom.java similarity index 60% rename from src/main/java/forestry/api/apiculture/IAlleleBeeSpeciesBuilder.java rename to src/main/java/forestry/api/apiculture/IAlleleBeeSpeciesCustom.java index 94baef045..9f7de5a51 100644 --- a/src/main/java/forestry/api/apiculture/IAlleleBeeSpeciesBuilder.java +++ b/src/main/java/forestry/api/apiculture/IAlleleBeeSpeciesCustom.java @@ -7,40 +7,37 @@ package forestry.api.apiculture; import net.minecraft.item.ItemStack; -import forestry.api.genetics.IAlleleSpeciesBuilder; +import forestry.api.genetics.IAlleleSpeciesCustom; -public interface IAlleleBeeSpeciesBuilder extends IAlleleSpeciesBuilder { - - @Override - IAlleleBeeSpecies build(); +public interface IAlleleBeeSpeciesCustom extends IAlleleBeeSpecies, IAlleleSpeciesCustom { /** * Add a product for this bee species. * Chance is between 0 and 1. */ - IAlleleBeeSpeciesBuilder addProduct(ItemStack product, Float chance); + IAlleleBeeSpeciesCustom addProduct(ItemStack product, Float chance); /** * Add a specialty product for this bee species. * Bees only produce their specialty when they are Jubilant (see IJubilanceProvider) * Chance is between 0 and 1. */ - IAlleleBeeSpeciesBuilder addSpecialty(ItemStack specialty, Float chance); + IAlleleBeeSpeciesCustom addSpecialty(ItemStack specialty, Float chance); /** * Set the Jubilance Provider for this bee species. * Bees only produce their specialty when they are Jubilant (see IJubilanceProvider) */ - IAlleleBeeSpeciesBuilder setJubilanceProvider(IJubilanceProvider provider); + IAlleleBeeSpeciesCustom setJubilanceProvider(IJubilanceProvider provider); /** * Make this species only active at night. */ - IAlleleBeeSpeciesBuilder setNocturnal(); + IAlleleBeeSpeciesCustom setNocturnal(); /** Use this if you have custom icons for bees. */ - IAlleleBeeSpeciesBuilder setCustomBeeModelProvider(IBeeModelProvider beeIconProvider); + IAlleleBeeSpeciesCustom setCustomBeeModelProvider(IBeeModelProvider beeIconProvider); /** Use this if you have custom icon colours for bees (other than the default static primary + secondary colours). */ - IAlleleBeeSpeciesBuilder setCustomBeeSpriteColourProvider(IBeeSpriteColourProvider beeIconColourProvider); + IAlleleBeeSpeciesCustom setCustomBeeSpriteColourProvider(IBeeSpriteColourProvider beeIconColourProvider); } diff --git a/src/main/java/forestry/api/apiculture/IApiaristTracker.java b/src/main/java/forestry/api/apiculture/IApiaristTracker.java index 999b2d4e5..942c45db3 100644 --- a/src/main/java/forestry/api/apiculture/IApiaristTracker.java +++ b/src/main/java/forestry/api/apiculture/IApiaristTracker.java @@ -13,7 +13,7 @@ import forestry.api.genetics.IIndividual; * * @author SirSengir */ -public interface IApiaristTracker extends IBreedingTracker { +public interface IApiaristTracker extends IBreedingTracker { /** * Register the birth of a queen. Will mark species as discovered. @@ -21,7 +21,7 @@ public interface IApiaristTracker extends IBreedingTracker { * @param queen * Created queen. */ - void registerQueen(IIndividual queen); + void registerQueen(IIndividual queen); /** * @return Amount of queens bred with this tracker. @@ -34,7 +34,7 @@ public interface IApiaristTracker extends IBreedingTracker { * @param princess * Created princess. */ - void registerPrincess(IIndividual princess); + void registerPrincess(IIndividual princess); /** * @return Amount of princesses bred with this tracker. @@ -47,7 +47,7 @@ public interface IApiaristTracker extends IBreedingTracker { * @param drone * Created drone. */ - void registerDrone(IIndividual drone); + void registerDrone(IIndividual drone); /** * @return Amount of drones bred with this tracker. diff --git a/src/main/java/forestry/api/apiculture/IBee.java b/src/main/java/forestry/api/apiculture/IBee.java index 6ac721b96..8333cdfa9 100644 --- a/src/main/java/forestry/api/apiculture/IBee.java +++ b/src/main/java/forestry/api/apiculture/IBee.java @@ -13,9 +13,9 @@ import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraft.world.biome.BiomeGenBase; -import forestry.api.arboriculture.ITree; import forestry.api.core.IErrorState; import forestry.api.genetics.IEffectData; +import forestry.api.genetics.IIndividual; import forestry.api.genetics.IIndividualLiving; /** @@ -23,7 +23,7 @@ import forestry.api.genetics.IIndividualLiving; * * @author SirSengir */ -public interface IBee extends IIndividualLiving { +public interface IBee extends IIndividualLiving { /** * @return Bee's genetic information. @@ -79,16 +79,14 @@ public interface IBee extends IIndividualLiving { ItemStack[] produceStacks(IBeeHousing housing); - @Nullable IBee spawnPrincess(IBeeHousing housing); - @Nullable IBee[] spawnDrones(IBeeHousing housing); void plantFlowerRandom(IBeeHousing housing); - ITree retrievePollen(IBeeHousing housing); + IIndividual retrievePollen(IBeeHousing housing); - boolean pollinateRandom(IBeeHousing housing, ITree pollen); + boolean pollinateRandom(IBeeHousing housing, IIndividual pollen); } diff --git a/src/main/java/forestry/api/apiculture/IBeeFactory.java b/src/main/java/forestry/api/apiculture/IBeeFactory.java index 0a8cde0b0..c164731ce 100644 --- a/src/main/java/forestry/api/apiculture/IBeeFactory.java +++ b/src/main/java/forestry/api/apiculture/IBeeFactory.java @@ -12,7 +12,7 @@ public interface IBeeFactory { /** * Creates a new bee species. * Automatically registered with AlleleManager.alleleRegistry.registerAllele() - * See IAlleleBeeSpeciesBuilder and IAlleleSpeciesBuilder for adding additional properties to the returned species. + * See IAlleleBeeSpeciesCustom and IAlleleSpeciesCustom for adding additional properties to the returned species. * * @param uid Unique Identifier for this species * @param dominant Whether this species is genetically dominant (false means it is recessive) @@ -25,7 +25,7 @@ public interface IBeeFactory { * @param secondaryColor The body color of this species * @return a new bee species allele. */ - IAlleleBeeSpeciesBuilder createSpecies(String uid, boolean dominant, String authority, String unlocalizedName, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor); + IAlleleBeeSpeciesCustom createSpecies(String uid, boolean dominant, String authority, String unlocalizedName, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor); /** * Creates a new bee branch. diff --git a/src/main/java/forestry/api/apiculture/IBeeGenome.java b/src/main/java/forestry/api/apiculture/IBeeGenome.java index 1d04bffb2..af2365aaf 100644 --- a/src/main/java/forestry/api/apiculture/IBeeGenome.java +++ b/src/main/java/forestry/api/apiculture/IBeeGenome.java @@ -5,8 +5,6 @@ ******************************************************************************/ package forestry.api.apiculture; -import javax.annotation.Nonnull; - import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IGenome; @@ -17,13 +15,11 @@ import forestry.api.genetics.IGenome; * @author SirSengir * */ -public interface IBeeGenome extends IGenome { +public interface IBeeGenome extends IGenome { - @Nonnull @Override IAlleleBeeSpecies getPrimary(); - @Nonnull @Override IAlleleBeeSpecies getSecondary(); @@ -33,10 +29,8 @@ public interface IBeeGenome extends IGenome { int getFertility(); - @Nonnull EnumTolerance getToleranceTemp(); - @Nonnull EnumTolerance getToleranceHumid(); boolean getNocturnal(); @@ -45,17 +39,12 @@ public interface IBeeGenome extends IGenome { boolean getCaveDwelling(); - @Nonnull IFlowerProvider getFlowerProvider(); int getFlowering(); int[] getTerritory(); - @Nonnull IAlleleBeeEffect getEffect(); - @Nonnull - @Override - IBeeRoot getSpeciesRoot(); } diff --git a/src/main/java/forestry/api/apiculture/IBeeHousing.java b/src/main/java/forestry/api/apiculture/IBeeHousing.java index ff0ef26d5..e4aa5c019 100644 --- a/src/main/java/forestry/api/apiculture/IBeeHousing.java +++ b/src/main/java/forestry/api/apiculture/IBeeHousing.java @@ -6,8 +6,11 @@ package forestry.api.apiculture; import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import com.mojang.authlib.GameProfile; + import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorLogicSource; @@ -41,8 +44,12 @@ public interface IBeeHousing extends IHousing, IErrorLogicSource { boolean canBlockSeeTheSky(); + World getWorld(); + BiomeGenBase getBiome(); + GameProfile getOwner(); + /** * @since Forestry 4.2 * @return exact coordinates where bee FX should spawn from diff --git a/src/main/java/forestry/api/apiculture/IBeeListener.java b/src/main/java/forestry/api/apiculture/IBeeListener.java index 1a62962c3..eaab40af2 100644 --- a/src/main/java/forestry/api/apiculture/IBeeListener.java +++ b/src/main/java/forestry/api/apiculture/IBeeListener.java @@ -5,7 +5,7 @@ ******************************************************************************/ package forestry.api.apiculture; -import forestry.api.arboriculture.ITree; +import forestry.api.genetics.IIndividual; public interface IBeeListener { @@ -24,6 +24,6 @@ public interface IBeeListener { * Called when the bees have retrieved some pollen. * @return true if this bee listener handled the pollen. */ - boolean onPollenRetrieved(ITree pollen); + boolean onPollenRetrieved(IIndividual pollen); } diff --git a/src/main/java/forestry/api/apiculture/IBeeMutation.java b/src/main/java/forestry/api/apiculture/IBeeMutation.java index ae9558785..f0bec0fd3 100644 --- a/src/main/java/forestry/api/apiculture/IBeeMutation.java +++ b/src/main/java/forestry/api/apiculture/IBeeMutation.java @@ -5,13 +5,10 @@ ******************************************************************************/ package forestry.api.apiculture; -import javax.annotation.Nonnull; - import forestry.api.genetics.IMutation; -public interface IBeeMutation extends IMutation { - - @Nonnull +public interface IBeeMutation extends IMutation { + @Override IBeeRoot getRoot(); diff --git a/src/main/java/forestry/api/apiculture/IBeeMutationBuilder.java b/src/main/java/forestry/api/apiculture/IBeeMutationCustom.java similarity index 61% rename from src/main/java/forestry/api/apiculture/IBeeMutationBuilder.java rename to src/main/java/forestry/api/apiculture/IBeeMutationCustom.java index 0582c16fd..d97a839a1 100644 --- a/src/main/java/forestry/api/apiculture/IBeeMutationBuilder.java +++ b/src/main/java/forestry/api/apiculture/IBeeMutationCustom.java @@ -5,12 +5,8 @@ ******************************************************************************/ package forestry.api.apiculture; -import javax.annotation.Nonnull; +import forestry.api.genetics.IMutationCustom; -import forestry.api.genetics.IMutationBuilder; +public interface IBeeMutationCustom extends IBeeMutation, IMutationCustom { -public interface IBeeMutationBuilder extends IMutationBuilder { - @Nonnull - @Override - IBeeMutation build(); } diff --git a/src/main/java/forestry/api/apiculture/IBeeMutationFactory.java b/src/main/java/forestry/api/apiculture/IBeeMutationFactory.java index 944f0dc7d..315a4c6f1 100644 --- a/src/main/java/forestry/api/apiculture/IBeeMutationFactory.java +++ b/src/main/java/forestry/api/apiculture/IBeeMutationFactory.java @@ -5,15 +5,13 @@ ******************************************************************************/ package forestry.api.apiculture; -import com.google.common.collect.ImmutableMap; - import forestry.api.genetics.IAllele; public interface IBeeMutationFactory { /** * Creates a new bee mutation. * Automatically registered with BeeManager.beeRoot.registerMutation() - * See IBeeMutationBuilder and IMutationBuilder for adding additional properties to the returned mutation. + * See IBeeMutationCustom and IMutationCustom for adding additional properties to the returned mutation. * * @param parentBee0 A parent bee for this mutation * @param parentBee1 A parent bee for this mutation @@ -21,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. */ - IBeeMutationBuilder createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, ImmutableMap result, int chance); + IBeeMutationCustom createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, IAllele[] result, int chance); } diff --git a/src/main/java/forestry/api/apiculture/IBeeRoot.java b/src/main/java/forestry/api/apiculture/IBeeRoot.java index 6aacbbf70..c01590936 100644 --- a/src/main/java/forestry/api/apiculture/IBeeRoot.java +++ b/src/main/java/forestry/api/apiculture/IBeeRoot.java @@ -5,11 +5,8 @@ ******************************************************************************/ package forestry.api.apiculture; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; +import java.util.ArrayList; import java.util.Collection; -import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -18,10 +15,9 @@ 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 IBeeRoot extends ISpeciesRoot { +public interface IBeeRoot extends ISpeciesRoot { /** * @return true if passed item is a Forestry bee. Equal to getType(ItemStack stack) != EnumBeeType.NONE @@ -39,23 +35,17 @@ public interface IBeeRoot extends ISpeciesRoot { IBee getMember(NBTTagCompound compound); /* GENOME CONVERSION */ - @Nonnull @Override - IBee templateAsIndividual(ImmutableMap template); - - @Nonnull - @Override - IBee templateAsIndividual(ImmutableMap templateActive, ImmutableMap templateInactive); + IBee templateAsIndividual(IAllele[] template); @Override - IBeeGenome templateAsGenome(ImmutableMap template); + IBee templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive); @Override - IBeeGenome templateAsGenome(ImmutableMap templateActive, ImmutableMap templateInactive); + IBeeGenome templateAsGenome(IAllele[] template); - @Nonnull @Override - IBeeGenome chromosomesAsGenome(ImmutableMap chromosomes); + IBeeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive); /* BREEDING TRACKER */ @@ -64,8 +54,7 @@ public interface IBeeRoot extends ISpeciesRoot { * @return {@link IApiaristTracker} associated with the passed world. */ @Override - @Nonnull - IApiaristTracker getBreedingTracker(@Nonnull World world, @Nonnull GameProfile player); + IApiaristTracker getBreedingTracker(World world, GameProfile player); /* BEE SPECIFIC */ @@ -105,26 +94,24 @@ public interface IBeeRoot extends ISpeciesRoot { /* TEMPLATES */ @Override - List getIndividualTemplates(); + ArrayList getIndividualTemplates(); /* MUTATIONS */ @Override Collection getMutations(boolean shuffle); /* GAME MODE */ - void registerMode(@Nonnull IBeekeepingMode mode); + void resetBeekeepingMode(); - @Nonnull - @Override - List getModes(); + ArrayList getBeekeepingModes(); - @Nonnull - @Override - IBeekeepingMode getMode(@Nonnull World world); + IBeekeepingMode getBeekeepingMode(World world); - @Nonnull - @Override - IBeekeepingMode getMode(@Nonnull String name); + IBeekeepingMode getBeekeepingMode(String name); + + void registerBeekeepingMode(IBeekeepingMode mode); + + void setBeekeepingMode(World world, String name); /* MISC */ diff --git a/src/main/java/forestry/api/apiculture/IBeekeepingMode.java b/src/main/java/forestry/api/apiculture/IBeekeepingMode.java index 454241bb3..ca288dc00 100644 --- a/src/main/java/forestry/api/apiculture/IBeekeepingMode.java +++ b/src/main/java/forestry/api/apiculture/IBeekeepingMode.java @@ -5,15 +5,18 @@ ******************************************************************************/ package forestry.api.apiculture; -import javax.annotation.Nonnull; import java.util.ArrayList; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import forestry.api.genetics.ISpeciesMode; +public interface IBeekeepingMode { + + /** + * @return Localized name of this beekeeping mode. + */ + String getName(); -public interface IBeekeepingMode extends ISpeciesMode { /** * @return Localized list of strings outlining the behaviour of this beekeeping mode. */ @@ -52,6 +55,12 @@ public interface IBeekeepingMode extends ISpeciesMode { */ boolean isDegenerating(IBee queen, IBee offspring, IBeeHousing housing); + /** + * @param queen + * @return true if an offspring of this queen is considered a natural + */ + boolean isNaturalOffspring(IBee queen); + /** * @param queen * @return true if this mode allows the passed queen or princess to be multiplied @@ -61,6 +70,5 @@ public interface IBeekeepingMode extends ISpeciesMode { /** * @return the bee modifier for this mode */ - @Nonnull IBeeModifier getBeeModifier(); } diff --git a/src/main/java/forestry/api/arboriculture/TreeChromosome.java b/src/main/java/forestry/api/arboriculture/EnumTreeChromosome.java similarity index 86% rename from src/main/java/forestry/api/arboriculture/TreeChromosome.java rename to src/main/java/forestry/api/arboriculture/EnumTreeChromosome.java index 89f4514f8..544535637 100644 --- a/src/main/java/forestry/api/arboriculture/TreeChromosome.java +++ b/src/main/java/forestry/api/arboriculture/EnumTreeChromosome.java @@ -5,7 +5,6 @@ ******************************************************************************/ package forestry.api.arboriculture; -import javax.annotation.Nonnull; import java.util.Locale; import net.minecraftforge.common.EnumPlantType; @@ -18,8 +17,9 @@ import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAllelePlantType; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IFruitFamily; +import forestry.api.genetics.ISpeciesRoot; -public enum TreeChromosome implements IChromosomeType { +public enum EnumTreeChromosome implements IChromosomeType { /** * Determines the following: - WorldGen, including the used wood blocks - {@link IFruitFamily}s supported. Limits which {@link IFruitProvider} @@ -73,32 +73,25 @@ public enum TreeChromosome implements IChromosomeType { */ FIREPROOF(IAlleleBoolean.class),; - Class alleleClass; + Class clss; - TreeChromosome(Class alleleClass) { - this.alleleClass = alleleClass; + EnumTreeChromosome(Class clss) { + this.clss = clss; } - @Nonnull @Override public Class getAlleleClass() { - return alleleClass; + return clss; } - @Nonnull @Override public String getName() { return this.toString().toLowerCase(Locale.ENGLISH); } - @Nonnull @Override - public ITreeRoot getSpeciesRoot() { + public ISpeciesRoot getSpeciesRoot() { return TreeManager.treeRoot; } - @Override - public byte getUid() { - return (byte) ordinal(); - } } diff --git a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java index bdc4bb7dc..4eb19f832 100644 --- a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java +++ b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java @@ -18,7 +18,7 @@ import forestry.api.genetics.IAlleleProperty; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IFruitFamily; -public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty { +public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty { @Override ITreeRoot getRoot(); diff --git a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpeciesBuilder.java b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpeciesCustom.java similarity index 65% rename from src/main/java/forestry/api/arboriculture/IAlleleTreeSpeciesBuilder.java rename to src/main/java/forestry/api/arboriculture/IAlleleTreeSpeciesCustom.java index 5c038b396..d5bf25b7e 100644 --- a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpeciesBuilder.java +++ b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpeciesCustom.java @@ -7,17 +7,15 @@ package forestry.api.arboriculture; import net.minecraftforge.common.EnumPlantType; -import forestry.api.genetics.IAlleleSpeciesBuilder; +import forestry.api.genetics.IAlleleSpeciesCustom; import forestry.api.genetics.IFruitFamily; -public interface IAlleleTreeSpeciesBuilder extends IAlleleSpeciesBuilder { - @Override - IAlleleTreeSpecies build(); +public interface IAlleleTreeSpeciesCustom extends IAlleleSpeciesCustom, IAlleleTreeSpecies { /** Add a fruit family for this tree. Trees can have multiple fruit families. */ - IAlleleTreeSpeciesBuilder addFruitFamily(IFruitFamily family); + IAlleleTreeSpeciesCustom addFruitFamily(IFruitFamily family); /** Set the minecraft plant type for this tree. Default is Plains. */ - IAlleleTreeSpeciesBuilder setPlantType(EnumPlantType type); + IAlleleTreeSpeciesCustom setPlantType(EnumPlantType type); } diff --git a/src/main/java/forestry/api/arboriculture/IArboristTracker.java b/src/main/java/forestry/api/arboriculture/IArboristTracker.java index a9d38a600..9f5bd2f92 100644 --- a/src/main/java/forestry/api/arboriculture/IArboristTracker.java +++ b/src/main/java/forestry/api/arboriculture/IArboristTracker.java @@ -7,6 +7,6 @@ package forestry.api.arboriculture; import forestry.api.genetics.IBreedingTracker; -public interface IArboristTracker extends IBreedingTracker { +public interface IArboristTracker extends IBreedingTracker { } diff --git a/src/main/java/forestry/api/arboriculture/ITree.java b/src/main/java/forestry/api/arboriculture/ITree.java index 815d67c98..3a693e6ff 100644 --- a/src/main/java/forestry/api/arboriculture/ITree.java +++ b/src/main/java/forestry/api/arboriculture/ITree.java @@ -6,7 +6,6 @@ package forestry.api.arboriculture; import javax.annotation.Nonnull; -import java.util.Collection; import java.util.EnumSet; import net.minecraft.item.ItemStack; @@ -23,7 +22,7 @@ import forestry.api.genetics.IEffectData; import forestry.api.genetics.IIndividual; import forestry.api.world.ITreeGenData; -public interface ITree extends IIndividual, ITreeGenData { +public interface ITree extends IIndividual, ITreeGenData { void mate(ITree other); @@ -39,7 +38,10 @@ public interface ITree extends IIndividual, ITreeGenData { EnumSet getPlantTypes(); - Collection getSaplings(World world, GameProfile playerProfile, BlockPos pos, float modifier); + /** + * @since Forestry 4.0 + */ + ITree[] getSaplings(World world, GameProfile playerProfile, BlockPos pos, float modifier); ItemStack[] getProduceList(); @@ -84,8 +86,7 @@ public interface ITree extends IIndividual, ITreeGenData { @Override ITree copy(); - @Override - boolean isPureBred(TreeChromosome chromosome); + boolean isPureBred(EnumTreeChromosome chromosome); boolean canBearFruit(); } diff --git a/src/main/java/forestry/api/arboriculture/ITreeFactory.java b/src/main/java/forestry/api/arboriculture/ITreeFactory.java index 069f59375..2eb8b8b94 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeFactory.java +++ b/src/main/java/forestry/api/arboriculture/ITreeFactory.java @@ -13,7 +13,7 @@ public interface ITreeFactory { /** * Creates a new tree species. * Automatically registered with AlleleManager.alleleRegistry.registerAllele() - * See IAlleleTreeSpeciesBuilder and IAlleleSpeciesBuilder for adding additional properties to the returned species. + * See IAlleleTreeSpeciesCustom and IAlleleSpeciesCustom for adding additional properties to the returned species. * * @param uid Unique Identifier for this species * @param unlocalizedName Unlocalized name for this species @@ -28,7 +28,7 @@ public interface ITreeFactory { * @param generator The tree generator * @return a new tree species allele. */ - IAlleleTreeSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String mdoelName, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator); + IAlleleTreeSpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String mdoelName, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator); /** Get one of the built-in Forestry leaf types. Default type is deciduous. */ ILeafSpriteProvider getLeafIconProvider(EnumLeafType enumLeafType, Color color, Color colorPollinated); diff --git a/src/main/java/forestry/api/arboriculture/ITreeGenome.java b/src/main/java/forestry/api/arboriculture/ITreeGenome.java index b2b9269e5..4578d020e 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeGenome.java +++ b/src/main/java/forestry/api/arboriculture/ITreeGenome.java @@ -5,20 +5,17 @@ ******************************************************************************/ package forestry.api.arboriculture; -import javax.annotation.Nonnull; import java.util.EnumSet; import net.minecraftforge.common.EnumPlantType; import forestry.api.genetics.IGenome; -public interface ITreeGenome extends IGenome { +public interface ITreeGenome extends IGenome { - @Nonnull @Override IAlleleTreeSpecies getPrimary(); - @Nonnull @Override IAlleleTreeSpecies getSecondary(); @@ -48,8 +45,4 @@ public interface ITreeGenome extends IGenome { int getGirth(); IAlleleLeafEffect getEffect(); - - @Nonnull - @Override - ITreeRoot getSpeciesRoot(); } diff --git a/src/main/java/forestry/api/arboriculture/ITreeModifier.java b/src/main/java/forestry/api/arboriculture/ITreeModifier.java index 1ff3b39a8..ba4bd21d5 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeModifier.java +++ b/src/main/java/forestry/api/arboriculture/ITreeModifier.java @@ -34,4 +34,12 @@ public interface ITreeModifier { * @return Float used to modify the maturation. */ float getMaturationModifier(ITreeGenome genome, float currentModifier); + + /** + * @param genome0 + * @param genome1 + * @return Float used to modify the base mutation chance. + */ + float getMutationModifier(ITreeGenome genome0, ITreeGenome genome1, float currentModifier); + } diff --git a/src/main/java/forestry/api/arboriculture/ITreeMutation.java b/src/main/java/forestry/api/arboriculture/ITreeMutation.java index a406614cd..32e68e798 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeMutation.java +++ b/src/main/java/forestry/api/arboriculture/ITreeMutation.java @@ -5,24 +5,23 @@ ******************************************************************************/ package forestry.api.arboriculture; -import javax.annotation.Nonnull; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; -public interface ITreeMutation extends IMutation { +public interface ITreeMutation extends IMutation { /** * @return {@link ISpeciesRoot} this mutation is associated with. */ - @Nonnull @Override ITreeRoot getRoot(); - // /** - // * @return float representing the percent chance for mutation to occur, from 0.0 to 100.0. - // * @since Forestry 4.0 - // */ - // @Override - // float getChance(World world, BlockPos pos, IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, ITreeGenome genome0, ITreeGenome genome1); + /** + * @return float representing the percent chance for mutation to occur, from 0.0 to 100.0. + * @since Forestry 4.0 + */ + float getChance(World world, BlockPos pos, IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, ITreeGenome genome0, ITreeGenome genome1); } diff --git a/src/main/java/forestry/api/arboriculture/ITreeMutationBuilder.java b/src/main/java/forestry/api/arboriculture/ITreeMutationCustom.java similarity index 61% rename from src/main/java/forestry/api/arboriculture/ITreeMutationBuilder.java rename to src/main/java/forestry/api/arboriculture/ITreeMutationCustom.java index 4383448a8..b4d2075ad 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeMutationBuilder.java +++ b/src/main/java/forestry/api/arboriculture/ITreeMutationCustom.java @@ -5,12 +5,8 @@ ******************************************************************************/ package forestry.api.arboriculture; -import javax.annotation.Nonnull; +import forestry.api.genetics.IMutationCustom; -import forestry.api.genetics.IMutationBuilder; +public interface ITreeMutationCustom extends ITreeMutation, IMutationCustom { -public interface ITreeMutationBuilder extends IMutationBuilder { - @Nonnull - @Override - ITreeMutation build(); } diff --git a/src/main/java/forestry/api/arboriculture/ITreeMutationFactory.java b/src/main/java/forestry/api/arboriculture/ITreeMutationFactory.java index 14407cc28..a6cf802fc 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeMutationFactory.java +++ b/src/main/java/forestry/api/arboriculture/ITreeMutationFactory.java @@ -5,15 +5,13 @@ ******************************************************************************/ package forestry.api.arboriculture; -import com.google.common.collect.ImmutableMap; - import forestry.api.genetics.IAllele; public interface ITreeMutationFactory { /** * Creates a new tree mutation. * Automatically registered with TreeManager.treeRoot.registerMutation() - * See ITreeMutationBuilder and IMutationBuilder for adding additional properties to the returned mutation. + * See ITreeMutationCustom and IMutationCustom for adding additional properties to the returned mutation. * * @param parentTree0 A parent tree for this mutation * @param parentTree1 A parent tree for this mutation @@ -21,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. */ - ITreeMutationBuilder createMutation(IAlleleTreeSpecies parentTree0, IAlleleTreeSpecies parentTree1, ImmutableMap result, int chance); + ITreeMutationCustom createMutation(IAlleleTreeSpecies parentTree0, IAlleleTreeSpecies parentTree1, IAllele[] result, int chance); } diff --git a/src/main/java/forestry/api/arboriculture/ITreeRoot.java b/src/main/java/forestry/api/arboriculture/ITreeRoot.java index 9831ca388..91b92275c 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeRoot.java +++ b/src/main/java/forestry/api/arboriculture/ITreeRoot.java @@ -5,12 +5,8 @@ ******************************************************************************/ package forestry.api.arboriculture; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collection; -import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -23,7 +19,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosome; import forestry.api.genetics.ISpeciesRoot; -public interface ITreeRoot extends ISpeciesRoot { +public interface ITreeRoot extends ISpeciesRoot { @Override boolean isMember(ItemStack itemstack); @@ -34,30 +30,24 @@ public interface ITreeRoot extends ISpeciesRoot { @Override ITree getMember(NBTTagCompound compound); - @Nonnull @Override - ITree templateAsIndividual(ImmutableMap template); - - @Nonnull - @Override - ITree templateAsIndividual(ImmutableMap templateActive, ImmutableMap templateInactive); + ITree templateAsIndividual(IAllele[] template); @Override - ITreeGenome templateAsGenome(ImmutableMap template); + ITree templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive); @Override - ITreeGenome templateAsGenome(ImmutableMap templateActive, ImmutableMap templateInactive); + ITreeGenome templateAsGenome(IAllele[] template); - @Nonnull @Override - ITreeGenome chromosomesAsGenome(ImmutableMap chromosomes); + ITreeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive); /** + * @param world * @return {@link IArboristTracker} associated with the passed world. */ - @Nonnull @Override - IArboristTracker getBreedingTracker(@Nonnull World world, @Nonnull GameProfile player); + IArboristTracker getBreedingTracker(World world, GameProfile player); /* TREE SPECIFIC */ @@ -82,27 +72,23 @@ public interface ITreeRoot extends ISpeciesRoot { boolean plantSapling(World world, ITree tree, GameProfile owner, BlockPos pos); @Override - ImmutableMap templateAsChromosomes(ImmutableMap template); + IChromosome[] templateAsChromosomes(IAllele[] template); @Override - ImmutableMap templateAsChromosomes(ImmutableMap templateActive, ImmutableMap templateInactive); + IChromosome[] templateAsChromosomes(IAllele[] templateActive, IAllele[] templateInactive); boolean setFruitBlock(World world, IAlleleFruit allele, float sappiness, short[] indices, BlockPos pos); /* GAME MODE */ - @Nonnull - @Override - List getModes(); + ArrayList getTreekeepingModes(); - @Nonnull - @Override - ITreekeepingMode getMode(@Nonnull World world); + ITreekeepingMode getTreekeepingMode(World world); - @Nonnull - @Override - ITreekeepingMode getMode(@Nonnull String name); + ITreekeepingMode getTreekeepingMode(String name); - void registerMode(@Nonnull ITreekeepingMode mode); + void registerTreekeepingMode(ITreekeepingMode mode); + + void setTreekeepingMode(World world, String name); /* TEMPLATES */ @Override diff --git a/src/main/java/forestry/api/arboriculture/ITreekeepingMode.java b/src/main/java/forestry/api/arboriculture/ITreekeepingMode.java index bd50fcb6b..f366c65a0 100644 --- a/src/main/java/forestry/api/arboriculture/ITreekeepingMode.java +++ b/src/main/java/forestry/api/arboriculture/ITreekeepingMode.java @@ -5,18 +5,18 @@ ******************************************************************************/ package forestry.api.arboriculture; -import javax.annotation.Nonnull; -import java.util.List; +import java.util.ArrayList; -import forestry.api.genetics.ISpeciesMode; +public interface ITreekeepingMode extends ITreeModifier { -public interface ITreekeepingMode extends ISpeciesMode { + /** + * @return Localized name of this treekeeping mode. + */ + String getName(); /** * @return Localized list of strings outlining the behaviour of this treekeeping mode. */ - List getDescription(); + ArrayList getDescription(); - @Nonnull - ITreeModifier getTreeModifier(); } diff --git a/src/main/java/forestry/api/core/INbtWritable.java b/src/main/java/forestry/api/core/INbtWritable.java index c43da67b3..fd8271f2f 100644 --- a/src/main/java/forestry/api/core/INbtWritable.java +++ b/src/main/java/forestry/api/core/INbtWritable.java @@ -5,10 +5,8 @@ ******************************************************************************/ package forestry.api.core; -import javax.annotation.Nonnull; - import net.minecraft.nbt.NBTTagCompound; public interface INbtWritable { - void writeToNBT(@Nonnull NBTTagCompound nbt); + void writeToNBT(NBTTagCompound nbt); } diff --git a/src/main/java/forestry/api/genetics/IAllele.java b/src/main/java/forestry/api/genetics/IAllele.java index 257a804d3..5c79d0842 100644 --- a/src/main/java/forestry/api/genetics/IAllele.java +++ b/src/main/java/forestry/api/genetics/IAllele.java @@ -5,8 +5,6 @@ ******************************************************************************/ package forestry.api.genetics; -import javax.annotation.Nonnull; - /** * An {@link IIndividual}'s {@link IGenome} is composed of {@link IChromosome}s consisting each of a primary and secondary {@link IAllele}. * @@ -21,7 +19,6 @@ public interface IAllele { /** * @return A unique string identifier for this allele. */ - @Nonnull String getUID(); /** @@ -32,13 +29,11 @@ public interface IAllele { /** * @return Localized short, human-readable identifier used in tooltips and beealyzer. */ - @Nonnull String getName(); /** * @return The unlocalized identifier */ - @Nonnull String getUnlocalizedName(); } diff --git a/src/main/java/forestry/api/genetics/IAlleleFactory.java b/src/main/java/forestry/api/genetics/IAlleleFactory.java index f1a12dc80..f216fae10 100644 --- a/src/main/java/forestry/api/genetics/IAlleleFactory.java +++ b/src/main/java/forestry/api/genetics/IAlleleFactory.java @@ -31,7 +31,7 @@ public interface IAlleleFactory { * @param valueName allele value name for uid and localization (i.e. "smallest") * @param value allele float value * @param isDominant allele dominance - * @param types allele chromosome type for registration (i.e. TreeChromosome.HEIGHT) + * @param types allele chromosome type for registration (i.e. EnumTreeChromosome.HEIGHT) * @return a new IAlleleFloat, registered with the allele registry. * @since Forestry 4.2 */ @@ -45,7 +45,7 @@ public interface IAlleleFactory { * @param yDimValue allele area Y Size * @param zDimValue allele area Z Size * @param isDominant allele dominance - * @param types allele chromosome type for registration (i.e. BeeChromosome.TERRITORY) + * @param types allele chromosome type for registration (i.e. EnumBeeChromosome.TERRITORY) * @return a new IAlleleArea, registered with the allele registry. * @since Forestry 4.2 */ @@ -57,7 +57,7 @@ public interface IAlleleFactory { * @param valueName allele value name for uid and localization (i.e. "low") * @param value allele int value * @param isDominant allele dominance - * @param types allele chromosome type for registration (i.e. BeeChromosome.FERTILITY) + * @param types allele chromosome type for registration (i.e. EnumBeeChromosome.FERTILITY) * @return a new IAlleleInteger, registered with the allele registry. * @since Forestry 4.2 */ @@ -68,7 +68,7 @@ public interface IAlleleFactory { * @param category allele category for uid and localization (i.e. "fireproof") * @param value allele boolean value * @param isDominant allele dominance - * @param types allele chromosome type for registration (i.e. TreeChromosome.FIREPROOF) + * @param types allele chromosome type for registration (i.e. EnumTreeChromosome.FIREPROOF) * @return a new IAlleleBoolean, registered with the allele registry. * Note that valueName will always be "true" or "false" * @since Forestry 4.2 @@ -81,7 +81,7 @@ public interface IAlleleFactory { * @param valueName allele value name for uid (i.e. "vanilla") * @param value allele IFlowerProvider value * @param isDominant allele dominance - * @param types allele chromosome type for registration (i.e. BeeChromosome.FLOWER_PROVIDER) + * @param types allele chromosome type for registration (i.e. EnumBeeChromosome.FLOWER_PROVIDER) * @return a new IAlleleFlowers, registered with the allele registry. * IAlleleFlowers localization is handled by the IFlowerProvider.getDescription(), unlike the other alleles. * @since Forestry 4.2 diff --git a/src/main/java/forestry/api/genetics/IAlleleRegistry.java b/src/main/java/forestry/api/genetics/IAlleleRegistry.java index 68e1b884a..f8736c597 100644 --- a/src/main/java/forestry/api/genetics/IAlleleRegistry.java +++ b/src/main/java/forestry/api/genetics/IAlleleRegistry.java @@ -5,7 +5,6 @@ ******************************************************************************/ package forestry.api.genetics; -import javax.annotation.Nullable; import java.util.Collection; import java.util.Map; @@ -28,7 +27,7 @@ public interface IAlleleRegistry { * Register a {@link ISpeciesRoot}. * @param root {@link ISpeciesRoot} to register. */ - void registerSpeciesRoot(ISpeciesRoot root); + void registerSpeciesRoot(ISpeciesRoot root); /** * @return Map of all registered {@link ISpeciesRoot}. @@ -40,21 +39,21 @@ public interface IAlleleRegistry { * @param uid Unique id for the species class, i.e. "rootBees", "rootTrees", "rootButterflies". * @return {@link ISpeciesRoot} if it exists, null otherwise. */ - ISpeciesRoot getSpeciesRoot(String uid); + ISpeciesRoot getSpeciesRoot(String uid); /** * Retrieve a matching {@link ISpeciesRoot} for the given itemstack. * @param stack An itemstack possibly containing NBT data which can be converted by a species root. * @return {@link ISpeciesRoot} if found, null otherwise. */ - ISpeciesRoot getSpeciesRoot(ItemStack stack); + ISpeciesRoot getSpeciesRoot(ItemStack stack); /** * Retrieve a matching {@link ISpeciesRoot} for the given {@link IIndividual}-class. - * @param individualClass Class extending {@link IIndividual}. + * @param clz Class extending {@link IIndividual}. * @return {@link ISpeciesRoot} if found, null otherwise. */ - ISpeciesRoot getSpeciesRoot(Class individualClass); + ISpeciesRoot getSpeciesRoot(Class clz); /* INDIVIDUAL */ @@ -73,8 +72,7 @@ public interface IAlleleRegistry { * Stack to retrieve genetic information for. * @return IIndividual containing genetic information, null if none could be extracted. */ - @Nullable - IIndividual getIndividual(ItemStack stack); + IIndividual getIndividual(ItemStack stack); /* ALLELES */ @@ -93,7 +91,7 @@ public interface IAlleleRegistry { * @param chromosomeTypes valid chromosomeTypes for this allele. * @since Forestry 4.2 */ - void registerAllele(IAllele allele, IChromosomeType... chromosomeTypes); + void registerAllele(IAllele allele, IChromosomeType... chromosomeTypes); /** * @return HashMap of all registered deprecated alleles and their corresponding replacements @@ -123,9 +121,7 @@ public interface IAlleleRegistry { * @return unmodifiable collection of all the known allele variations for the given chromosome type. * @since Forestry 4.2 */ - Collection getRegisteredAlleles(IChromosomeType type); - - Collection> getChromosomeTypes(IAllele allele); + Collection getRegisteredAlleles(IChromosomeType type); /* CLASSIFICATIONS */ diff --git a/src/main/java/forestry/api/genetics/IAlleleSpecies.java b/src/main/java/forestry/api/genetics/IAlleleSpecies.java index d48d2d599..81bdf2ead 100644 --- a/src/main/java/forestry/api/genetics/IAlleleSpecies.java +++ b/src/main/java/forestry/api/genetics/IAlleleSpecies.java @@ -20,12 +20,12 @@ import forestry.api.core.IModelProvider; /** * Basic species allele. */ -public interface IAlleleSpecies extends IAllele { +public interface IAlleleSpecies extends IAllele { /** * @return the {@link ISpeciesRoot} associated with this species. */ - ISpeciesRoot getRoot(); + ISpeciesRoot getRoot(); /** * @return Localized short description of this species. (May be null.) @@ -74,7 +74,7 @@ public interface IAlleleSpecies extends IAllele { * @param bountyLevel * @return Array of itemstacks representing the bounty for this research success. */ - ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual individual, int bountyLevel); + ItemStack[] getResearchBounty(World world, GameProfile gameProfile, IIndividual individual, int bountyLevel); /* CLIMATE */ diff --git a/src/main/java/forestry/api/genetics/IAlleleSpeciesBuilder.java b/src/main/java/forestry/api/genetics/IAlleleSpeciesCustom.java similarity index 59% rename from src/main/java/forestry/api/genetics/IAlleleSpeciesBuilder.java rename to src/main/java/forestry/api/genetics/IAlleleSpeciesCustom.java index 15bc1dd07..771f26124 100644 --- a/src/main/java/forestry/api/genetics/IAlleleSpeciesBuilder.java +++ b/src/main/java/forestry/api/genetics/IAlleleSpeciesCustom.java @@ -8,19 +8,17 @@ package forestry.api.genetics; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -public interface IAlleleSpeciesBuilder { +public interface IAlleleSpeciesCustom extends IAlleleSpecies { - IAlleleSpecies build(); + IAlleleSpeciesCustom setTemperature(EnumTemperature temperature); - IAlleleSpeciesBuilder setTemperature(EnumTemperature temperature); + IAlleleSpeciesCustom setHumidity(EnumHumidity humidity); - IAlleleSpeciesBuilder setHumidity(EnumHumidity humidity); - - IAlleleSpeciesBuilder setHasEffect(); + IAlleleSpeciesCustom setHasEffect(); /** Secret species are not shown in creative mode. */ - IAlleleSpeciesBuilder setIsSecret(); + IAlleleSpeciesCustom setIsSecret(); /** Uncounted species do not count toward total species discovered. */ - IAlleleSpeciesBuilder setIsNotCounted(); + IAlleleSpeciesCustom setIsNotCounted(); } diff --git a/src/main/java/forestry/api/genetics/IBreedingTracker.java b/src/main/java/forestry/api/genetics/IBreedingTracker.java index 26976baf3..13f67a70b 100644 --- a/src/main/java/forestry/api/genetics/IBreedingTracker.java +++ b/src/main/java/forestry/api/genetics/IBreedingTracker.java @@ -15,7 +15,7 @@ import forestry.api.apiculture.IBeekeepingMode; * * @author SirSengir */ -public interface IBreedingTracker { +public interface IBreedingTracker { /** * @return Name of the current {@link IBeekeepingMode}. @@ -37,28 +37,28 @@ public interface IBreedingTracker { * * @param individual */ - void registerBirth(IIndividual individual); + void registerBirth(IIndividual individual); /** * Register the pickup of an individual. * * @param individual */ - void registerPickup(IIndividual individual); + void registerPickup(IIndividual individual); /** * Marks a species as discovered. Should only be called from registerIndividual normally. * * @param species */ - void registerSpecies(IAlleleSpecies species); + void registerSpecies(IAlleleSpecies species); /** * Register a successful mutation. Will mark it as discovered. * * @param mutation */ - void registerMutation(IMutation mutation); + void registerMutation(IMutation mutation); /** * Queries the tracker for discovered species. @@ -67,7 +67,7 @@ public interface IBreedingTracker { * Mutation to query for. * @return true if the mutation has been discovered. */ - boolean isDiscovered(IMutation mutation); + boolean isDiscovered(IMutation mutation); /** * Queries the tracker for discovered species. @@ -76,7 +76,7 @@ public interface IBreedingTracker { * Species to check. * @return true if the species has been bred. */ - boolean isDiscovered(IAlleleSpecies species); + boolean isDiscovered(IAlleleSpecies species); /** * Register a successfully researched mutation. @@ -84,12 +84,12 @@ public interface IBreedingTracker { * Researched mutations may have bonuses such as occurring at a higher rate. * Researched mutations count as discovered. */ - void researchMutation(IMutation mutation); + void researchMutation(IMutation mutation); /** * @return true if the mutation has been researched. */ - boolean isResearched(IMutation mutation); + boolean isResearched(IMutation mutation); /** * Synchronizes the tracker to the client side. diff --git a/src/main/java/forestry/api/genetics/IChromosome.java b/src/main/java/forestry/api/genetics/IChromosome.java index 81a4dd0c6..331cc3d19 100644 --- a/src/main/java/forestry/api/genetics/IChromosome.java +++ b/src/main/java/forestry/api/genetics/IChromosome.java @@ -5,8 +5,6 @@ ******************************************************************************/ package forestry.api.genetics; -import javax.annotation.Nonnull; - import forestry.api.core.INbtWritable; /** @@ -16,16 +14,12 @@ import forestry.api.core.INbtWritable; */ public interface IChromosome extends INbtWritable { - @Nonnull IAllele getPrimaryAllele(); - @Nonnull IAllele getSecondaryAllele(); - @Nonnull IAllele getInactiveAllele(); - @Nonnull IAllele getActiveAllele(); } diff --git a/src/main/java/forestry/api/genetics/IChromosomeType.java b/src/main/java/forestry/api/genetics/IChromosomeType.java index 41c73b7ac..1f727b252 100644 --- a/src/main/java/forestry/api/genetics/IChromosomeType.java +++ b/src/main/java/forestry/api/genetics/IChromosomeType.java @@ -5,25 +5,20 @@ ******************************************************************************/ package forestry.api.genetics; -import javax.annotation.Nonnull; - /* * Interface to be implemented by the enums representing the various chromosomes */ -public interface IChromosomeType> { +public interface IChromosomeType { /* * Get class which all alleles on this chromosome must interface */ - @Nonnull Class getAlleleClass(); - @Nonnull String getName(); - @Nonnull - ISpeciesRoot getSpeciesRoot(); + ISpeciesRoot getSpeciesRoot(); - byte getUid(); + int ordinal(); } diff --git a/src/main/java/forestry/api/genetics/IClassification.java b/src/main/java/forestry/api/genetics/IClassification.java index eff03ddb4..b681537c2 100644 --- a/src/main/java/forestry/api/genetics/IClassification.java +++ b/src/main/java/forestry/api/genetics/IClassification.java @@ -5,8 +5,6 @@ ******************************************************************************/ package forestry.api.genetics; -import java.util.Collection; - /** * Biological classifications from domain down to genus. * @@ -76,7 +74,7 @@ public interface IClassification { /** * @return Member groups of this one. */ - Collection getMemberGroups(); + IClassification[] getMemberGroups(); /** * Adds subgroups to this group. @@ -86,14 +84,14 @@ public interface IClassification { /** * @return Member species of this group. */ - Collection> getMemberSpecies(); + IAlleleSpecies[] getMemberSpecies(); /** * Used by the allele registry to populate internal collection of branch members on the fly. * * @param species */ - void addMemberSpecies(IAlleleSpecies species); + void addMemberSpecies(IAlleleSpecies species); /** * @return Parent classification, null if this is root. diff --git a/src/main/java/forestry/api/genetics/IFlowerProvider.java b/src/main/java/forestry/api/genetics/IFlowerProvider.java index ed560b097..5a428a6e8 100644 --- a/src/main/java/forestry/api/genetics/IFlowerProvider.java +++ b/src/main/java/forestry/api/genetics/IFlowerProvider.java @@ -5,27 +5,23 @@ ******************************************************************************/ package forestry.api.genetics; -import javax.annotation.Nonnull; - import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; public interface IFlowerProvider { - boolean isAcceptedPollinatable(@Nonnull World world, @Nonnull IPollinatable pollinatable); + boolean isAcceptedPollinatable(World world, IPollinatable pollinatable); /** * @return The unique type used for the IFlowerRegistry * @since Forestry 4.0.0 */ - @Nonnull String getFlowerType(); /** * @return Short, human-readable identifier used in the beealyzer. */ - @Nonnull String getDescription(); /** @@ -33,6 +29,5 @@ public interface IFlowerProvider { * If this flowerProvider does not affect the products, it should return the products unchanged. * @return Array of itemstacks being the (modified or unmodified) produce. */ - @Nonnull ItemStack[] affectProducts(World world, IIndividual individual, BlockPos pos, ItemStack[] products); } diff --git a/src/main/java/forestry/api/genetics/IGenome.java b/src/main/java/forestry/api/genetics/IGenome.java index 54e8c89be..3ac8bcefb 100644 --- a/src/main/java/forestry/api/genetics/IGenome.java +++ b/src/main/java/forestry/api/genetics/IGenome.java @@ -5,10 +5,6 @@ ******************************************************************************/ package forestry.api.genetics; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; - import forestry.api.core.INbtWritable; /** @@ -16,25 +12,19 @@ import forestry.api.core.INbtWritable; * * Only the default implementation is supported. */ -public interface IGenome extends INbtWritable { +public interface IGenome extends INbtWritable { - @Nonnull - IAlleleSpecies getPrimary(); + IAlleleSpecies getPrimary(); - @Nonnull - IAlleleSpecies getSecondary(); + IAlleleSpecies getSecondary(); - @Nonnull - ImmutableMap getChromosomes(); + IChromosome[] getChromosomes(); - @Nonnull - IAllele getActiveAllele(C chromosomeType); + IAllele getActiveAllele(IChromosomeType chromosomeType); - @Nonnull - IAllele getInactiveAllele(C chromosomeType); + IAllele getInactiveAllele(IChromosomeType chromosomeType); - boolean isGeneticEqual(IGenome other); - - @Nonnull - ISpeciesRoot getSpeciesRoot(); + boolean isGeneticEqual(IGenome other); + + ISpeciesRoot getSpeciesRoot(); } diff --git a/src/main/java/forestry/api/genetics/IHousing.java b/src/main/java/forestry/api/genetics/IHousing.java index b23525660..b13624b97 100644 --- a/src/main/java/forestry/api/genetics/IHousing.java +++ b/src/main/java/forestry/api/genetics/IHousing.java @@ -6,9 +6,6 @@ package forestry.api.genetics; import net.minecraft.util.BlockPos; -import net.minecraft.world.World; - -import com.mojang.authlib.GameProfile; /** * Any housing, hatchery or nest with a location in the world. @@ -17,8 +14,4 @@ public interface IHousing { BlockPos getCoordinates(); - World getWorld(); - - GameProfile getOwner(); - } diff --git a/src/main/java/forestry/api/genetics/IIndividual.java b/src/main/java/forestry/api/genetics/IIndividual.java index 03024d278..0e473f157 100644 --- a/src/main/java/forestry/api/genetics/IIndividual.java +++ b/src/main/java/forestry/api/genetics/IIndividual.java @@ -15,7 +15,7 @@ import forestry.api.core.INbtWritable; * * Only the default implementation is supported. */ -public interface IIndividual extends INbtWritable { +public interface IIndividual extends INbtWritable { String getIdent(); @@ -36,20 +36,20 @@ public interface IIndividual extends INbtWritable { boolean isSecret(); @Nonnull - IGenome getGenome(); + IGenome getGenome(); /** * Check whether the genetic makeup of two IIndividuals is identical. Ignores additional data like generations, irregular mating, etc.. * @param other * @return true if the given other IIndividual has the amount of chromosomes and their alleles are identical. */ - boolean isGeneticEqual(IIndividual other); + boolean isGeneticEqual(IIndividual other); /** * @return A deep copy of this individual. */ - IIndividual copy(); + IIndividual copy(); - boolean isPureBred(C chromosomeType); + boolean isPureBred(IChromosomeType chromosomeType); } diff --git a/src/main/java/forestry/api/genetics/IIndividualLiving.java b/src/main/java/forestry/api/genetics/IIndividualLiving.java index 37e45dec8..f935dd204 100644 --- a/src/main/java/forestry/api/genetics/IIndividualLiving.java +++ b/src/main/java/forestry/api/genetics/IIndividualLiving.java @@ -7,7 +7,7 @@ package forestry.api.genetics; import net.minecraft.world.World; -public interface IIndividualLiving extends IIndividual { +public interface IIndividualLiving extends IIndividual { /** * @return Genetic information of the mate, null if unmated. diff --git a/src/main/java/forestry/api/genetics/IMutation.java b/src/main/java/forestry/api/genetics/IMutation.java index 120d44878..2e04420ac 100644 --- a/src/main/java/forestry/api/genetics/IMutation.java +++ b/src/main/java/forestry/api/genetics/IMutation.java @@ -5,17 +5,8 @@ ******************************************************************************/ package forestry.api.genetics; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.Collection; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; - -import forestry.api.core.INbtWritable; - /** * Individuals can be seeded either as hive drops or as mutation results. * @@ -23,43 +14,38 @@ import forestry.api.core.INbtWritable; * * @author SirSengir */ -public interface IMutation extends INbtWritable { +public interface IMutation { /** * @return {@link ISpeciesRoot} this mutation is associated with. */ - @Nonnull - ISpeciesRoot getRoot(); + ISpeciesRoot getRoot(); /** * @return first of the alleles implementing IAlleleSpecies required for this mutation. */ - @Nonnull - IAlleleSpecies getSpecies0(); + IAlleleSpecies getAllele0(); /** * @return second of the alleles implementing IAlleleSpecies required for this mutation. */ - @Nonnull - IAlleleSpecies getSpecies1(); + IAlleleSpecies getAllele1(); /** - * @return The full default genome of the mutated side. + * @return Array of {@link IAllele} representing the full default genome of the mutated side. + * + * Make sure to return a proper array for the species class. Returning an allele of the wrong type will cause cast errors on runtime. */ - @Nonnull - ImmutableMap getResultTemplate(); + IAllele[] getTemplate(); /** * @return Unmodified base chance for mutation to fire. */ float getBaseChance(); - float getChance(World world, BlockPos pos, IAlleleSpecies species0, IAlleleSpecies species1, IGenome genome0, IGenome genome1); - /** * @return Collection of localized, human-readable strings describing special mutation conditions, if any. */ - @Nonnull Collection getSpecialConditions(); /** @@ -72,7 +58,6 @@ public interface IMutation extends INbtWritable { * @param allele * @return the other allele which was not passed as argument. */ - @Nullable IAllele getPartner(IAllele allele); /** diff --git a/src/main/java/forestry/api/genetics/IMutationCondition.java b/src/main/java/forestry/api/genetics/IMutationCondition.java index 9aeb7680f..0267d42de 100644 --- a/src/main/java/forestry/api/genetics/IMutationCondition.java +++ b/src/main/java/forestry/api/genetics/IMutationCondition.java @@ -15,7 +15,7 @@ public interface IMutationCondition { * Most will return 1 if the condition is met and 0 otherwise, * but the float offers flexibility for more advanced conditions. */ - float getChance(World world, BlockPos pos, IAlleleSpecies species0, IAlleleSpecies species1, IGenome genome0, IGenome genome1); + float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1); /** * A localized description of the mutation condition. (i.e. "A temperature of HOT is required.") diff --git a/src/main/java/forestry/api/genetics/IMutationBuilder.java b/src/main/java/forestry/api/genetics/IMutationCustom.java similarity index 54% rename from src/main/java/forestry/api/genetics/IMutationBuilder.java rename to src/main/java/forestry/api/genetics/IMutationCustom.java index b74331cc2..786eef316 100644 --- a/src/main/java/forestry/api/genetics/IMutationBuilder.java +++ b/src/main/java/forestry/api/genetics/IMutationCustom.java @@ -5,8 +5,6 @@ ******************************************************************************/ package forestry.api.genetics; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraftforge.common.BiomeDictionary; @@ -15,42 +13,40 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; /** Set custom mutation requirements */ -public interface IMutationBuilder> { - @Nonnull - IMutation build(); +public interface IMutationCustom extends IMutation { /** Prevent this mutation from being shown in the analyzers */ - IMutationBuilder setIsSecret(); + IMutationCustom setIsSecret(); /** Require a specific temperature for this mutation to occur */ - IMutationBuilder restrictTemperature(EnumTemperature temperature); + IMutationCustom restrictTemperature(EnumTemperature temperature); - IMutationBuilder restrictTemperature(EnumTemperature minTemperature, EnumTemperature maxTemperature); + IMutationCustom restrictTemperature(EnumTemperature minTemperature, EnumTemperature maxTemperature); /** Require a specific humidity for this mutation to occur */ - IMutationBuilder restrictHumidity(EnumHumidity humidity); + IMutationCustom restrictHumidity(EnumHumidity humidity); - IMutationBuilder restrictHumidity(EnumHumidity minHumidity, EnumHumidity maxHumidity); + IMutationCustom restrictHumidity(EnumHumidity minHumidity, EnumHumidity maxHumidity); /** * Restrict this mutation to certain types of biomes. * @param types The types of biomes this mutation can occur. */ - IMutationBuilder restrictBiomeType(BiomeDictionary.Type... types); + IMutationCustom restrictBiomeType(BiomeDictionary.Type... types); /** Restrict the days of the year that this mutation can occur */ - IMutationBuilder restrictDateRange(int startMonth, int startDay, int endMonth, int endDay); + IMutationCustom restrictDateRange(int startMonth, int startDay, int endMonth, int endDay); /** Restrict the time of day that this mutation can occur */ - IMutationBuilder requireDay(); + IMutationCustom requireDay(); - IMutationBuilder requireNight(); + IMutationCustom requireNight(); /** Require a specific resource to be under the location of the mutation */ - IMutationBuilder requireResource(Block block, int meta); + IMutationCustom requireResource(Block block, int meta); - IMutationBuilder requireResource(String oreDictName); + IMutationCustom requireResource(String oreDictName); /** Require some other custom mutation condition */ - IMutationBuilder addMutationCondition(IMutationCondition mutationCondition); + IMutationCustom addMutationCondition(IMutationCondition mutationCondition); } diff --git a/src/main/java/forestry/api/genetics/IPollinatable.java b/src/main/java/forestry/api/genetics/IPollinatable.java index 03226e3a6..68278b3c1 100644 --- a/src/main/java/forestry/api/genetics/IPollinatable.java +++ b/src/main/java/forestry/api/genetics/IPollinatable.java @@ -9,8 +9,6 @@ import java.util.EnumSet; import net.minecraftforge.common.EnumPlantType; -import forestry.api.arboriculture.ITree; - /** * Can be implemented by tile entities, if they wish to be pollinatable. * @@ -26,7 +24,7 @@ public interface IPollinatable { /** * @return IIndividual containing the genetic information of this IPollinatable */ - ITree getPollen(); + IIndividual getPollen(); /** * Checks whether this {@link IPollinatable} can mate with the given pollen. @@ -37,7 +35,7 @@ public interface IPollinatable { * IIndividual representing the pollen. * @return true if mating is possible, false otherwise. */ - boolean canMateWith(ITree pollen); + boolean canMateWith(IIndividual pollen); /** * Pollinates this entity. @@ -45,7 +43,7 @@ public interface IPollinatable { * @param pollen * IIndividual representing the pollen. */ - void mateWith(ITree pollen); + void mateWith(IIndividual pollen); /** * @return true if this IPollinatable has already been pollinated. diff --git a/src/main/java/forestry/api/genetics/ISpeciesMode.java b/src/main/java/forestry/api/genetics/ISpeciesMode.java deleted file mode 100644 index 6cf4a1dd4..000000000 --- a/src/main/java/forestry/api/genetics/ISpeciesMode.java +++ /dev/null @@ -1,17 +0,0 @@ -package forestry.api.genetics; - -import javax.annotation.Nonnull; - -public interface ISpeciesMode { - - /** - * @return Localized name of this mode. - */ - @Nonnull - String getName(); - - /** - * @return Float used to modify the base mutation chance. - */ - float getMutationModifier(IGenome genome, IGenome mate); -} diff --git a/src/main/java/forestry/api/genetics/ISpeciesRoot.java b/src/main/java/forestry/api/genetics/ISpeciesRoot.java index 69102463f..f2e40b12c 100644 --- a/src/main/java/forestry/api/genetics/ISpeciesRoot.java +++ b/src/main/java/forestry/api/genetics/ISpeciesRoot.java @@ -5,10 +5,7 @@ ******************************************************************************/ package forestry.api.genetics; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; @@ -23,7 +20,7 @@ import com.mojang.authlib.GameProfile; /** * Describes a class of species (i.e. bees, trees, butterflies), provides helper functions and access to common functionality. */ -public interface ISpeciesRoot { +public interface ISpeciesRoot { /** * @return A unique identifier for the species class. Should consist of "root" + a common name for the species class in camel-case, i.e. "rootBees", "rootTrees", "rootButterflies". @@ -33,7 +30,7 @@ public interface ISpeciesRoot { /** * @return Class of the sub-interface inheriting from {@link IIndividual}. */ - Class> getMemberClass(); + Class getMemberClass(); /** * @return Integer denoting the number of (counted) species of this type in the world. @@ -62,38 +59,29 @@ public interface ISpeciesRoot { */ boolean isMember(IIndividual individual); - @Nullable - IIndividual getMember(ItemStack stack); + IIndividual getMember(ItemStack stack); - @Nullable - IIndividual getMember(NBTTagCompound compound); + IIndividual getMember(NBTTagCompound compound); - @Nullable ISpeciesType getType(ItemStack itemStack); - ItemStack getMemberStack(IIndividual individual, int type); + ItemStack getMemberStack(IIndividual individual, int type); /* BREEDING TRACKER */ - @Nonnull - IBreedingTracker getBreedingTracker(@Nonnull World world, @Nonnull GameProfile player); + IBreedingTracker getBreedingTracker(World world, GameProfile player); /* GENOME MANIPULATION */ - @Nonnull - IIndividual templateAsIndividual(ImmutableMap template); + IIndividual templateAsIndividual(IAllele[] template); - @Nonnull - IIndividual templateAsIndividual(ImmutableMap templateActive, ImmutableMap templateInactive); + IIndividual templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive); - ImmutableMap templateAsChromosomes(ImmutableMap template); + IChromosome[] templateAsChromosomes(IAllele[] template); - ImmutableMap templateAsChromosomes(ImmutableMap templateActive, ImmutableMap templateInactive); + IChromosome[] templateAsChromosomes(IAllele[] templateActive, IAllele[] templateInactive); - IGenome templateAsGenome(ImmutableMap template); + IGenome templateAsGenome(IAllele[] template); - IGenome templateAsGenome(ImmutableMap templateActive, ImmutableMap templateInactive); - - @Nonnull - IGenome chromosomesAsGenome(ImmutableMap chromosomes); + IGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive); /* TEMPLATES */ @@ -102,38 +90,37 @@ public interface ISpeciesRoot { * * @param template */ - void registerTemplate(ImmutableMap template); + void registerTemplate(IAllele[] template); /** * Registers a bee template using the passed identifier. * * @param template */ - void registerTemplate(String identifier, ImmutableMap template); + void registerTemplate(String identifier, IAllele[] template); /** * Retrieves a registered template using the passed identifier. * * @param identifier - * @return Map of {@link IAllele} representing a genome. + * @return Array of {@link IAllele} representing a genome. */ - @Nullable - ImmutableMap getTemplate(String identifier); + IAllele[] getTemplate(String identifier); /** * @return Default individual template for use when stuff breaks. */ - ImmutableMap getDefaultTemplate(); + IAllele[] getDefaultTemplate(); /** * @param rand Random to use. * @return A random template from the pool of registered species templates. */ - ImmutableMap getRandomTemplate(Random rand); + IAllele[] getRandomTemplate(Random rand); - Map> getGenomeTemplates(); + Map getGenomeTemplates(); - List> getIndividualTemplates(); + ArrayList getIndividualTemplates(); /* MUTATIONS */ @@ -142,26 +129,26 @@ public interface ISpeciesRoot { * * @param mutation */ - void registerMutation(IMutation mutation); + void registerMutation(IMutation mutation); /** * @return All registered mutations. */ - Collection> getMutations(boolean shuffle); + Collection getMutations(boolean shuffle); /** * @param other Allele to match mutations against. * @return All registered mutations the given allele is part of. */ - List> getCombinations(IAllele other); + Collection getCombinations(IAllele other); /** * @since Forestry 3.7 * @return all possible mutations that result from breeding two species */ - List> getCombinations(IAlleleSpecies parentSpecies0, IAlleleSpecies parentSpecies1, boolean shuffle); + List getCombinations(IAlleleSpecies parentSpecies0, IAlleleSpecies parentSpecies1, boolean shuffle); - Collection> getPaths(IAllele result, C chromosomeType); + Collection getPaths(IAllele result, IChromosomeType chromosomeType); /* RESEARCH */ @@ -180,29 +167,10 @@ public interface ISpeciesRoot { /** * @return Array of {@link IChromosomeType} which are in this species genome */ - @Nonnull - C[] getKaryotype(); + IChromosomeType[] getKaryotype(); /** * @return {@link IChromosomeType} which is the "key" for this species class, usually the species chromosome. */ - @Nonnull - C getKaryotypeKey(); - - C getChromosomeTypeForUid(byte uid); - - /* GAME MODE */ - void resetMode(); - - @Nonnull - List> getModes(); - - @Nonnull - ISpeciesMode getMode(@Nonnull World world); - - @Nonnull - ISpeciesMode getMode(@Nonnull String name); - - void setMode(@Nonnull World world, @Nonnull String name); - + IChromosomeType getKaryotypeKey(); } diff --git a/src/main/java/forestry/api/lepidopterology/ButterflyChromosome.java b/src/main/java/forestry/api/lepidopterology/EnumButterflyChromosome.java similarity index 83% rename from src/main/java/forestry/api/lepidopterology/ButterflyChromosome.java rename to src/main/java/forestry/api/lepidopterology/EnumButterflyChromosome.java index cc8b6feea..d829a6c36 100644 --- a/src/main/java/forestry/api/lepidopterology/ButterflyChromosome.java +++ b/src/main/java/forestry/api/lepidopterology/EnumButterflyChromosome.java @@ -5,7 +5,6 @@ ******************************************************************************/ package forestry.api.lepidopterology; -import javax.annotation.Nonnull; import java.util.Locale; import forestry.api.genetics.IAllele; @@ -17,7 +16,7 @@ import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -public enum ButterflyChromosome implements IChromosomeType { +public enum EnumButterflyChromosome implements IChromosomeType { /** * Species of the bee. Alleles here must implement {@link IAlleleButterflySpecies}. */ @@ -70,34 +69,25 @@ public enum ButterflyChromosome implements IChromosomeType * Extra effect to surroundings. (?) */ EFFECT(IAlleleButterflyEffect.class); - - @Nonnull - private final Class alleleClass; - ButterflyChromosome(@Nonnull Class alleleClass) { - this.alleleClass = alleleClass; + Class clss; + + EnumButterflyChromosome(Class clss) { + this.clss = clss; } - @Nonnull @Override public Class getAlleleClass() { - return alleleClass; + return clss; } - @Nonnull @Override public String getName() { return this.toString().toLowerCase(Locale.ENGLISH); } - @Nonnull @Override - public ISpeciesRoot getSpeciesRoot() { + public ISpeciesRoot getSpeciesRoot() { return ButterflyManager.butterflyRoot; } - - @Override - public byte getUid() { - return (byte) ordinal(); - } } diff --git a/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpecies.java b/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpecies.java index 7a00859b6..dc97ba14e 100644 --- a/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpecies.java +++ b/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpecies.java @@ -15,7 +15,7 @@ import net.minecraftforge.common.BiomeDictionary; import forestry.api.core.ISpriteProvider; import forestry.api.genetics.IAlleleSpecies; -public interface IAlleleButterflySpecies extends IAlleleSpecies { +public interface IAlleleButterflySpecies extends IAlleleSpecies { /** * @return the IBeeRoot diff --git a/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpeciesBuilder.java b/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpeciesCustom.java similarity index 62% rename from src/main/java/forestry/api/lepidopterology/IAlleleButterflySpeciesBuilder.java rename to src/main/java/forestry/api/lepidopterology/IAlleleButterflySpeciesCustom.java index dbb06f15a..37bda181b 100644 --- a/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpeciesBuilder.java +++ b/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpeciesCustom.java @@ -10,16 +10,12 @@ ******************************************************************************/ package forestry.api.lepidopterology; -import forestry.api.genetics.IAlleleSpeciesBuilder; +import forestry.api.genetics.IAlleleSpeciesCustom; -public interface IAlleleButterflySpeciesBuilder extends IAlleleSpeciesBuilder { +public interface IAlleleButterflySpeciesCustom extends IAlleleButterflySpecies, IAlleleSpeciesCustom { + IAlleleButterflySpeciesCustom setRarity(float rarity); - @Override - IAlleleButterflySpecies build(); + IAlleleButterflySpeciesCustom setFlightDistance(float flightDistance); - IAlleleButterflySpeciesBuilder setRarity(float rarity); - - IAlleleButterflySpeciesBuilder setFlightDistance(float flightDistance); - - IAlleleButterflySpeciesBuilder setNocturnal(); + IAlleleButterflySpeciesCustom setNocturnal(); } diff --git a/src/main/java/forestry/api/lepidopterology/IButterfly.java b/src/main/java/forestry/api/lepidopterology/IButterfly.java index 1deaef595..61fdbb93a 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterfly.java +++ b/src/main/java/forestry/api/lepidopterology/IButterfly.java @@ -12,7 +12,7 @@ import net.minecraft.world.World; import forestry.api.genetics.IIndividualLiving; -public interface IButterfly extends IIndividualLiving { +public interface IButterfly extends IIndividualLiving { @Nonnull @Override diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyFactory.java b/src/main/java/forestry/api/lepidopterology/IButterflyFactory.java index a37de4e1a..b66407ab1 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyFactory.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyFactory.java @@ -18,7 +18,7 @@ public interface IButterflyFactory { /** * Creates a new butterfly species. * Automatically registered with AlleleManager.alleleRegistry.registerAllele() - * See IAlleleButterflySpeciesBuilder and IAlleleSpeciesBuilder for adding additional properties to the returned species. + * See IAlleleButterflySpeciesCustom and IAlleleSpeciesCustom for adding additional properties to the returned species. * * @param uid Unique Identifier for this species * @param unlocalizedName Unlocalized name for this species @@ -31,5 +31,5 @@ public interface IButterflyFactory { * @param serumColour The color of this butterfly's serum. * @return a new butterfly species allele. */ - IAlleleButterflySpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String texturePath, boolean dominant, IClassification branch, String binomial, Color serumColour); + IAlleleButterflySpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String texturePath, boolean dominant, IClassification branch, String binomial, Color serumColour); } diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyGenome.java b/src/main/java/forestry/api/lepidopterology/IButterflyGenome.java index 86f327324..324a2f358 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyGenome.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyGenome.java @@ -5,19 +5,15 @@ ******************************************************************************/ package forestry.api.lepidopterology; -import javax.annotation.Nonnull; - import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IGenome; -public interface IButterflyGenome extends IGenome { - - @Nonnull +public interface IButterflyGenome extends IGenome { + @Override IAlleleButterflySpecies getPrimary(); - @Nonnull @Override IAlleleButterflySpecies getSecondary(); @@ -35,7 +31,7 @@ public interface IButterflyGenome extends IGenome { EnumTolerance getToleranceHumid(); - boolean getNeverSleeps(); + boolean getNocturnal(); boolean getTolerantFlyer(); @@ -45,7 +41,4 @@ public interface IButterflyGenome extends IGenome { IAlleleButterflyEffect getEffect(); - @Nonnull - @Override - IButterflyRoot getSpeciesRoot(); } diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyMode.java b/src/main/java/forestry/api/lepidopterology/IButterflyMode.java deleted file mode 100644 index 2c4e59b6a..000000000 --- a/src/main/java/forestry/api/lepidopterology/IButterflyMode.java +++ /dev/null @@ -1,6 +0,0 @@ -package forestry.api.lepidopterology; - -import forestry.api.genetics.ISpeciesMode; - -public interface IButterflyMode extends ISpeciesMode { -} diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyMutation.java b/src/main/java/forestry/api/lepidopterology/IButterflyMutation.java index 2161398c6..d9bf32766 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyMutation.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyMutation.java @@ -9,6 +9,6 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutation; -public interface IButterflyMutation extends IMutation { +public interface IButterflyMutation extends IMutation { float getChance(IButterflyNursery housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1); } diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyNursery.java b/src/main/java/forestry/api/lepidopterology/IButterflyNursery.java index 5a6d06b93..463fb4bda 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyNursery.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyNursery.java @@ -5,14 +5,14 @@ ******************************************************************************/ package forestry.api.lepidopterology; -import forestry.api.arboriculture.ITree; import forestry.api.genetics.IHousing; +import forestry.api.genetics.IIndividual; public interface IButterflyNursery extends IHousing { IButterfly getCaterpillar(); - ITree getNanny(); + IIndividual getNanny(); void setCaterpillar(IButterfly butterfly); diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java b/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java index 28119c052..f867645f0 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java @@ -5,11 +5,8 @@ ******************************************************************************/ package forestry.api.lepidopterology; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; +import java.util.ArrayList; import java.util.Collection; -import java.util.List; import net.minecraft.entity.EntityLiving; import net.minecraft.item.ItemStack; @@ -19,11 +16,10 @@ import net.minecraft.world.World; import com.mojang.authlib.GameProfile; import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosome; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -public interface IButterflyRoot extends ISpeciesRoot { +public interface IButterflyRoot extends ISpeciesRoot { @Override boolean isMember(ItemStack stack); @@ -35,31 +31,24 @@ public interface IButterflyRoot extends ISpeciesRoot { IButterfly getMember(NBTTagCompound compound); @Override - ItemStack getMemberStack(IIndividual butterfly, int type); + ItemStack getMemberStack(IIndividual butterfly, int type); /* GENOME CONVERSION */ - @Nonnull @Override - IButterfly templateAsIndividual(ImmutableMap template); - - @Nonnull - @Override - IButterfly templateAsIndividual(ImmutableMap templateActive, ImmutableMap templateInactive); + IButterfly templateAsIndividual(IAllele[] template); @Override - IButterflyGenome templateAsGenome(ImmutableMap template); + IButterfly templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive); @Override - IButterflyGenome templateAsGenome(ImmutableMap templateActive, ImmutableMap templateInactive); + IButterflyGenome templateAsGenome(IAllele[] template); - @Nonnull @Override - IButterflyGenome chromosomesAsGenome(ImmutableMap chromosomes); + IButterflyGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive); /* BUTTERFLY SPECIFIC */ - @Nonnull @Override - IButterflyTracker getBreedingTracker(@Nonnull World world, @Nonnull GameProfile player); + ILepidopteristTracker getBreedingTracker(World world, GameProfile player); /** * Spawns the given butterfly in the world. @@ -75,7 +64,7 @@ public interface IButterflyRoot extends ISpeciesRoot { /* TEMPLATES */ @Override - List getIndividualTemplates(); + ArrayList getIndividualTemplates(); /* MUTATIONS */ @Override @@ -84,14 +73,4 @@ public interface IButterflyRoot extends ISpeciesRoot { @Override EnumFlutterType getType(ItemStack stack); - /** Modes */ - @Nonnull - @Override - IButterflyMode getMode(@Nonnull World world); - - @Nonnull - @Override - List getModes(); - - void registerMode(@Nonnull IButterflyMode mode); } diff --git a/src/main/java/forestry/api/lepidopterology/IEntityButterfly.java b/src/main/java/forestry/api/lepidopterology/IEntityButterfly.java index be33d41a4..8e9551e04 100644 --- a/src/main/java/forestry/api/lepidopterology/IEntityButterfly.java +++ b/src/main/java/forestry/api/lepidopterology/IEntityButterfly.java @@ -8,7 +8,7 @@ package forestry.api.lepidopterology; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.passive.IAnimals; -import forestry.api.arboriculture.ITree; +import forestry.api.genetics.IIndividual; public interface IEntityButterfly extends IAnimals { @@ -23,7 +23,7 @@ public interface IEntityButterfly extends IAnimals { */ EntityCreature getEntity(); - ITree getPollen(); + IIndividual getPollen(); - void setPollen(ITree pollen); + void setPollen(IIndividual pollen); } diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyTracker.java b/src/main/java/forestry/api/lepidopterology/ILepidopteristTracker.java similarity index 83% rename from src/main/java/forestry/api/lepidopterology/IButterflyTracker.java rename to src/main/java/forestry/api/lepidopterology/ILepidopteristTracker.java index 12ee33d95..befa591d9 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyTracker.java +++ b/src/main/java/forestry/api/lepidopterology/ILepidopteristTracker.java @@ -7,7 +7,7 @@ package forestry.api.lepidopterology; import forestry.api.genetics.IBreedingTracker; -public interface IButterflyTracker extends IBreedingTracker { +public interface ILepidopteristTracker extends IBreedingTracker { void registerCatch(IButterfly butterfly); diff --git a/src/main/java/forestry/api/multiblock/IMultiblockLogic.java b/src/main/java/forestry/api/multiblock/IMultiblockLogic.java index 441b3621f..9e14c2c0b 100644 --- a/src/main/java/forestry/api/multiblock/IMultiblockLogic.java +++ b/src/main/java/forestry/api/multiblock/IMultiblockLogic.java @@ -5,8 +5,6 @@ ******************************************************************************/ package forestry.api.multiblock; -import javax.annotation.Nonnull; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; @@ -71,5 +69,5 @@ public interface IMultiblockLogic extends INbtWritable { * Use this in Tile.writeToNBT() */ @Override - void writeToNBT(@Nonnull NBTTagCompound nbttagcompound); + void writeToNBT(NBTTagCompound nbttagcompound); } diff --git a/src/main/java/forestry/apiculture/BeeHousingListener.java b/src/main/java/forestry/apiculture/BeeHousingListener.java index 657e919ad..f24d8deb1 100644 --- a/src/main/java/forestry/apiculture/BeeHousingListener.java +++ b/src/main/java/forestry/apiculture/BeeHousingListener.java @@ -12,7 +12,7 @@ package forestry.apiculture; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeListener; -import forestry.api.arboriculture.ITree; +import forestry.api.genetics.IIndividual; public class BeeHousingListener implements IBeeListener { private final IBeeHousing beeHousing; @@ -36,7 +36,7 @@ public class BeeHousingListener implements IBeeListener { } @Override - public boolean onPollenRetrieved(ITree pollen) { + public boolean onPollenRetrieved(IIndividual pollen) { for (IBeeListener beeListener : beeHousing.getBeeListeners()) { if (beeListener.onPollenRetrieved(pollen)) { return true; diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 78cb6212a..e001fddfe 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.apiculture; -import javax.annotation.Nonnull; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -35,10 +34,10 @@ import forestry.api.apiculture.IBeeHousingInventory; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingLogic; -import forestry.api.arboriculture.ITree; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorState; import forestry.api.genetics.IEffectData; +import forestry.api.genetics.IIndividual; import forestry.apiculture.network.packets.PacketBeeLogicActive; import forestry.apiculture.network.packets.PacketBeeLogicActiveEntity; import forestry.core.config.Constants; @@ -102,7 +101,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setInteger("BreedingTime", beeProgress); nbttagcompound.setInteger("Throttle", queenWorkCycleThrottle); @@ -493,7 +492,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { private static class PollenHandler { private static final int MAX_POLLINATION_ATTEMPTS = 20; - private ITree pollen; + private IIndividual pollen; private int attemptedPollinations = 0; public void doPollination(IBee queen, IBeeHousing beeHousing, IBeeListener beeListener) { diff --git a/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java b/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java index b41bdd234..9f0ca1c6d 100644 --- a/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.apiculture; -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; @@ -65,7 +63,7 @@ public class FakeBeekeepingLogic implements IBeekeepingLogic { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { } } diff --git a/src/main/java/forestry/apiculture/HasFlowersCache.java b/src/main/java/forestry/apiculture/HasFlowersCache.java index 7612d6828..2e67b722a 100644 --- a/src/main/java/forestry/apiculture/HasFlowersCache.java +++ b/src/main/java/forestry/apiculture/HasFlowersCache.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.apiculture; -import javax.annotation.Nonnull; import java.util.Random; import net.minecraft.nbt.NBTTagCompound; @@ -103,7 +102,7 @@ public class HasFlowersCache implements INbtWritable, INbtReadable { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { NBTTagCompound hasFlowerCacheNBT = new NBTTagCompound(); if (flowerCoords != null) { hasFlowerCacheNBT.setInteger("flowerX", flowerCoords.getX()); diff --git a/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java b/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java index 2d6a1da07..f5a9a06dd 100755 --- a/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java @@ -19,7 +19,7 @@ public class SaveEventHandlerApiculture implements ISaveEventHandler { @Override public void onWorldLoad(World world) { - BeeManager.beeRoot.resetMode(); + BeeManager.beeRoot.resetBeekeepingMode(); } @Override diff --git a/src/main/java/forestry/apiculture/commands/BeeModeHelper.java b/src/main/java/forestry/apiculture/commands/BeeModeHelper.java index a0ceff5a5..e54fe20e9 100644 --- a/src/main/java/forestry/apiculture/commands/BeeModeHelper.java +++ b/src/main/java/forestry/apiculture/commands/BeeModeHelper.java @@ -11,7 +11,6 @@ package forestry.apiculture.commands; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import net.minecraft.world.World; @@ -24,7 +23,7 @@ public class BeeModeHelper implements ICommandModeHelper { @Override public String[] getModeNames() { - Collection beekeepingModes = BeeManager.beeRoot.getModes(); + ArrayList beekeepingModes = BeeManager.beeRoot.getBeekeepingModes(); int modeStringCount = beekeepingModes.size(); List modeStrings = new ArrayList<>(modeStringCount); for (IBeekeepingMode mode : beekeepingModes) { @@ -36,7 +35,7 @@ public class BeeModeHelper implements ICommandModeHelper { @Override public String getModeNameMatching(String desired) { - IBeekeepingMode mode = BeeManager.beeRoot.getMode(desired); + IBeekeepingMode mode = BeeManager.beeRoot.getBeekeepingMode(desired); if (mode == null) { return null; } @@ -45,17 +44,17 @@ public class BeeModeHelper implements ICommandModeHelper { @Override public String getModeName(World world) { - return BeeManager.beeRoot.getMode(world).getName(); + return BeeManager.beeRoot.getBeekeepingMode(world).getName(); } @Override public void setMode(World world, String modeName) { - BeeManager.beeRoot.setMode(world, modeName); + BeeManager.beeRoot.setBeekeepingMode(world, modeName); } @Override public Iterable getDescription(String modeName) { - IBeekeepingMode mode = BeeManager.beeRoot.getMode(modeName); + IBeekeepingMode mode = BeeManager.beeRoot.getBeekeepingMode(modeName); return mode.getDescription(); } diff --git a/src/main/java/forestry/apiculture/commands/CommandBeeGive.java b/src/main/java/forestry/apiculture/commands/CommandBeeGive.java index 8d3e443d7..c8516e8be 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBeeGive.java +++ b/src/main/java/forestry/apiculture/commands/CommandBeeGive.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.apiculture.commands; -import com.google.common.collect.ImmutableMap; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -22,7 +20,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -132,7 +129,7 @@ public class CommandBeeGive extends SubCommand { throw new SpeciesNotFoundException(speciesName); } - ImmutableMap template = BeeManager.beeRoot.getTemplate(species.getUID()); + IAllele[] template = BeeManager.beeRoot.getTemplate(species.getUID()); if (template == null) { throw new TemplateNotFoundException(species); diff --git a/src/main/java/forestry/apiculture/flowers/FlowerProvider.java b/src/main/java/forestry/apiculture/flowers/FlowerProvider.java index 8a5403e54..8e4865a1b 100644 --- a/src/main/java/forestry/apiculture/flowers/FlowerProvider.java +++ b/src/main/java/forestry/apiculture/flowers/FlowerProvider.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.apiculture.flowers; -import javax.annotation.Nonnull; import java.util.EnumSet; import net.minecraft.item.ItemStack; @@ -26,24 +25,22 @@ import forestry.api.genetics.IPollinatable; import forestry.core.utils.StringUtil; public class FlowerProvider implements IFlowerProvider { - @Nonnull + private final String flowerType; - @Nonnull private final String description; - public FlowerProvider(@Nonnull String flowerType, @Nonnull String description) { + public FlowerProvider(String flowerType, String description) { this.flowerType = flowerType; this.description = description; } - @Nonnull @Override public String getFlowerType() { return flowerType; } @Override - public boolean isAcceptedPollinatable(@Nonnull World world, @Nonnull IPollinatable pollinatable) { + public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) { EnumSet plantTypes = pollinatable.getPlantType(); @@ -57,13 +54,11 @@ public class FlowerProvider implements IFlowerProvider { } } - @Nonnull @Override public String getDescription() { return StringUtil.localize(this.description); } - @Nonnull @Override public ItemStack[] affectProducts(World world, IIndividual individual, BlockPos pos, ItemStack[] products) { return products; diff --git a/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java b/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java index 687f37ef4..d971f6df2 100755 --- a/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java +++ b/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java @@ -13,15 +13,15 @@ package forestry.apiculture.genetics; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IApiaristTracker; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import forestry.core.genetics.BreedingTracker; -public class ApiaristTracker extends BreedingTracker implements IApiaristTracker { +public class ApiaristTracker extends BreedingTracker implements IApiaristTracker { /** Required for creation from map storage */ public ApiaristTracker(String s) { @@ -55,13 +55,13 @@ public class ApiaristTracker extends BreedingTracker implements I } @Override - public void registerPickup(IIndividual individual) { - ISpeciesRoot speciesRoot = individual.getGenome().getPrimary().getRoot(); + public void registerPickup(IIndividual individual) { + ISpeciesRoot speciesRoot = individual.getGenome().getPrimary().getRoot(); if (!speciesRoot.getUID().equals(speciesRootUID())) { return; } - if (!individual.isPureBred(BeeChromosome.SPECIES)) { + if (!individual.isPureBred(EnumBeeChromosome.SPECIES)) { return; } @@ -73,7 +73,7 @@ public class ApiaristTracker extends BreedingTracker implements I } @Override - public void registerQueen(IIndividual bee) { + public void registerQueen(IIndividual bee) { queensTotal++; } @@ -83,7 +83,8 @@ public class ApiaristTracker extends BreedingTracker implements I } @Override - public void registerPrincess(IIndividual bee) { + public void registerPrincess(IIndividual bee) { + princessesTotal++; registerBirth(bee); } @@ -94,7 +95,7 @@ public class ApiaristTracker extends BreedingTracker implements I } @Override - public void registerDrone(IIndividual bee) { + public void registerDrone(IIndividual bee) { dronesTotal++; registerBirth(bee); } @@ -105,7 +106,7 @@ public class ApiaristTracker extends BreedingTracker implements I } @Override - protected IBreedingTracker getBreedingTracker(EntityPlayer player) { + protected IBreedingTracker getBreedingTracker(EntityPlayer player) { return BeeManager.beeRoot.getBreedingTracker(player.worldObj, player.getGameProfile()); } diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index a5d754a27..d38cf8714 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import com.google.common.collect.ImmutableMap; - import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; @@ -30,17 +28,20 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import forestry.api.apiculture.BeeChromosome; +import com.mojang.authlib.GameProfile; + import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.FlowerManager; import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IApiaristTracker; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IBeeMutation; import forestry.api.apiculture.IBeekeepingMode; -import forestry.api.arboriculture.ITree; import forestry.api.core.BiomeHelper; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; @@ -53,11 +54,14 @@ import forestry.api.genetics.IChromosome; import forestry.api.genetics.IEffectData; import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; import forestry.api.genetics.IPollinatable; import forestry.arboriculture.genetics.pollination.FakePollinatable; import forestry.arboriculture.genetics.pollination.ICheckPollinatable; +import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; +import forestry.core.genetics.Chromosome; import forestry.core.genetics.GenericRatings; import forestry.core.genetics.IndividualLiving; import forestry.core.utils.GeneticsUtil; @@ -65,7 +69,7 @@ import forestry.core.utils.Log; import forestry.core.utils.StringUtil; import forestry.core.utils.vect.Vect; -public class Bee extends IndividualLiving implements IBee { +public class Bee extends IndividualLiving implements IBee { private int generation; private boolean isNatural = true; @@ -115,7 +119,7 @@ public class Bee extends IndividualLiving implements IBee { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { super.writeToNBT(nbttagcompound); @@ -169,7 +173,7 @@ public class Bee extends IndividualLiving implements IBee { return storedData; } - IAlleleBeeEffect secondary = (IAlleleBeeEffect) genome.getInactiveAllele(BeeChromosome.EFFECT); + IAlleleBeeEffect secondary = (IAlleleBeeEffect) genome.getInactiveAllele(EnumBeeChromosome.EFFECT); if (!secondary.isCombinable()) { return storedData; } @@ -199,7 +203,7 @@ public class Bee extends IndividualLiving implements IBee { return storedData; } - IAlleleBeeEffect secondary = (IAlleleBeeEffect) genome.getInactiveAllele(BeeChromosome.EFFECT); + IAlleleBeeEffect secondary = (IAlleleBeeEffect) genome.getInactiveAllele(EnumBeeChromosome.EFFECT); if (!secondary.isCombinable()) { return storedData; } @@ -370,7 +374,7 @@ public class Bee extends IndividualLiving implements IBee { // You analyzed it? Juicy tooltip coming up! IAlleleBeeSpecies primary = genome.getPrimary(); IAlleleBeeSpecies secondary = genome.getSecondary(); - if (!isPureBred(BeeChromosome.SPECIES)) { + if (!isPureBred(EnumBeeChromosome.SPECIES)) { list.add(EnumChatFormatting.BLUE + StringUtil.localize("bees.hybrid").replaceAll("%PRIMARY", primary.getName()).replaceAll("%SECONDARY", secondary.getName())); } @@ -390,9 +394,9 @@ public class Bee extends IndividualLiving implements IBee { list.add(generationString); } - IAllele speedAllele = genome.getActiveAllele(BeeChromosome.SPEED); - IAlleleTolerance tempToleranceAllele = (IAlleleTolerance) getGenome().getActiveAllele(BeeChromosome.TEMPERATURE_TOLERANCE); - IAlleleTolerance humidToleranceAllele = (IAlleleTolerance) getGenome().getActiveAllele(BeeChromosome.HUMIDITY_TOLERANCE); + IAllele speedAllele = genome.getActiveAllele(EnumBeeChromosome.SPEED); + IAlleleTolerance tempToleranceAllele = (IAlleleTolerance) getGenome().getActiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE); + IAlleleTolerance humidToleranceAllele = (IAlleleTolerance) getGenome().getActiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE); String unlocalizedCustomSpeed = "tooltip.worker." + speedAllele.getUnlocalizedName().replaceAll("(.*)\\.", ""); String speed; @@ -402,7 +406,7 @@ public class Bee extends IndividualLiving implements IBee { speed = speedAllele.getName() + ' ' + StringUtil.localize("gui.worker"); } - String lifespan = genome.getActiveAllele(BeeChromosome.LIFESPAN).getName() + ' ' + StringUtil.localize("gui.life"); + String lifespan = genome.getActiveAllele(EnumBeeChromosome.LIFESPAN).getName() + ' ' + StringUtil.localize("gui.life"); String tempTolerance = EnumChatFormatting.GREEN + "T: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getTemperature()) + " / " + tempToleranceAllele.getName(); String humidTolerance = EnumChatFormatting.GREEN + "H: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getHumidity()) + " / " + humidToleranceAllele.getName(); String flowers = genome.getFlowerProvider().getDescription(); @@ -424,7 +428,7 @@ public class Bee extends IndividualLiving implements IBee { @Override public void age(World world, float housingLifespanModifier) { - IBeekeepingMode mode = BeeManager.beeRoot.getMode(world); + IBeekeepingMode mode = BeeManager.beeRoot.getBeekeepingMode(world); IBeeModifier beeModifier = mode.getBeeModifier(); float finalModifier = housingLifespanModifier * beeModifier.getLifespanModifier(genome, mate, housingLifespanModifier); @@ -474,7 +478,7 @@ public class Bee extends IndividualLiving implements IBee { Log.warning("Failed to produce in an apiary because the beehousing was null."); return null; } - IBeekeepingMode mode = BeeManager.beeRoot.getMode(housing.getWorld()); + IBeekeepingMode mode = BeeManager.beeRoot.getBeekeepingMode(housing.getWorld()); if (mode == null) { Log.warning("Failed to produce in an apiary because the beekeeping mode was null."); return null; @@ -524,13 +528,22 @@ public class Bee extends IndividualLiving implements IBee { } /* REPRODUCTION */ - @Nullable @Override public IBee spawnPrincess(IBeeHousing housing) { + + // We need a mated queen to produce offspring. + if (mate == null) { + return null; + } + + // Fatigued queens do not produce princesses. + if (BeeManager.beeRoot.getBeekeepingMode(housing.getWorld()).isFatigued(this, housing)) { + return null; + } + return createOffspring(housing, getGeneration() + 1); } - @Nullable @Override public IBee[] spawnDrones(IBeeHousing housing) { @@ -544,7 +557,8 @@ public class Bee extends IndividualLiving implements IBee { List bees = new ArrayList<>(); BlockPos housingPos = housing.getCoordinates(); - int toCreate = BeeManager.beeRoot.getMode(world).getFinalFertility(this, world, housingPos); + int toCreate = BeeManager.beeRoot.getBeekeepingMode(world).getFinalFertility(this, world, housingPos); + if (toCreate <= 0) { toCreate = 1; } @@ -564,26 +578,93 @@ public class Bee extends IndividualLiving implements IBee { } } - @Nullable private IBee createOffspring(IBeeHousing housing, int generation) { - // We need a mated queen to produce offspring. - if (mate == null) { - return null; + + World world = housing.getWorld(); + + IChromosome[] chromosomes = new IChromosome[genome.getChromosomes().length]; + IChromosome[] parent1 = genome.getChromosomes(); + IChromosome[] parent2 = mate.getChromosomes(); + + // Check for mutation. Replace one of the parents with the mutation + // template if mutation occured. + IChromosome[] mutated1 = mutateSpecies(housing, genome, mate); + if (mutated1 != null) { + parent1 = mutated1; + } + IChromosome[] mutated2 = mutateSpecies(housing, mate, genome); + if (mutated2 != null) { + parent2 = mutated2; } - // Fatigued queens do not produce princesses. - if (BeeManager.beeRoot.getMode(housing.getWorld()).isFatigued(this, housing)) { - return null; + for (int i = 0; i < parent1.length; i++) { + if (parent1[i] != null && parent2[i] != null) { + chromosomes[i] = Chromosome.inheritChromosome(world.rand, parent1[i], parent2[i]); + } } - ImmutableMap chromosomes = createOffspringChromosomes(housing.getWorld(), housing.getOwner(), housing.getCoordinates(), genome, mate); - IBeeGenome genome = BeeManager.beeRoot.chromosomesAsGenome(chromosomes); - return new Bee(genome, isNatural, generation); + IBeekeepingMode mode = BeeManager.beeRoot.getBeekeepingMode(world); + return new Bee(new BeeGenome(chromosomes), mode.isNaturalOffspring(this), generation); + } + + private static IChromosome[] mutateSpecies(IBeeHousing housing, IBeeGenome genomeOne, IBeeGenome genomeTwo) { + + World world = housing.getWorld(); + + IChromosome[] parent1 = genomeOne.getChromosomes(); + IChromosome[] parent2 = genomeTwo.getChromosomes(); + + IBeeGenome genome0; + IBeeGenome genome1; + + IAlleleBeeSpecies allele0; + IAlleleBeeSpecies allele1; + + if (world.rand.nextBoolean()) { + allele0 = (IAlleleBeeSpecies) parent1[EnumBeeChromosome.SPECIES.ordinal()].getPrimaryAllele(); + allele1 = (IAlleleBeeSpecies) parent2[EnumBeeChromosome.SPECIES.ordinal()].getSecondaryAllele(); + + genome0 = genomeOne; + genome1 = genomeTwo; + } else { + allele0 = (IAlleleBeeSpecies) parent2[EnumBeeChromosome.SPECIES.ordinal()].getPrimaryAllele(); + allele1 = (IAlleleBeeSpecies) parent1[EnumBeeChromosome.SPECIES.ordinal()].getSecondaryAllele(); + + genome0 = genomeTwo; + genome1 = genomeOne; + } + + GameProfile playerProfile = housing.getOwner(); + IApiaristTracker breedingTracker = BeeManager.beeRoot.getBreedingTracker(world, playerProfile); + + List combinations = BeeManager.beeRoot.getCombinations(allele0, allele1, true); + for (IMutation mutation : combinations) { + IBeeMutation beeMutation = (IBeeMutation) mutation; + + float chance = beeMutation.getChance(housing, allele0, allele1, genome0, genome1); + if (chance <= 0) { + continue; + } + + // boost chance for researched mutations + if (breedingTracker.isResearched(beeMutation)) { + float mutationBoost = chance * (Config.researchMutationBoostMultiplier - 1.0f); + mutationBoost = Math.min(Config.maxResearchMutationBoostPercent, mutationBoost); + chance += mutationBoost; + } + + if (chance > world.rand.nextFloat() * 100) { + breedingTracker.registerMutation(mutation); + return BeeManager.beeRoot.templateAsChromosomes(mutation.getTemplate()); + } + } + + return null; } /* FLOWERS */ @Override - public ITree retrievePollen(IBeeHousing housing) { + public IIndividual retrievePollen(IBeeHousing housing) { IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); @@ -601,7 +682,7 @@ public class Bee extends IndividualLiving implements IBee { Vect offset = new Vect(-area.getX() / 2, -area.getY() / 4, -area.getZ() / 2); Vect housingPos = new Vect(housing.getCoordinates()); - ITree pollen = null; + IIndividual pollen = null; for (int i = 0; i < 20; i++) { Vect randomPos = Vect.getRandomPositionInArea(random, area); @@ -626,7 +707,7 @@ public class Bee extends IndividualLiving implements IBee { } @Override - public boolean pollinateRandom(IBeeHousing housing, ITree pollen) { + public boolean pollinateRandom(IBeeHousing housing, IIndividual pollen) { IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); diff --git a/src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java b/src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java index e47c5fcab..0735eb173 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java @@ -1,13 +1,10 @@ package forestry.apiculture.genetics; -import com.google.common.collect.ImmutableMap; - -import java.util.EnumMap; +import java.util.Arrays; import java.util.Locale; -import java.util.Map; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; import forestry.apiculture.genetics.alleles.AlleleEffect; @@ -15,104 +12,104 @@ import forestry.core.genetics.IBranchDefinition; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; -public enum BeeBranchDefinition implements IBranchDefinition { +public enum BeeBranchDefinition implements IBranchDefinition { HONEY("Apis"), NOBLE("Probapis"), INDUSTRIOUS("Industrapis"), HEROIC("Herapis"), INFERNAL("Diapis") { @Override - protected void setBranchProperties(Map alleles) { - AlleleHelper.instance.set(alleles, BeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_2); - AlleleHelper.instance.set(alleles, BeeChromosome.NEVER_SLEEPS, true); - AlleleHelper.instance.set(alleles, BeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.NETHER); - AlleleHelper.instance.set(alleles, BeeChromosome.FLOWERING, EnumAllele.Flowering.AVERAGE); + protected void setBranchProperties(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_2); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.NEVER_SLEEPS, true); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.NETHER); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.AVERAGE); } }, AUSTERE("Modapis") { @Override - protected void setBranchProperties(Map alleles) { - AlleleHelper.instance.set(alleles, BeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, BeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, BeeChromosome.NEVER_SLEEPS, true); - AlleleHelper.instance.set(alleles, BeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.CACTI); + protected void setBranchProperties(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.NEVER_SLEEPS, true); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.CACTI); } }, TROPICAL("Caldapis") { @Override - protected void setBranchProperties(Map alleles) { - AlleleHelper.instance.set(alleles, BeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, BeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, BeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE); - AlleleHelper.instance.set(alleles, BeeChromosome.EFFECT, AlleleEffect.effectMiasmic); + protected void setBranchProperties(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.EFFECT, AlleleEffect.effectMiasmic); } }, END("Finapis") { @Override - protected void setBranchProperties(Map alleles) { - AlleleHelper.instance.set(alleles, BeeChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(alleles, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); - AlleleHelper.instance.set(alleles, BeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, BeeChromosome.TERRITORY, EnumAllele.Territory.LARGE); - AlleleHelper.instance.set(alleles, BeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.END); - AlleleHelper.instance.set(alleles, BeeChromosome.NEVER_SLEEPS, true); - AlleleHelper.instance.set(alleles, BeeChromosome.EFFECT, AlleleEffect.effectMisanthrope); + protected void setBranchProperties(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGE); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.END); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.NEVER_SLEEPS, true); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.EFFECT, AlleleEffect.effectMisanthrope); } }, FROZEN("Coagapis") { @Override - protected void setBranchProperties(Map alleles) { - AlleleHelper.instance.set(alleles, BeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, BeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, BeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.SNOW); - AlleleHelper.instance.set(alleles, BeeChromosome.EFFECT, AlleleEffect.effectGlacial); + protected void setBranchProperties(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.SNOW); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.EFFECT, AlleleEffect.effectGlacial); } }, VENGEFUL("Punapis") { @Override - protected void setBranchProperties(Map alleles) { - AlleleHelper.instance.set(alleles, BeeChromosome.TERRITORY, EnumAllele.Territory.LARGEST); - AlleleHelper.instance.set(alleles, BeeChromosome.EFFECT, AlleleEffect.effectRadioactive); + protected void setBranchProperties(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGEST); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.EFFECT, AlleleEffect.effectRadioactive); } }, FESTIVE("Festapis") { @Override - protected void setBranchProperties(Map alleles) { - AlleleHelper.instance.set(alleles, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(alleles, BeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); - AlleleHelper.instance.set(alleles, BeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); + protected void setBranchProperties(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); } }, AGRARIAN("Rustapis") { @Override - protected void setBranchProperties(Map alleles) { - AlleleHelper.instance.set(alleles, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(alleles, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); - AlleleHelper.instance.set(alleles, BeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.WHEAT); - AlleleHelper.instance.set(alleles, BeeChromosome.FLOWERING, EnumAllele.Flowering.FASTER); + protected void setBranchProperties(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.WHEAT); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.FASTER); } }, BOGGY("Paludapis") { @Override - protected void setBranchProperties(Map alleles) { - AlleleHelper.instance.set(alleles, BeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.MUSHROOMS); - AlleleHelper.instance.set(alleles, BeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWER); - AlleleHelper.instance.set(alleles, BeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + protected void setBranchProperties(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.MUSHROOMS); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWER); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); } }, MONASTIC("Monapis") { @Override - protected void setBranchProperties(Map alleles) { - AlleleHelper.instance.set(alleles, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(alleles, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(alleles, BeeChromosome.FERTILITY, EnumAllele.Fertility.LOW); - AlleleHelper.instance.set(alleles, BeeChromosome.FLOWERING, EnumAllele.Flowering.FASTER); - AlleleHelper.instance.set(alleles, BeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, BeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); - AlleleHelper.instance.set(alleles, BeeChromosome.CAVE_DWELLING, true); - AlleleHelper.instance.set(alleles, BeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.WHEAT); + protected void setBranchProperties(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.FASTER); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.CAVE_DWELLING, true); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.WHEAT); } }; @@ -122,13 +119,13 @@ public enum BeeBranchDefinition implements IBranchDefinition { branch = BeeManager.beeFactory.createBranch(this.name().toLowerCase(Locale.ENGLISH), scientific); } - protected void setBranchProperties(Map template) { + protected void setBranchProperties(IAllele[] template) { } @Override - public final Map getTemplate() { - Map template = getDefaultTemplate(); + public final IAllele[] getTemplate() { + IAllele[] template = getDefaultTemplate(); setBranchProperties(template); return template; } @@ -138,27 +135,25 @@ public enum BeeBranchDefinition implements IBranchDefinition { return branch; } - private static ImmutableMap defaultTemplate; + private static IAllele[] defaultTemplate; - private static Map getDefaultTemplate() { + private static IAllele[] getDefaultTemplate() { if (defaultTemplate == null) { - Map defaultTemplateBuilder = new EnumMap<>(BeeChromosome.class); - AlleleHelper.instance.set(defaultTemplateBuilder, BeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); - AlleleHelper.instance.set(defaultTemplateBuilder, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); - AlleleHelper.instance.set(defaultTemplateBuilder, BeeChromosome.FERTILITY, EnumAllele.Fertility.NORMAL); - AlleleHelper.instance.set(defaultTemplateBuilder, BeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE); - AlleleHelper.instance.set(defaultTemplateBuilder, BeeChromosome.NEVER_SLEEPS, false); - AlleleHelper.instance.set(defaultTemplateBuilder, BeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE); - AlleleHelper.instance.set(defaultTemplateBuilder, BeeChromosome.TOLERANT_FLYER, false); - AlleleHelper.instance.set(defaultTemplateBuilder, BeeChromosome.CAVE_DWELLING, false); - AlleleHelper.instance.set(defaultTemplateBuilder, BeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.VANILLA); - AlleleHelper.instance.set(defaultTemplateBuilder, BeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWEST); - AlleleHelper.instance.set(defaultTemplateBuilder, BeeChromosome.TERRITORY, EnumAllele.Territory.AVERAGE); - AlleleHelper.instance.set(defaultTemplateBuilder, BeeChromosome.EFFECT, AlleleEffect.effectNone); + defaultTemplate = new IAllele[EnumBeeChromosome.values().length]; - defaultTemplate = ImmutableMap.copyOf(defaultTemplateBuilder); + AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); + AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); + AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.NORMAL); + AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE); + AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.NEVER_SLEEPS, false); + AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE); + AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.TOLERANT_FLYER, false); + AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.CAVE_DWELLING, false); + AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.VANILLA); + AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWEST); + AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.AVERAGE); + AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.EFFECT, AlleleEffect.effectNone); } - - return new EnumMap<>(defaultTemplate); + return Arrays.copyOf(defaultTemplate, defaultTemplate.length); } } diff --git a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java index 5d3e8fe35..10d9ed884 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java @@ -10,12 +10,10 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import com.google.common.collect.ImmutableMap; - import java.awt.Color; +import java.util.Arrays; import java.util.EnumSet; import java.util.Locale; -import java.util.Map; import org.apache.commons.lang3.text.WordUtils; @@ -24,14 +22,13 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.BiomeDictionary; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IAlleleBeeSpeciesBuilder; +import forestry.api.apiculture.IAlleleBeeSpeciesCustom; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeMutationBuilder; +import forestry.api.apiculture.IBeeMutationCustom; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; @@ -47,56 +44,46 @@ public enum BeeDefinition implements IBeeDefinition { /* HONEY BRANCH */ FOREST(BeeBranchDefinition.HONEY, "nigrocincta", true, new Color(0x19d0ec), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWER); - AlleleHelper.instance.set(template, BeeChromosome.FERTILITY, EnumAllele.Fertility.HIGH); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.HIGH); } @Override protected void registerMutations() { // found in hives } - - @Override - protected boolean isShownInCreative() { - return true; - } }, MEADOWS(BeeBranchDefinition.HONEY, "florea", true, new Color(0xef131e), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWER); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWER); } @Override protected void registerMutations() { // found in hives } - - @Override - protected boolean isShownInCreative() { - return true; - } }, COMMON(BeeBranchDefinition.HONEY, "cerana", true, new Color(0xb2b2b2), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.35f); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); } @Override @@ -112,14 +99,14 @@ public enum BeeDefinition implements IBeeDefinition { }, CULTIVATED(BeeBranchDefinition.HONEY, "mellifera", true, new Color(0x5734ec), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.FAST); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); } @Override @@ -133,15 +120,15 @@ public enum BeeDefinition implements IBeeDefinition { /* NOBLE BRANCH */ NOBLE(BeeBranchDefinition.NOBLE, "nobilis", false, new Color(0xec9a19), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); - AlleleHelper.instance.set(template, BeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW); } @Override @@ -151,15 +138,15 @@ public enum BeeDefinition implements IBeeDefinition { }, MAJESTIC(BeeBranchDefinition.NOBLE, "regalis", true, new Color(0x7f0000), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.30f); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.NORMAL); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); - AlleleHelper.instance.set(template, BeeChromosome.FERTILITY, EnumAllele.Fertility.MAXIMUM); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.NORMAL); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); + AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.MAXIMUM); } @Override @@ -169,17 +156,17 @@ public enum BeeDefinition implements IBeeDefinition { }, IMPERIAL(BeeBranchDefinition.NOBLE, "imperatorius", false, new Color(0xa3e02f), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f) .addProduct(PluginApiculture.items.royalJelly.getItemStack(), 0.15f) .setHasEffect(); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectBeatific); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectBeatific); } @Override @@ -191,15 +178,15 @@ public enum BeeDefinition implements IBeeDefinition { /* INDUSTRIOUS BRANCH */ DILIGENT(BeeBranchDefinition.INDUSTRIOUS, "sedulus", false, new Color(0xc219ec), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); - AlleleHelper.instance.set(template, BeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW); } @Override @@ -209,14 +196,14 @@ public enum BeeDefinition implements IBeeDefinition { }, UNWEARY(BeeBranchDefinition.INDUSTRIOUS, "assiduus", true, new Color(0x19ec5a), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.STRINGY, 1), 0.30f); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.NORMAL); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.NORMAL); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTENED); } @Override @@ -226,17 +213,17 @@ public enum BeeDefinition implements IBeeDefinition { }, INDUSTRIOUS(BeeBranchDefinition.INDUSTRIOUS, "industria", false, new Color(0xffffff), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f) .addProduct(PluginApiculture.items.pollenCluster.get(EnumPollenCluster.NORMAL, 1), 0.15f) .setHasEffect(); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); - AlleleHelper.instance.set(template, BeeChromosome.FLOWERING, EnumAllele.Flowering.FAST); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); + AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.FAST); } @Override @@ -248,17 +235,17 @@ public enum BeeDefinition implements IBeeDefinition { /* HEROIC BRANCH */ STEADFAST(BeeBranchDefinition.HEROIC, "legio", false, new Color(0x4d2b15), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.COCOA, 1), 0.20f) .setHasEffect(); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); - AlleleHelper.instance.set(template, BeeChromosome.NEVER_SLEEPS, true); - AlleleHelper.instance.set(template, BeeChromosome.CAVE_DWELLING, true); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); + AlleleHelper.instance.set(template, EnumBeeChromosome.NEVER_SLEEPS, true); + AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true); } @Override @@ -268,17 +255,17 @@ public enum BeeDefinition implements IBeeDefinition { }, VALIANT(BeeBranchDefinition.HEROIC, "centurio", true, new Color(0x626bdd), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.COCOA, 1), 0.30f) .addSpecialty(new ItemStack(Items.sugar), 0.15f); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOW); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(template, BeeChromosome.NEVER_SLEEPS, true); - AlleleHelper.instance.set(template, BeeChromosome.CAVE_DWELLING, true); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOW); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.instance.set(template, EnumBeeChromosome.NEVER_SLEEPS, true); + AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true); } @Override @@ -288,18 +275,18 @@ public enum BeeDefinition implements IBeeDefinition { }, HEROIC(BeeBranchDefinition.HEROIC, "kraphti", false, new Color(0xb3d5e4), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.COCOA, 1), 0.40f) .setHasEffect(); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOW); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(template, BeeChromosome.NEVER_SLEEPS, true); - AlleleHelper.instance.set(template, BeeChromosome.CAVE_DWELLING, true); - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectHeroic); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOW); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.instance.set(template, EnumBeeChromosome.NEVER_SLEEPS, true); + AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectHeroic); } @Override @@ -312,17 +299,17 @@ public enum BeeDefinition implements IBeeDefinition { /* INFERNAL BRANCH */ SINISTER(BeeBranchDefinition.INFERNAL, "caecus", false, new Color(0xb3d5e4), new Color(0x9a2323)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f) .setTemperature(EnumTemperature.HELLISH) .setHumidity(EnumHumidity.ARID); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectAggressive); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectAggressive); } @Override @@ -335,7 +322,7 @@ public enum BeeDefinition implements IBeeDefinition { }, FIENDISH(BeeBranchDefinition.INFERNAL, "diabolus", true, new Color(0xd7bee5), new Color(0x9a2323)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.55f) .addProduct(PluginCore.items.ash.getItemStack(), 0.15f) .setTemperature(EnumTemperature.HELLISH) @@ -343,10 +330,10 @@ public enum BeeDefinition implements IBeeDefinition { } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.NORMAL); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectAggressive); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.NORMAL); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectAggressive); } @Override @@ -359,7 +346,7 @@ public enum BeeDefinition implements IBeeDefinition { }, DEMONIC(BeeBranchDefinition.INFERNAL, "draco", false, new Color(0xf4e400), new Color(0x9a2323)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f) .addProduct(new ItemStack(Items.glowstone_dust), 0.15f) .setHasEffect() @@ -368,10 +355,10 @@ public enum BeeDefinition implements IBeeDefinition { } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectIgnition); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectIgnition); } @Override @@ -384,40 +371,35 @@ public enum BeeDefinition implements IBeeDefinition { /* AUSTERE BRANCH */ MODEST(BeeBranchDefinition.AUSTERE, "modicus", false, new Color(0xc5be86), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f) .setTemperature(EnumTemperature.HOT) .setHumidity(EnumHumidity.ARID); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); } @Override protected void registerMutations() { // found in hives } - - @Override - protected boolean isShownInCreative() { - return true; - } }, FRUGAL(BeeBranchDefinition.AUSTERE, "permodestus", true, new Color(0xe8dcb1), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.PARCHED, 1), 0.30f) .setTemperature(EnumTemperature.HOT) .setHumidity(EnumHumidity.ARID); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.NORMAL); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.NORMAL); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); } @Override @@ -432,7 +414,7 @@ public enum BeeDefinition implements IBeeDefinition { }, AUSTERE(BeeBranchDefinition.AUSTERE, "correpere", false, new Color(0xfffac2), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f) .addSpecialty(PluginApiculture.items.beeComb.get(EnumHoneyComb.POWDERY, 1), 0.50f) .setHasEffect() @@ -441,11 +423,11 @@ public enum BeeDefinition implements IBeeDefinition { } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); - AlleleHelper.instance.set(template, BeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_2); - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectCreeper); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_2); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectCreeper); } @Override @@ -459,40 +441,35 @@ public enum BeeDefinition implements IBeeDefinition { /* TROPICAL BRANCH */ TROPICAL(BeeBranchDefinition.TROPICAL, "mendelia", false, new Color(0x378020), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f) .setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); } @Override protected void registerMutations() { // found in hives } - - @Override - protected boolean isShownInCreative() { - return true; - } }, EXOTIC(BeeBranchDefinition.TROPICAL, "darwini", true, new Color(0x304903), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f) .setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.NORMAL); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.NORMAL); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); } @Override @@ -502,7 +479,7 @@ public enum BeeDefinition implements IBeeDefinition { }, EDENIC(BeeBranchDefinition.TROPICAL, "humboldti", false, new Color(0x393d0d), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f) .setHasEffect() .setTemperature(EnumTemperature.WARM) @@ -510,11 +487,11 @@ public enum BeeDefinition implements IBeeDefinition { } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); - AlleleHelper.instance.set(template, BeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectExploration); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectExploration); } @Override @@ -526,13 +503,13 @@ public enum BeeDefinition implements IBeeDefinition { /* END BRANCH */ ENDED(BeeBranchDefinition.END, "notchi", false, new Color(0xe079fa), new Color(0xd9de9e)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.30f) .setTemperature(EnumTemperature.COLD); } @Override - protected void setAlleles(Map template) { + protected void setAlleles(IAllele[] template) { } @@ -543,14 +520,14 @@ public enum BeeDefinition implements IBeeDefinition { }, SPECTRAL(BeeBranchDefinition.END, "idolum", true, new Color(0xa98bed), new Color(0xd9de9e)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.50f) .setTemperature(EnumTemperature.COLD); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectReanimation); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectReanimation); } @Override @@ -560,17 +537,17 @@ public enum BeeDefinition implements IBeeDefinition { }, PHANTASMAL(BeeBranchDefinition.END, "lemur", false, new Color(0xcc00fa), new Color(0xd9de9e)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.40f) .setHasEffect() .setTemperature(EnumTemperature.COLD); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST); - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectResurrection); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectResurrection); } @Override @@ -582,40 +559,35 @@ public enum BeeDefinition implements IBeeDefinition { /* FROZEN BRANCH */ WINTRY(BeeBranchDefinition.FROZEN, "brumalis", false, new Color(0xa0ffc8), new Color(0xdaf5f3)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f) .setTemperature(EnumTemperature.ICY); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); - AlleleHelper.instance.set(template, BeeChromosome.FERTILITY, EnumAllele.Fertility.MAXIMUM); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.MAXIMUM); } @Override protected void registerMutations() { // found in hives } - - @Override - protected boolean isShownInCreative() { - return true; - } }, ICY(BeeBranchDefinition.FROZEN, "coagulis", true, new Color(0xa0ffff), new Color(0xdaf5f3)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f) .addProduct(PluginCore.items.craftingMaterial.getIceShard(1), 0.20f) .setTemperature(EnumTemperature.ICY); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOW); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOW); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); } @Override @@ -626,7 +598,7 @@ public enum BeeDefinition implements IBeeDefinition { }, GLACIAL(BeeBranchDefinition.FROZEN, "glacialis", false, new Color(0xefffff), new Color(0xdaf5f3)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f) .addProduct(PluginCore.items.craftingMaterial.getIceShard(1), 0.40f) .setTemperature(EnumTemperature.ICY) @@ -634,9 +606,9 @@ public enum BeeDefinition implements IBeeDefinition { } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); } @Override @@ -649,15 +621,15 @@ public enum BeeDefinition implements IBeeDefinition { /* VENGEFUL BRANCH */ VINDICTIVE(BeeBranchDefinition.VENGEFUL, "ultio", false, new Color(0xeafff3), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.25f) .setIsNotCounted(); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); } @Override @@ -667,15 +639,15 @@ public enum BeeDefinition implements IBeeDefinition { }, VENGEFUL(BeeBranchDefinition.VENGEFUL, "punire", false, new Color(0xc2de00), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f) .setIsNotCounted(); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.NORMAL); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.NORMAL); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); } @Override @@ -686,16 +658,16 @@ public enum BeeDefinition implements IBeeDefinition { }, AVENGING(BeeBranchDefinition.VENGEFUL, "hostimentum", false, new Color(0xddff00), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f) .setHasEffect() .setIsNotCounted(); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); - AlleleHelper.instance.set(template, BeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST); } @Override @@ -708,7 +680,7 @@ public enum BeeDefinition implements IBeeDefinition { // Easter LEPORINE(BeeBranchDefinition.FESTIVE, "lepus", false, new Color(0xfeff8f), new Color(0x3cd757)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f) .addProduct(new ItemStack(Items.egg), 0.10f) .setHasEffect() @@ -716,8 +688,8 @@ public enum BeeDefinition implements IBeeDefinition { } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectFestiveEaster); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectFestiveEaster); } @Override @@ -730,7 +702,7 @@ public enum BeeDefinition implements IBeeDefinition { // Christmas MERRY(BeeBranchDefinition.FESTIVE, "feliciter", false, new Color(0xffffff), new Color(0xd40000)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f) .addProduct(PluginCore.items.craftingMaterial.getIceShard(1), 0.20f) .setTemperature(EnumTemperature.ICY) @@ -739,9 +711,9 @@ public enum BeeDefinition implements IBeeDefinition { } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.NEVER_SLEEPS, true); - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectSnowing); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.NEVER_SLEEPS, true); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectSnowing); } @Override @@ -754,7 +726,7 @@ public enum BeeDefinition implements IBeeDefinition { // New Year TIPSY(BeeBranchDefinition.FESTIVE, "ebrius", false, new Color(0xffffff), new Color(0xc219ec)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f) .addProduct(PluginCore.items.craftingMaterial.getIceShard(1), 0.20f) .setTemperature(EnumTemperature.ICY) @@ -763,9 +735,9 @@ public enum BeeDefinition implements IBeeDefinition { } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.NEVER_SLEEPS, true); - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectDrunkard); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.NEVER_SLEEPS, true); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectDrunkard); } @Override @@ -779,7 +751,7 @@ public enum BeeDefinition implements IBeeDefinition { // Halloween TRICKY(BeeBranchDefinition.FESTIVE, "libita", false, new Color(0x49413B), new Color(0xFF6A00)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f) .addProduct(new ItemStack(Items.cookie), 0.15f) .addSpecialty(new ItemStack(Items.skull, 1, 0), 0.02f) @@ -791,10 +763,10 @@ public enum BeeDefinition implements IBeeDefinition { } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.NEVER_SLEEPS, true); - AlleleHelper.instance.set(template, BeeChromosome.TOLERANT_FLYER, true); - AlleleHelper.instance.set(template, BeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.GOURD); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.NEVER_SLEEPS, true); + AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true); + AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.GOURD); } @Override @@ -809,12 +781,12 @@ public enum BeeDefinition implements IBeeDefinition { /* AGRARIAN BRANCH */ RURAL(BeeBranchDefinition.AGRARIAN, "rustico", false, new Color(0xfeff8f), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.20f); } @Override - protected void setAlleles(Map template) { + protected void setAlleles(IAllele[] template) { } @@ -826,14 +798,14 @@ public enum BeeDefinition implements IBeeDefinition { }, FARMERLY(BeeBranchDefinition.AGRARIAN, "arator", true, new Color(0xD39728), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.27f); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOW); - AlleleHelper.instance.set(template, BeeChromosome.TERRITORY, EnumAllele.Territory.LARGE); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOW); + AlleleHelper.instance.set(template, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGE); } @Override @@ -844,17 +816,17 @@ public enum BeeDefinition implements IBeeDefinition { }, AGRARIAN(BeeBranchDefinition.AGRARIAN, "arator", true, new Color(0xFFCA75), new Color(0xFFE047)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.35f) .setHasEffect(); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.SPEED, EnumAllele.Speed.SLOW); - AlleleHelper.instance.set(template, BeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2); - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectFertile); - AlleleHelper.instance.set(template, BeeChromosome.TERRITORY, EnumAllele.Territory.LARGE); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOW); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectFertile); + AlleleHelper.instance.set(template, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGE); } @Override @@ -867,13 +839,13 @@ public enum BeeDefinition implements IBeeDefinition { /* BOGGY BRANCH */ MARSHY(BeeBranchDefinition.BOGGY, "adorasti", true, new Color(0x546626), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MOSSY, 1), 0.30f) .setHumidity(EnumHumidity.DAMP); } @Override - protected void setAlleles(Map template) { + protected void setAlleles(IAllele[] template) { } @@ -881,24 +853,19 @@ public enum BeeDefinition implements IBeeDefinition { protected void registerMutations() { // found in hives } - - @Override - protected boolean isShownInCreative() { - return true; - } }, MIRY(BeeBranchDefinition.BOGGY, "humidium", true, new Color(0x92AF42), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MOSSY, 1), 0.36f) .setHumidity(EnumHumidity.DAMP); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.FERTILITY, EnumAllele.Fertility.MAXIMUM); - AlleleHelper.instance.set(template, BeeChromosome.TOLERANT_FLYER, true); - AlleleHelper.instance.set(template, BeeChromosome.NEVER_SLEEPS, true); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.MAXIMUM); + AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true); + AlleleHelper.instance.set(template, EnumBeeChromosome.NEVER_SLEEPS, true); } @Override @@ -910,18 +877,18 @@ public enum BeeDefinition implements IBeeDefinition { }, BOGGY(BeeBranchDefinition.BOGGY, "paluster", true, new Color(0x698948), new Color(0xffdc16)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MOSSY, 1), 0.39f) .addSpecialty(PluginCore.items.peat.getItemStack(), 0.08f) .setHumidity(EnumHumidity.DAMP); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.TOLERANT_FLYER, true); - AlleleHelper.instance.set(template, BeeChromosome.NEVER_SLEEPS, true); - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectMycophilic); - AlleleHelper.instance.set(template, BeeChromosome.TERRITORY, EnumAllele.Territory.LARGER); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true); + AlleleHelper.instance.set(template, EnumBeeChromosome.NEVER_SLEEPS, true); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectMycophilic); + AlleleHelper.instance.set(template, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGER); } @Override @@ -935,14 +902,14 @@ public enum BeeDefinition implements IBeeDefinition { /* MONASTIC BRANCH */ MONASTIC(BeeBranchDefinition.MONASTIC, "monachus", false, new Color(0x42371c), new Color(0xfff7b6)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.30f) .addSpecialty(PluginApiculture.items.beeComb.get(EnumHoneyComb.MELLOW, 1), 0.10f) .setJubilanceProvider(new JubilanceProviderHermit()); } @Override - protected void setAlleles(Map template) { + protected void setAlleles(IAllele[] template) { } @@ -953,14 +920,14 @@ public enum BeeDefinition implements IBeeDefinition { }, SECLUDED(BeeBranchDefinition.MONASTIC, "contractus", true, new Color(0x7b6634), new Color(0xfff7b6)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addSpecialty(PluginApiculture.items.beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f) .setJubilanceProvider(new JubilanceProviderHermit()); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.FLOWERING, EnumAllele.Flowering.FASTEST); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.FASTEST); } @Override @@ -970,16 +937,16 @@ public enum BeeDefinition implements IBeeDefinition { }, HERMITIC(BeeBranchDefinition.MONASTIC, "anachoreta", false, new Color(0xffd46c), new Color(0xfff7b6)) { @Override - protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addSpecialty(PluginApiculture.items.beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f) .setJubilanceProvider(new JubilanceProviderHermit()) .setHasEffect(); } @Override - protected void setAlleles(Map template) { - AlleleHelper.instance.set(template, BeeChromosome.FLOWERING, EnumAllele.Flowering.FASTEST); - AlleleHelper.instance.set(template, BeeChromosome.EFFECT, AlleleEffect.effectRepulsion); + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.FASTEST); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectRepulsion); } @Override @@ -990,9 +957,10 @@ public enum BeeDefinition implements IBeeDefinition { private static final EnumSet overworldHiveBees = EnumSet.of(FOREST, MARSHY, MEADOWS, MODEST, TROPICAL, WINTRY); - private final IAlleleBeeSpecies species; - private ImmutableMap template; private final BeeBranchDefinition branch; + private final IAlleleBeeSpeciesCustom species; + + private IAllele[] template; private IBeeGenome genome; BeeDefinition(BeeBranchDefinition branch, String binomial, boolean dominant, Color primary, Color secondary) { @@ -1004,22 +972,12 @@ public enum BeeDefinition implements IBeeDefinition { String name = "for.bees.species." + lowercaseName; this.branch = branch; - IAlleleBeeSpeciesBuilder speciesBuilder = BeeManager.beeFactory.createSpecies(uid, dominant, "Sengir", name, description, branch.getBranch(), binomial, primary.getRGB(), secondary.getRGB()); - if (!isShownInCreative()) { - speciesBuilder.setIsSecret(); - } - setSpeciesProperties(speciesBuilder); - - this.species = speciesBuilder.build(); + this.species = BeeManager.beeFactory.createSpecies(uid, dominant, "Sengir", name, description, branch.getBranch(), binomial, primary.getRGB(), secondary.getRGB()); } - protected boolean isShownInCreative() { - return false; - } + protected abstract void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies); - protected abstract void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies); - - protected abstract void setAlleles(Map template); + protected abstract void setAlleles(IAllele[] template); protected abstract void registerMutations(); @@ -1037,24 +995,27 @@ public enum BeeDefinition implements IBeeDefinition { } private void init() { - Map templateBuilder = branch.getTemplate(); - AlleleHelper.instance.set(templateBuilder, BeeChromosome.SPECIES, species); - setAlleles(templateBuilder); + if (!overworldHiveBees.contains(this)) { + species.setIsSecret(); + } + setSpeciesProperties(species); - template = ImmutableMap.copyOf(templateBuilder); + template = branch.getTemplate(); + AlleleHelper.instance.set(template, EnumBeeChromosome.SPECIES, species); + setAlleles(template); genome = BeeManager.beeRoot.templateAsGenome(template); BeeManager.beeRoot.registerTemplate(template); } - protected final IBeeMutationBuilder registerMutation(BeeDefinition parent1, BeeDefinition parent2, int chance) { + protected final IBeeMutationCustom registerMutation(BeeDefinition parent1, BeeDefinition parent2, int chance) { return BeeManager.beeMutationFactory.createMutation(parent1.species, parent2.species, getTemplate(), chance); } @Override - public final ImmutableMap getTemplate() { - return template; + public final IAllele[] getTemplate() { + return Arrays.copyOf(template, template.length); } @Override diff --git a/src/main/java/forestry/apiculture/genetics/BeeFactory.java b/src/main/java/forestry/apiculture/genetics/BeeFactory.java index 520b3aee9..094813ff5 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeFactory.java +++ b/src/main/java/forestry/apiculture/genetics/BeeFactory.java @@ -10,15 +10,19 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import forestry.api.apiculture.IAlleleBeeSpeciesBuilder; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.IAlleleBeeSpeciesCustom; import forestry.api.apiculture.IBeeFactory; +import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; import forestry.apiculture.genetics.alleles.AlleleBeeSpecies; public class BeeFactory implements IBeeFactory { @Override - public IAlleleBeeSpeciesBuilder createSpecies(String uid, boolean dominant, String authority, String unlocalizedName, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor) { - return new AlleleBeeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, primaryColor, secondaryColor); + public IAlleleBeeSpeciesCustom createSpecies(String uid, boolean dominant, String authority, String unlocalizedName, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor) { + IAlleleBeeSpeciesCustom species = new AlleleBeeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, primaryColor, secondaryColor); + AlleleManager.alleleRegistry.registerAllele(species, EnumBeeChromosome.SPECIES); + return species; } @Override diff --git a/src/main/java/forestry/apiculture/genetics/BeeGenome.java b/src/main/java/forestry/apiculture/genetics/BeeGenome.java index 853dfb961..fe79176db 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeGenome.java +++ b/src/main/java/forestry/apiculture/genetics/BeeGenome.java @@ -13,7 +13,6 @@ package forestry.apiculture.genetics; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.google.common.collect.ImmutableMap; import javax.annotation.Nonnull; import java.util.concurrent.TimeUnit; @@ -21,12 +20,11 @@ import java.util.concurrent.TimeUnit; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAlleleFloat; import forestry.api.genetics.IAlleleFlowers; @@ -34,13 +32,14 @@ import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IChromosome; import forestry.api.genetics.IFlowerProvider; +import forestry.api.genetics.ISpeciesRoot; import forestry.core.genetics.Genome; import forestry.core.genetics.alleles.AlleleArea; import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.genetics.alleles.AlleleTolerance; import forestry.core.utils.vect.Vect; -public class BeeGenome extends Genome implements IBeeGenome { +public class BeeGenome extends Genome implements IBeeGenome { /** * 0 - Species (determines product) * 1 - Speed @@ -77,11 +76,11 @@ public class BeeGenome extends Genome implements IBeeGenome { } /* CONSTRUCTOR */ - private BeeGenome(@Nonnull NBTTagCompound nbttagcompound) { + private BeeGenome(NBTTagCompound nbttagcompound) { super(nbttagcompound); } - public BeeGenome(@Nonnull ImmutableMap chromosomes) { + public BeeGenome(IChromosome[] chromosomes) { super(chromosomes); } @@ -96,90 +95,83 @@ public class BeeGenome extends Genome implements IBeeGenome { return (IAlleleBeeSpecies) species; } - return (IAlleleBeeSpecies) getActiveAllele(itemStack, BeeChromosome.SPECIES, BeeManager.beeRoot); + return (IAlleleBeeSpecies) getActiveAllele(itemStack, EnumBeeChromosome.SPECIES, BeeManager.beeRoot); } // / INFORMATION RETRIEVAL - @Nonnull @Override public IAlleleBeeSpecies getPrimary() { - return (IAlleleBeeSpecies) getActiveAllele(BeeChromosome.SPECIES); + return (IAlleleBeeSpecies) getActiveAllele(EnumBeeChromosome.SPECIES); } - @Nonnull @Override public IAlleleBeeSpecies getSecondary() { - return (IAlleleBeeSpecies) getInactiveAllele(BeeChromosome.SPECIES); + return (IAlleleBeeSpecies) getInactiveAllele(EnumBeeChromosome.SPECIES); } @Override public float getSpeed() { - return ((IAlleleFloat) getActiveAllele(BeeChromosome.SPEED)).getValue(); + return ((IAlleleFloat) getActiveAllele(EnumBeeChromosome.SPEED)).getValue(); } @Override public int getLifespan() { - return ((IAlleleInteger) getActiveAllele(BeeChromosome.LIFESPAN)).getValue(); + return ((IAlleleInteger) getActiveAllele(EnumBeeChromosome.LIFESPAN)).getValue(); } @Override public int getFertility() { - return ((IAlleleInteger) getActiveAllele(BeeChromosome.FERTILITY)).getValue(); + return ((IAlleleInteger) getActiveAllele(EnumBeeChromosome.FERTILITY)).getValue(); } - @Nonnull @Override public EnumTolerance getToleranceTemp() { - return ((AlleleTolerance) getActiveAllele(BeeChromosome.TEMPERATURE_TOLERANCE)).getValue(); + return ((AlleleTolerance) getActiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE)).getValue(); } @Override public boolean getNocturnal() { - return ((AlleleBoolean) getActiveAllele(BeeChromosome.NEVER_SLEEPS)).getValue(); + return ((AlleleBoolean) getActiveAllele(EnumBeeChromosome.NEVER_SLEEPS)).getValue(); } - @Nonnull @Override public EnumTolerance getToleranceHumid() { - return ((AlleleTolerance) getActiveAllele(BeeChromosome.HUMIDITY_TOLERANCE)).getValue(); + return ((AlleleTolerance) getActiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE)).getValue(); } @Override public boolean getTolerantFlyer() { - return ((AlleleBoolean) getActiveAllele(BeeChromosome.TOLERANT_FLYER)).getValue(); + return ((AlleleBoolean) getActiveAllele(EnumBeeChromosome.TOLERANT_FLYER)).getValue(); } @Override public boolean getCaveDwelling() { - return ((AlleleBoolean) getActiveAllele(BeeChromosome.CAVE_DWELLING)).getValue(); + return ((AlleleBoolean) getActiveAllele(EnumBeeChromosome.CAVE_DWELLING)).getValue(); } - @Nonnull @Override public IFlowerProvider getFlowerProvider() { - return ((IAlleleFlowers) getActiveAllele(BeeChromosome.FLOWER_PROVIDER)).getProvider(); + return ((IAlleleFlowers) getActiveAllele(EnumBeeChromosome.FLOWER_PROVIDER)).getProvider(); } @Override public int getFlowering() { - return ((IAlleleInteger) getActiveAllele(BeeChromosome.FLOWERING)).getValue(); + return ((IAlleleInteger) getActiveAllele(EnumBeeChromosome.FLOWERING)).getValue(); } @Override public int[] getTerritory() { - Vect area = ((AlleleArea) getActiveAllele(BeeChromosome.TERRITORY)).getArea(); + Vect area = ((AlleleArea) getActiveAllele(EnumBeeChromosome.TERRITORY)).getArea(); return area.toArray(); } - @Nonnull @Override public IAlleleBeeEffect getEffect() { - return (IAlleleBeeEffect) getActiveAllele(BeeChromosome.EFFECT); + return (IAlleleBeeEffect) getActiveAllele(EnumBeeChromosome.EFFECT); } - @Nonnull @Override - public IBeeRoot getSpeciesRoot() { + public ISpeciesRoot getSpeciesRoot() { return BeeManager.beeRoot; } } diff --git a/src/main/java/forestry/apiculture/genetics/BeeHelper.java b/src/main/java/forestry/apiculture/genetics/BeeHelper.java index bd6012844..df7d926c9 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeHelper.java +++ b/src/main/java/forestry/apiculture/genetics/BeeHelper.java @@ -10,13 +10,9 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; 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; @@ -29,8 +25,8 @@ import com.mojang.authlib.GameProfile; import net.minecraftforge.fml.common.FMLCommonHandler; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IApiaristTracker; @@ -46,31 +42,27 @@ import forestry.api.apiculture.IBeekeepingMode; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosome; +import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.apiculture.BeeHousingListener; import forestry.apiculture.BeeHousingModifier; import forestry.apiculture.BeekeepingLogic; import forestry.core.genetics.SpeciesRoot; -import forestry.core.utils.Log; import forestry.plugins.PluginApiculture; -public class BeeHelper extends SpeciesRoot implements IBeeRoot { +public class BeeHelper extends SpeciesRoot implements IBeeRoot { private static int beeSpeciesCount = -1; public static final String UID = "rootBees"; - public BeeHelper() { - super(BeeChromosome.class); - } - @Override public String getUID() { return UID; } @Override - public Class getMemberClass() { + public Class getMemberClass() { return IBee.class; } @@ -203,32 +195,23 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot { /* GENOME CONVERSIONS */ @Override - public IBeeGenome templateAsGenome(ImmutableMap template) { - ImmutableMap chromosomes = templateAsChromosomes(template); + public IBeeGenome templateAsGenome(IAllele[] template) { + IChromosome[] chromosomes = templateAsChromosomes(template); return new BeeGenome(chromosomes); } @Override - public IBeeGenome templateAsGenome(ImmutableMap templateActive, ImmutableMap templateInactive) { - ImmutableMap chromosomes = templateAsChromosomes(templateActive, templateInactive); - return new BeeGenome(chromosomes); + public IBeeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive) { + return new BeeGenome(templateAsChromosomes(templateActive, templateInactive)); } - @Nonnull @Override - public IBeeGenome chromosomesAsGenome(ImmutableMap chromosomes) { - return new BeeGenome(chromosomes); - } - - @Nonnull - @Override - public IBee templateAsIndividual(ImmutableMap template) { + public IBee templateAsIndividual(IAllele[] template) { return new Bee(templateAsGenome(template)); } - @Nonnull @Override - public IBee templateAsIndividual(ImmutableMap templateActive, ImmutableMap templateInactive) { + public IBee templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive) { return new Bee(templateAsGenome(templateActive, templateInactive)); } @@ -241,16 +224,15 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot { } @Override - public void registerTemplate(String identifier, ImmutableMap template) { - super.registerTemplate(identifier, template); + public void registerTemplate(String identifier, IAllele[] template) { IBeeGenome beeGenome = BeeManager.beeRoot.templateAsGenome(template); IBee bee = new Bee(beeGenome); beeTemplates.add(bee); + speciesTemplates.put(identifier, template); } - @Nonnull @Override - public ImmutableMap getDefaultTemplate() { + public IAllele[] getDefaultTemplate() { return BeeDefinition.FOREST.getTemplate(); } @@ -269,14 +251,14 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot { } @Override - public void registerMutation(IMutation mutation) { - if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getResultTemplate().get(getKaryotypeKey()).getUID())) { + public void registerMutation(IMutation mutation) { + if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getTemplate()[0].getUID())) { return; } - if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getSpecies0().getUID())) { + if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele0().getUID())) { return; } - if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getSpecies1().getUID())) { + if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele1().getUID())) { return; } @@ -284,24 +266,21 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot { } /* BREEDING MODES */ - @Nonnull - private final List beekeepingModes = new ArrayList<>(); + private final ArrayList beekeepingModes = new ArrayList<>(); private static IBeekeepingMode activeBeekeepingMode; @Override - public void resetMode() { + public void resetBeekeepingMode() { activeBeekeepingMode = null; } - @Nonnull @Override - public List getModes() { + public ArrayList getBeekeepingModes() { return this.beekeepingModes; } - @Nonnull @Override - public IBeekeepingMode getMode(@Nonnull World world) { + public IBeekeepingMode getBeekeepingMode(World world) { if (activeBeekeepingMode != null) { return activeBeekeepingMode; } @@ -313,39 +292,37 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot { mode = PluginApiculture.beekeepingMode; } - setMode(world, mode); + setBeekeepingMode(world, mode); FMLCommonHandler.instance().getFMLLogger().debug("Set beekeeping mode for a world to " + mode); return activeBeekeepingMode; } @Override - public void registerMode(@Nonnull IBeekeepingMode mode) { + public void registerBeekeepingMode(IBeekeepingMode mode) { beekeepingModes.add(mode); } @Override - public void setMode(@Nonnull World world, @Nonnull String name) { - activeBeekeepingMode = getMode(name); + public void setBeekeepingMode(World world, String name) { + activeBeekeepingMode = getBeekeepingMode(name); getBreedingTracker(world, null).setModeName(name); } - @Nonnull @Override - public IBeekeepingMode getMode(@Nonnull String name) { + public IBeekeepingMode getBeekeepingMode(String name) { for (IBeekeepingMode mode : beekeepingModes) { if (mode.getName().equals(name) || mode.getName().equals(name.toLowerCase(Locale.ENGLISH))) { return mode; } } - Log.debug("Failed to find a beekeeping mode called '%s', reverting to fallback."); + FMLCommonHandler.instance().getFMLLogger().debug("Failed to find a beekeeping mode called '%s', reverting to fallback."); return beekeepingModes.get(0); } - @Nonnull @Override - public IApiaristTracker getBreedingTracker(@Nonnull World world, @Nonnull GameProfile player) { + public IApiaristTracker getBreedingTracker(World world, GameProfile player) { String filename = "ApiaristTracker." + (player == null ? "common" : player.getId()); ApiaristTracker tracker = (ApiaristTracker) world.loadItemData(ApiaristTracker.class, filename); @@ -376,15 +353,13 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot { return new BeeHousingListener(housing); } - @Nonnull @Override - public BeeChromosome[] getKaryotype() { - return BeeChromosome.values(); + public IChromosomeType[] getKaryotype() { + return EnumBeeChromosome.values(); } - @Nonnull @Override - public BeeChromosome getKaryotypeKey() { - return BeeChromosome.SPECIES; + public IChromosomeType getKaryotypeKey() { + return EnumBeeChromosome.SPECIES; } } diff --git a/src/main/java/forestry/apiculture/genetics/BeeMutation.java b/src/main/java/forestry/apiculture/genetics/BeeMutation.java index 3b728ac08..f2b43ff92 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeMutation.java +++ b/src/main/java/forestry/apiculture/genetics/BeeMutation.java @@ -10,57 +10,42 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; - import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; -import forestry.api.apiculture.IBeeMutation; -import forestry.api.apiculture.IBeeMutationBuilder; +import forestry.api.apiculture.IBeeMutationCustom; import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.IAllele; import forestry.core.genetics.mutations.Mutation; -public class BeeMutation extends Mutation implements IBeeMutation, IBeeMutationBuilder { +public class BeeMutation extends Mutation implements IBeeMutationCustom { - public BeeMutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, ImmutableMap result, int chance) { + public BeeMutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance) { super(bee0, bee1, result, chance); } - // TODO: break this into a separate builder class - @Nonnull - @Override - public IBeeMutation build() { - BeeManager.beeRoot.registerMutation(this); - return this; - } - - @Nonnull @Override public IBeeRoot getRoot() { return BeeManager.beeRoot; } @Override - public float getChance(IBeeHousing housing, IAlleleBeeSpecies genome, IAlleleBeeSpecies mate, IBeeGenome genome0, IBeeGenome genome1) { + public float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, IBeeGenome genome0, IBeeGenome genome1) { World world = housing.getWorld(); BlockPos housingPos = housing.getCoordinates(); - float processedChance = super.getChance(world, housingPos, genome, mate, genome0, genome1); + float processedChance = super.getChance(world, housingPos, allele0, allele1, genome0, genome1); if (processedChance <= 0) { return 0; } IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); - IBeeModifier beeModeModifier = BeeManager.beeRoot.getMode(world).getBeeModifier(); + IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier(); processedChance *= beeHousingModifier.getMutationModifier(genome0, genome1, processedChance); processedChance *= beeModeModifier.getMutationModifier(genome0, genome1, processedChance); diff --git a/src/main/java/forestry/apiculture/genetics/BeeMutationFactory.java b/src/main/java/forestry/apiculture/genetics/BeeMutationFactory.java index 1c7270291..2013e75d2 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeMutationFactory.java +++ b/src/main/java/forestry/apiculture/genetics/BeeMutationFactory.java @@ -10,18 +10,18 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import com.google.common.collect.ImmutableMap; - -import forestry.api.apiculture.BeeChromosome; +import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBeeMutationBuilder; +import forestry.api.apiculture.IBeeMutationCustom; import forestry.api.apiculture.IBeeMutationFactory; import forestry.api.genetics.IAllele; public class BeeMutationFactory implements IBeeMutationFactory { @Override - public IBeeMutationBuilder createMutation(IAlleleBeeSpecies parentBee0, IAlleleBeeSpecies parentBee1, ImmutableMap result, int chance) { - return new BeeMutation(parentBee0, parentBee1, result, chance); + 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; } } diff --git a/src/main/java/forestry/apiculture/genetics/BeeVariation.java b/src/main/java/forestry/apiculture/genetics/BeeVariation.java index 706681ff4..af8395da6 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeVariation.java +++ b/src/main/java/forestry/apiculture/genetics/BeeVariation.java @@ -1,15 +1,9 @@ package forestry.apiculture.genetics; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; -import java.util.EnumMap; -import java.util.Map; - import net.minecraft.item.ItemStack; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; @@ -18,20 +12,19 @@ import forestry.core.genetics.alleles.AlleleHelper; public abstract class BeeVariation implements IBeeDefinition { - private final ImmutableMap template; + private final IAllele[] template; private final IBeeGenome genome; - private BeeVariation(IBeeDefinition bee) { - Map templateBuilder = new EnumMap<>(bee.getTemplate()); - initializeTemplate(templateBuilder); - template = ImmutableMap.copyOf(templateBuilder); + protected BeeVariation(IBeeDefinition bee) { + template = bee.getTemplate(); + initializeTemplate(template); genome = BeeManager.beeRoot.templateAsGenome(template); } - protected abstract void initializeTemplate(@Nonnull Map template); + protected abstract void initializeTemplate(IAllele[] template); @Override - public ImmutableMap getTemplate() { + public IAllele[] getTemplate() { return template; } @@ -57,8 +50,8 @@ public abstract class BeeVariation implements IBeeDefinition { } @Override - protected void initializeTemplate(@Nonnull Map template) { - AlleleHelper.instance.set(template, BeeChromosome.TOLERANT_FLYER, true); + protected void initializeTemplate(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true); } } } diff --git a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java index 60920d6de..ae61c1da9 100755 --- a/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java +++ b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Locale; import java.util.Random; @@ -18,7 +17,6 @@ import java.util.Random; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.DefaultBeeModifier; import forestry.api.apiculture.IBee; @@ -26,7 +24,6 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingMode; -import forestry.api.genetics.IGenome; public class BeekeepingMode implements IBeekeepingMode { @@ -37,34 +34,24 @@ public class BeekeepingMode implements IBeekeepingMode { public static final IBeekeepingMode insane = new BeekeepingMode("INSANE", 0.2f, 10.0f, 0.6f, true, true); private final Random rand; - @Nonnull private final String name; private final boolean reducesFertility; private final boolean canFatigue; - private final float mutationModifier; - @Nonnull private final IBeeModifier beeModifier; - private BeekeepingMode(@Nonnull String name, float mutationModifier, float lifespanModifier, float speedModifier, boolean reducesFertility, boolean canFatigue) { + public BeekeepingMode(String name, float mutationModifier, float lifespanModifier, float speedModifier, boolean reducesFertility, boolean canFatigue) { this.rand = new Random(); this.name = name; this.reducesFertility = reducesFertility; this.canFatigue = canFatigue; this.beeModifier = new BeekeepingModeBeeModifier(mutationModifier, lifespanModifier, speedModifier); - this.mutationModifier = mutationModifier; } - @Nonnull @Override public String getName() { return this.name; } - @Override - public float getMutationModifier(IGenome genome, IGenome mate) { - return mutationModifier; - } - @Override public ArrayList getDescription() { ArrayList ret = new ArrayList<>(); @@ -131,13 +118,17 @@ public class BeekeepingMode implements IBeekeepingMode { return false; } + + @Override + public boolean isNaturalOffspring(IBee queen) { + return queen.isNatural(); + } @Override public boolean mayMultiplyPrincess(IBee queen) { return true; } - @Nonnull @Override public IBeeModifier getBeeModifier() { return beeModifier; diff --git a/src/main/java/forestry/apiculture/genetics/IBeeDefinition.java b/src/main/java/forestry/apiculture/genetics/IBeeDefinition.java index 9d503cd18..71c30aa1c 100644 --- a/src/main/java/forestry/apiculture/genetics/IBeeDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/IBeeDefinition.java @@ -12,13 +12,12 @@ package forestry.apiculture.genetics; import net.minecraft.item.ItemStack; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.core.genetics.IGeneticDefinition; -public interface IBeeDefinition extends IGeneticDefinition { +public interface IBeeDefinition extends IGeneticDefinition { @Override IBeeGenome getGenome(); diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java index 3346911f5..57434509a 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleBeeSpecies.java @@ -25,11 +25,9 @@ import com.mojang.authlib.GameProfile; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IAlleleBeeSpeciesBuilder; +import forestry.api.apiculture.IAlleleBeeSpeciesCustom; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModelProvider; @@ -38,7 +36,6 @@ import forestry.api.apiculture.IBeeSpriteColourProvider; import forestry.api.apiculture.IJubilanceProvider; import forestry.api.core.IModelManager; import forestry.api.core.IModelProvider; -import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; import forestry.apiculture.genetics.DefaultBeeModelProvider; @@ -47,7 +44,7 @@ import forestry.apiculture.genetics.JubilanceDefault; import forestry.core.genetics.alleles.AlleleSpecies; import forestry.core.utils.ItemStackUtil; -public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies, IAlleleBeeSpeciesBuilder { +public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpeciesCustom { private final Map productChances = new HashMap<>(); private final Map specialtyChances = new HashMap<>(); @@ -69,15 +66,8 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IA return BeeManager.beeRoot; } - // TODO: break this into a separate builder class @Override - public IAlleleBeeSpecies build() { - AlleleManager.alleleRegistry.registerAllele(this, BeeChromosome.SPECIES); - return this; - } - - @Override - public IAlleleBeeSpeciesBuilder addProduct(ItemStack product, Float chance) { + public IAlleleBeeSpeciesCustom addProduct(ItemStack product, Float chance) { if (product == null || product.getItem() == null) { throw new IllegalArgumentException("Tried to add null product"); } @@ -89,7 +79,7 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IA } @Override - public IAlleleBeeSpeciesBuilder addSpecialty(ItemStack specialty, Float chance) { + public IAlleleBeeSpeciesCustom addSpecialty(ItemStack specialty, Float chance) { if (specialty == null || specialty.getItem() == null) { throw new IllegalArgumentException("Tried to add null specialty"); } @@ -101,25 +91,25 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IA } @Override - public IAlleleBeeSpeciesBuilder setJubilanceProvider(IJubilanceProvider provider) { + public IAlleleBeeSpeciesCustom setJubilanceProvider(IJubilanceProvider provider) { this.jubilanceProvider = provider; return this; } @Override - public IAlleleBeeSpeciesBuilder setNocturnal() { + public IAlleleBeeSpeciesCustom setNocturnal() { nocturnal = true; return this; } @Override - public IAlleleBeeSpeciesBuilder setCustomBeeModelProvider(IBeeModelProvider beeIconProvider) { + public IAlleleBeeSpeciesCustom setCustomBeeModelProvider(IBeeModelProvider beeIconProvider) { this.beeModelProvider = beeIconProvider; return this; } @Override - public IAlleleBeeSpeciesBuilder setCustomBeeSpriteColourProvider(IBeeSpriteColourProvider beeIconColourProvider) { + public IAlleleBeeSpeciesCustom setCustomBeeSpriteColourProvider(IBeeSpriteColourProvider beeIconColourProvider) { this.beeSpriteColourProvider = beeIconColourProvider; return this; } @@ -146,7 +136,7 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IA } @Override - public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) { + public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) { ArrayList bounty = new ArrayList<>(); Collections.addAll(bounty, super.getResearchBounty(world, researcher, individual, bountyLevel)); diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java index eeb953e9a..970cefae2 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java @@ -19,8 +19,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; @@ -79,7 +79,7 @@ public abstract class AlleleEffect extends AlleleCategorized implements IAlleleB ); for (IAlleleBeeEffect beeEffect : beeEffects) { - AlleleManager.alleleRegistry.registerAllele(beeEffect, BeeChromosome.EFFECT); + AlleleManager.alleleRegistry.registerAllele(beeEffect, EnumBeeChromosome.EFFECT); } } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleFlowers.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleFlowers.java index 9d0694b7d..3e08fe43f 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleFlowers.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleFlowers.java @@ -10,28 +10,24 @@ ******************************************************************************/ package forestry.apiculture.genetics.alleles; -import javax.annotation.Nonnull; - import forestry.api.genetics.IAlleleFlowers; import forestry.api.genetics.IFlowerProvider; import forestry.core.genetics.alleles.AlleleCategorized; public class AlleleFlowers extends AlleleCategorized implements IAlleleFlowers { - @Nonnull + private final IFlowerProvider provider; - public AlleleFlowers(@Nonnull String modId, @Nonnull String category, @Nonnull String name, @Nonnull IFlowerProvider provider, boolean isDominant) { + public AlleleFlowers(String modId, String category, String name, IFlowerProvider provider, boolean isDominant) { super(modId, category, name, isDominant); this.provider = provider; } - @Nonnull @Override public IFlowerProvider getProvider() { return provider; } - - @Nonnull + @Override public String getName() { return getProvider().getDescription(); diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index 79a8f635d..51c495d74 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -15,8 +15,8 @@ import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; @@ -33,7 +33,7 @@ import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.utils.StringUtil; import forestry.plugins.PluginApiculture; -public class GuiBeealyzer extends GuiAlyzer { +public class GuiBeealyzer extends GuiAlyzer { public GuiBeealyzer(EntityPlayer player, ItemInventoryBeealyzer inventory) { super(BeeManager.beeRoot, player, new ContainerAlyzer(inventory, player), inventory, "gui.beealyzer"); @@ -110,30 +110,30 @@ public class GuiBeealyzer extends GuiAlyzer { String customPrimaryBeeKey = "bees.custom.beealyzer." + type.getName() + "." + bee.getGenome().getPrimary().getUnlocalizedName().replace("bees.species.", ""); String customSecondaryBeeKey = "bees.custom.beealyzer." + type.getName() + "." + bee.getGenome().getSecondary().getUnlocalizedName().replace("bees.species.", ""); - drawSpeciesRow(StringUtil.localize("gui.species"), bee, BeeChromosome.SPECIES, checkCustomName(customPrimaryBeeKey), checkCustomName(customSecondaryBeeKey)); + drawSpeciesRow(StringUtil.localize("gui.species"), bee, EnumBeeChromosome.SPECIES, checkCustomName(customPrimaryBeeKey), checkCustomName(customSecondaryBeeKey)); textLayout.newLine(); } - drawChromosomeRow(StringUtil.localize("gui.lifespan"), bee, BeeChromosome.LIFESPAN); + drawChromosomeRow(StringUtil.localize("gui.lifespan"), bee, EnumBeeChromosome.LIFESPAN); textLayout.newLine(); - drawChromosomeRow(StringUtil.localize("gui.speed"), bee, BeeChromosome.SPEED); + drawChromosomeRow(StringUtil.localize("gui.speed"), bee, EnumBeeChromosome.SPEED); textLayout.newLine(); - drawChromosomeRow(StringUtil.localize("gui.pollination"), bee, BeeChromosome.FLOWERING); + drawChromosomeRow(StringUtil.localize("gui.pollination"), bee, EnumBeeChromosome.FLOWERING); textLayout.newLine(); - drawChromosomeRow(StringUtil.localize("gui.flowers"), bee, BeeChromosome.FLOWER_PROVIDER); + drawChromosomeRow(StringUtil.localize("gui.flowers"), bee, EnumBeeChromosome.FLOWER_PROVIDER); textLayout.newLine(); textLayout.drawLine(StringUtil.localize("gui.fertility"), COLUMN_0); - IAlleleInteger primaryFertility = (IAlleleInteger) bee.getGenome().getActiveAllele(BeeChromosome.FERTILITY); - IAlleleInteger secondaryFertility = (IAlleleInteger) bee.getGenome().getInactiveAllele(BeeChromosome.FERTILITY); + IAlleleInteger primaryFertility = (IAlleleInteger) bee.getGenome().getActiveAllele(EnumBeeChromosome.FERTILITY); + IAlleleInteger secondaryFertility = (IAlleleInteger) bee.getGenome().getInactiveAllele(EnumBeeChromosome.FERTILITY); drawFertilityInfo(primaryFertility.getValue(), COLUMN_1, getColorCoding(primaryFertility.isDominant()), 0); drawFertilityInfo(secondaryFertility.getValue(), COLUMN_2, getColorCoding(secondaryFertility.isDominant()), 0); textLayout.newLine(); - drawChromosomeRow(StringUtil.localize("gui.area"), bee, BeeChromosome.TERRITORY); + drawChromosomeRow(StringUtil.localize("gui.area"), bee, EnumBeeChromosome.TERRITORY); textLayout.newLine(); - drawChromosomeRow(StringUtil.localize("gui.effect"), bee, BeeChromosome.EFFECT); + drawChromosomeRow(StringUtil.localize("gui.effect"), bee, EnumBeeChromosome.EFFECT); textLayout.newLine(); textLayout.endPage(); @@ -149,12 +149,12 @@ public class GuiBeealyzer extends GuiAlyzer { textLayout.newLine(); drawRow(StringUtil.localize("gui.climate"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getTemperature()), - AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getTemperature()), bee, BeeChromosome.SPECIES); + AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getTemperature()), bee, EnumBeeChromosome.SPECIES); textLayout.newLine(); - IAlleleTolerance tempToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(BeeChromosome.TEMPERATURE_TOLERANCE); - IAlleleTolerance tempToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(BeeChromosome.TEMPERATURE_TOLERANCE); + IAlleleTolerance tempToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE); + IAlleleTolerance tempToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TEMPERATURE_TOLERANCE); textLayout.drawLine(" " + StringUtil.localize("gui.tolerance"), COLUMN_0); drawToleranceInfo(tempToleranceActive, COLUMN_1); drawToleranceInfo(tempToleranceInactive, COLUMN_2); @@ -162,12 +162,12 @@ public class GuiBeealyzer extends GuiAlyzer { textLayout.newLine(16); drawRow(StringUtil.localize("gui.humidity"), AlleleManager.climateHelper.toDisplay(bee.getGenome().getPrimary().getHumidity()), - AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getHumidity()), bee, BeeChromosome.SPECIES); + AlleleManager.climateHelper.toDisplay(bee.getGenome().getSecondary().getHumidity()), bee, EnumBeeChromosome.SPECIES); textLayout.newLine(); - IAlleleTolerance humidToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(BeeChromosome.HUMIDITY_TOLERANCE); - IAlleleTolerance humidToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(BeeChromosome.HUMIDITY_TOLERANCE); + IAlleleTolerance humidToleranceActive = (IAlleleTolerance) bee.getGenome().getActiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE); + IAlleleTolerance humidToleranceInactive = (IAlleleTolerance) bee.getGenome().getInactiveAllele(EnumBeeChromosome.HUMIDITY_TOLERANCE); textLayout.drawLine(" " + StringUtil.localize("gui.tolerance"), COLUMN_0); drawToleranceInfo(humidToleranceActive, COLUMN_1); drawToleranceInfo(humidToleranceInactive, COLUMN_2); @@ -184,7 +184,7 @@ public class GuiBeealyzer extends GuiAlyzer { nocturnal0 = bee.getGenome().getPrimary().isNocturnal() ? yes : no; diurnal0 = !bee.getGenome().getPrimary().isNocturnal() ? yes : no; } - if (((AlleleBoolean) bee.getGenome().getInactiveAllele(BeeChromosome.NEVER_SLEEPS)).getValue()) { + if (((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.NEVER_SLEEPS)).getValue()) { nocturnal1 = diurnal1 = yes; } else { nocturnal1 = bee.getGenome().getSecondary().isNocturnal() ? yes : no; @@ -202,16 +202,16 @@ public class GuiBeealyzer extends GuiAlyzer { textLayout.newLineCompressed(); String primary = StringUtil.readableBoolean(bee.getGenome().getTolerantFlyer(), yes, no); - String secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(BeeChromosome.TOLERANT_FLYER)).getValue(), yes, no); + String secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.TOLERANT_FLYER)).getValue(), yes, no); - drawRow(StringUtil.localize("gui.flyer"), primary, secondary, bee, BeeChromosome.TOLERANT_FLYER); + drawRow(StringUtil.localize("gui.flyer"), primary, secondary, bee, EnumBeeChromosome.TOLERANT_FLYER); textLayout.newLineCompressed(); primary = StringUtil.readableBoolean(bee.getGenome().getCaveDwelling(), yes, no); - secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(BeeChromosome.CAVE_DWELLING)).getValue(), yes, no); + secondary = StringUtil.readableBoolean(((AlleleBoolean) bee.getGenome().getInactiveAllele(EnumBeeChromosome.CAVE_DWELLING)).getValue(), yes, no); - drawRow(StringUtil.localize("gui.cave"), primary, secondary, bee, BeeChromosome.CAVE_DWELLING); + drawRow(StringUtil.localize("gui.cave"), primary, secondary, bee, EnumBeeChromosome.CAVE_DWELLING); textLayout.newLine(); diff --git a/src/main/java/forestry/apiculture/inventory/InventoryApiary.java b/src/main/java/forestry/apiculture/inventory/InventoryApiary.java index 8b4bf1765..52c3eedb2 100644 --- a/src/main/java/forestry/apiculture/inventory/InventoryApiary.java +++ b/src/main/java/forestry/apiculture/inventory/InventoryApiary.java @@ -71,7 +71,7 @@ public class InventoryApiary extends InventoryBeeHousing implements IApiaryInven @Override public void wearOutFrames(IBeeHousing beeHousing, int amount) { - IBeekeepingMode beekeepingMode = BeeManager.beeRoot.getMode(beeHousing.getWorld()); + IBeekeepingMode beekeepingMode = BeeManager.beeRoot.getBeekeepingMode(beeHousing.getWorld()); int wear = Math.round(amount * beekeepingMode.getWearModifier()); for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) { diff --git a/src/main/java/forestry/apiculture/inventory/ItemInventoryBeealyzer.java b/src/main/java/forestry/apiculture/inventory/ItemInventoryBeealyzer.java index 70aabd18f..aeca6751e 100644 --- a/src/main/java/forestry/apiculture/inventory/ItemInventoryBeealyzer.java +++ b/src/main/java/forestry/apiculture/inventory/ItemInventoryBeealyzer.java @@ -15,13 +15,12 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; import forestry.core.config.Config; import forestry.core.gui.IHintSource; import forestry.core.inventory.ItemInventoryAlyzer; -public class ItemInventoryBeealyzer extends ItemInventoryAlyzer implements IHintSource { +public class ItemInventoryBeealyzer extends ItemInventoryAlyzer implements IHintSource { public ItemInventoryBeealyzer(EntityPlayer player, ItemStack itemStack) { super(BeeManager.beeRoot, player, itemStack); diff --git a/src/main/java/forestry/apiculture/items/ItemBeeGE.java b/src/main/java/forestry/apiculture/items/ItemBeeGE.java index fb4df3e84..b04082cdc 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeeGE.java +++ b/src/main/java/forestry/apiculture/items/ItemBeeGE.java @@ -11,7 +11,6 @@ package forestry.apiculture.items; import java.util.List; -import java.util.Map; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.resources.model.ModelResourceLocation; @@ -24,8 +23,8 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; @@ -154,8 +153,7 @@ public class ItemBeeGE extends ItemGE { @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - Map registeredAlleles = AlleleManager.alleleRegistry.getRegisteredAlleles(); - for (IAllele allele : registeredAlleles.values()) { + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { if (allele instanceof IAlleleBeeSpecies) { ((IAlleleBeeSpecies) allele).getModelProvider().registerModels(item, manager); } @@ -169,7 +167,8 @@ public class ItemBeeGE extends ItemGE { public ModelResourceLocation getModelLocation(ItemStack stack) { IAlleleBeeSpecies species = (IAlleleBeeSpecies) getSpecies(stack); if (species == null) { - species = (IAlleleBeeSpecies) BeeManager.beeRoot.getDefaultTemplate().get(BeeChromosome.SPECIES); + species = (IAlleleBeeSpecies) BeeManager.beeRoot.getDefaultTemplate()[EnumBeeChromosome.SPECIES + .ordinal()]; } return species.getModel(type); } diff --git a/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java b/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java index da47bf97b..612c1810e 100644 --- a/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java +++ b/src/main/java/forestry/apiculture/items/ItemRegistryApiculture.java @@ -14,6 +14,7 @@ import net.minecraftforge.oredict.OreDictionary; import forestry.api.apiculture.EnumBeeType; import forestry.api.core.Tabs; +import forestry.apiculture.genetics.BeeDefinition; import forestry.core.items.ItemForestry; import forestry.core.items.ItemOverlay; import forestry.core.items.ItemRegistry; @@ -52,6 +53,7 @@ public class ItemRegistryApiculture extends ItemRegistry { public ItemRegistryApiculture() { // / BEES + BeeDefinition.preInit(); beeQueenGE = registerItem(new ItemBeeGE(EnumBeeType.QUEEN), "beeQueenGE"); beeDroneGE = registerItem(new ItemBeeGE(EnumBeeType.DRONE), "beeDroneGE"); beePrincessGE = registerItem(new ItemBeeGE(EnumBeeType.PRINCESS), "beePrincessGE"); diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index 9f6a7aa71..2c76ff6f5 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.apiculture.multiblock; -import javax.annotation.Nonnull; import java.io.IOException; import java.util.HashSet; import java.util.Set; @@ -289,7 +288,7 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple } @Override - public void writeToNBT(@Nonnull NBTTagCompound data) { + public void writeToNBT(NBTTagCompound data) { super.writeToNBT(data); data.setFloat("TempChange", tempChange); diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java index 32bcfc3e9..22b922109 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySieve.java @@ -16,8 +16,9 @@ import net.minecraft.item.ItemStack; import forestry.api.apiculture.DefaultBeeListener; import forestry.api.apiculture.IBeeListener; import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.ITreeRoot; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; import forestry.api.multiblock.IAlvearyComponent; import forestry.apiculture.blocks.BlockAlveary; import forestry.apiculture.gui.ContainerAlvearySieve; @@ -61,7 +62,7 @@ public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.B return new ContainerAlvearySieve(player.inventory, this); } - private static class AlvearySieveBeeListener extends DefaultBeeListener { + static class AlvearySieveBeeListener extends DefaultBeeListener { private final InventoryAlvearySieve inventory; public AlvearySieveBeeListener(InventoryAlvearySieve inventory) { @@ -69,12 +70,12 @@ public class TileAlvearySieve extends TileAlveary implements IAlvearyComponent.B } @Override - public boolean onPollenRetrieved(ITree pollen) { + public boolean onPollenRetrieved(IIndividual pollen) { if (!inventory.canStorePollen()) { return false; } - ITreeRoot speciesRoot = pollen.getGenome().getSpeciesRoot(); + ISpeciesRoot speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(pollen.getClass()); ItemStack pollenStack = speciesRoot.getMemberStack(pollen, EnumGermlingType.POLLEN.ordinal()); if (pollenStack != null) { diff --git a/src/main/java/forestry/apiculture/tiles/TileApiaristChest.java b/src/main/java/forestry/apiculture/tiles/TileApiaristChest.java index 6f67506a2..f01659670 100644 --- a/src/main/java/forestry/apiculture/tiles/TileApiaristChest.java +++ b/src/main/java/forestry/apiculture/tiles/TileApiaristChest.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.apiculture.tiles; -import forestry.api.apiculture.BeeChromosome; import forestry.api.apiculture.BeeManager; import forestry.core.tiles.TileNaturalistChest; -public class TileApiaristChest extends TileNaturalistChest { +public class TileApiaristChest extends TileNaturalistChest { public TileApiaristChest() { super(BeeManager.beeRoot); } diff --git a/src/main/java/forestry/arboriculture/FruitProviderPod.java b/src/main/java/forestry/arboriculture/FruitProviderPod.java index 640ddef3e..5d2fc1209 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderPod.java +++ b/src/main/java/forestry/arboriculture/FruitProviderPod.java @@ -18,9 +18,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IFruitFamily; import forestry.core.utils.BlockUtil; @@ -85,7 +85,7 @@ public class FruitProviderPod extends FruitProviderNone { if (type == EnumPodType.COCOA) { return BlockUtil.tryPlantPot(world, pos, Blocks.cocoa); } else { - return TreeManager.treeRoot.setFruitBlock(world, (IAlleleFruit) genome.getActiveAllele(TreeChromosome.FRUITS), + return TreeManager.treeRoot.setFruitBlock(world, (IAlleleFruit) genome.getActiveAllele(EnumTreeChromosome.FRUITS), genome.getSappiness(), type.uids, pos); } } diff --git a/src/main/java/forestry/arboriculture/FruitProviderRandom.java b/src/main/java/forestry/arboriculture/FruitProviderRandom.java index 8224364e9..01150c7a1 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderRandom.java +++ b/src/main/java/forestry/arboriculture/FruitProviderRandom.java @@ -21,8 +21,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.ITreeModifier; -import forestry.api.arboriculture.ITreekeepingMode; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IFruitFamily; @@ -53,9 +51,7 @@ public class FruitProviderRandom extends FruitProviderNone { public ItemStack[] getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime) { ArrayList product = new ArrayList<>(); - ITreekeepingMode mode = TreeManager.treeRoot.getMode(world); - ITreeModifier modifier = mode.getTreeModifier(); - float modeYieldMod = modifier.getYieldModifier(genome, 1f); + float modeYieldMod = TreeManager.treeRoot.getTreekeepingMode(world).getYieldModifier(genome, 1f); for (Map.Entry entry : products.entrySet()) { if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry.getValue()) { diff --git a/src/main/java/forestry/arboriculture/FruitProviderRipening.java b/src/main/java/forestry/arboriculture/FruitProviderRipening.java index 892f4f0f3..3eab10a72 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderRipening.java +++ b/src/main/java/forestry/arboriculture/FruitProviderRipening.java @@ -21,8 +21,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.ITreeModifier; -import forestry.api.arboriculture.ITreekeepingMode; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IFruitFamily; @@ -73,9 +71,7 @@ public class FruitProviderRipening extends FruitProviderNone { return new ItemStack[0]; } - ITreekeepingMode mode = TreeManager.treeRoot.getMode(world); - ITreeModifier modifier = mode.getTreeModifier(); - float modeYieldMod = modifier.getYieldModifier(genome, 1f); + float modeYieldMod = TreeManager.treeRoot.getTreekeepingMode(world).getYieldModifier(genome, 1f); for (Map.Entry entry : products.entrySet()) { if (world.rand.nextFloat() <= genome.getYield() * entry.getValue() * modeYieldMod * 5.0f * stage) { diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index 49ce3335a..a452b82b0 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -12,7 +12,6 @@ package forestry.arboriculture.blocks; import javax.annotation.Nullable; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Random; @@ -178,7 +177,7 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP } // Add saplings - Collection saplings = tile.getTree().getSaplings((World) world, playerProfile, pos, saplingModifier); + ITree[] saplings = tile.getTree().getSaplings((World) world, playerProfile, pos, saplingModifier); for (ITree sapling : saplings) { if (sapling != null) { diff --git a/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java b/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java index 450de364b..cc2bac860 100644 --- a/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java +++ b/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.arboriculture.commands; -import com.google.common.collect.ImmutableMap; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.BlockPos; import net.minecraft.world.gen.feature.WorldGenerator; @@ -19,7 +17,6 @@ import net.minecraft.world.gen.feature.WorldGenerator; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -76,7 +73,7 @@ public final class TreeGenHelper { throw new SpeciesNotFoundException(speciesName); } - ImmutableMap template = TreeManager.treeRoot.getTemplate(species.getUID()); + IAllele[] template = TreeManager.treeRoot.getTemplate(species.getUID()); if (template == null) { throw new TemplateNotFoundException(species); diff --git a/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java b/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java index 2c9130475..8443e1af7 100644 --- a/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java +++ b/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java @@ -11,7 +11,6 @@ package forestry.arboriculture.commands; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import net.minecraft.world.World; @@ -24,7 +23,7 @@ public class TreeModeHelper implements ICommandModeHelper { @Override public String[] getModeNames() { - Collection treekeepingModes = TreeManager.treeRoot.getModes(); + ArrayList treekeepingModes = TreeManager.treeRoot.getTreekeepingModes(); int modeStringCount = treekeepingModes.size(); List modeStrings = new ArrayList<>(modeStringCount); for (ITreekeepingMode mode : treekeepingModes) { @@ -36,7 +35,7 @@ public class TreeModeHelper implements ICommandModeHelper { @Override public String getModeNameMatching(String desired) { - ITreekeepingMode mode = TreeManager.treeRoot.getMode(desired); + ITreekeepingMode mode = TreeManager.treeRoot.getTreekeepingMode(desired); if (mode == null) { return null; } @@ -45,17 +44,17 @@ public class TreeModeHelper implements ICommandModeHelper { @Override public String getModeName(World world) { - return TreeManager.treeRoot.getMode(world).getName(); + return TreeManager.treeRoot.getTreekeepingMode(world).getName(); } @Override public void setMode(World world, String modeName) { - TreeManager.treeRoot.setMode(world, modeName); + TreeManager.treeRoot.setTreekeepingMode(world, modeName); } @Override public Iterable getDescription(String modeName) { - ITreekeepingMode mode = TreeManager.treeRoot.getMode(modeName); + ITreekeepingMode mode = TreeManager.treeRoot.getTreekeepingMode(modeName); return mode.getDescription(); } diff --git a/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java b/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java index 36741a56d..bcf05c96d 100755 --- a/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java +++ b/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java @@ -13,12 +13,12 @@ package forestry.arboriculture.genetics; import net.minecraft.entity.player.EntityPlayer; import forestry.api.arboriculture.IArboristTracker; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.arboriculture.TreeManager; +import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.core.genetics.BreedingTracker; -public class ArboristTracker extends BreedingTracker implements IArboristTracker { +public class ArboristTracker extends BreedingTracker implements IArboristTracker { /** Required for creation from map storage */ public ArboristTracker(String s) { @@ -26,13 +26,13 @@ public class ArboristTracker extends BreedingTracker implements } @Override - protected IArboristTracker getBreedingTracker(EntityPlayer player) { + protected IBreedingTracker getBreedingTracker(EntityPlayer player) { return TreeManager.treeRoot.getBreedingTracker(player.worldObj, player.getGameProfile()); } @Override protected String speciesRootUID() { - return TreeRoot.UID; + return TreeHelper.UID; } @Override diff --git a/src/main/java/forestry/arboriculture/genetics/Tree.java b/src/main/java/forestry/arboriculture/genetics/Tree.java index bbfd283cb..1ce11b406 100755 --- a/src/main/java/forestry/arboriculture/genetics/Tree.java +++ b/src/main/java/forestry/arboriculture/genetics/Tree.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import com.google.common.collect.ImmutableMap; - import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; @@ -37,25 +35,30 @@ import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import forestry.api.arboriculture.EnumGrowthConditions; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleLeafEffect; import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.IArboristTracker; import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.IGrowthProvider; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.TreeChromosome; +import forestry.api.arboriculture.ITreeMutation; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleBoolean; import forestry.api.genetics.IChromosome; import forestry.api.genetics.IEffectData; import forestry.api.genetics.IFruitFamily; +import forestry.api.genetics.IMutation; import forestry.arboriculture.genetics.alleles.AlleleFruit; +import forestry.core.config.Config; +import forestry.core.genetics.Chromosome; import forestry.core.genetics.Individual; import forestry.core.utils.BlockUtil; import forestry.core.utils.StringUtil; -public class Tree extends Individual implements ITree, IPlantable { +public class Tree extends Individual implements ITree, IPlantable { @Nonnull private final ITreeGenome genome; @@ -89,7 +92,7 @@ public class Tree extends Individual implements ITree, IPlantabl } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { super.writeToNBT(nbttagcompound); NBTTagCompound nbtGenome = new NBTTagCompound(); @@ -112,7 +115,7 @@ public class Tree extends Individual implements ITree, IPlantabl /* EFFECTS */ @Override public IEffectData[] doEffect(IEffectData[] storedData, World world, BlockPos pos) { - IAlleleLeafEffect effect = (IAlleleLeafEffect) getGenome().getActiveAllele(TreeChromosome.EFFECT); + IAlleleLeafEffect effect = (IAlleleLeafEffect) getGenome().getActiveAllele(EnumTreeChromosome.EFFECT); if (effect == null) { return null; @@ -125,7 +128,7 @@ public class Tree extends Individual implements ITree, IPlantabl return storedData; } - IAlleleLeafEffect secondary = (IAlleleLeafEffect) getGenome().getInactiveAllele(TreeChromosome.EFFECT); + IAlleleLeafEffect secondary = (IAlleleLeafEffect) getGenome().getInactiveAllele(EnumTreeChromosome.EFFECT); if (!secondary.isCombinable()) { return storedData; } @@ -268,7 +271,7 @@ public class Tree extends Individual implements ITree, IPlantabl } @Override - public boolean isPureBred(TreeChromosome chromosome) { + public boolean isPureBred(EnumTreeChromosome chromosome) { return genome.getActiveAllele(chromosome).getUID().equals(genome.getInactiveAllele(chromosome).getUID()); } @@ -289,26 +292,26 @@ public class Tree extends Individual implements ITree, IPlantabl // You analyzed it? Juicy tooltip coming up! IAlleleTreeSpecies primary = genome.getPrimary(); IAlleleTreeSpecies secondary = genome.getSecondary(); - if (!isPureBred(TreeChromosome.SPECIES)) { + if (!isPureBred(EnumTreeChromosome.SPECIES)) { list.add(EnumChatFormatting.BLUE + StringUtil.localize("trees.hybrid").replaceAll("%PRIMARY", primary.getName()).replaceAll("%SECONDARY", secondary.getName())); } - String sappiness = EnumChatFormatting.GOLD + "S: " + genome.getActiveAllele(TreeChromosome.SAPPINESS).getName(); - String maturation = EnumChatFormatting.RED + "M: " + genome.getActiveAllele(TreeChromosome.MATURATION).getName(); - String height = EnumChatFormatting.LIGHT_PURPLE + "H: " + genome.getActiveAllele(TreeChromosome.HEIGHT).getName(); + String sappiness = EnumChatFormatting.GOLD + "S: " + genome.getActiveAllele(EnumTreeChromosome.SAPPINESS).getName(); + String maturation = EnumChatFormatting.RED + "M: " + genome.getActiveAllele(EnumTreeChromosome.MATURATION).getName(); + String height = EnumChatFormatting.LIGHT_PURPLE + "H: " + genome.getActiveAllele(EnumTreeChromosome.HEIGHT).getName(); String girth = EnumChatFormatting.AQUA + "G: " + String.format("%sx%s", genome.getGirth(), genome.getGirth()); - String saplings = EnumChatFormatting.YELLOW + "S: " + genome.getActiveAllele(TreeChromosome.FERTILITY).getName(); - String yield = EnumChatFormatting.WHITE + "Y: " + genome.getActiveAllele(TreeChromosome.YIELD).getName(); + String saplings = EnumChatFormatting.YELLOW + "S: " + genome.getActiveAllele(EnumTreeChromosome.FERTILITY).getName(); + String yield = EnumChatFormatting.WHITE + "Y: " + genome.getActiveAllele(EnumTreeChromosome.YIELD).getName(); list.add(String.format("%s, %s", saplings, maturation)); list.add(String.format("%s, %s", height, girth)); list.add(String.format("%s, %s", yield, sappiness)); - IAlleleBoolean primaryFireproof = (IAlleleBoolean) genome.getActiveAllele(TreeChromosome.FIREPROOF); + IAlleleBoolean primaryFireproof = (IAlleleBoolean) genome.getActiveAllele(EnumTreeChromosome.FIREPROOF); if (primaryFireproof.getValue()) { list.add(EnumChatFormatting.RED + StatCollector.translateToLocal("for.gui.fireresist")); } - IAllele fruit = getGenome().getActiveAllele(TreeChromosome.FRUITS); + IAllele fruit = getGenome().getActiveAllele(EnumTreeChromosome.FRUITS); if (fruit != AlleleFruit.fruitNone) { String strike = ""; if (!canBearFruit()) { @@ -321,10 +324,10 @@ public class Tree extends Individual implements ITree, IPlantabl /* REPRODUCTION */ @Override - public Collection getSaplings(World world, GameProfile playerProfile, BlockPos pos, float modifier) { - List prod = new ArrayList<>(); + public ITree[] getSaplings(World world, GameProfile playerProfile, BlockPos pos, float modifier) { + ArrayList prod = new ArrayList<>(); - final float chance = genome.getFertility() * modifier; + float chance = genome.getFertility() * modifier; if (world.rand.nextFloat() <= chance) { if (this.getMate() == null) { @@ -334,16 +337,90 @@ public class Tree extends Individual implements ITree, IPlantabl } } - return prod; + return prod.toArray(new ITree[prod.size()]); } private ITree createOffspring(World world, GameProfile playerProfile, BlockPos pos) { - if (mate == null) { - return null; + + IChromosome[] chromosomes = new IChromosome[genome.getChromosomes().length]; + IChromosome[] parent1 = genome.getChromosomes(); + IChromosome[] parent2 = mate.getChromosomes(); + + // Check for mutation. Replace one of the parents with the mutation + // template if mutation occured. + IChromosome[] mutated = mutateSpecies(world, playerProfile, pos, genome, mate); + if (mutated == null) { + mutated = mutateSpecies(world, playerProfile, pos, mate, genome); } - ImmutableMap chromosomes = createOffspringChromosomes(world, playerProfile, pos, genome, mate); - ITreeGenome genome = TreeManager.treeRoot.chromosomesAsGenome(chromosomes); - return new Tree(genome); + + if (mutated != null) { + return new Tree(new TreeGenome(mutated)); + } + + for (int i = 0; i < parent1.length; i++) { + if (parent1[i] != null && parent2[i] != null) { + chromosomes[i] = Chromosome.inheritChromosome(world.rand, parent1[i], parent2[i]); + } + } + + return new Tree(new TreeGenome(chromosomes)); + } + + private static IChromosome[] mutateSpecies(World world, @Nullable GameProfile playerProfile, BlockPos pos, ITreeGenome genomeOne, ITreeGenome genomeTwo) { + + IChromosome[] parent1 = genomeOne.getChromosomes(); + IChromosome[] parent2 = genomeTwo.getChromosomes(); + + ITreeGenome genome0; + ITreeGenome genome1; + IAlleleTreeSpecies allele0; + IAlleleTreeSpecies allele1; + + if (world.rand.nextBoolean()) { + allele0 = (IAlleleTreeSpecies) parent1[EnumTreeChromosome.SPECIES.ordinal()].getPrimaryAllele(); + allele1 = (IAlleleTreeSpecies) parent2[EnumTreeChromosome.SPECIES.ordinal()].getSecondaryAllele(); + + genome0 = genomeOne; + genome1 = genomeTwo; + } else { + allele0 = (IAlleleTreeSpecies) parent2[EnumTreeChromosome.SPECIES.ordinal()].getPrimaryAllele(); + allele1 = (IAlleleTreeSpecies) parent1[EnumTreeChromosome.SPECIES.ordinal()].getSecondaryAllele(); + + genome0 = genomeTwo; + genome1 = genomeOne; + } + + IArboristTracker breedingTracker = null; + if (playerProfile != null) { + breedingTracker = TreeManager.treeRoot.getBreedingTracker(world, playerProfile); + } + + List combinations = TreeManager.treeRoot.getCombinations(allele0, allele1, true); + for (IMutation mutation : combinations) { + ITreeMutation treeMutation = (ITreeMutation) mutation; + // Stop blacklisted species. + // if (BeeManager.breedingManager.isBlacklisted(mutation.getTemplate()[0].getUID())) { + // continue; + // } + + float chance = treeMutation.getChance(world, pos, allele0, allele1, genome0, genome1); + if (chance <= 0) { + continue; + } + + // boost chance for researched mutations + if (breedingTracker != null && breedingTracker.isResearched(treeMutation)) { + float mutationBoost = chance * (Config.researchMutationBoostMultiplier - 1.0f); + mutationBoost = Math.min(Config.maxResearchMutationBoostPercent, mutationBoost); + chance += mutationBoost; + } + + if (chance > world.rand.nextFloat() * 100) { + return TreeManager.treeRoot.templateAsChromosomes(treeMutation.getTemplate()); + } + } + + return null; } /* PRODUCTION */ diff --git a/src/main/java/forestry/arboriculture/genetics/TreeBranchDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeBranchDefinition.java index 88bb0e299..43ca3e2a1 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeBranchDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeBranchDefinition.java @@ -10,15 +10,12 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import com.google.common.collect.ImmutableMap; - -import java.util.EnumMap; +import java.util.Arrays; import java.util.Locale; -import java.util.Map; import org.apache.commons.lang3.text.WordUtils; -import forestry.api.arboriculture.TreeChromosome; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleRegistry; @@ -81,29 +78,27 @@ public enum TreeBranchDefinition implements IBranchDefinition { branch = new BranchTrees(name, scientific); } - private static ImmutableMap defaultTemplate; + private static IAllele[] defaultTemplate; @Override - public Map getTemplate() { + public IAllele[] getTemplate() { if (defaultTemplate == null) { - Map defaultTemplateBuilder = new EnumMap<>(TreeChromosome.class); - AlleleHelper.instance.set(defaultTemplateBuilder, TreeChromosome.FRUITS, AlleleFruit.fruitNone); - AlleleHelper.instance.set(defaultTemplateBuilder, TreeChromosome.GROWTH, AlleleGrowth.growthLightLevel); - AlleleHelper.instance.set(defaultTemplateBuilder, TreeChromosome.HEIGHT, EnumAllele.Height.SMALL); - AlleleHelper.instance.set(defaultTemplateBuilder, TreeChromosome.FERTILITY, EnumAllele.Saplings.LOWER); - AlleleHelper.instance.set(defaultTemplateBuilder, TreeChromosome.YIELD, EnumAllele.Yield.LOWEST); - AlleleHelper.instance.set(defaultTemplateBuilder, TreeChromosome.PLANT, AllelePlantType.plantTypeNone); - AlleleHelper.instance.set(defaultTemplateBuilder, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWEST); - AlleleHelper.instance.set(defaultTemplateBuilder, TreeChromosome.TERRITORY, EnumAllele.Territory.AVERAGE); - AlleleHelper.instance.set(defaultTemplateBuilder, TreeChromosome.EFFECT, AlleleLeafEffect.leavesNone); - AlleleHelper.instance.set(defaultTemplateBuilder, TreeChromosome.MATURATION, EnumAllele.Maturation.AVERAGE); - AlleleHelper.instance.set(defaultTemplateBuilder, TreeChromosome.GIRTH, 1); - AlleleHelper.instance.set(defaultTemplateBuilder, TreeChromosome.FIREPROOF, EnumAllele.Fireproof.FALSE); + defaultTemplate = new IAllele[EnumTreeChromosome.values().length]; - defaultTemplate = ImmutableMap.copyOf(defaultTemplateBuilder); + AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.FRUITS, AlleleFruit.fruitNone); + AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.GROWTH, AlleleGrowth.growthLightLevel); + AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.HEIGHT, EnumAllele.Height.SMALL); + AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.LOWER); + AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.YIELD, EnumAllele.Yield.LOWEST); + AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.PLANT, AllelePlantType.plantTypeNone); + AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWEST); + AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.TERRITORY, EnumAllele.Territory.AVERAGE); + AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.EFFECT, AlleleLeafEffect.leavesNone); + AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.AVERAGE); + AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.GIRTH, 1); + AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.FIREPROOF, EnumAllele.Fireproof.FALSE); } - - return new EnumMap<>(defaultTemplate); + return Arrays.copyOf(defaultTemplate, defaultTemplate.length); } @Override diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java index 25fdbcc59..7bf9ea683 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java @@ -10,10 +10,8 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import com.google.common.collect.ImmutableMap; - import java.awt.Color; -import java.util.Map; +import java.util.Arrays; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -28,16 +26,15 @@ import com.mojang.authlib.GameProfile; import forestry.api.arboriculture.EnumFruitFamily; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumLeafType; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.EnumWoodType; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.IAlleleTreeSpeciesBuilder; +import forestry.api.arboriculture.IAlleleTreeSpeciesCustom; import forestry.api.arboriculture.IGermlingModelProvider; import forestry.api.arboriculture.ILeafSpriteProvider; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenerator; import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.ITreeMutationBuilder; -import forestry.api.arboriculture.TreeChromosome; +import forestry.api.arboriculture.ITreeMutationCustom; import forestry.api.arboriculture.TreeManager; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; @@ -101,14 +98,14 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FRUITS, AlleleFruit.fruitApple); - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.AVERAGE); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.FASTER); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FRUITS, AlleleFruit.fruitApple); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.AVERAGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.FASTER); } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.POMES); } @@ -124,14 +121,14 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.AVERAGE); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.FASTER); - AlleleHelper.instance.set(alleles, TreeChromosome.GIRTH, 2); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.AVERAGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.FASTER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.GIRTH, 2); } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.POMES); } @@ -147,13 +144,13 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.AVERAGE); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.FASTER); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.AVERAGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.FASTER); } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { } @@ -169,15 +166,15 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.YIELD, EnumAllele.Yield.LOWER); - //Allele.helper.set(alleles, TreeChromosome.EFFECT, Allele.leavesBrimstone); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.YIELD, EnumAllele.Yield.LOWER); + //Allele.helper.set(alleles, EnumTreeChromosome.EFFECT, Allele.leavesBrimstone); } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.NUX) .addFruitFamily(EnumFruitFamily.PRUNES) .addFruitFamily(EnumFruitFamily.POMES); @@ -195,20 +192,20 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.NUX) .addFruitFamily(EnumFruitFamily.PRUNES) .addFruitFamily(EnumFruitFamily.POMES); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FRUITS, AlleleFruit.fruitWalnut); - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.YIELD, EnumAllele.Yield.AVERAGE); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); - AlleleHelper.instance.set(alleles, TreeChromosome.GIRTH, 2); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FRUITS, AlleleFruit.fruitWalnut); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.YIELD, EnumAllele.Yield.AVERAGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.GIRTH, 2); } @Override @@ -223,19 +220,19 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.NUX) .addFruitFamily(EnumFruitFamily.PRUNES) .addFruitFamily(EnumFruitFamily.POMES); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FRUITS, AlleleFruit.fruitChestnut); - AlleleHelper.instance.set(alleles, TreeChromosome.YIELD, EnumAllele.Yield.AVERAGE); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.LARGE); - AlleleHelper.instance.set(alleles, TreeChromosome.GIRTH, 2); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FRUITS, AlleleFruit.fruitChestnut); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.YIELD, EnumAllele.Yield.AVERAGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.LARGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.GIRTH, 2); } @Override @@ -251,18 +248,18 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.PRUNES) .addFruitFamily(EnumFruitFamily.POMES); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FRUITS, AlleleFruit.fruitCherry); - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.YIELD, EnumAllele.Yield.AVERAGE); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.SMALLER); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FRUITS, AlleleFruit.fruitCherry); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.YIELD, EnumAllele.Yield.AVERAGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.SMALLER); } @Override @@ -278,17 +275,17 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.PRUNES) .addFruitFamily(EnumFruitFamily.POMES); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FRUITS, AlleleFruit.fruitLemon); - AlleleHelper.instance.set(alleles, TreeChromosome.YIELD, EnumAllele.Yield.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.AVERAGE); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.SMALLEST); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FRUITS, AlleleFruit.fruitLemon); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.YIELD, EnumAllele.Yield.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.AVERAGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.SMALLEST); } @Override @@ -303,17 +300,17 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.PRUNES) .addFruitFamily(EnumFruitFamily.POMES); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FRUITS, AlleleFruit.fruitPlum); - AlleleHelper.instance.set(alleles, TreeChromosome.YIELD, EnumAllele.Yield.HIGH); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.AVERAGE); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.SMALLEST); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FRUITS, AlleleFruit.fruitPlum); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.YIELD, EnumAllele.Yield.HIGH); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.AVERAGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.SMALLEST); } @Override @@ -328,16 +325,16 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.PRUNES) .addFruitFamily(EnumFruitFamily.POMES); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); } @Override @@ -352,15 +349,15 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.AVERAGE); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.FASTER); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.AVERAGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.FASTER); } @Override @@ -375,15 +372,15 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); } @Override @@ -399,15 +396,15 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); } @Override @@ -422,17 +419,17 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.LARGEST); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.SLOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.GIRTH, 3); - AlleleHelper.instance.set(alleles, TreeChromosome.FIREPROOF, EnumAllele.Fireproof.TRUE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.LARGEST); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.SLOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.GIRTH, 3); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FIREPROOF, EnumAllele.Fireproof.TRUE); } @Override @@ -447,17 +444,17 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.GIGANTIC); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWEST); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.SLOWEST); - AlleleHelper.instance.set(alleles, TreeChromosome.GIRTH, 4); - AlleleHelper.instance.set(alleles, TreeChromosome.FIREPROOF, EnumAllele.Fireproof.TRUE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.GIGANTIC); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWEST); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.SLOWEST); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.GIRTH, 4); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FIREPROOF, EnumAllele.Fireproof.TRUE); } @Override @@ -472,15 +469,15 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FRUITS, AlleleFruit.fruitCocoa); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.LARGER); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.FAST); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FRUITS, AlleleFruit.fruitCocoa); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.LARGER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.FAST); } @Override @@ -495,13 +492,13 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); } @Override @@ -516,15 +513,15 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.LARGE); - AlleleHelper.instance.set(alleles, TreeChromosome.GIRTH, 2); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.LARGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.GIRTH, 2); } @Override @@ -539,16 +536,16 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE) .addFruitFamily(EnumFruitFamily.PRUNES); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.LARGE); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.SLOW); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.LARGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.SLOW); } @Override @@ -563,17 +560,17 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE) .addFruitFamily(EnumFruitFamily.PRUNES); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.SLOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.GIRTH, 3); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.SLOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.GIRTH, 3); } @Override @@ -588,14 +585,14 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.NUX); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.LARGE); - AlleleHelper.instance.set(alleles, TreeChromosome.GIRTH, 2); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.LARGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.GIRTH, 2); } @Override @@ -610,16 +607,16 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.LARGE); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.SLOW); - AlleleHelper.instance.set(alleles, TreeChromosome.GIRTH, 2); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.LARGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.SLOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.GIRTH, 2); } @Override @@ -634,13 +631,13 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE) .addFruitFamily(EnumFruitFamily.NUX); } @Override - protected void setAlleles(Map alleles) { + protected void setAlleles(IAllele[] alleles) { } @@ -656,14 +653,14 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE) .addFruitFamily(EnumFruitFamily.NUX); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.PLANT, AllelePlantType.plantTypeDesert); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.PLANT, AllelePlantType.plantTypeDesert); } @Override @@ -678,14 +675,14 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.LARGE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.LARGE); } @Override @@ -700,16 +697,16 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE) .addFruitFamily(EnumFruitFamily.NUX); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.HIGH); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.LARGE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.HIGH); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.LARGE); } @Override @@ -724,13 +721,13 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.LARGEST); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.LARGEST); } @Override @@ -745,15 +742,15 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE) .addFruitFamily(EnumFruitFamily.NUX); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.LOWEST); - AlleleHelper.instance.set(alleles, TreeChromosome.GIRTH, 2); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.LOWEST); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.GIRTH, 2); } @Override @@ -768,18 +765,18 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE) .addFruitFamily(EnumFruitFamily.NUX); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.LARGE); - AlleleHelper.instance.set(alleles, TreeChromosome.PLANT, AllelePlantType.plantTypeDesert); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.SLOW); - AlleleHelper.instance.set(alleles, TreeChromosome.GIRTH, 3); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.LARGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.PLANT, AllelePlantType.plantTypeDesert); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.SLOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.GIRTH, 3); } @Override @@ -794,17 +791,17 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE) .addFruitFamily(EnumFruitFamily.POMES) .addFruitFamily(EnumFruitFamily.PRUNES); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.SMALL); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.SLOWEST); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.SMALL); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.HIGH); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.SLOWEST); } @Override @@ -819,17 +816,17 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.NUX) .addFruitFamily(EnumFruitFamily.PRUNES) .addFruitFamily(EnumFruitFamily.POMES); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.FASTER); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.FASTER); } @Override @@ -852,16 +849,16 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.GROWTH, AlleleGrowth.growthTropical); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.LARGE); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.SLOW); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.GROWTH, AlleleGrowth.growthTropical); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.LARGE); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.SLOW); } @Override @@ -878,17 +875,17 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE) .addFruitFamily(EnumFruitFamily.NUX); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FRUITS, AlleleFruit.fruitPapaya); - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FRUITS, AlleleFruit.fruitPapaya); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOWER); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); } @Override @@ -903,18 +900,18 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE) .addFruitFamily(EnumFruitFamily.NUX); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.FRUITS, AlleleFruit.fruitDates); - AlleleHelper.instance.set(alleles, TreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.YIELD, EnumAllele.Yield.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FRUITS, AlleleFruit.fruitDates); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.FERTILITY, EnumAllele.Saplings.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.YIELD, EnumAllele.Yield.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.AVERAGE); } @Override @@ -929,16 +926,16 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } @Override - protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) { + protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) { treeSpecies.addFruitFamily(EnumFruitFamily.PRUNES) .addFruitFamily(EnumFruitFamily.POMES); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, TreeChromosome.HEIGHT, EnumAllele.Height.SMALL); - AlleleHelper.instance.set(alleles, TreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); - AlleleHelper.instance.set(alleles, TreeChromosome.MATURATION, EnumAllele.Maturation.SLOWER); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumTreeChromosome.HEIGHT, EnumAllele.Height.SMALL); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.SAPPINESS, EnumAllele.Sappiness.LOW); + AlleleHelper.instance.set(alleles, EnumTreeChromosome.MATURATION, EnumAllele.Maturation.SLOWER); } @Override @@ -949,15 +946,15 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } }; - private final IAlleleTreeSpecies species; private final TreeBranchDefinition branch; + private final IAlleleTreeSpeciesCustom species; + private final EnumWoodType woodType; // for forestry trees private final ItemStack vanillaWood; // for vanilla trees - private ImmutableMap template; + private IAllele[] template; private ITreeGenome genome; - // vanilla tree constructor TreeDefinition(TreeBranchDefinition branch, String speciesName, String binomial, boolean dominant, EnumLeafType leafType, Color primary, Color secondary, int vanillaMeta, ItemStack vanillaWood) { String uid = "forestry.tree" + this; @@ -970,10 +967,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { ILeafSpriteProvider leafIconProvider = TreeManager.treeFactory.getLeafIconProvider(leafType, primary, secondary); IGermlingModelProvider germlingIconProvider = new ModelProviderGermlingVanilla(vanillaMeta); - IAlleleTreeSpeciesBuilder speciesBuilder = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, modelName, leafIconProvider, germlingIconProvider, this); - setSpeciesProperties(speciesBuilder); - this.species = speciesBuilder.build(); - + this.species = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, modelName, leafIconProvider, germlingIconProvider, this); this.woodType = null; this.vanillaWood = vanillaWood; } @@ -990,17 +984,14 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { ILeafSpriteProvider leafIconProvider = TreeManager.treeFactory.getLeafIconProvider(leafType, primary, secondary); IGermlingModelProvider germlingIconProvider = new ModelProviderGermling(uid); - IAlleleTreeSpeciesBuilder speciesBuilder = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, modelName, leafIconProvider, germlingIconProvider, this); - setSpeciesProperties(speciesBuilder); - this.species = speciesBuilder.build(); - + this.species = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, modelName, leafIconProvider, germlingIconProvider, this); this.woodType = woodType; this.vanillaWood = null; } - protected abstract void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies); + protected abstract void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies); - protected abstract void setAlleles(Map alleles); + protected abstract void setAlleles(IAllele[] alleles); protected abstract void registerMutations(); @@ -1022,7 +1013,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { world.setBlockState(pos, vanillaWoodBlock.getStateFromMeta(vanillaWoodMeta), Constants.FLAG_BLOCK_SYNCH); } else { - AlleleBoolean fireproofAllele = (AlleleBoolean) genome.getActiveAllele(TreeChromosome.FIREPROOF); + AlleleBoolean fireproofAllele = (AlleleBoolean) genome.getActiveAllele(EnumTreeChromosome.FIREPROOF); boolean fireproof = fireproofAllele.getValue(); ItemStack log = TreeManager.woodItemAccess.getLog(woodType, fireproof); @@ -1070,24 +1061,24 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { } private void init() { - Map templateBuilder = branch.getTemplate(); - AlleleHelper.instance.set(templateBuilder, TreeChromosome.SPECIES, species); - setAlleles(templateBuilder); + setSpeciesProperties(species); - template = ImmutableMap.copyOf(templateBuilder); + template = branch.getTemplate(); + AlleleHelper.instance.set(template, EnumTreeChromosome.SPECIES, species); + setAlleles(template); genome = TreeManager.treeRoot.templateAsGenome(template); TreeManager.treeRoot.registerTemplate(template); } - protected final ITreeMutationBuilder registerMutation(TreeDefinition parent1, TreeDefinition parent2, int chance) { + protected final ITreeMutationCustom registerMutation(TreeDefinition parent1, TreeDefinition parent2, int chance) { return TreeManager.treeMutationFactory.createMutation(parent1.species, parent2.species, getTemplate(), chance); } @Override - public final ImmutableMap getTemplate() { - return template; + public final IAllele[] getTemplate() { + return Arrays.copyOf(template, template.length); } public final String getUID() { diff --git a/src/main/java/forestry/arboriculture/genetics/TreeFactory.java b/src/main/java/forestry/arboriculture/genetics/TreeFactory.java index ae9a5fdc3..4d5f44733 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeFactory.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeFactory.java @@ -13,19 +13,23 @@ package forestry.arboriculture.genetics; import java.awt.Color; import forestry.api.arboriculture.EnumLeafType; -import forestry.api.arboriculture.IAlleleTreeSpeciesBuilder; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.IAlleleTreeSpeciesCustom; import forestry.api.arboriculture.IGermlingModelProvider; import forestry.api.arboriculture.ILeafSpriteProvider; import forestry.api.arboriculture.ITreeFactory; import forestry.api.arboriculture.ITreeGenerator; +import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies; import forestry.arboriculture.render.SpriteProviderLeaves; public class TreeFactory implements ITreeFactory { @Override - public IAlleleTreeSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String modelName, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator) { - return new AlleleTreeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, modelName, leafSpriteProvider, germlingModelProvider, generator); + public IAlleleTreeSpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String modelName, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator) { + IAlleleTreeSpeciesCustom treeSpecies = new AlleleTreeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, modelName, leafSpriteProvider, germlingModelProvider, generator); + AlleleManager.alleleRegistry.registerAllele(treeSpecies, EnumTreeChromosome.SPECIES); + return treeSpecies; } @Override diff --git a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java index 4e4515330..6743839c5 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java @@ -10,9 +10,6 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; import java.util.EnumSet; import net.minecraft.item.ItemStack; @@ -20,6 +17,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.EnumPlantType; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleGrowth; import forestry.api.arboriculture.IAlleleLeafEffect; @@ -27,19 +25,18 @@ import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.IGrowthProvider; import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.ITreeRoot; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAlleleFloat; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IChromosome; +import forestry.api.genetics.ISpeciesRoot; import forestry.core.genetics.Genome; import forestry.core.genetics.alleles.AllelePlantType; -public class TreeGenome extends Genome implements ITreeGenome { +public class TreeGenome extends Genome implements ITreeGenome { - public TreeGenome(@Nonnull ImmutableMap chromosomes) { + public TreeGenome(IChromosome[] chromosomes) { super(chromosomes); } @@ -58,74 +55,71 @@ public class TreeGenome extends Genome implements ITreeGenome { return (IAlleleTreeSpecies) species; } - return (IAlleleTreeSpecies) getActiveAllele(itemStack, TreeChromosome.SPECIES, TreeManager.treeRoot); + return (IAlleleTreeSpecies) getActiveAllele(itemStack, EnumTreeChromosome.SPECIES, TreeManager.treeRoot); } - @Nonnull @Override public IAlleleTreeSpecies getPrimary() { - return (IAlleleTreeSpecies) getActiveAllele(TreeChromosome.SPECIES); + return (IAlleleTreeSpecies) getActiveAllele(EnumTreeChromosome.SPECIES); } - @Nonnull @Override public IAlleleTreeSpecies getSecondary() { - return (IAlleleTreeSpecies) getInactiveAllele(TreeChromosome.SPECIES); + return (IAlleleTreeSpecies) getInactiveAllele(EnumTreeChromosome.SPECIES); } @Override public IFruitProvider getFruitProvider() { - return ((IAlleleFruit) getActiveAllele(TreeChromosome.FRUITS)).getProvider(); + return ((IAlleleFruit) getActiveAllele(EnumTreeChromosome.FRUITS)).getProvider(); } @Override public IGrowthProvider getGrowthProvider() { - return ((IAlleleGrowth) getActiveAllele(TreeChromosome.GROWTH)).getProvider(); + return ((IAlleleGrowth) getActiveAllele(EnumTreeChromosome.GROWTH)).getProvider(); } @Override public float getHeight() { - return ((IAlleleFloat) getActiveAllele(TreeChromosome.HEIGHT)).getValue(); + return ((IAlleleFloat) getActiveAllele(EnumTreeChromosome.HEIGHT)).getValue(); } @Override public float getFertility() { - return ((IAlleleFloat) getActiveAllele(TreeChromosome.FERTILITY)).getValue(); + return ((IAlleleFloat) getActiveAllele(EnumTreeChromosome.FERTILITY)).getValue(); } @Override public float getYield() { - return ((IAlleleFloat) getActiveAllele(TreeChromosome.YIELD)).getValue(); + return ((IAlleleFloat) getActiveAllele(EnumTreeChromosome.YIELD)).getValue(); } @Override public float getSappiness() { - return ((IAlleleFloat) getActiveAllele(TreeChromosome.SAPPINESS)).getValue(); + return ((IAlleleFloat) getActiveAllele(EnumTreeChromosome.SAPPINESS)).getValue(); } @Override public EnumSet getPlantTypes() { - return ((AllelePlantType) getActiveAllele(TreeChromosome.PLANT)).getPlantTypes(); + return ((AllelePlantType) getActiveAllele(EnumTreeChromosome.PLANT)).getPlantTypes(); } @Override public int getMaturationTime() { - return ((IAlleleInteger) getActiveAllele(TreeChromosome.MATURATION)).getValue(); + return ((IAlleleInteger) getActiveAllele(EnumTreeChromosome.MATURATION)).getValue(); } @Override public int getGirth() { - return ((IAlleleInteger) getActiveAllele(TreeChromosome.GIRTH)).getValue(); + return ((IAlleleInteger) getActiveAllele(EnumTreeChromosome.GIRTH)).getValue(); } @Override public IAlleleLeafEffect getEffect() { - return (IAlleleLeafEffect) getActiveAllele(TreeChromosome.EFFECT); + return (IAlleleLeafEffect) getActiveAllele(EnumTreeChromosome.EFFECT); } - @Nonnull @Override - public ITreeRoot getSpeciesRoot() { + public ISpeciesRoot getSpeciesRoot() { return TreeManager.treeRoot; } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java b/src/main/java/forestry/arboriculture/genetics/TreeHelper.java old mode 100644 new mode 100755 similarity index 79% rename from src/main/java/forestry/arboriculture/genetics/TreeRoot.java rename to src/main/java/forestry/arboriculture/genetics/TreeHelper.java index 8f778ddf9..58f383ad2 --- a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeHelper.java @@ -10,9 +10,6 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -36,6 +33,7 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.oredict.OreDictionary; import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.IArboristTracker; @@ -45,11 +43,10 @@ import forestry.api.arboriculture.ITreeGenome; import forestry.api.arboriculture.ITreeMutation; import forestry.api.arboriculture.ITreeRoot; import forestry.api.arboriculture.ITreekeepingMode; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosome; +import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.arboriculture.blocks.BlockFruitPod; @@ -58,21 +55,18 @@ import forestry.arboriculture.tiles.TileSapling; import forestry.core.config.Constants; import forestry.core.genetics.SpeciesRoot; import forestry.core.utils.BlockUtil; -import forestry.core.utils.Log; import forestry.plugins.PluginArboriculture; -public class TreeRoot extends SpeciesRoot implements ITreeRoot { +public class TreeHelper extends SpeciesRoot implements ITreeRoot { public static final String UID = "rootTrees"; private static int treeSpeciesCount = -1; private static ITreekeepingMode activeTreekeepingMode; public static final ArrayList treeTemplates = new ArrayList<>(); - @Nonnull private final ArrayList treekeepingModes = new ArrayList<>(); - public TreeRoot() { - super(TreeChromosome.class); + public TreeHelper() { setResearchSuitability(new ItemStack(Blocks.sapling, 1, OreDictionary.WILDCARD_VALUE), 1.0f); } @@ -82,7 +76,7 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { } @Override - public Class getMemberClass() { + public Class getMemberClass() { return ITree.class; } @@ -251,37 +245,28 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { /* GENOME CONVERSIONS */ @Override - public ITreeGenome templateAsGenome(ImmutableMap template) { + public ITreeGenome templateAsGenome(IAllele[] template) { return new TreeGenome(templateAsChromosomes(template)); } @Override - public ITreeGenome templateAsGenome(ImmutableMap templateActive, ImmutableMap templateInactive) { + public ITreeGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive) { return new TreeGenome(templateAsChromosomes(templateActive, templateInactive)); } - @Nonnull @Override - public ITreeGenome chromosomesAsGenome(ImmutableMap chromosomes) { - return new TreeGenome(chromosomes); - } - - @Nonnull - @Override - public ITree templateAsIndividual(ImmutableMap template) { + public ITree templateAsIndividual(IAllele[] template) { return new Tree(templateAsGenome(template)); } - @Nonnull @Override - public ITree templateAsIndividual(ImmutableMap templateActive, ImmutableMap templateInactive) { + public ITree templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive) { return new Tree(templateAsGenome(templateActive, templateInactive)); } /* BREEDING TRACKER */ - @Nonnull @Override - public IArboristTracker getBreedingTracker(@Nonnull World world, @Nonnull GameProfile player) { + public IArboristTracker getBreedingTracker(World world, GameProfile player) { String filename = "ArboristTracker." + (player == null ? "common" : player.getId()); ArboristTracker tracker = (ArboristTracker) world.loadItemData(ArboristTracker.class, filename); @@ -299,20 +284,13 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { /* BREEDING MODES */ - @Nonnull @Override - public List getModes() { + public ArrayList getTreekeepingModes() { return this.treekeepingModes; } @Override - public void resetMode() { - activeTreekeepingMode = null; - } - - @Nonnull - @Override - public ITreekeepingMode getMode(@Nonnull World world) { + public ITreekeepingMode getTreekeepingMode(World world) { if (activeTreekeepingMode != null) { return activeTreekeepingMode; } @@ -324,33 +302,32 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { mode = PluginArboriculture.treekeepingMode; } - setMode(world, mode); + setTreekeepingMode(world, mode); FMLCommonHandler.instance().getFMLLogger().debug("Set Treekeeping mode for a world to " + mode); return activeTreekeepingMode; } @Override - public void registerMode(@Nonnull ITreekeepingMode mode) { + public void registerTreekeepingMode(ITreekeepingMode mode) { treekeepingModes.add(mode); } @Override - public void setMode(@Nonnull World world, @Nonnull String name) { - activeTreekeepingMode = getMode(name); + public void setTreekeepingMode(World world, String name) { + activeTreekeepingMode = getTreekeepingMode(name); getBreedingTracker(world, null).setModeName(name); } - @Nonnull @Override - public ITreekeepingMode getMode(@Nonnull String name) { + public ITreekeepingMode getTreekeepingMode(String name) { for (ITreekeepingMode mode : treekeepingModes) { if (mode.getName().equals(name) || mode.getName().equals(name.toLowerCase(Locale.ENGLISH))) { return mode; } } - Log.error("Failed to find a Treekeeping mode called '%s', reverting to fallback."); + FMLCommonHandler.instance().getFMLLogger().debug("Failed to find a Treekeeping mode called '%s', reverting to fallback."); return treekeepingModes.get(0); } @@ -362,13 +339,13 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { } @Override - public void registerTemplate(String identifier, ImmutableMap template) { + public void registerTemplate(String identifier, IAllele[] template) { treeTemplates.add(new Tree(TreeManager.treeRoot.templateAsGenome(template))); speciesTemplates.put(identifier, template); } @Override - public ImmutableMap getDefaultTemplate() { + public IAllele[] getDefaultTemplate() { return TreeDefinition.Oak.getTemplate(); } @@ -384,14 +361,14 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { } @Override - public void registerMutation(IMutation mutation) { - if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getResultTemplate().get(TreeChromosome.SPECIES).getUID())) { + public void registerMutation(IMutation mutation) { + if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getTemplate()[0].getUID())) { return; } - if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getSpecies0().getUID())) { + if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele0().getUID())) { return; } - if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getSpecies1().getUID())) { + if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele1().getUID())) { return; } @@ -411,16 +388,14 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { return leafTickHandlers; } - @Nonnull @Override - public TreeChromosome[] getKaryotype() { - return TreeChromosome.values(); + public IChromosomeType[] getKaryotype() { + return EnumTreeChromosome.values(); } - @Nonnull @Override - public TreeChromosome getKaryotypeKey() { - return TreeChromosome.SPECIES; + public IChromosomeType getKaryotypeKey() { + return EnumTreeChromosome.SPECIES; } } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java index 78d9e2765..4e52e14f4 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeMutation.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java @@ -10,36 +10,38 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.ITreeMutation; -import forestry.api.arboriculture.ITreeMutationBuilder; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.ITreeMutationCustom; import forestry.api.arboriculture.ITreeRoot; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; import forestry.core.genetics.mutations.Mutation; -public class TreeMutation extends Mutation implements ITreeMutation, ITreeMutationBuilder { +public class TreeMutation extends Mutation implements ITreeMutationCustom { - public TreeMutation(IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, ImmutableMap template, int chance) { + public TreeMutation(IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, IAllele[] template, int chance) { super(allele0, allele1, template, chance); } - // TODO: break this into a separate builder class - @Nonnull - @Override - public ITreeMutation build() { - TreeManager.treeRoot.registerMutation(this); - return this; - } - - @Nonnull @Override public ITreeRoot getRoot() { return TreeManager.treeRoot; } + + @Override + public float getChance(World world, BlockPos pos, IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, ITreeGenome genome0, ITreeGenome genome1) { + float processedChance = super.getChance(world, pos, allele0, allele1, genome0, genome1); + if (processedChance <= 0) { + return 0; + } + + processedChance *= getRoot().getTreekeepingMode(world).getMutationModifier(genome0, genome1, 1f); + + return processedChance; + } + } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeMutationFactory.java b/src/main/java/forestry/arboriculture/genetics/TreeMutationFactory.java index 1f8bd4919..23af72f92 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeMutationFactory.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeMutationFactory.java @@ -10,18 +10,18 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import com.google.common.collect.ImmutableMap; - import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.ITreeMutationBuilder; +import forestry.api.arboriculture.ITreeMutationCustom; import forestry.api.arboriculture.ITreeMutationFactory; -import forestry.api.arboriculture.TreeChromosome; +import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; public class TreeMutationFactory implements ITreeMutationFactory { @Override - public ITreeMutationBuilder createMutation(IAlleleTreeSpecies parent0, IAlleleTreeSpecies parent1, ImmutableMap result, int chance) { - return new TreeMutation(parent0, parent1, result, chance); + 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; } } diff --git a/src/main/java/forestry/arboriculture/genetics/TreekeepingMode.java b/src/main/java/forestry/arboriculture/genetics/TreekeepingMode.java index 937334c14..39c955156 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreekeepingMode.java +++ b/src/main/java/forestry/arboriculture/genetics/TreekeepingMode.java @@ -10,16 +10,11 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import javax.annotation.Nonnull; import java.util.ArrayList; -import java.util.List; import java.util.Locale; import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.ITreeModifier; import forestry.api.arboriculture.ITreekeepingMode; -import forestry.api.arboriculture.TreeChromosome; -import forestry.api.genetics.IGenome; public class TreekeepingMode implements ITreekeepingMode { @@ -29,71 +24,54 @@ public class TreekeepingMode implements ITreekeepingMode { public static final ITreekeepingMode hardcore = new TreekeepingMode("HARDCORE", 0.7f, 0.7f, 0.5f, 0.5f); public static final ITreekeepingMode insane = new TreekeepingMode("INSANE", 0.5f, 0.5f, 0.2f, 0.1f); - @Nonnull private final String name; - @Nonnull - private final ITreeModifier treeModifier; + private final float yieldModifier; + private final float sappinessModifier; + private final float maturationModifier; private final float mutationModifier; - private TreekeepingMode(@Nonnull String name, float yieldModifier, float sappinessModifier, float maturationModifier, float mutationModifier) { + public TreekeepingMode(String name, float yieldModifier, float sappinessModifier, float maturationModifier, float mutationModifier) { this.name = name; - this.treeModifier = new TreekeepingModifier(yieldModifier, sappinessModifier, maturationModifier); + this.yieldModifier = yieldModifier; + this.sappinessModifier = sappinessModifier; + this.maturationModifier = maturationModifier; this.mutationModifier = mutationModifier; } - @Nonnull @Override public String getName() { return this.name; } @Override - public List getDescription() { + public ArrayList getDescription() { ArrayList ret = new ArrayList<>(); ret.add("treemode." + name.toLowerCase(Locale.ENGLISH) + ".desc"); return ret; } @Override - public float getMutationModifier(IGenome genome, IGenome mate) { - return mutationModifier; + public float getHeightModifier(ITreeGenome genome, float currentModifier) { + return 1f; } @Override - @Nonnull - public ITreeModifier getTreeModifier() { - return treeModifier; + public float getYieldModifier(ITreeGenome genome, float currentModifier) { + return yieldModifier; } - private static class TreekeepingModifier implements ITreeModifier { - private final float yieldModifier; - private final float sappinessModifier; - private final float maturationModifier; + @Override + public float getSappinessModifier(ITreeGenome genome, float currentModifier) { + return sappinessModifier; + } - public TreekeepingModifier(float yieldModifier, float sappinessModifier, float maturationModifier) { - this.yieldModifier = yieldModifier; - this.sappinessModifier = sappinessModifier; - this.maturationModifier = maturationModifier; - } + @Override + public float getMaturationModifier(ITreeGenome genome, float currentModifier) { + return maturationModifier; + } - @Override - public float getHeightModifier(ITreeGenome genome, float currentModifier) { - return 1f; - } - - @Override - public float getYieldModifier(ITreeGenome genome, float currentModifier) { - return yieldModifier; - } - - @Override - public float getSappinessModifier(ITreeGenome genome, float currentModifier) { - return sappinessModifier; - } - - @Override - public float getMaturationModifier(ITreeGenome genome, float currentModifier) { - return maturationModifier; - } + @Override + public float getMutationModifier(ITreeGenome genome, ITreeGenome mate, float currentModifier) { + return mutationModifier; } } diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java index 5df190a4d..8fb699257 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java @@ -18,9 +18,9 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import forestry.api.arboriculture.EnumFruitFamily; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IFruitProvider; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.genetics.AlleleManager; import forestry.arboriculture.FruitProviderNone; import forestry.arboriculture.FruitProviderPod; @@ -60,7 +60,7 @@ public class AlleleFruit extends AlleleCategorized implements IAlleleFruit { ); for (IAlleleFruit fruitAllele : fruitAlleles) { - AlleleManager.alleleRegistry.registerAllele(fruitAllele, TreeChromosome.FRUITS); + AlleleManager.alleleRegistry.registerAllele(fruitAllele, EnumTreeChromosome.FRUITS); } } @@ -75,13 +75,11 @@ public class AlleleFruit extends AlleleCategorized implements IAlleleFruit { this.provider = provider; } - @Nonnull @Override public IFruitProvider getProvider() { return this.provider; } - - @Nonnull + @Override public String getName() { return getProvider().getDescription(); diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleGrowth.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleGrowth.java index e4c214246..4f98efd27 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleGrowth.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleGrowth.java @@ -13,9 +13,9 @@ package forestry.arboriculture.genetics.alleles; import java.util.Arrays; import java.util.List; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleGrowth; import forestry.api.arboriculture.IGrowthProvider; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.genetics.AlleleManager; import forestry.arboriculture.genetics.GrowthProvider; import forestry.arboriculture.genetics.GrowthProviderTropical; @@ -35,7 +35,7 @@ public class AlleleGrowth extends AlleleCategorized implements IAlleleGrowth { ); for (IAlleleGrowth alleleGrowth : growthAlleles) { - AlleleManager.alleleRegistry.registerAllele(alleleGrowth, TreeChromosome.GROWTH); + AlleleManager.alleleRegistry.registerAllele(alleleGrowth, EnumTreeChromosome.GROWTH); } } diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffect.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffect.java index f93bb5fe0..f09fcddb9 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffect.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffect.java @@ -14,9 +14,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleLeafEffect; import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IEffectData; import forestry.core.genetics.alleles.Allele; @@ -30,7 +30,7 @@ public class AlleleLeafEffect extends AlleleCategorized implements IAlleleLeafEf public static void createAlleles() { leavesNone = new AlleleLeafEffectNone(); - AlleleManager.alleleRegistry.registerAllele(leavesNone, TreeChromosome.EFFECT); + AlleleManager.alleleRegistry.registerAllele(leavesNone, EnumTreeChromosome.EFFECT); } protected AlleleLeafEffect(String valueName, boolean isDominant) { diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffectNone.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffectNone.java index ad221619d..ee2eeff6a 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffectNone.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffectNone.java @@ -10,14 +10,11 @@ ******************************************************************************/ package forestry.arboriculture.genetics.alleles; -import javax.annotation.Nonnull; - public class AlleleLeafEffectNone extends AlleleLeafEffect { public AlleleLeafEffectNone() { super("none", true); } - @Nonnull @Override public String getUnlocalizedName() { return "for.arboriculture.effect.none"; diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java index e4902b2cf..41fdd46e3 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java @@ -21,21 +21,19 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.IAlleleTreeSpeciesBuilder; +import forestry.api.arboriculture.IAlleleTreeSpeciesCustom; import forestry.api.arboriculture.IGermlingModelProvider; import forestry.api.arboriculture.ILeafSpriteProvider; import forestry.api.arboriculture.ITreeGenerator; import forestry.api.arboriculture.ITreeRoot; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.arboriculture.TreeManager; import forestry.api.core.IModelManager; import forestry.api.core.IModelProvider; -import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; import forestry.api.genetics.IFruitFamily; import forestry.core.genetics.alleles.AlleleSpecies; -public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpecies, IAlleleTreeSpeciesBuilder { +public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeciesCustom { private final ITreeGenerator generator; private final IGermlingModelProvider germlingModelProvider; private final ILeafSpriteProvider leafSpriteProvider; @@ -54,13 +52,6 @@ public class AlleleTreeSpecies extends AlleleSpecies implements this.modelName = modelName; } - // TODO: break this into a separate builder class - @Override - public IAlleleTreeSpecies build() { - AlleleManager.alleleRegistry.registerAllele(this, TreeChromosome.SPECIES); - return this; - } - @Override public ITreeRoot getRoot() { return TreeManager.treeRoot; diff --git a/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatable.java b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatable.java index 8315882ab..3054b7983 100644 --- a/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatable.java +++ b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatable.java @@ -14,7 +14,7 @@ import java.util.EnumSet; import net.minecraftforge.common.EnumPlantType; -import forestry.api.arboriculture.ITree; +import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; public class CheckPollinatable implements ICheckPollinatable { @@ -31,12 +31,12 @@ public class CheckPollinatable implements ICheckPollinatable { } @Override - public ITree getPollen() { + public IIndividual getPollen() { return pollinatable.getPollen(); } @Override - public boolean canMateWith(ITree pollen) { + public boolean canMateWith(IIndividual pollen) { return pollinatable.canMateWith(pollen); } diff --git a/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java index af3627cfe..c9f541b8f 100644 --- a/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java +++ b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java @@ -15,6 +15,7 @@ import java.util.EnumSet; import net.minecraftforge.common.EnumPlantType; import forestry.api.arboriculture.ITree; +import forestry.api.genetics.IIndividual; public class CheckPollinatableTree implements ICheckPollinatable { @@ -30,15 +31,18 @@ public class CheckPollinatableTree implements ICheckPollinatable { } @Override - public ITree getPollen() { + public IIndividual getPollen() { return tree; } @Override - public boolean canMateWith(ITree pollen) { + public boolean canMateWith(IIndividual pollen) { if (tree.getMate() != null) { return false; } + if (!(pollen instanceof ITree)) { + return false; + } return !tree.isGeneticEqual(pollen); } diff --git a/src/main/java/forestry/arboriculture/genetics/pollination/FakePollinatable.java b/src/main/java/forestry/arboriculture/genetics/pollination/FakePollinatable.java index d69bc2e37..b8dd0871c 100644 --- a/src/main/java/forestry/arboriculture/genetics/pollination/FakePollinatable.java +++ b/src/main/java/forestry/arboriculture/genetics/pollination/FakePollinatable.java @@ -4,7 +4,7 @@ import java.util.EnumSet; import net.minecraftforge.common.EnumPlantType; -import forestry.api.arboriculture.ITree; +import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; public class FakePollinatable implements IPollinatable { @@ -21,17 +21,17 @@ public class FakePollinatable implements IPollinatable { } @Override - public ITree getPollen() { + public IIndividual getPollen() { return checkPollinatable.getPollen(); } @Override - public boolean canMateWith(ITree pollen) { + public boolean canMateWith(IIndividual pollen) { return checkPollinatable.canMateWith(pollen); } @Override - public void mateWith(ITree pollen) { + public void mateWith(IIndividual pollen) { } diff --git a/src/main/java/forestry/arboriculture/genetics/pollination/ICheckPollinatable.java b/src/main/java/forestry/arboriculture/genetics/pollination/ICheckPollinatable.java index 710bcc229..30d040d33 100644 --- a/src/main/java/forestry/arboriculture/genetics/pollination/ICheckPollinatable.java +++ b/src/main/java/forestry/arboriculture/genetics/pollination/ICheckPollinatable.java @@ -14,7 +14,7 @@ import java.util.EnumSet; import net.minecraftforge.common.EnumPlantType; -import forestry.api.arboriculture.ITree; +import forestry.api.genetics.IIndividual; /** Just like IPollinatable but for checking only, it can't be mated */ public interface ICheckPollinatable { @@ -27,7 +27,7 @@ public interface ICheckPollinatable { /** * @return IIndividual containing the genetic information of this IPollinatable */ - ITree getPollen(); + IIndividual getPollen(); /** * Checks whether this can mate with the given pollen. @@ -37,7 +37,7 @@ public interface ICheckPollinatable { * @param pollen IIndividual representing the pollen. * @return true if mating is possible, false otherwise. */ - boolean canMateWith(ITree pollen); + boolean canMateWith(IIndividual pollen); boolean isPollinated(); } diff --git a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java index 23d609e89..4c371f185 100755 --- a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java @@ -22,11 +22,11 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.EnumPlantType; import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IAlleleGrowth; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleInteger; @@ -42,7 +42,7 @@ import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.utils.StringUtil; import forestry.plugins.PluginArboriculture; -public class GuiTreealyzer extends GuiAlyzer { +public class GuiTreealyzer extends GuiAlyzer { public GuiTreealyzer(EntityPlayer player, ItemInventoryTreealyzer inventory) { super(TreeManager.treeRoot, player, new ContainerAlyzer(inventory, player), inventory, "gui.treealyzer"); @@ -118,43 +118,43 @@ public class GuiTreealyzer extends GuiAlyzer { String customPrimaryTreeKey = "trees.custom.treealyzer." + type.getName() + "." + tree.getGenome().getPrimary().getUnlocalizedName().replace("trees.species.", ""); String customSecondaryTreeKey = "trees.custom.treealyzer." + type.getName() + "." + tree.getGenome().getSecondary().getUnlocalizedName().replace("trees.species.", ""); - drawSpeciesRow(StringUtil.localize("gui.species"), tree, TreeChromosome.SPECIES, checkCustomName(customPrimaryTreeKey), checkCustomName(customSecondaryTreeKey)); + drawSpeciesRow(StringUtil.localize("gui.species"), tree, EnumTreeChromosome.SPECIES, checkCustomName(customPrimaryTreeKey), checkCustomName(customSecondaryTreeKey)); textLayout.newLine(); } - drawChromosomeRow(StringUtil.localize("gui.saplings"), tree, TreeChromosome.FERTILITY); + drawChromosomeRow(StringUtil.localize("gui.saplings"), tree, EnumTreeChromosome.FERTILITY); textLayout.newLineCompressed(); - drawChromosomeRow(StringUtil.localize("gui.maturity"), tree, TreeChromosome.MATURATION); + drawChromosomeRow(StringUtil.localize("gui.maturity"), tree, EnumTreeChromosome.MATURATION); textLayout.newLineCompressed(); - drawChromosomeRow(StringUtil.localize("gui.height"), tree, TreeChromosome.HEIGHT); + drawChromosomeRow(StringUtil.localize("gui.height"), tree, EnumTreeChromosome.HEIGHT); textLayout.newLineCompressed(); - IAlleleInteger activeGirth = (IAlleleInteger) tree.getGenome().getActiveAllele(TreeChromosome.GIRTH); - IAlleleInteger inactiveGirth = (IAlleleInteger) tree.getGenome().getInactiveAllele(TreeChromosome.GIRTH); + IAlleleInteger activeGirth = (IAlleleInteger) tree.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH); + IAlleleInteger inactiveGirth = (IAlleleInteger) tree.getGenome().getInactiveAllele(EnumTreeChromosome.GIRTH); textLayout.drawLine(StringUtil.localize("gui.girth"), COLUMN_0); - drawLine(String.format("%sx%s", activeGirth.getValue(), activeGirth.getValue()), COLUMN_1, tree, TreeChromosome.GIRTH, false); - drawLine(String.format("%sx%s", inactiveGirth.getValue(), inactiveGirth.getValue()), COLUMN_2, tree, TreeChromosome.GIRTH, true); + drawLine(String.format("%sx%s", activeGirth.getValue(), activeGirth.getValue()), COLUMN_1, tree, EnumTreeChromosome.GIRTH, false); + drawLine(String.format("%sx%s", inactiveGirth.getValue(), inactiveGirth.getValue()), COLUMN_2, tree, EnumTreeChromosome.GIRTH, true); textLayout.newLineCompressed(); - drawChromosomeRow(StringUtil.localize("gui.yield"), tree, TreeChromosome.YIELD); + drawChromosomeRow(StringUtil.localize("gui.yield"), tree, EnumTreeChromosome.YIELD); textLayout.newLineCompressed(); - drawChromosomeRow(StringUtil.localize("gui.sappiness"), tree, TreeChromosome.SAPPINESS); + drawChromosomeRow(StringUtil.localize("gui.sappiness"), tree, EnumTreeChromosome.SAPPINESS); textLayout.newLineCompressed(); String yes = StringUtil.localize("yes"); String no = StringUtil.localize("no"); - AlleleBoolean primaryFireproof = (AlleleBoolean) tree.getGenome().getActiveAllele(TreeChromosome.FIREPROOF); - AlleleBoolean secondaryFireproof = (AlleleBoolean) tree.getGenome().getInactiveAllele(TreeChromosome.FIREPROOF); + AlleleBoolean primaryFireproof = (AlleleBoolean) tree.getGenome().getActiveAllele(EnumTreeChromosome.FIREPROOF); + AlleleBoolean secondaryFireproof = (AlleleBoolean) tree.getGenome().getInactiveAllele(EnumTreeChromosome.FIREPROOF); textLayout.drawLine(StringUtil.localize("gui.fireproof"), COLUMN_0); - drawLine(StringUtil.readableBoolean(primaryFireproof.getValue(), yes, no), COLUMN_1, tree, TreeChromosome.FIREPROOF, false); - drawLine(StringUtil.readableBoolean(secondaryFireproof.getValue(), yes, no), COLUMN_2, tree, TreeChromosome.FIREPROOF, false); + drawLine(StringUtil.readableBoolean(primaryFireproof.getValue(), yes, no), COLUMN_1, tree, EnumTreeChromosome.FIREPROOF, false); + drawLine(StringUtil.readableBoolean(secondaryFireproof.getValue(), yes, no), COLUMN_2, tree, EnumTreeChromosome.FIREPROOF, false); textLayout.newLineCompressed(); - drawChromosomeRow(StringUtil.localize("gui.effect"), tree, TreeChromosome.EFFECT); + drawChromosomeRow(StringUtil.localize("gui.effect"), tree, EnumTreeChromosome.EFFECT); textLayout.endPage(); } @@ -173,9 +173,9 @@ public class GuiTreealyzer extends GuiAlyzer { textLayout.newLine(); textLayout.drawLine(StringUtil.localize("gui.growth"), COLUMN_0); - drawLine(tree.getGenome().getGrowthProvider().getDescription(), COLUMN_1, tree, TreeChromosome.GROWTH, false); - drawLine(((IAlleleGrowth) tree.getGenome().getInactiveAllele(TreeChromosome.GROWTH)).getProvider().getDescription(), COLUMN_2, tree, - TreeChromosome.GROWTH, true); + drawLine(tree.getGenome().getGrowthProvider().getDescription(), COLUMN_1, tree, EnumTreeChromosome.GROWTH, false); + drawLine(((IAlleleGrowth) tree.getGenome().getInactiveAllele(EnumTreeChromosome.GROWTH)).getProvider().getDescription(), COLUMN_2, tree, + EnumTreeChromosome.GROWTH, true); textLayout.newLine(); @@ -192,7 +192,7 @@ public class GuiTreealyzer extends GuiAlyzer { List activeTolerated = new ArrayList<>(tree.getGenome().getPlantTypes()); List inactiveTolerated = Collections.emptyList(); - IAllele inactiveAllelePlant = tree.getGenome().getInactiveAllele(TreeChromosome.PLANT); + IAllele inactiveAllelePlant = tree.getGenome().getInactiveAllele(EnumTreeChromosome.PLANT); if (inactiveAllelePlant instanceof AllelePlantType) { inactiveTolerated = new ArrayList<>(((AllelePlantType) inactiveAllelePlant).getPlantTypes()); } @@ -203,10 +203,10 @@ public class GuiTreealyzer extends GuiAlyzer { textLayout.newLine(); } if (activeTolerated.size() > i) { - drawLine(StringUtil.localize("gui." + activeTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_1, tree, TreeChromosome.PLANT, false); + drawLine(StringUtil.localize("gui." + activeTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_1, tree, EnumTreeChromosome.PLANT, false); } if (inactiveTolerated.size() > i) { - drawLine(StringUtil.localize("gui." + inactiveTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_2, tree, TreeChromosome.PLANT, true); + drawLine(StringUtil.localize("gui." + inactiveTolerated.get(i).toString().toLowerCase(Locale.ENGLISH)), COLUMN_2, tree, EnumTreeChromosome.PLANT, true); } } textLayout.newLine(); @@ -234,19 +234,19 @@ public class GuiTreealyzer extends GuiAlyzer { textLayout.newLine(); textLayout.newLine(); - int fruitDominance0 = getColorCoding(tree.getGenome().getActiveAllele(TreeChromosome.FRUITS).isDominant()); - int fruitDominance1 = getColorCoding(tree.getGenome().getInactiveAllele(TreeChromosome.FRUITS).isDominant()); + int fruitDominance0 = getColorCoding(tree.getGenome().getActiveAllele(EnumTreeChromosome.FRUITS).isDominant()); + int fruitDominance1 = getColorCoding(tree.getGenome().getInactiveAllele(EnumTreeChromosome.FRUITS).isDominant()); textLayout.drawLine(StringUtil.localize("gui.fruits"), COLUMN_0); String strike = ""; - IAllele fruit0 = tree.getGenome().getActiveAllele(TreeChromosome.FRUITS); + IAllele fruit0 = tree.getGenome().getActiveAllele(EnumTreeChromosome.FRUITS); if (!tree.canBearFruit() && fruit0 != AlleleFruit.fruitNone) { strike = EnumChatFormatting.STRIKETHROUGH.toString(); } textLayout.drawLine(strike + StringUtil.localize(tree.getGenome().getFruitProvider().getDescription()), COLUMN_1, fruitDominance0); strike = ""; - IAllele fruit1 = tree.getGenome().getInactiveAllele(TreeChromosome.FRUITS); + IAllele fruit1 = tree.getGenome().getInactiveAllele(EnumTreeChromosome.FRUITS); if (!tree.getGenome().getSecondary().getSuitableFruit().contains(((IAlleleFruit) fruit1).getProvider().getFamily()) && fruit1 != AlleleFruit.fruitNone) { strike = EnumChatFormatting.STRIKETHROUGH.toString(); } @@ -256,7 +256,7 @@ public class GuiTreealyzer extends GuiAlyzer { textLayout.drawLine(StringUtil.localize("gui.family"), COLUMN_0); IFruitFamily primary = tree.getGenome().getFruitProvider().getFamily(); - IFruitFamily secondary = ((IAlleleFruit) tree.getGenome().getInactiveAllele(TreeChromosome.FRUITS)).getProvider().getFamily(); + IFruitFamily secondary = ((IAlleleFruit) tree.getGenome().getInactiveAllele(EnumTreeChromosome.FRUITS)).getProvider().getFamily(); if (primary != null) { textLayout.drawLine(primary.getName(), COLUMN_1, fruitDominance0); diff --git a/src/main/java/forestry/arboriculture/inventory/ItemInventoryTreealyzer.java b/src/main/java/forestry/arboriculture/inventory/ItemInventoryTreealyzer.java index 83b03e3e6..f5aa6e9ef 100644 --- a/src/main/java/forestry/arboriculture/inventory/ItemInventoryTreealyzer.java +++ b/src/main/java/forestry/arboriculture/inventory/ItemInventoryTreealyzer.java @@ -15,14 +15,13 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.arboriculture.TreeManager; import forestry.core.config.Config; import forestry.core.gui.IHintSource; import forestry.core.inventory.ItemInventoryAlyzer; import forestry.core.utils.GeneticsUtil; -public class ItemInventoryTreealyzer extends ItemInventoryAlyzer implements IHintSource { +public class ItemInventoryTreealyzer extends ItemInventoryAlyzer implements IHintSource { public ItemInventoryTreealyzer(EntityPlayer player, ItemStack itemStack) { super(TreeManager.treeRoot, player, itemStack); diff --git a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java index 3fc430e7b..5db568fba 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java +++ b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java @@ -11,7 +11,6 @@ package forestry.arboriculture.items; import java.util.List; -import java.util.Map; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.resources.model.ModelResourceLocation; @@ -130,8 +129,7 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable { @Override public void registerModel(Item item, IModelManager manager) { manager.registerItemModel(item, new GermlingMeshDefinition()); - Map registeredAlleles = AlleleManager.alleleRegistry.getRegisteredAlleles(); - for (IAllele allele : registeredAlleles.values()) { + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { if (allele instanceof IAlleleTreeSpecies) { ((IAlleleTreeSpecies) allele).registerModels(manager); } diff --git a/src/main/java/forestry/arboriculture/render/ModelLeaves.java b/src/main/java/forestry/arboriculture/render/ModelLeaves.java index d97080a1e..569c7b640 100644 --- a/src/main/java/forestry/arboriculture/render/ModelLeaves.java +++ b/src/main/java/forestry/arboriculture/render/ModelLeaves.java @@ -17,7 +17,7 @@ import net.minecraft.world.IBlockAccess; import forestry.api.core.IModelBaker; import forestry.arboriculture.blocks.BlockForestryLeaves; -import forestry.arboriculture.genetics.TreeRoot; +import forestry.arboriculture.genetics.TreeHelper; import forestry.arboriculture.items.ItemBlockLeaves; import forestry.arboriculture.tiles.TileLeaves; import forestry.core.models.ModelBlockOverlay; @@ -39,7 +39,7 @@ public class ModelLeaves extends ModelBlockOverlay { if (itemStack.hasTagCompound()) { leaves.readFromNBT(itemStack.getTagCompound()); } else { - leaves.setTree(TreeRoot.treeTemplates.get(0)); + leaves.setTree(TreeHelper.treeTemplates.get(0)); } TextureAtlasSprite leavesIcon = leaves.getLeaveSprite(Proxies.render.fancyGraphicsEnabled()); diff --git a/src/main/java/forestry/arboriculture/tiles/TileArboristChest.java b/src/main/java/forestry/arboriculture/tiles/TileArboristChest.java index acd5e7159..cf40c67da 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileArboristChest.java +++ b/src/main/java/forestry/arboriculture/tiles/TileArboristChest.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.arboriculture.tiles; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.arboriculture.TreeManager; import forestry.core.tiles.TileNaturalistChest; -public class TileArboristChest extends TileNaturalistChest { +public class TileArboristChest extends TileNaturalistChest { public TileArboristChest() { super(TreeManager.treeRoot); } diff --git a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java index efcba78bd..57f252ca0 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java @@ -10,20 +10,17 @@ ******************************************************************************/ package forestry.arboriculture.tiles; -import com.google.common.collect.ImmutableMap; - import java.io.IOException; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.EnumMap; import java.util.EnumSet; -import java.util.Map; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; import net.minecraft.util.BlockPos; import net.minecraft.world.World; @@ -33,21 +30,21 @@ import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.ILeafSpriteProvider; import forestry.api.arboriculture.ILeafTickHandler; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.ITreeModifier; import forestry.api.arboriculture.ITreekeepingMode; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IEffectData; import forestry.api.genetics.IFruitBearer; import forestry.api.genetics.IFruitFamily; +import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; @@ -66,7 +63,6 @@ import forestry.core.render.TextureManager; import forestry.core.utils.ColourUtil; import forestry.core.utils.GeneticsUtil; import forestry.core.utils.Log; -import forestry.core.utils.PlayerUtil; public class TileLeaves extends TileTreeContainer implements IPollinatable, IFruitBearer, IButterflyNursery, IRipeningPacketReceiver { @@ -104,12 +100,12 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru isDecorative = true; String speciesUID = nbttagcompound.getString("species"); - ImmutableMap treeTemplate = TreeManager.treeRoot.getTemplate(speciesUID); + IAllele[] treeTemplate = TreeManager.treeRoot.getTemplate(speciesUID); ITree containedTree = TreeManager.treeRoot.templateAsIndividual(treeTemplate); setTree(containedTree); } else { if (nbttagcompound.hasKey("owner")) { - setOwner(PlayerUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner"))); + setOwner(NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner"))); } ripeningTime = nbttagcompound.getShort("RT"); @@ -153,7 +149,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru GameProfile owner = getOwner(); if (owner != null) { NBTTagCompound nbt = new NBTTagCompound(); - PlayerUtil.writeGameProfile(nbt, owner); + NBTUtil.writeGameProfile(nbt, owner); nbtTagCompound.setTag("owner", nbt); } @@ -195,9 +191,8 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru } if (hasFruit() && getRipeningTime() < ripeningPeriod) { - ITreekeepingMode treekeepingMode = TreeManager.treeRoot.getMode(worldObj); - ITreeModifier treeModifier = treekeepingMode.getTreeModifier(); - float sappinessModifier = treeModifier.getSappinessModifier(genome, 1f); + ITreekeepingMode treekeepingMode = TreeManager.treeRoot.getTreekeepingMode(worldObj); + float sappinessModifier = treekeepingMode.getSappinessModifier(genome, 1f); float sappiness = genome.getSappiness() * sappinessModifier; if (worldObj.rand.nextFloat() < sappiness) { @@ -330,7 +325,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru } @Override - public boolean canMateWith(ITree individual) { + public boolean canMateWith(IIndividual individual) { if (getTree() == null || isDecorative) { return false; } @@ -345,17 +340,17 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru } @Override - public void mateWith(ITree individual) { + public void mateWith(IIndividual individual) { if (getTree() == null || isDecorative) { return; } - getTree().mate(individual); + getTree().mate((ITree) individual); worldObj.markBlockForUpdate(getPos()); } @Override - public ITree getPollen() { + public IIndividual getPollen() { if (isDecorative) { return null; } @@ -407,7 +402,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru data.writeByte(leafState); if (hasFruit) { - String fruitAlleleUID = getTree().getGenome().getActiveAllele(TreeChromosome.FRUITS).getUID(); + String fruitAlleleUID = getTree().getGenome().getActiveAllele(EnumTreeChromosome.FRUITS).getUID(); int colourFruits = getFruitColour(); data.writeUTF(fruitAlleleUID); @@ -430,17 +425,16 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru colourFruits = data.readInt(); } - ImmutableMap treeTemplate = TreeManager.treeRoot.getTemplate(speciesUID); - if (treeTemplate != null) { - if (fruitAlleleUID != null) { - IAllele fruitAllele = AlleleManager.alleleRegistry.getAllele(fruitAlleleUID); - if (fruitAllele != null) { - Map mutableTreeTemplate = new EnumMap<>(treeTemplate); - mutableTreeTemplate.put(TreeChromosome.FRUITS, fruitAllele); - treeTemplate = ImmutableMap.copyOf(mutableTreeTemplate); - } - } + IAllele[] treeTemplate = TreeManager.treeRoot.getTemplate(speciesUID); + if (fruitAlleleUID != null) { + IAllele fruitAllele = AlleleManager.alleleRegistry.getAllele(fruitAlleleUID); + if (fruitAllele != null) { + treeTemplate[EnumTreeChromosome.FRUITS.ordinal()] = fruitAllele; + } + } + + if (treeTemplate != null) { ITree tree = TreeManager.treeRoot.templateAsIndividual(treeTemplate); if (isPollinatedState) { tree.mate(tree); @@ -562,7 +556,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru } @Override - public ITree getNanny() { + public IIndividual getNanny() { return getTree(); } diff --git a/src/main/java/forestry/arboriculture/tiles/TileSapling.java b/src/main/java/forestry/arboriculture/tiles/TileSapling.java index bd57d7ce8..8e358c1f7 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileSapling.java +++ b/src/main/java/forestry/arboriculture/tiles/TileSapling.java @@ -14,11 +14,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import forestry.api.arboriculture.IArboristTracker; import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.ITreeModifier; import forestry.api.arboriculture.ITreekeepingMode; import forestry.api.arboriculture.TreeManager; +import forestry.api.genetics.IBreedingTracker; import forestry.arboriculture.worldgen.WorldGenArboriculture; import forestry.core.worldgen.WorldGenBase; @@ -49,9 +48,8 @@ public class TileSapling extends TileTreeContainer { } private static int getRequiredMaturity(World world, ITree tree) { - ITreekeepingMode treekeepingMode = TreeManager.treeRoot.getMode(world); - ITreeModifier treeModifier = treekeepingMode.getTreeModifier(); - float maturationModifier = treeModifier.getMaturationModifier(tree.getGenome(), 1f); + ITreekeepingMode treekeepingMode = TreeManager.treeRoot.getTreekeepingMode(world); + float maturationModifier = treekeepingMode.getMaturationModifier(tree.getGenome(), 1f); return Math.round(tree.getRequiredMaturity() * maturationModifier); } @@ -102,7 +100,7 @@ public class TileSapling extends TileTreeContainer { } if (generated) { - IArboristTracker breedingTracker = TreeManager.treeRoot.getBreedingTracker(worldObj, getOwner()); + IBreedingTracker breedingTracker = TreeManager.treeRoot.getBreedingTracker(worldObj, getOwner()); breedingTracker.registerBirth(tree); } } diff --git a/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java b/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java index c4a094fc9..9e80016f9 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java +++ b/src/main/java/forestry/arboriculture/tiles/TileTreeContainer.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.arboriculture.tiles; -import com.google.common.collect.ImmutableMap; - import java.io.IOException; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; @@ -26,7 +25,6 @@ import net.minecraft.world.World; import com.mojang.authlib.GameProfile; import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.TreeChromosome; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; import forestry.arboriculture.genetics.Tree; @@ -56,7 +54,7 @@ public abstract class TileTreeContainer extends TileEntity implements IStreamabl containedTree = new Tree(nbttagcompound.getCompoundTag("ContainedTree")); } if (nbttagcompound.hasKey("owner")) { - owner = PlayerUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner")); + owner = NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner")); } } @@ -71,7 +69,7 @@ public abstract class TileTreeContainer extends TileEntity implements IStreamabl } if (this.owner != null) { NBTTagCompound nbt = new NBTTagCompound(); - PlayerUtil.writeGameProfile(nbt, owner); + NBTUtil.writeGameProfile(nbt, owner); nbttagcompound.setTag("owner", nbt); } } @@ -94,7 +92,7 @@ public abstract class TileTreeContainer extends TileEntity implements IStreamabl } private static ITree getTree(String speciesUID) { - ImmutableMap treeTemplate = TreeManager.treeRoot.getTemplate(speciesUID); + IAllele[] treeTemplate = TreeManager.treeRoot.getTemplate(speciesUID); if (treeTemplate == null) { return null; } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java index 5caa77dcb..b480a0791 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java @@ -16,7 +16,6 @@ import net.minecraft.world.World; import com.mojang.authlib.GameProfile; import forestry.api.arboriculture.ITreeModifier; -import forestry.api.arboriculture.ITreekeepingMode; import forestry.api.arboriculture.TreeManager; import forestry.api.world.ITreeGenData; @@ -100,15 +99,13 @@ public abstract class WorldGenTree extends WorldGenArboriculture { } protected int modifyByHeight(World world, int val, int min, int max) { - ITreekeepingMode mode = TreeManager.treeRoot.getMode(world); - ITreeModifier treeModifier = mode.getTreeModifier(); + ITreeModifier treeModifier = TreeManager.treeRoot.getTreekeepingMode(world); int determined = Math.round(val * tree.getHeightModifier() * treeModifier.getHeightModifier(tree.getGenome(), 1f)); return determined < min ? min : determined > max ? max : determined; } private int determineHeight(World world, int required, int variation) { - ITreekeepingMode mode = TreeManager.treeRoot.getMode(world); - ITreeModifier treeModifier = mode.getTreeModifier(); + ITreeModifier treeModifier = TreeManager.treeRoot.getTreekeepingMode(world); int baseHeight = required + world.rand.nextInt(variation); int height = Math.round(baseHeight * tree.getHeightModifier() * treeModifier.getHeightModifier(tree.getGenome(), 1f)); return height < minHeight ? minHeight : height > maxHeight ? maxHeight : height; diff --git a/src/main/java/forestry/core/PickupHandlerCore.java b/src/main/java/forestry/core/PickupHandlerCore.java index 940c2ff47..53374a6de 100755 --- a/src/main/java/forestry/core/PickupHandlerCore.java +++ b/src/main/java/forestry/core/PickupHandlerCore.java @@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; @@ -31,19 +30,14 @@ public class PickupHandlerCore implements IPickupHandler { ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(itemstack); if (root != null) { - return onItemPickup(entityPlayer, itemstack, root); + IIndividual individual = root.getMember(itemstack); + if (individual != null) { + IBreedingTracker tracker = root.getBreedingTracker(entityitem.worldObj, entityPlayer.getGameProfile()); + tracker.registerPickup(individual); + } } return false; } - private static boolean onItemPickup(EntityPlayer entityPlayer, ItemStack itemstack, ISpeciesRoot root) { - IIndividual individual = root.getMember(itemstack); - if (individual != null) { - IBreedingTracker tracker = root.getBreedingTracker(entityPlayer.getEntityWorld(), entityPlayer.getGameProfile()); - tracker.registerPickup(individual); - } - return false; - } - } diff --git a/src/main/java/forestry/core/access/AccessHandler.java b/src/main/java/forestry/core/access/AccessHandler.java index e8bbd2942..4a40474fc 100644 --- a/src/main/java/forestry/core/access/AccessHandler.java +++ b/src/main/java/forestry/core/access/AccessHandler.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.core.access; -import javax.annotation.Nonnull; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -19,6 +18,7 @@ import java.util.UUID; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; @@ -167,17 +167,18 @@ public final class AccessHandler implements IAccessHandler { access = EnumAccess.values()[data.getInteger("Access")]; if (data.hasKey("owner")) { - owner = PlayerUtil.readGameProfileFromNBT(data.getCompoundTag("owner")); + owner = NBTUtil.readGameProfileFromNBT(data.getCompoundTag("owner")); } } @Override - public void writeToNBT(@Nonnull NBTTagCompound data) { + public void writeToNBT(NBTTagCompound data) { data.setInteger("Access", access.ordinal()); if (this.owner != null) { NBTTagCompound nbt = new NBTTagCompound(); - PlayerUtil.writeGameProfile(nbt, owner); + NBTUtil.writeGameProfile(nbt, owner); + nbt.removeTag("Properties"); data.setTag("owner", nbt); } } diff --git a/src/main/java/forestry/core/access/FakeAccessHandler.java b/src/main/java/forestry/core/access/FakeAccessHandler.java index 6beb836de..511cf3c0f 100644 --- a/src/main/java/forestry/core/access/FakeAccessHandler.java +++ b/src/main/java/forestry/core/access/FakeAccessHandler.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.core.access; -import javax.annotation.Nonnull; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; @@ -101,7 +100,7 @@ public class FakeAccessHandler implements IAccessHandler { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { } diff --git a/src/main/java/forestry/core/circuits/CircuitBoard.java b/src/main/java/forestry/core/circuits/CircuitBoard.java index b2cddd8d5..229e945ae 100755 --- a/src/main/java/forestry/core/circuits/CircuitBoard.java +++ b/src/main/java/forestry/core/circuits/CircuitBoard.java @@ -97,7 +97,7 @@ public class CircuitBoard implements ICircuitBoard { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setShort("T", (short) type.ordinal()); diff --git a/src/main/java/forestry/core/commands/CommandSaveStats.java b/src/main/java/forestry/core/commands/CommandSaveStats.java index e56d619e0..1e422bd99 100644 --- a/src/main/java/forestry/core/commands/CommandSaveStats.java +++ b/src/main/java/forestry/core/commands/CommandSaveStats.java @@ -32,7 +32,6 @@ import net.minecraft.world.World; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; import forestry.core.config.Constants; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; @@ -164,7 +163,7 @@ public final class CommandSaveStats extends SubCommand { return speciesListEntry(discoveredSymbol, blacklistedSymbol, notCountedSymbol, "UID", species, authority); } - private static String generateSpeciesListEntry(IAlleleSpecies species, IBreedingTracker tracker) { + private static String generateSpeciesListEntry(IAlleleSpecies species, IBreedingTracker tracker) { String discovered = ""; if (tracker.isDiscovered(species)) { discovered = discoveredSymbol; diff --git a/src/main/java/forestry/core/fluids/PipetteContents.java b/src/main/java/forestry/core/fluids/PipetteContents.java index 32b130a30..147239abd 100644 --- a/src/main/java/forestry/core/fluids/PipetteContents.java +++ b/src/main/java/forestry/core/fluids/PipetteContents.java @@ -59,7 +59,7 @@ public class PipetteContents implements INbtWritable { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { contents.writeToNBT(nbttagcompound); } } diff --git a/src/main/java/forestry/core/fluids/TankManager.java b/src/main/java/forestry/core/fluids/TankManager.java index 81984c296..c067b978d 100644 --- a/src/main/java/forestry/core/fluids/TankManager.java +++ b/src/main/java/forestry/core/fluids/TankManager.java @@ -90,7 +90,7 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl } @Override - public void writeToNBT(@Nonnull NBTTagCompound data) { + public void writeToNBT(NBTTagCompound data) { NBTTagList tagList = new NBTTagList(); for (byte slot = 0; slot < tanks.size(); slot++) { StandardTank tank = tanks.get(slot); diff --git a/src/main/java/forestry/core/genetics/Branch.java b/src/main/java/forestry/core/genetics/Branch.java index 03650625b..1d598e931 100755 --- a/src/main/java/forestry/core/genetics/Branch.java +++ b/src/main/java/forestry/core/genetics/Branch.java @@ -10,9 +10,9 @@ ******************************************************************************/ package forestry.core.genetics; -public abstract class Branch extends Classification { +public class Branch extends Classification { - protected Branch(String uid, String scientific) { + public Branch(String uid, String scientific) { super(EnumClassLevel.GENUS, uid, scientific); } diff --git a/src/main/java/forestry/core/genetics/BreedingTracker.java b/src/main/java/forestry/core/genetics/BreedingTracker.java index 31b2ebee4..78679c067 100755 --- a/src/main/java/forestry/core/genetics/BreedingTracker.java +++ b/src/main/java/forestry/core/genetics/BreedingTracker.java @@ -32,14 +32,13 @@ import forestry.api.core.ForestryEvent; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.core.network.packets.PacketGenomeTrackerSync; import forestry.core.proxy.Proxies; -public abstract class BreedingTracker extends WorldSavedData implements IBreedingTracker { +public abstract class BreedingTracker extends WorldSavedData implements IBreedingTracker { private static final String SPECIES_COUNT_KEY = "SpeciesCount"; private static final String MUTATIONS_COUNT_KEY = "MutationsCount"; @@ -92,7 +91,7 @@ public abstract class BreedingTracker extends WorldSa * @param player used to get worldObj * @return common tracker for this breeding system */ - protected abstract IBreedingTracker getBreedingTracker(EntityPlayer player); + protected abstract IBreedingTracker getBreedingTracker(EntityPlayer player); /** * Tag stored in NBT to identify the type of the tracker being synced @@ -193,16 +192,15 @@ public abstract class BreedingTracker extends WorldSa } } - private String getMutationString(IMutation mutation) { - String species0 = mutation.getSpecies0().getUID(); - String species1 = mutation.getSpecies1().getUID(); - C speciesChromosomeType = mutation.getRoot().getKaryotypeKey(); - String resultSpecies = mutation.getResultTemplate().get(speciesChromosomeType).getUID(); + private static String getMutationString(IMutation mutation) { + String species0 = mutation.getAllele0().getUID(); + String species1 = mutation.getAllele1().getUID(); + String resultSpecies = mutation.getTemplate()[0].getUID(); return String.format(MUTATION_FORMAT, species0, species1, resultSpecies); } @Override - public void registerMutation(IMutation mutation) { + public void registerMutation(IMutation mutation) { String mutationString = getMutationString(mutation); if (!discoveredMutations.contains(mutationString)) { discoveredMutations.add(mutationString); @@ -217,7 +215,7 @@ public abstract class BreedingTracker extends WorldSa } @Override - public boolean isDiscovered(IMutation mutation) { + public boolean isDiscovered(IMutation mutation) { String mutationString = getMutationString(mutation); return discoveredMutations.contains(mutationString) || researchedMutations.contains(mutationString); } @@ -233,13 +231,13 @@ public abstract class BreedingTracker extends WorldSa } @Override - public void registerBirth(IIndividual individual) { + public void registerBirth(IIndividual individual) { registerSpecies(individual.getGenome().getPrimary()); registerSpecies(individual.getGenome().getSecondary()); } @Override - public void registerSpecies(IAlleleSpecies species) { + public void registerSpecies(IAlleleSpecies species) { if (!discoveredSpecies.contains(species.getUID())) { discoveredSpecies.add(species.getUID()); @@ -252,7 +250,7 @@ public abstract class BreedingTracker extends WorldSa } @Override - public void researchMutation(IMutation mutation) { + public void researchMutation(IMutation mutation) { String mutationString = getMutationString(mutation); if (!researchedMutations.contains(mutationString)) { researchedMutations.add(mutationString); @@ -265,7 +263,7 @@ public abstract class BreedingTracker extends WorldSa } @Override - public boolean isResearched(IMutation mutation) { + public boolean isResearched(IMutation mutation) { String mutationString = getMutationString(mutation); return researchedMutations.contains(mutationString); } diff --git a/src/main/java/forestry/core/genetics/Chromosome.java b/src/main/java/forestry/core/genetics/Chromosome.java index 5721959ed..22b9941f9 100755 --- a/src/main/java/forestry/core/genetics/Chromosome.java +++ b/src/main/java/forestry/core/genetics/Chromosome.java @@ -11,7 +11,6 @@ package forestry.core.genetics; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.Random; import net.minecraft.nbt.NBTTagCompound; @@ -19,13 +18,12 @@ import net.minecraft.nbt.NBTTagCompound; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosome; -import forestry.core.genetics.alleles.Allele; import forestry.core.utils.Log; public class Chromosome implements IChromosome { - private static final String UID0_TAG = "0"; - private static final String UID1_TAG = "1"; + private static final String UID0_TAG = "UID0"; + private static final String UID1_TAG = "UID1"; @Nonnull private final IAllele primary; @@ -42,37 +40,32 @@ public class Chromosome implements IChromosome { this.secondary = secondary; } - @Nullable - public static Chromosome create(@Nonnull NBTTagCompound nbt) { - IAllele primary = AlleleManager.alleleRegistry.getAllele(nbt.getString(UID0_TAG)); - IAllele secondary = AlleleManager.alleleRegistry.getAllele(nbt.getString(UID1_TAG)); - if (primary == null || secondary == null) { - return null; - } - return new Chromosome(primary, secondary); + public Chromosome(@Nonnull NBTTagCompound nbt) { + primary = AlleleManager.alleleRegistry.getAllele(nbt.getString(UID0_TAG)); + secondary = AlleleManager.alleleRegistry.getAllele(nbt.getString(UID1_TAG)); } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setString(UID0_TAG, primary.getUID()); nbttagcompound.setString(UID1_TAG, secondary.getUID()); } - @Nonnull @Override public IAllele getPrimaryAllele() { return primary; } - @Nonnull @Override public IAllele getSecondaryAllele() { return secondary; } - @Nonnull @Override public IAllele getActiveAllele() { + if (primary == null || secondary == null) { + return null; + } if (primary.isDominant()) { return primary; } @@ -83,7 +76,6 @@ public class Chromosome implements IChromosome { return primary; } - @Nonnull @Override public IAllele getInactiveAllele() { if (!secondary.isDominant()) { @@ -152,24 +144,6 @@ public class Chromosome implements IChromosome { } } - public static boolean equals(@Nullable IChromosome chromosome1, @Nullable IChromosome chromosome2) { - if (chromosome1 == chromosome2) { - return true; - } - if (chromosome1 == null || chromosome2 == null) { - return false; - } - - if (!Allele.equals(chromosome1.getPrimaryAllele(), chromosome2.getPrimaryAllele())) { - return false; - } - if (!Allele.equals(chromosome1.getSecondaryAllele(), chromosome2.getSecondaryAllele())) { - return false; - } - - return true; - } - @Override public String toString() { return "{" + primary + ", " + secondary + "}"; diff --git a/src/main/java/forestry/core/genetics/Classification.java b/src/main/java/forestry/core/genetics/Classification.java index 5d8d8c7dc..8a5420cb4 100755 --- a/src/main/java/forestry/core/genetics/Classification.java +++ b/src/main/java/forestry/core/genetics/Classification.java @@ -11,9 +11,6 @@ package forestry.core.genetics; import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; import java.util.Locale; import forestry.api.genetics.AlleleManager; @@ -29,8 +26,8 @@ public class Classification implements IClassification { private IClassification parent; - private final List> members = new ArrayList<>(); - private final List groups = new ArrayList<>(); + private final ArrayList members = new ArrayList<>(); + private final ArrayList groups = new ArrayList<>(); public Classification(EnumClassLevel level, String uid, String scientific) { this.level = level; @@ -75,8 +72,8 @@ public class Classification implements IClassification { } @Override - public Collection getMemberGroups() { - return Collections.unmodifiableCollection(groups); + public IClassification[] getMemberGroups() { + return groups.toArray(new IClassification[groups.size()]); } @Override @@ -86,12 +83,12 @@ public class Classification implements IClassification { } @Override - public Collection> getMemberSpecies() { - return Collections.unmodifiableCollection(members); + public IAlleleSpecies[] getMemberSpecies() { + return members.toArray(new IAlleleSpecies[members.size()]); } @Override - public void addMemberSpecies(IAlleleSpecies species) { + public void addMemberSpecies(IAlleleSpecies species) { members.add(species); } diff --git a/src/main/java/forestry/core/genetics/EffectData.java b/src/main/java/forestry/core/genetics/EffectData.java index ca10b1ffa..bd28f14a9 100755 --- a/src/main/java/forestry/core/genetics/EffectData.java +++ b/src/main/java/forestry/core/genetics/EffectData.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.genetics; -import javax.annotation.Nonnull; - import net.minecraft.nbt.NBTTagCompound; import forestry.api.genetics.IEffectData; @@ -66,6 +64,6 @@ public class EffectData implements IEffectData { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { } } diff --git a/src/main/java/forestry/core/genetics/Genome.java b/src/main/java/forestry/core/genetics/Genome.java index 28943d24c..6069c7302 100755 --- a/src/main/java/forestry/core/genetics/Genome.java +++ b/src/main/java/forestry/core/genetics/Genome.java @@ -11,10 +11,9 @@ package forestry.core.genetics; import com.google.common.base.Objects; -import com.google.common.collect.ImmutableMap; import javax.annotation.Nonnull; -import java.util.Map; +import java.util.Arrays; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -29,31 +28,32 @@ import forestry.api.genetics.ISpeciesRoot; import forestry.core.config.Config; import forestry.core.utils.Log; -public abstract class Genome & IChromosomeType> implements IGenome { +public abstract class Genome implements IGenome { - private static final String UID_KEY = "uid"; + private static final String SLOT_TAG = "Slot"; @Nonnull - private final ImmutableMap chromosomes; + private final IChromosome[] chromosomes; protected Genome(@Nonnull NBTTagCompound nbttagcompound) { this.chromosomes = getChromosomes(nbttagcompound, getSpeciesRoot()); } - protected Genome(@Nonnull ImmutableMap chromosomes) { + protected Genome(@Nonnull IChromosome[] chromosomes) { checkChromosomes(chromosomes); this.chromosomes = chromosomes; } - private void checkChromosomes(ImmutableMap chromosomes) { - if (chromosomes == null || chromosomes.size() != getDefaultTemplate().size()) { + private void checkChromosomes(IChromosome[] chromosomes) { + if (chromosomes == null || chromosomes.length != getDefaultTemplate().length) { String message = String.format("Tried to create a genome for '%s' from an invalid chromosome template.\n%s", getSpeciesRoot().getUID(), chromosomesToString(chromosomes)); throw new IllegalArgumentException(message); } - C[] karyotype = getSpeciesRoot().getKaryotype(); - for (C chromosomeType : karyotype) { - IChromosome chromosome = chromosomes.get(chromosomeType); + IChromosomeType[] karyotype = getSpeciesRoot().getKaryotype(); + for (int i = 0; i < karyotype.length; i++) { + IChromosomeType chromosomeType = karyotype[i]; + IChromosome chromosome = chromosomes[i]; if (chromosome == null) { String message = String.format("Tried to create a genome for '%s' from an invalid chromosome template. " + "Missing chromosome '%s'.\n%s", getSpeciesRoot().getUID(), chromosomeType.getName(), chromosomesToString(chromosomes)); @@ -61,7 +61,18 @@ public abstract class Genome & IChromosomeType> implements } IAllele primary = chromosome.getPrimaryAllele(); + if (primary == null) { + String message = String.format("Tried to create a genome for '%s' from an invalid chromosome template. " + + "Missing primary allele for '%s'.\n%s", getSpeciesRoot().getUID(), chromosomeType.getName(), chromosomesToString(chromosomes)); + throw new IllegalArgumentException(message); + } + IAllele secondary = chromosome.getSecondaryAllele(); + if (secondary == null) { + String message = String.format("Tried to create a genome for '%s' from an invalid chromosome template. " + + "Missing secondary allele for '%s'.\n%s", getSpeciesRoot().getUID(), chromosomeType.getName(), chromosomesToString(chromosomes)); + throw new IllegalArgumentException(message); + } Class chromosomeAlleleClass = chromosomeType.getAlleleClass(); if (!chromosomeAlleleClass.isAssignableFrom(primary.getClass())) { @@ -78,24 +89,23 @@ public abstract class Genome & IChromosomeType> implements } } - @Nonnull - private String chromosomesToString(@Nonnull ImmutableMap chromosomes) { + private String chromosomesToString(IChromosome[] chromosomes) { if (chromosomes == null) { return "null"; } StringBuilder stringBuilder = new StringBuilder(); - C[] karyotype = getSpeciesRoot().getKaryotype(); - for (int i = 0; i < chromosomes.size(); i++) { - C chromosomeType = karyotype[i]; - IChromosome chromosome = chromosomes.get(chromosomeType); + IChromosomeType[] karyotype = getSpeciesRoot().getKaryotype(); + for (int i = 0; i < chromosomes.length; i++) { + IChromosomeType chromosomeType = karyotype[i]; + IChromosome chromosome = chromosomes[i]; stringBuilder.append(chromosomeType.getName()).append(": ").append(chromosome).append("\n"); } return stringBuilder.toString(); } - private ImmutableMap getDefaultTemplate() { + private IAllele[] getDefaultTemplate() { return getSpeciesRoot().getDefaultTemplate(); } @@ -122,10 +132,7 @@ public abstract class Genome & IChromosomeType> implements } NBTTagCompound chromosomeNBT = chromosomesNBT.getCompoundTagAt(0); - Chromosome chromosome = Chromosome.create(chromosomeNBT); - if (chromosome == null) { - return null; - } + Chromosome chromosome = new Chromosome(chromosomeNBT); IAllele activeAllele = chromosome.getActiveAllele(); if (!(activeAllele instanceof IAlleleSpecies)) { @@ -135,7 +142,7 @@ public abstract class Genome & IChromosomeType> implements return (IAlleleSpecies) activeAllele; } - private static & IChromosomeType> IChromosome getChromosome(@Nonnull ItemStack itemStack, @Nonnull C chromosomeType, @Nonnull ISpeciesRoot speciesRoot) { + private static IChromosome getChromosome(ItemStack itemStack, IChromosomeType chromosomeType, ISpeciesRoot speciesRoot) { NBTTagCompound nbtTagCompound = itemStack.getTagCompound(); if (nbtTagCompound == null) { return null; @@ -146,43 +153,44 @@ public abstract class Genome & IChromosomeType> implements return null; } - ImmutableMap chromosomes = getChromosomes(genome, speciesRoot); + IChromosome[] chromosomes = getChromosomes(genome, speciesRoot); if (chromosomes == null) { return null; } - return chromosomes.get(chromosomeType); + return chromosomes[chromosomeType.ordinal()]; } - private static & IChromosomeType> ImmutableMap getChromosomes(@Nonnull NBTTagCompound genomeNBT, @Nonnull ISpeciesRoot speciesRoot) { + private static IChromosome[] getChromosomes(@Nonnull NBTTagCompound genomeNBT, @Nonnull ISpeciesRoot speciesRoot) { + NBTTagList chromosomesNBT = genomeNBT.getTagList("Chromosomes", 10); - ImmutableMap.Builder chromosomesBuilder = ImmutableMap.builder(); + IChromosome[] chromosomes = new IChromosome[speciesRoot.getDefaultTemplate().length]; for (int i = 0; i < chromosomesNBT.tagCount(); i++) { NBTTagCompound chromosomeNBT = chromosomesNBT.getCompoundTagAt(i); - byte chromosomeUid = chromosomeNBT.getByte(UID_KEY); + byte chromosomeOrdinal = chromosomeNBT.getByte(SLOT_TAG); - Chromosome chromosome = Chromosome.create(chromosomeNBT); - C chromosomeType = speciesRoot.getChromosomeTypeForUid(chromosomeUid); + if (chromosomeOrdinal >= 0 && chromosomeOrdinal < chromosomes.length) { + Chromosome chromosome = new Chromosome(chromosomeNBT); + chromosomes[chromosomeOrdinal] = chromosome; - Class alleleClass = chromosomeType.getAlleleClass(); - if (chromosome == null || chromosome.hasInvalidAlleles(alleleClass)) { - if (Config.clearInvalidChromosomes) { - Log.warning("Found Chromosome with invalid Alleles. Config is set to clear invalid chromosomes, replacing with the default."); - ImmutableMap defaultTemplate = speciesRoot.getDefaultTemplate(); - return speciesRoot.templateAsChromosomes(defaultTemplate); - } else { - throw new RuntimeException("Found Chromosome with invalid Alleles.\nNBTTagCompound: " + chromosomesNBT + "\nSee config option \"genetics.clear.invalid.chromosomes\".\nMissing: " + chromosomeNBT); + IChromosomeType chromosomeType = speciesRoot.getKaryotype()[chromosomeOrdinal]; + if (chromosome.hasInvalidAlleles(chromosomeType.getAlleleClass())) { + if (Config.clearInvalidChromosomes) { + Log.warning("Found Chromosome with invalid Alleles. Config is set to clear invalid chromosomes, replacing with the default."); + IAllele[] defaultTemplate = speciesRoot.getDefaultTemplate(); + return speciesRoot.templateAsChromosomes(defaultTemplate); + } else { + throw new RuntimeException("Found Chromosome with invalid Alleles.\nNBTTagCompound: " + chromosomesNBT + "\nSee config option \"genetics.clear.invalid.chromosomes\".\nMissing: " + chromosomeNBT); + } } } - - chromosomesBuilder.put(chromosomeType, chromosome); } - return chromosomesBuilder.build(); + return chromosomes; } - protected static & IChromosomeType> IAllele getActiveAllele(ItemStack itemStack, C chromosomeType, ISpeciesRoot speciesRoot) { + protected static IAllele getActiveAllele(ItemStack itemStack, IChromosomeType chromosomeType, ISpeciesRoot speciesRoot) { IChromosome chromosome = getChromosome(itemStack, chromosomeType, speciesRoot); if (chromosome == null) { return null; @@ -191,55 +199,57 @@ public abstract class Genome & IChromosomeType> implements } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbt) { + public void writeToNBT(NBTTagCompound nbttagcompound) { + NBTTagList nbttaglist = new NBTTagList(); - for (Map.Entry entry : chromosomes.entrySet()) { - C chromosomeType = entry.getKey(); - - IChromosome chromosome = entry.getValue(); - byte chromosomeUid = chromosomeType.getUid(); - - NBTTagCompound chromosomeNbt = new NBTTagCompound(); - chromosomeNbt.setByte(UID_KEY, chromosomeUid); - chromosome.writeToNBT(chromosomeNbt); - - nbttaglist.appendTag(chromosomeNbt); + for (int i = 0; i < chromosomes.length; i++) { + if (chromosomes[i] != null) { + NBTTagCompound nbttagcompound1 = new NBTTagCompound(); + nbttagcompound1.setByte(SLOT_TAG, (byte) i); + chromosomes[i].writeToNBT(nbttagcompound1); + nbttaglist.appendTag(nbttagcompound1); + } } - nbt.setTag("Chromosomes", nbttaglist); + nbttagcompound.setTag("Chromosomes", nbttaglist); } // / INFORMATION RETRIEVAL - @Nonnull @Override - public ImmutableMap getChromosomes() { - return chromosomes; - } - - @Nonnull - @Override - public IAllele getActiveAllele(C chromosomeType) { - return chromosomes.get(chromosomeType).getActiveAllele(); - } - - @Nonnull - @Override - public IAllele getInactiveAllele(C chromosomeType) { - return chromosomes.get(chromosomeType).getInactiveAllele(); + public IChromosome[] getChromosomes() { + return Arrays.copyOf(chromosomes, chromosomes.length); } @Override - public boolean isGeneticEqual(IGenome other) { - ImmutableMap genetics = other.getChromosomes(); - if (chromosomes.size() != genetics.size()) { + public IAllele getActiveAllele(IChromosomeType chromosomeType) { + return chromosomes[chromosomeType.ordinal()].getActiveAllele(); + } + + @Override + public IAllele getInactiveAllele(IChromosomeType chromosomeType) { + return chromosomes[chromosomeType.ordinal()].getInactiveAllele(); + } + + @Override + public boolean isGeneticEqual(IGenome other) { + IChromosome[] genetics = other.getChromosomes(); + if (chromosomes.length != genetics.length) { return false; } - for (Map.Entry entry : chromosomes.entrySet()) { - C chromosomeType = entry.getKey(); - IChromosome chromosome = entry.getValue(); - IChromosome otherChromosome = genetics.get(chromosomeType); + for (int i = 0; i < chromosomes.length; i++) { + IChromosome chromosome = chromosomes[i]; + IChromosome otherChromosome = genetics[i]; + if (chromosome == null && otherChromosome == null) { + continue; + } + if (chromosome == null || otherChromosome == null) { + return false; + } - if (!Chromosome.equals(chromosome, otherChromosome)) { + if (!chromosome.getPrimaryAllele().getUID().equals(otherChromosome.getPrimaryAllele().getUID())) { + return false; + } + if (!chromosome.getSecondaryAllele().getUID().equals(otherChromosome.getSecondaryAllele().getUID())) { return false; } } @@ -250,10 +260,9 @@ public abstract class Genome & IChromosomeType> implements @Override public String toString() { Objects.ToStringHelper toStringHelper = Objects.toStringHelper(this); - for (Map.Entry entry : chromosomes.entrySet()) { - C chromosomeType = entry.getKey(); - IChromosome chromosome = entry.getValue(); - toStringHelper.add(chromosomeType.getName(), chromosome); + int i = 0; + for (IChromosome chromosome : chromosomes) { + toStringHelper.add(String.valueOf(i++), chromosome); } return toStringHelper.toString(); } diff --git a/src/main/java/forestry/core/genetics/IBranchDefinition.java b/src/main/java/forestry/core/genetics/IBranchDefinition.java index 4e30fe7b1..ed327ae83 100644 --- a/src/main/java/forestry/core/genetics/IBranchDefinition.java +++ b/src/main/java/forestry/core/genetics/IBranchDefinition.java @@ -1,13 +1,10 @@ package forestry.core.genetics; -import java.util.Map; - import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IClassification; -public interface IBranchDefinition> { - Map getTemplate(); +public interface IBranchDefinition { + IAllele[] getTemplate(); IClassification getBranch(); } diff --git a/src/main/java/forestry/core/genetics/IGeneticDefinition.java b/src/main/java/forestry/core/genetics/IGeneticDefinition.java index 57b53d3ad..73b9ff29f 100644 --- a/src/main/java/forestry/core/genetics/IGeneticDefinition.java +++ b/src/main/java/forestry/core/genetics/IGeneticDefinition.java @@ -1,18 +1,15 @@ package forestry.core.genetics; -import com.google.common.collect.ImmutableMap; - import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; -public interface IGeneticDefinition { +public interface IGeneticDefinition { - ImmutableMap getTemplate(); + IAllele[] getTemplate(); - IGenome getGenome(); + IGenome getGenome(); - IIndividual getIndividual(); + IIndividual getIndividual(); } diff --git a/src/main/java/forestry/core/genetics/Individual.java b/src/main/java/forestry/core/genetics/Individual.java index 466ba69a9..4a9d5fb8d 100755 --- a/src/main/java/forestry/core/genetics/Individual.java +++ b/src/main/java/forestry/core/genetics/Individual.java @@ -10,30 +10,14 @@ ******************************************************************************/ package forestry.core.genetics; -import com.google.common.collect.ImmutableMap; - import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; -import java.util.Map; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import com.mojang.authlib.GameProfile; - -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosome; import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesRoot; -import forestry.core.config.Config; -public abstract class Individual implements IIndividual { +public abstract class Individual implements IIndividual { protected boolean isAnalyzed; @@ -61,7 +45,7 @@ public abstract class Individual implements IIndividu } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setBoolean("IsAnalyzed", isAnalyzed); } @@ -88,90 +72,12 @@ public abstract class Individual implements IIndividu } @Override - public boolean isGeneticEqual(IIndividual other) { + public boolean isGeneticEqual(IIndividual other) { return getGenome().isGeneticEqual(other.getGenome()); } @Override - public boolean isPureBred(C chromosomeType) { + public boolean isPureBred(IChromosomeType chromosomeType) { return getGenome().getActiveAllele(chromosomeType).getUID().equals(getGenome().getInactiveAllele(chromosomeType).getUID()); } - - private ImmutableMap mutateSpecies(World world, @Nullable GameProfile playerProfile, BlockPos pos, IGenome genomeOne, IGenome genomeTwo) { - IGenome genome0; - IGenome genome1; - IAlleleSpecies allele0; - IAlleleSpecies allele1; - - ISpeciesRoot root = genomeOne.getSpeciesRoot(); - - if (world.rand.nextBoolean()) { - allele0 = genomeOne.getPrimary(); - allele1 = genomeTwo.getSecondary(); - - genome0 = genomeOne; - genome1 = genomeTwo; - } else { - allele0 = genomeTwo.getPrimary(); - allele1 = genomeOne.getSecondary(); - - genome0 = genomeTwo; - genome1 = genomeOne; - } - - final IBreedingTracker breedingTracker; - if (playerProfile != null) { - breedingTracker = root.getBreedingTracker(world, playerProfile); - } else { - breedingTracker = null; - } - - List> combinations = root.getCombinations(allele0, allele1, true); - for (IMutation mutation : combinations) { - float chance = mutation.getChance(world, pos, allele0, allele1, genome0, genome1); - if (chance <= 0) { - continue; - } - - // boost chance for researched mutations - if (breedingTracker != null && breedingTracker.isResearched(mutation)) { - float mutationBoost = chance * (Config.researchMutationBoostMultiplier - 1.0f); - mutationBoost = Math.min(Config.maxResearchMutationBoostPercent, mutationBoost); - chance += mutationBoost; - } - - if (chance > world.rand.nextFloat() * 100) { - return root.templateAsChromosomes(mutation.getResultTemplate()); - } - } - - return null; - } - - @Nonnull - protected ImmutableMap createOffspringChromosomes(@Nonnull World world, @Nullable GameProfile playerProfile, @Nonnull BlockPos pos, @Nonnull IGenome genome, @Nonnull IGenome mate) { - ImmutableMap.Builder chromosomeBuilder = ImmutableMap.builder(); - ImmutableMap parent0 = genome.getChromosomes(); - ImmutableMap parent1 = mate.getChromosomes(); - - // Check for mutation. Replace one of the parents with the mutation template if mutation occurred. - ImmutableMap mutated0 = mutateSpecies(world, playerProfile, pos, genome, mate); - if (mutated0 != null) { - parent0 = mutated0; - } - ImmutableMap mutated1 = mutateSpecies(world, playerProfile, pos, mate, genome); - if (mutated1 != null) { - parent1 = mutated1; - } - - for (Map.Entry entry : parent0.entrySet()) { - C chromosomeType = entry.getKey(); - IChromosome parentChromosome0 = entry.getValue(); - IChromosome parentChromosome1 = parent1.get(chromosomeType); - IChromosome chromosome = Chromosome.inheritChromosome(world.rand, parentChromosome0, parentChromosome1); - chromosomeBuilder.put(chromosomeType, chromosome); - } - - return chromosomeBuilder.build(); - } } diff --git a/src/main/java/forestry/core/genetics/IndividualLiving.java b/src/main/java/forestry/core/genetics/IndividualLiving.java index 768f3a5a5..0c077b58e 100755 --- a/src/main/java/forestry/core/genetics/IndividualLiving.java +++ b/src/main/java/forestry/core/genetics/IndividualLiving.java @@ -15,11 +15,10 @@ import javax.annotation.Nonnull; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividualLiving; -public abstract class IndividualLiving extends Individual implements IIndividualLiving { +public abstract class IndividualLiving extends Individual implements IIndividualLiving { private int health; private int maxHealth; @@ -38,7 +37,7 @@ public abstract class IndividualLiving extends Indivi } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { super.writeToNBT(nbttagcompound); @@ -101,4 +100,5 @@ public abstract class IndividualLiving extends Indivi health--; } } + } diff --git a/src/main/java/forestry/core/genetics/ItemResearchNote.java b/src/main/java/forestry/core/genetics/ItemResearchNote.java index 284e15ed9..5f2d062ff 100755 --- a/src/main/java/forestry/core/genetics/ItemResearchNote.java +++ b/src/main/java/forestry/core/genetics/ItemResearchNote.java @@ -10,20 +10,251 @@ ******************************************************************************/ package forestry.core.genetics; +import java.util.ArrayList; import java.util.List; +import java.util.Locale; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import forestry.core.genetics.research.ResearchNote; +import com.mojang.authlib.GameProfile; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesRoot; +import forestry.core.genetics.mutations.EnumMutateChance; import forestry.core.items.ItemForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; public class ItemResearchNote extends ItemForestry { + public enum EnumNoteType { + NONE, MUTATION, SPECIES; + + public static final EnumNoteType[] VALUES = values(); + + private static IMutation getEncodedMutation(ISpeciesRoot root, NBTTagCompound compound) { + IAllele allele0 = AlleleManager.alleleRegistry.getAllele(compound.getString("AL0")); + IAllele allele1 = AlleleManager.alleleRegistry.getAllele(compound.getString("AL1")); + if (allele0 == null || allele1 == null) { + return null; + } + + IAllele result = null; + if (compound.hasKey("RST")) { + result = AlleleManager.alleleRegistry.getAllele(compound.getString("RST")); + } + + IMutation encoded = null; + for (IMutation mutation : root.getCombinations(allele0)) { + if (mutation.isPartner(allele1)) { + if (result == null + || mutation.getTemplate()[0].getUID().equals(result.getUID())) { + encoded = mutation; + break; + } + } + } + + return encoded; + } + + public ArrayList getTooltip(NBTTagCompound compound) { + ArrayList tooltips = new ArrayList<>(); + + if (compound == null || this == NONE) { + return tooltips; + } + + if (this == MUTATION) { + ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(compound.getString("ROT")); + if (root == null) { + return tooltips; + } + + IMutation encoded = getEncodedMutation(root, compound); + if (encoded == null) { + return tooltips; + } + + String species1 = encoded.getAllele0().getName(); + String species2 = encoded.getAllele1().getName(); + String mutationChanceKey = EnumMutateChance.rateChance(encoded.getBaseChance()).toString().toLowerCase(Locale.ENGLISH); + String mutationChance = StringUtil.localize("researchNote.chance." + mutationChanceKey); + String speciesResult = encoded.getTemplate()[root.getKaryotypeKey().ordinal()].getName(); + + tooltips.add(StringUtil.localize("researchNote.discovery.0")); + tooltips.add(StringUtil.localize("researchNote.discovery.1").replace("%SPEC1", species1).replace("%SPEC2", species2)); + tooltips.add(StringUtil.localizeAndFormat("researchNote.discovery.2", mutationChance)); + tooltips.add(StringUtil.localizeAndFormat("researchNote.discovery.3", speciesResult)); + + if (encoded.getSpecialConditions() != null && encoded.getSpecialConditions().size() > 0) { + for (String line : encoded.getSpecialConditions()) { + tooltips.add(EnumChatFormatting.GOLD + line); + } + } + } else if (this == SPECIES) { + IAlleleSpecies allele0 = (IAlleleSpecies) AlleleManager.alleleRegistry.getAllele(compound.getString("AL0")); + if (allele0 == null) { + return tooltips; + } + ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(compound.getString("ROT")); + if (root == null) { + return tooltips; + } + + tooltips.add("researchNote.discovered.0"); + tooltips.add(StringUtil.localizeAndFormat("researchNote.discovered.1", allele0.getName(), allele0.getBinomial())); + } + + return tooltips; + } + + public boolean registerResults(World world, EntityPlayer player, NBTTagCompound compound) { + if (compound == null || this == NONE) { + return false; + } + + if (this == MUTATION) { + ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(compound.getString("ROT")); + if (root == null) { + return false; + } + + IMutation encoded = getEncodedMutation(root, compound); + if (encoded == null) { + return false; + } + + IBreedingTracker tracker = encoded.getRoot().getBreedingTracker(world, player.getGameProfile()); + if (tracker.isResearched(encoded)) { + player.addChatMessage(new ChatComponentTranslation("for.chat.cannotmemorizeagain")); + return false; + } + + IAlleleSpecies species0 = encoded.getAllele0(); + IAlleleSpecies species1 = encoded.getAllele1(); + IAlleleSpecies speciesResult = (IAlleleSpecies) encoded.getTemplate()[root.getKaryotypeKey().ordinal()]; + + tracker.registerSpecies(species0); + tracker.registerSpecies(species1); + tracker.registerSpecies(speciesResult); + + tracker.researchMutation(encoded); + player.addChatMessage(new ChatComponentTranslation("for.chat.memorizednote")); + + player.addChatMessage(new ChatComponentTranslation("for.chat.memorizednote2", + EnumChatFormatting.GRAY + species0.getName(), + EnumChatFormatting.GRAY + species1.getName(), + EnumChatFormatting.GREEN + speciesResult.getName())); + + return true; + } + + return false; + + } + + public static ResearchNote createMutationNote(GameProfile researcher, IMutation mutation) { + NBTTagCompound compound = new NBTTagCompound(); + compound.setString("ROT", mutation.getRoot().getUID()); + compound.setString("AL0", mutation.getAllele0().getUID()); + compound.setString("AL1", mutation.getAllele1().getUID()); + compound.setString("RST", mutation.getTemplate()[0].getUID()); + return new ResearchNote(researcher, MUTATION, compound); + } + + public static ItemStack createMutationNoteStack(Item item, GameProfile researcher, IMutation mutation) { + ResearchNote note = createMutationNote(researcher, mutation); + NBTTagCompound compound = new NBTTagCompound(); + note.writeToNBT(compound); + ItemStack created = new ItemStack(item); + created.setTagCompound(compound); + return created; + } + + public static ResearchNote createSpeciesNote(GameProfile researcher, IAlleleSpecies species) { + NBTTagCompound compound = new NBTTagCompound(); + compound.setString("ROT", species.getRoot().getUID()); + compound.setString("AL0", species.getUID()); + return new ResearchNote(researcher, SPECIES, compound); + } + + public static ItemStack createSpeciesNoteStack(Item item, GameProfile researcher, IAlleleSpecies species) { + ResearchNote note = createSpeciesNote(researcher, species); + NBTTagCompound compound = new NBTTagCompound(); + note.writeToNBT(compound); + ItemStack created = new ItemStack(item); + created.setTagCompound(compound); + return created; + } + + } + + public static class ResearchNote { + + private final GameProfile researcher; + private final EnumNoteType type; + private final NBTTagCompound inner; + + public ResearchNote(GameProfile researcher, EnumNoteType type, NBTTagCompound inner) { + this.researcher = researcher; + this.type = type; + this.inner = inner; + } + + public ResearchNote(NBTTagCompound compound) { + if (compound != null) { + if (compound.hasKey("res")) { + this.researcher = NBTUtil.readGameProfileFromNBT(compound.getCompoundTag("res")); + } else { + this.researcher = null; + } + this.type = EnumNoteType.VALUES[compound.getByte("TYP")]; + this.inner = compound.getCompoundTag("INN"); + } else { + this.type = EnumNoteType.NONE; + this.researcher = null; + this.inner = new NBTTagCompound(); + } + } + + public void writeToNBT(NBTTagCompound compound) { + if (this.researcher != null) { + NBTTagCompound nbt = new NBTTagCompound(); + NBTUtil.writeGameProfile(nbt, researcher); + compound.setTag("res", nbt); + } + compound.setByte("TYP", (byte) type.ordinal()); + compound.setTag("INN", inner); + } + + public void addTooltip(List list) { + ArrayList tooltips = type.getTooltip(inner); + if (tooltips.size() <= 0) { + list.add(EnumChatFormatting.ITALIC + EnumChatFormatting.RED.toString() + StringUtil.localize("researchNote.error.0")); + list.add(StringUtil.localize("researchNote.error.1")); + return; + } + + list.addAll(tooltips); + } + + public boolean registerResults(World world, EntityPlayer player) { + return type.registerResults(world, player, inner); + } + } + public ItemResearchNote() { super(); setCreativeTab(null); @@ -31,36 +262,32 @@ public class ItemResearchNote extends ItemForestry { @Override public String getItemStackDisplayName(ItemStack itemstack) { - ResearchNote note = ResearchNote.create(itemstack.getTagCompound()); + ResearchNote note = new ResearchNote(itemstack.getTagCompound()); String researcherName; - if (note == null) { + if (note.researcher == null) { researcherName = "Sengir"; } else { - researcherName = note.getResearcher().getName(); + researcherName = note.researcher.getName(); } - return StringUtil.localizeAndFormatRaw(getUnlocalizedName(itemstack) + ".name", researcherName); } + @SuppressWarnings({"unchecked", "rawtypes"}) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean advanced) { - ResearchNote note = ResearchNote.create(itemstack.getTagCompound()); - if (note != null) { - note.addTooltip(list); - } else { - list.add(EnumChatFormatting.ITALIC + EnumChatFormatting.RED.toString() + StringUtil.localize("researchNote.error.0")); - list.add(StringUtil.localize("researchNote.error.1")); - } + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + ResearchNote note = new ResearchNote(itemstack.getTagCompound()); + note.addTooltip(list); } @Override public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { + if (world.isRemote) { return itemstack; } - ResearchNote note = ResearchNote.create(itemstack.getTagCompound()); - if (note != null && note.registerResults(world, entityplayer)) { + ResearchNote note = new ResearchNote(itemstack.getTagCompound()); + if (note.registerResults(world, entityplayer)) { entityplayer.inventory.decrStackSize(entityplayer.inventory.currentItem, 1); // Notify player that his inventory has changed. Proxies.net.inventoryChangeNotify(entityplayer); diff --git a/src/main/java/forestry/core/genetics/SpeciesRoot.java b/src/main/java/forestry/core/genetics/SpeciesRoot.java index af25ce8de..f5b3b0d00 100755 --- a/src/main/java/forestry/core/genetics/SpeciesRoot.java +++ b/src/main/java/forestry/core/genetics/SpeciesRoot.java @@ -10,12 +10,8 @@ ******************************************************************************/ package forestry.core.genetics; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -33,24 +29,10 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; -public abstract class SpeciesRoot & IChromosomeType> implements ISpeciesRoot { +public abstract class SpeciesRoot implements ISpeciesRoot { /* RESEARCH */ private final LinkedHashMap researchCatalysts = new LinkedHashMap<>(); - private final ImmutableMap chromosomeTypeMap; - - public SpeciesRoot(@Nonnull Class chromosomeTypeClass) { - ImmutableMap.Builder chromosomeMapBuilder = ImmutableMap.builder(); - for (C chromosomeType : chromosomeTypeClass.getEnumConstants()) { - chromosomeMapBuilder.put(chromosomeType.getUid(), chromosomeType); - } - chromosomeTypeMap = chromosomeMapBuilder.build(); - } - - @Override - public C getChromosomeTypeForUid(byte uid) { - return chromosomeTypeMap.get(uid); - } @Override public Map getResearchCatalysts() { @@ -63,48 +45,46 @@ public abstract class SpeciesRoot & IChromosomeType> implem } /* TEMPLATES */ - protected final Map> speciesTemplates = new HashMap<>(); + protected final HashMap speciesTemplates = new HashMap<>(); @Override - public void registerTemplate(String identifier, ImmutableMap template) { - speciesTemplates.put(identifier, template); - } - - @Override - public Map> getGenomeTemplates() { + public Map getGenomeTemplates() { return speciesTemplates; } @Override - public void registerTemplate(ImmutableMap template) { + public void registerTemplate(IAllele[] template) { if (template == null) { throw new IllegalArgumentException("Tried to register null template"); } - if (template.size() == 0) { + if (template.length == 0) { throw new IllegalArgumentException("Tried to register empty template"); } - registerTemplate(template.get(getKaryotypeKey()).getUID(), template); + registerTemplate(template[0].getUID(), template); } @Override - public ImmutableMap getRandomTemplate(Random rand) { - Collection> templates = speciesTemplates.values(); + public IAllele[] getRandomTemplate(Random rand) { + Collection templates = speciesTemplates.values(); int size = templates.size(); - ImmutableList> templatesList = ImmutableList.copyOf(speciesTemplates.values()); - return templatesList.get(rand.nextInt(size)); + IAllele[][] templatesArray = templates.toArray(new IAllele[size][]); + return templatesArray[rand.nextInt(size)]; } - @Nullable @Override - public ImmutableMap getTemplate(String identifier) { - return speciesTemplates.get(identifier); + public IAllele[] getTemplate(String identifier) { + IAllele[] template = speciesTemplates.get(identifier); + if (template == null) { + return null; + } + return Arrays.copyOf(template, template.length); } /* MUTATIONS */ @Override - public List> getCombinations(IAllele other) { - ArrayList> combinations = new ArrayList<>(); - for (IMutation mutation : getMutations(false)) { + public Collection getCombinations(IAllele other) { + ArrayList combinations = new ArrayList<>(); + for (IMutation mutation : getMutations(false)) { if (mutation.isPartner(other)) { combinations.add(mutation); } @@ -114,11 +94,11 @@ public abstract class SpeciesRoot & IChromosomeType> implem } @Override - public List> getCombinations(IAlleleSpecies parentSpecies0, IAlleleSpecies parentSpecies1, boolean shuffle) { - List> combinations = new ArrayList<>(); + public List getCombinations(IAlleleSpecies parentSpecies0, IAlleleSpecies parentSpecies1, boolean shuffle) { + List combinations = new ArrayList<>(); String parentSpecies1UID = parentSpecies1.getUID(); - for (IMutation mutation : getMutations(shuffle)) { + for (IMutation mutation : getMutations(shuffle)) { if (mutation.isPartner(parentSpecies0)) { IAllele partner = mutation.getPartner(parentSpecies0); if (partner != null && partner.getUID().equals(parentSpecies1UID)) { @@ -131,10 +111,10 @@ public abstract class SpeciesRoot & IChromosomeType> implem } @Override - public Collection> getPaths(IAllele result, C chromosomeType) { - ArrayList> paths = new ArrayList<>(); - for (IMutation mutation : getMutations(false)) { - if (mutation.getResultTemplate().get(chromosomeType) == result) { + public Collection getPaths(IAllele result, IChromosomeType chromosomeType) { + ArrayList paths = new ArrayList<>(); + for (IMutation mutation : getMutations(false)) { + if (mutation.getTemplate()[chromosomeType.ordinal()] == result) { paths.add(mutation); } } @@ -144,27 +124,26 @@ public abstract class SpeciesRoot & IChromosomeType> implem /* GENOME CONVERSIONS */ @Override - public ImmutableMap templateAsChromosomes(ImmutableMap template) { - ImmutableMap.Builder templateBuilder = ImmutableMap.builder(); - for (Map.Entry entry : template.entrySet()) { - C chromosomeType = entry.getKey(); - IAllele allele = entry.getValue(); - IChromosome chromosome = new Chromosome(allele); - templateBuilder.put(chromosomeType, chromosome); + public IChromosome[] templateAsChromosomes(IAllele[] template) { + Chromosome[] chromosomes = new Chromosome[template.length]; + for (int i = 0; i < template.length; i++) { + if (template[i] != null) { + chromosomes[i] = new Chromosome(template[i]); + } } - return templateBuilder.build(); + + return chromosomes; } @Override - public ImmutableMap templateAsChromosomes(ImmutableMap templateActive, ImmutableMap templateInactive) { - ImmutableMap.Builder templateBuilder = ImmutableMap.builder(); - for (Map.Entry activeEntry : templateActive.entrySet()) { - C chromosomeType = activeEntry.getKey(); - IAllele activeAllele = activeEntry.getValue(); - IAllele inactiveAllele = templateInactive.get(chromosomeType); - IChromosome chromosome = new Chromosome(activeAllele, inactiveAllele); - templateBuilder.put(chromosomeType, chromosome); + public IChromosome[] templateAsChromosomes(IAllele[] templateActive, IAllele[] templateInactive) { + Chromosome[] chromosomes = new Chromosome[templateActive.length]; + for (int i = 0; i < templateActive.length; i++) { + if (templateActive[i] != null) { + chromosomes[i] = new Chromosome(templateActive[i], templateInactive[i]); + } } - return templateBuilder.build(); + + return chromosomes; } } diff --git a/src/main/java/forestry/core/genetics/alleles/Allele.java b/src/main/java/forestry/core/genetics/alleles/Allele.java index 3a27eab52..6c4833080 100644 --- a/src/main/java/forestry/core/genetics/alleles/Allele.java +++ b/src/main/java/forestry/core/genetics/alleles/Allele.java @@ -10,28 +10,22 @@ ******************************************************************************/ package forestry.core.genetics.alleles; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraft.util.StatCollector; import forestry.api.genetics.IAllele; public abstract class Allele implements IAllele { - @Nonnull private final String uid; private final boolean isDominant; - @Nonnull private final String unlocalizedName; - protected Allele(@Nonnull String uid, @Nonnull String unlocalizedName, boolean isDominant) { + protected Allele(String uid, String unlocalizedName, boolean isDominant) { this.uid = uid; this.isDominant = isDominant; this.unlocalizedName = unlocalizedName; } - @Nonnull @Override public String getUID() { return uid; @@ -42,13 +36,11 @@ public abstract class Allele implements IAllele { return isDominant; } - @Nonnull @Override public String getName() { return StatCollector.translateToLocal(getUnlocalizedName()); } - @Nonnull @Override public String getUnlocalizedName() { return unlocalizedName; @@ -58,15 +50,4 @@ public abstract class Allele implements IAllele { public String toString() { return uid; } - - public static boolean equals(@Nullable IAllele allele1, @Nullable IAllele allele2) { - if (allele1 == allele2) { - return true; - } - if (allele1 == null || allele2 == null) { - return false; - } - - return allele1.getUID().equals(allele2.getUID()); - } } diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java b/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java index b05bc1da6..e8bb94c22 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java @@ -10,14 +10,13 @@ ******************************************************************************/ package forestry.core.genetics.alleles; -import java.util.Collection; import java.util.EnumMap; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import forestry.api.apiculture.BeeChromosome; -import forestry.api.arboriculture.TreeChromosome; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; @@ -26,7 +25,7 @@ import forestry.api.genetics.IAlleleBoolean; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IChromosomeType; -import forestry.api.lepidopterology.ButterflyChromosome; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.apiculture.flowers.FlowerProvider; import forestry.core.config.Constants; import forestry.core.utils.vect.IVect; @@ -41,58 +40,75 @@ public class AlleleHelper implements IAlleleHelper { public void init() { if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { - createAlleles(EnumAllele.Fertility.class, BeeChromosome.FERTILITY); - createAlleles(EnumAllele.Flowering.class, BeeChromosome.FLOWERING); + createAlleles(EnumAllele.Fertility.class, EnumBeeChromosome.FERTILITY); + createAlleles(EnumAllele.Flowering.class, EnumBeeChromosome.FLOWERING); } if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE) || ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) { createAlleles(EnumAllele.Territory.class, - BeeChromosome.TERRITORY, - TreeChromosome.TERRITORY + EnumBeeChromosome.TERRITORY, + EnumTreeChromosome.TERRITORY ); + + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.territoryDefault", get(EnumAllele.Territory.AVERAGE)); } if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE) || ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) { createAlleles(EnumAllele.Speed.class, - BeeChromosome.SPEED, - ButterflyChromosome.SPEED + EnumBeeChromosome.SPEED, + EnumButterflyChromosome.SPEED ); createAlleles(EnumAllele.Lifespan.class, - BeeChromosome.LIFESPAN, - ButterflyChromosome.LIFESPAN + EnumBeeChromosome.LIFESPAN, + EnumButterflyChromosome.LIFESPAN ); createAlleles(EnumAllele.Tolerance.class, - BeeChromosome.TEMPERATURE_TOLERANCE, - BeeChromosome.HUMIDITY_TOLERANCE, - ButterflyChromosome.TEMPERATURE_TOLERANCE, - ButterflyChromosome.HUMIDITY_TOLERANCE + EnumBeeChromosome.TEMPERATURE_TOLERANCE, + EnumBeeChromosome.HUMIDITY_TOLERANCE, + EnumButterflyChromosome.TEMPERATURE_TOLERANCE, + EnumButterflyChromosome.HUMIDITY_TOLERANCE ); createAlleles(EnumAllele.Flowers.class, - BeeChromosome.FLOWER_PROVIDER, - ButterflyChromosome.FLOWER_PROVIDER + EnumBeeChromosome.FLOWER_PROVIDER, + EnumButterflyChromosome.FLOWER_PROVIDER ); + + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.speedNorm", get(EnumAllele.Speed.NORMAL)); } if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) { - createAlleles(EnumAllele.Height.class, TreeChromosome.HEIGHT); - createAlleles(EnumAllele.Saplings.class, TreeChromosome.FERTILITY); - createAlleles(EnumAllele.Yield.class, TreeChromosome.YIELD); - createAlleles(EnumAllele.Fireproof.class, TreeChromosome.FIREPROOF); - createAlleles(EnumAllele.Maturation.class, TreeChromosome.MATURATION); - createAlleles(EnumAllele.Sappiness.class, TreeChromosome.SAPPINESS); + createAlleles(EnumAllele.Height.class, EnumTreeChromosome.HEIGHT); + createAlleles(EnumAllele.Saplings.class, EnumTreeChromosome.FERTILITY); + createAlleles(EnumAllele.Yield.class, EnumTreeChromosome.YIELD); + createAlleles(EnumAllele.Fireproof.class, EnumTreeChromosome.FIREPROOF); + createAlleles(EnumAllele.Maturation.class, EnumTreeChromosome.MATURATION); + createAlleles(EnumAllele.Sappiness.class, EnumTreeChromosome.SAPPINESS); + + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.heightMax10", get(EnumAllele.Height.AVERAGE)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.saplingsDefault", get(EnumAllele.Saplings.AVERAGE)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.saplingsDouble", get(EnumAllele.Saplings.HIGH)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.saplingsTriple", get(EnumAllele.Saplings.HIGHER)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.yieldDefault", get(EnumAllele.Yield.AVERAGE)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.maturitySlowest", get(EnumAllele.Maturation.SLOWEST)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.maturitySlower", get(EnumAllele.Maturation.SLOWER)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.maturitySlow", get(EnumAllele.Maturation.SLOW)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.maturityAverage", get(EnumAllele.Maturation.AVERAGE)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.maturityFast", get(EnumAllele.Maturation.FAST)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.maturityFaster", get(EnumAllele.Maturation.FASTER)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.maturityFastest", get(EnumAllele.Maturation.FASTEST)); } if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) { - createAlleles(EnumAllele.Size.class, ButterflyChromosome.SIZE); + createAlleles(EnumAllele.Size.class, EnumButterflyChromosome.SIZE); } Map integers = new HashMap<>(); for (int i = 1; i <= 10; i++) { IAlleleInteger alleleInteger = new AlleleInteger(modId, "i", i + "d", i, true); AlleleManager.alleleRegistry.registerAllele(alleleInteger, - TreeChromosome.GIRTH, - ButterflyChromosome.METABOLISM, - ButterflyChromosome.FERTILITY + EnumTreeChromosome.GIRTH, + EnumButterflyChromosome.METABOLISM, + EnumButterflyChromosome.FERTILITY ); integers.put(i, alleleInteger); } @@ -103,12 +119,12 @@ public class AlleleHelper implements IAlleleHelper { booleans.put(false, new AlleleBoolean(modId, "bool", false, false)); for (IAlleleBoolean alleleBoolean : booleans.values()) { AlleleManager.alleleRegistry.registerAllele(alleleBoolean, - BeeChromosome.NEVER_SLEEPS, - BeeChromosome.TOLERANT_FLYER, - BeeChromosome.CAVE_DWELLING, - ButterflyChromosome.NOCTURNAL, - ButterflyChromosome.TOLERANT_FLYER, - ButterflyChromosome.FIRE_RESIST + EnumBeeChromosome.NEVER_SLEEPS, + EnumBeeChromosome.TOLERANT_FLYER, + EnumBeeChromosome.CAVE_DWELLING, + EnumButterflyChromosome.NOCTURNAL, + EnumButterflyChromosome.TOLERANT_FLYER, + EnumButterflyChromosome.FIRE_RESIST ); } alleleMaps.put(Boolean.class, booleans); @@ -129,7 +145,7 @@ public class AlleleHelper implements IAlleleHelper { } @Override - public & IChromosomeType> void set(Map alleles, C chromosomeType, IAllele allele) { + public & IChromosomeType> void set(IAllele[] alleles, T chromosomeType, IAllele allele) { if (allele == null) { throw new NullPointerException("Allele must not be null"); } @@ -137,26 +153,27 @@ public class AlleleHelper implements IAlleleHelper { throw new IllegalArgumentException("Allele is the wrong type. Expected: " + chromosomeType + " Got: " + allele); } - Collection> validTypes = AlleleManager.alleleRegistry.getChromosomeTypes(allele); - if (validTypes.size() > 0 && !validTypes.contains(chromosomeType)) { - throw new IllegalArgumentException("Allele can't applied to this Chromosome type. Expected: " + validTypes + " Got: " + chromosomeType); - } + // uncomment this once all addon mods are using the allele registration with IChromosomeType + // Collection validTypes = AlleleManager.alleleRegistry.getChromosomeTypes(allele); + // if (validTypes.size() > 0 && !validTypes.contains(chromosomeType)) { + // throw new IllegalArgumentException("Allele can't applied to this Chromosome type. Expected: " + validTypes + " Got: " + chromosomeType); + // } - alleles.put(chromosomeType, allele); + alleles[chromosomeType.ordinal()] = allele; } @Override - public & IChromosomeType> void set(Map alleles, C chromosomeType, IAlleleValue value) { + public & IChromosomeType> void set(IAllele[] alleles, T chromosomeType, IAlleleValue value) { set(alleles, chromosomeType, get(value)); } @Override - public & IChromosomeType> void set(Map alleles, C chromosomeType, boolean value) { + public & IChromosomeType> void set(IAllele[] alleles, T chromosomeType, boolean value) { set(alleles, chromosomeType, get(value)); } @Override - public & IChromosomeType> void set(Map alleles, C chromosomeType, int value) { + public & IChromosomeType> void set(IAllele[] alleles, T chromosomeType, int value) { set(alleles, chromosomeType, get(value)); } diff --git a/src/main/java/forestry/core/genetics/alleles/AllelePlantType.java b/src/main/java/forestry/core/genetics/alleles/AllelePlantType.java index 37d796053..56988089c 100644 --- a/src/main/java/forestry/core/genetics/alleles/AllelePlantType.java +++ b/src/main/java/forestry/core/genetics/alleles/AllelePlantType.java @@ -17,7 +17,7 @@ import java.util.Locale; import net.minecraftforge.common.EnumPlantType; -import forestry.api.arboriculture.TreeChromosome; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllelePlantType; @@ -45,7 +45,7 @@ public class AllelePlantType extends AlleleCategorized implements IAllelePlantTy ); for (IAllelePlantType allele : alleles) { - AlleleManager.alleleRegistry.registerAllele(allele, TreeChromosome.PLANT); + AlleleManager.alleleRegistry.registerAllele(allele, EnumTreeChromosome.PLANT); } } diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java index 49f1e51ec..49ef3ab5b 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java @@ -35,7 +35,7 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.core.genetics.Classification; -import forestry.core.genetics.research.EnumNoteType; +import forestry.core.genetics.ItemResearchNote.EnumNoteType; import forestry.plugins.PluginCore; public class AlleleRegistry implements IAlleleRegistry { @@ -78,9 +78,9 @@ public class AlleleRegistry implements IAlleleRegistry { } @Override - public ISpeciesRoot getSpeciesRoot(Class individualClass) { - for (ISpeciesRoot root : rootMap.values()) { - if (root.getMemberClass().isAssignableFrom(individualClass)) { + public ISpeciesRoot getSpeciesRoot(Class clz) { + for (ISpeciesRoot root : rootMap.values()) { + if (root.getMemberClass().isAssignableFrom(clz)) { return root; } } @@ -108,8 +108,8 @@ public class AlleleRegistry implements IAlleleRegistry { /* ALLELES */ private final LinkedHashMap alleleMap = new LinkedHashMap<>(ALLELE_ARRAY_SIZE); - private final HashMultimap, IAllele> allelesByType = HashMultimap.create(); - private final HashMultimap> typesByAllele = HashMultimap.create(); + private final HashMultimap allelesByType = HashMultimap.create(); + private final HashMultimap typesByAllele = HashMultimap.create(); private final LinkedHashMap deprecatedAlleleMap = new LinkedHashMap<>(32); private final LinkedHashMap classificationMap = new LinkedHashMap<>(128); private final LinkedHashMap fruitMap = new LinkedHashMap<>(64); @@ -148,10 +148,9 @@ public class AlleleRegistry implements IAlleleRegistry { } @Override - public void registerAllele(IAllele allele, IChromosomeType... chromosomeTypes) { - for (IChromosomeType chromosomeType : chromosomeTypes) { - Class chromosomeAlleleClass = chromosomeType.getAlleleClass(); - if (!chromosomeAlleleClass.isAssignableFrom(allele.getClass())) { + public void registerAllele(IAllele allele, IChromosomeType... chromosomeTypes) { + for (IChromosomeType chromosomeType : chromosomeTypes) { + if (!chromosomeType.getAlleleClass().isAssignableFrom(allele.getClass())) { throw new IllegalArgumentException("Allele class (" + allele.getClass() + ") does not match chromosome type (" + chromosomeType.getAlleleClass() + ")."); } allelesByType.put(chromosomeType, allele); @@ -160,10 +159,9 @@ public class AlleleRegistry implements IAlleleRegistry { alleleMap.put(allele.getUID(), allele); if (allele instanceof IAlleleSpecies) { - IAlleleSpecies alleleSpecies = (IAlleleSpecies) allele; - IClassification branch = alleleSpecies.getBranch(); + IClassification branch = ((IAlleleSpecies) allele).getBranch(); if (branch != null) { - branch.addMemberSpecies(alleleSpecies); + branch.addMemberSpecies((IAlleleSpecies) allele); } } @@ -193,12 +191,12 @@ public class AlleleRegistry implements IAlleleRegistry { } @Override - public Collection getRegisteredAlleles(IChromosomeType type) { + public Collection getRegisteredAlleles(IChromosomeType type) { return Collections.unmodifiableSet(allelesByType.get(type)); } - @Override - public Collection> getChromosomeTypes(IAllele allele) { + // This method is not useful until all mod addon alleles are registered with their valid IChromosomeTypes + public Collection getChromosomeTypes(IAllele allele) { return Collections.unmodifiableSet(typesByAllele.get(allele)); } diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java index 726c9e9fb..516a0ed8e 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.core.genetics.alleles; -import java.util.List; +import java.util.Collection; import java.util.Map; import net.minecraft.item.Item; @@ -27,9 +27,7 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IModelProvider; import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IAlleleSpeciesBuilder; -import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IAlleleSpeciesCustom; import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; @@ -38,7 +36,7 @@ import forestry.core.utils.GeneticsUtil; import forestry.core.utils.ItemStackUtil; import forestry.plugins.PluginApiculture; -public abstract class AlleleSpecies> extends Allele implements IAlleleSpecies, IAlleleSpeciesBuilder { +public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCustom { private final String binomial; private final String authority; private final String description; @@ -101,14 +99,13 @@ public abstract class AlleleSpecies> extends Allele } @Override - public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) { + public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) { ItemStack research = null; if (world.rand.nextFloat() < ((float) 10 / bountyLevel)) { - List> combinations = getRoot().getCombinations(this); + Collection combinations = getRoot().getCombinations(this); if (combinations.size() > 0) { - int randomIndex = world.rand.nextInt(combinations.size()); - IMutation mutation = combinations.get(randomIndex); - research = AlleleManager.alleleRegistry.getMutationNoteStack(researcher, mutation); + IMutation[] candidates = combinations.toArray(new IMutation[combinations.size()]); + research = AlleleManager.alleleRegistry.getMutationNoteStack(researcher, candidates[world.rand.nextInt(candidates.length)]); } } @@ -160,31 +157,31 @@ public abstract class AlleleSpecies> extends Allele } @Override - public AlleleSpecies setTemperature(EnumTemperature temperature) { + public IAlleleSpeciesCustom setTemperature(EnumTemperature temperature) { climate = temperature; return this; } @Override - public AlleleSpecies setHumidity(EnumHumidity humidity) { + public IAlleleSpeciesCustom setHumidity(EnumHumidity humidity) { this.humidity = humidity; return this; } @Override - public AlleleSpecies setHasEffect() { + public IAlleleSpeciesCustom setHasEffect() { hasEffect = true; return this; } @Override - public AlleleSpecies setIsSecret() { + public IAlleleSpeciesCustom setIsSecret() { isSecret = true; return this; } @Override - public AlleleSpecies setIsNotCounted() { + public IAlleleSpeciesCustom setIsNotCounted() { isCounted = false; return this; } diff --git a/src/main/java/forestry/core/genetics/alleles/IAlleleHelper.java b/src/main/java/forestry/core/genetics/alleles/IAlleleHelper.java index 7f8cf822b..a1047e04b 100644 --- a/src/main/java/forestry/core/genetics/alleles/IAlleleHelper.java +++ b/src/main/java/forestry/core/genetics/alleles/IAlleleHelper.java @@ -10,19 +10,17 @@ ******************************************************************************/ package forestry.core.genetics.alleles; -import java.util.Map; - import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; public interface IAlleleHelper { - & IChromosomeType> void set(Map alleles, C chromosomeType, IAllele allele); + & IChromosomeType> void set(IAllele[] alleles, T chromosomeType, IAllele allele); - & IChromosomeType> void set(Map alleles, C chromosomeType, IAlleleValue value); + & IChromosomeType> void set(IAllele[] alleles, T chromosomeType, IAlleleValue value); - & IChromosomeType> void set(Map alleles, C chromosomeType, boolean value); + & IChromosomeType> void set(IAllele[] alleles, T chromosomeType, boolean value); - & IChromosomeType> void set(Map alleles, C chromosomeType, int value); + & IChromosomeType> void set(IAllele[] alleles, T chromosomeType, int value); } diff --git a/src/main/java/forestry/core/genetics/mutations/Mutation.java b/src/main/java/forestry/core/genetics/mutations/Mutation.java index 6d7d9c54e..f185bd006 100644 --- a/src/main/java/forestry/core/genetics/mutations/Mutation.java +++ b/src/main/java/forestry/core/genetics/mutations/Mutation.java @@ -10,16 +10,11 @@ ******************************************************************************/ package forestry.core.genetics.mutations; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.world.World; @@ -27,176 +22,127 @@ import net.minecraftforge.common.BiomeDictionary; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleRegistry; import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IGenome; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.IMutationBuilder; import forestry.api.genetics.IMutationCondition; -import forestry.api.genetics.ISpeciesMode; -import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.IMutationCustom; -public abstract class Mutation> implements IMutation, IMutationBuilder { +public abstract class Mutation implements IMutationCustom { private final int chance; - @Nonnull - private final IAlleleSpecies species0; - @Nonnull - private final IAlleleSpecies species1; - @Nonnull - private final ImmutableMap resultTemplate; + private final IAlleleSpecies species0; + private final IAlleleSpecies species1; + + private final IAllele[] template; - @Nonnull private final List mutationConditions = new ArrayList<>(); - @Nonnull private final List specialConditions = new ArrayList<>(); private boolean isSecret = false; - protected Mutation(@Nonnull IAlleleSpecies species0, @Nonnull IAlleleSpecies species1, @Nonnull ImmutableMap resultTemplate, int chance) { + protected Mutation(IAlleleSpecies species0, IAlleleSpecies species1, IAllele[] template, int chance) { this.species0 = species0; this.species1 = species1; - this.resultTemplate = resultTemplate; + this.template = template; this.chance = chance; } - @Nullable - public static IMutation create(@Nonnull NBTTagCompound nbt) { - IAlleleRegistry alleleRegistry = AlleleManager.alleleRegistry; - - ISpeciesRoot root = alleleRegistry.getSpeciesRoot(nbt.getString("ROT")); - IAllele allele0 = alleleRegistry.getAllele(nbt.getString("AL0")); - IAllele allele1 = alleleRegistry.getAllele(nbt.getString("AL1")); - IAllele result = AlleleManager.alleleRegistry.getAllele(nbt.getString("RST")); - if (root == null || allele0 == null || allele1 == null || result == null) { - return null; - } - - IChromosomeType speciesChromosomeType = root.getKaryotypeKey(); - for (IMutation mutation : root.getCombinations(allele0)) { - if (mutation.isPartner(allele1)) { - String mutationSpeciesUid = mutation.getResultTemplate().get(speciesChromosomeType).getUID(); - if (mutationSpeciesUid.equals(result.getUID())) { - return mutation; - } - } - } - - return null; - } - - @Override - public void writeToNBT(@Nonnull NBTTagCompound nbt) { - ISpeciesRoot speciesRoot = getRoot(); - nbt.setString("ROT", speciesRoot.getUID()); - nbt.setString("AL0", getSpecies0().getUID()); - nbt.setString("AL1", getSpecies1().getUID()); - nbt.setString("RST", getResultTemplate().get(speciesRoot.getKaryotypeKey()).getUID()); - } - - @Nonnull @Override public Collection getSpecialConditions() { return specialConditions; } @Override - public Mutation setIsSecret() { + public Mutation setIsSecret() { isSecret = true; return this; } @Override - public Mutation restrictTemperature(EnumTemperature temperature) { + public Mutation restrictTemperature(EnumTemperature temperature) { return restrictTemperature(temperature, temperature); } @Override - public Mutation restrictTemperature(EnumTemperature minTemperature, EnumTemperature maxTemperature) { + public Mutation restrictTemperature(EnumTemperature minTemperature, EnumTemperature maxTemperature) { IMutationCondition mutationCondition = new MutationConditionTemperature(minTemperature, maxTemperature); return addMutationCondition(mutationCondition); } @Override - public Mutation restrictHumidity(EnumHumidity humidity) { + public Mutation restrictHumidity(EnumHumidity humidity) { return restrictHumidity(humidity, humidity); } @Override - public Mutation restrictHumidity(EnumHumidity minHumidity, EnumHumidity maxHumidity) { + public Mutation restrictHumidity(EnumHumidity minHumidity, EnumHumidity maxHumidity) { IMutationCondition mutationCondition = new MutationConditionHumidity(minHumidity, maxHumidity); return addMutationCondition(mutationCondition); } @Override - public Mutation restrictBiomeType(BiomeDictionary.Type... types) { + public Mutation restrictBiomeType(BiomeDictionary.Type... types) { IMutationCondition mutationCondition = new MutationConditionBiome(types); return addMutationCondition(mutationCondition); } @Override - public Mutation requireDay() { + public Mutation requireDay() { IMutationCondition mutationCondition = new MutationConditionDaytime(true); return addMutationCondition(mutationCondition); } @Override - public Mutation requireNight() { + public Mutation requireNight() { IMutationCondition mutationCondition = new MutationConditionDaytime(false); return addMutationCondition(mutationCondition); } @Override - public Mutation restrictDateRange(int startMonth, int startDay, int endMonth, int endDay) { + public Mutation restrictDateRange(int startMonth, int startDay, int endMonth, int endDay) { IMutationCondition mutationCondition = new MutationConditionTimeLimited(startMonth, startDay, endMonth, endDay); return addMutationCondition(mutationCondition); } @Override - public Mutation requireResource(Block block, int meta) { + public Mutation requireResource(Block block, int meta) { IMutationCondition mutationCondition = new MutationConditionRequiresResource(block, meta); return addMutationCondition(mutationCondition); } @Override - public Mutation requireResource(String oreName) { + public Mutation requireResource(String oreName) { IMutationCondition mutationCondition = new MutationConditionRequiresResourceOreDict(oreName); return addMutationCondition(mutationCondition); } @Override - public Mutation addMutationCondition(IMutationCondition mutationCondition) { + public Mutation addMutationCondition(IMutationCondition mutationCondition) { mutationConditions.add(mutationCondition); specialConditions.add(mutationCondition.getDescription()); return this; } - @Override - public float getChance(World world, BlockPos pos, IAlleleSpecies species0, IAlleleSpecies species1, IGenome genome0, IGenome genome1) { + protected float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { float mutationChance = chance; for (IMutationCondition mutationCondition : mutationConditions) { - mutationChance *= mutationCondition.getChance(world, pos, species0, species1, genome0, genome1); + mutationChance *= mutationCondition.getChance(world, pos, allele0, allele1, genome0, genome1); + if (mutationChance == 0) { + return 0; + } } - - ISpeciesMode mode = getRoot().getMode(world); - mutationChance *= mode.getMutationModifier(genome0, genome1); - return mutationChance; } - @Nonnull @Override - public IAlleleSpecies getSpecies0() { + public IAlleleSpecies getAllele0() { return species0; } - @Nonnull @Override - public IAlleleSpecies getSpecies1() { + public IAlleleSpecies getAllele1() { return species1; } @@ -205,10 +151,9 @@ public abstract class Mutation> implements IMutatio return chance; } - @Nonnull @Override - public ImmutableMap getResultTemplate() { - return resultTemplate; + public IAllele[] getTemplate() { + return template; } @Override @@ -216,15 +161,12 @@ public abstract class Mutation> implements IMutatio return species0.getUID().equals(allele.getUID()) || species1.getUID().equals(allele.getUID()); } - @Nullable @Override public IAllele getPartner(IAllele allele) { if (species0.getUID().equals(allele.getUID())) { return species1; - } else if (species1.getUID().equals(allele.getUID())) { - return species0; } else { - return null; + return species0; } } @@ -232,4 +174,5 @@ public abstract class Mutation> implements IMutatio public boolean isSecret() { return isSecret; } + } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java index 1fc3b0265..03bfa94b2 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java @@ -20,8 +20,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeDictionary; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.core.utils.StringUtil; @@ -35,7 +34,7 @@ public class MutationConditionBiome implements IMutationCondition { } @Override - public float getChance(World world, BlockPos pos, IAlleleSpecies species0, IAlleleSpecies species1, IGenome genome0, IGenome genome1) { + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { BiomeGenBase biome = world.getBiomeGenForCoords(pos); for (BiomeDictionary.Type type : validBiomeTypes) { if (BiomeDictionary.isBiomeOfType(biome, type)) { diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java index 919796463..39b273994 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionDaytime.java @@ -13,8 +13,7 @@ package forestry.core.genetics.mutations; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.core.utils.StringUtil; @@ -28,7 +27,7 @@ public class MutationConditionDaytime implements IMutationCondition { } @Override - public float getChance(World world, BlockPos pos, IAlleleSpecies species0, IAlleleSpecies species1, IGenome genome0, IGenome genome1) { + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { if (world.isDaytime() == daytime) { return 1; } diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java index ac7e214e8..2757a83e1 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionHumidity.java @@ -16,8 +16,7 @@ import net.minecraft.world.biome.BiomeGenBase; import forestry.api.core.EnumHumidity; import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.core.utils.StringUtil; @@ -32,7 +31,7 @@ public class MutationConditionHumidity implements IMutationCondition { } @Override - public float getChance(World world, BlockPos pos, IAlleleSpecies species0, IAlleleSpecies species1, IGenome genome0, IGenome genome1) { + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenerator(pos); EnumHumidity biomeHumidity = EnumHumidity.getFromValue(biome.rainfall); diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java index 24dcf4b88..8b7977bcb 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResource.java @@ -16,8 +16,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import forestry.api.apiculture.IBeeHousing; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.core.utils.BlockUtil; @@ -33,7 +32,7 @@ public class MutationConditionRequiresResource implements IMutationCondition { } @Override - public float getChance(World world, BlockPos pos, IAlleleSpecies species0, IAlleleSpecies species1, IGenome genome0, IGenome genome1) { + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { Block block; int meta; int i = 1; diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java index e657604a2..9789d2bb1 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionRequiresResourceOreDict.java @@ -20,8 +20,7 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import forestry.api.apiculture.IBeeHousing; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.core.utils.BlockUtil; @@ -44,7 +43,7 @@ public class MutationConditionRequiresResourceOreDict implements IMutationCondit } @Override - public float getChance(World world, BlockPos pos, IAlleleSpecies species0, IAlleleSpecies species1, IGenome genome0, IGenome genome1) { + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { Block block; int meta; int i = 1; diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java index ac28de4b1..aa08c94ab 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java @@ -16,8 +16,7 @@ import net.minecraft.world.biome.BiomeGenBase; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.core.utils.StringUtil; @@ -33,7 +32,7 @@ public class MutationConditionTemperature implements IMutationCondition { } @Override - public float getChance(World world, BlockPos pos, IAlleleSpecies species0, IAlleleSpecies species1, IGenome genome0, IGenome genome1) { + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenerator(pos); EnumTemperature biomeTemperature = EnumTemperature.getFromBiome(biome, pos); diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java index e71068328..faded25b6 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionTimeLimited.java @@ -15,8 +15,7 @@ import java.util.Calendar; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.core.utils.DayMonth; @@ -33,7 +32,7 @@ public class MutationConditionTimeLimited implements IMutationCondition { } @Override - public float getChance(World world, BlockPos pos, IAlleleSpecies species0, IAlleleSpecies species1, IGenome genome0, IGenome genome1) { + public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { DayMonth now = new DayMonth(); // If we are equal to start day, return 1. diff --git a/src/main/java/forestry/core/genetics/research/EnumNoteType.java b/src/main/java/forestry/core/genetics/research/EnumNoteType.java deleted file mode 100644 index 2ede6c7ba..000000000 --- a/src/main/java/forestry/core/genetics/research/EnumNoteType.java +++ /dev/null @@ -1,88 +0,0 @@ -package forestry.core.genetics.research; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import com.mojang.authlib.GameProfile; - -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IMutation; -import forestry.core.genetics.mutations.Mutation; -import forestry.core.utils.PlayerUtil; - -public enum EnumNoteType { - MUTATION { - @Nullable - @Override - public ResearchNote createResearchNote(@Nonnull GameProfile researcher, @Nonnull NBTTagCompound nbt) { - NBTTagCompound mutationNbt = nbt.getCompoundTag(ResearchNoteMutation.MUTATION_NBT_KEY); - if (mutationNbt == null) { - return null; - } - IMutation mutation = Mutation.create(mutationNbt); - if (mutation == null) { - return null; - } - return new ResearchNoteMutation<>(researcher, mutation); - } - }, - SPECIES { - @Nullable - @Override - public ResearchNote createResearchNote(@Nonnull GameProfile researcher, @Nonnull NBTTagCompound nbt) { - String speciesUid = nbt.getString(ResearchNoteSpecies.SPECIES_NBT_KEY); - if (speciesUid == null) { - return null; - } - IAllele allele = AlleleManager.alleleRegistry.getAllele(speciesUid); - if (!(allele instanceof IAlleleSpecies)) { - return null; - } - IAlleleSpecies alleleSpecies = (IAlleleSpecies) allele; - return new ResearchNoteSpecies<>(researcher, alleleSpecies); - } - }; - - public static final EnumNoteType[] VALUES = values(); - - @Nullable - public ResearchNote createResearchNote(@Nonnull NBTTagCompound nbt) { - NBTTagCompound researcherNbt = nbt.getCompoundTag(ResearchNote.RESEARCHER_NBT_KEY); - if (researcherNbt == null) { - return null; - } - GameProfile researcher = PlayerUtil.readGameProfileFromNBT(researcherNbt); - if (researcher == null) { - return null; - } - return createResearchNote(researcher, nbt); - } - - @Nullable - protected abstract ResearchNote createResearchNote(@Nonnull GameProfile researcher, @Nonnull NBTTagCompound nbt); - - public static ItemStack createMutationNoteStack(@Nonnull Item item, @Nonnull GameProfile researcher, @Nonnull IMutation mutation) { - ResearchNote note = new ResearchNoteMutation<>(researcher, mutation); - NBTTagCompound compound = new NBTTagCompound(); - note.writeToNBT(compound); - ItemStack created = new ItemStack(item); - created.setTagCompound(compound); - return created; - } - - public static ItemStack createSpeciesNoteStack(@Nonnull Item item, @Nonnull GameProfile researcher, @Nonnull IAlleleSpecies species) { - ResearchNote note = new ResearchNoteSpecies<>(researcher, species); - NBTTagCompound compound = new NBTTagCompound(); - note.writeToNBT(compound); - ItemStack created = new ItemStack(item); - created.setTagCompound(compound); - return created; - } - -} diff --git a/src/main/java/forestry/core/genetics/research/ResearchNote.java b/src/main/java/forestry/core/genetics/research/ResearchNote.java deleted file mode 100644 index 885239bed..000000000 --- a/src/main/java/forestry/core/genetics/research/ResearchNote.java +++ /dev/null @@ -1,57 +0,0 @@ -package forestry.core.genetics.research; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - -import com.mojang.authlib.GameProfile; - -import forestry.api.core.INbtWritable; -import forestry.core.utils.PlayerUtil; - -public abstract class ResearchNote implements INbtWritable { - private static final String TYPE_NBT_KEY = "typ"; - public static final String RESEARCHER_NBT_KEY = "res"; - @Nonnull - private final EnumNoteType type; - @Nonnull - private final GameProfile researcher; - - @Nullable - public static ResearchNote create(@Nullable NBTTagCompound nbt) { - if (nbt == null) { - return null; - } - if (nbt.hasKey(TYPE_NBT_KEY)) { - EnumNoteType type = EnumNoteType.VALUES[nbt.getByte(TYPE_NBT_KEY)]; - return type.createResearchNote(nbt); - } - return null; - } - - public ResearchNote(@Nonnull EnumNoteType type, @Nonnull GameProfile researcher) { - this.type = type; - this.researcher = researcher; - } - - @Nonnull - public GameProfile getResearcher() { - return researcher; - } - - @Override - public void writeToNBT(@Nonnull NBTTagCompound nbt) { - NBTTagCompound researcherNbt = new NBTTagCompound(); - PlayerUtil.writeGameProfile(researcherNbt, researcher); - nbt.setTag(RESEARCHER_NBT_KEY, researcherNbt); - nbt.setByte(TYPE_NBT_KEY, (byte) type.ordinal()); - } - - public abstract void addTooltip(@Nonnull List list); - - public abstract boolean registerResults(@Nonnull World world, @Nonnull EntityPlayer player); -} diff --git a/src/main/java/forestry/core/genetics/research/ResearchNoteMutation.java b/src/main/java/forestry/core/genetics/research/ResearchNoteMutation.java deleted file mode 100644 index 463f4bdba..000000000 --- a/src/main/java/forestry/core/genetics/research/ResearchNoteMutation.java +++ /dev/null @@ -1,92 +0,0 @@ -package forestry.core.genetics.research; - -import javax.annotation.Nonnull; -import java.util.List; -import java.util.Locale; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; - -import com.mojang.authlib.GameProfile; - -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IGenome; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesRoot; -import forestry.core.genetics.mutations.EnumMutateChance; -import forestry.core.utils.StringUtil; - -public class ResearchNoteMutation extends ResearchNote { - public static final String MUTATION_NBT_KEY = "mut"; - - private final IMutation mutation; - - public ResearchNoteMutation(@Nonnull GameProfile researcher, @Nonnull IMutation mutation) { - super(EnumNoteType.MUTATION, researcher); - this.mutation = mutation; - } - - @Override - public void writeToNBT(@Nonnull NBTTagCompound nbt) { - super.writeToNBT(nbt); - - NBTTagCompound mutationNbt = new NBTTagCompound(); - mutation.writeToNBT(mutationNbt); - nbt.setTag(MUTATION_NBT_KEY, mutationNbt); - } - - @Override - public boolean registerResults(@Nonnull World world, @Nonnull EntityPlayer player) { - ISpeciesRoot root = mutation.getRoot(); - IBreedingTracker tracker = root.getBreedingTracker(world, player.getGameProfile()); - if (tracker.isResearched(mutation)) { - player.addChatMessage(new ChatComponentTranslation("for.chat.cannotmemorizeagain")); - return false; - } - - IAlleleSpecies species0 = mutation.getSpecies0(); - IAlleleSpecies species1 = mutation.getSpecies1(); - IGenome resultGenome = root.templateAsGenome(mutation.getResultTemplate()); - IAlleleSpecies speciesResult = resultGenome.getPrimary(); - - tracker.registerSpecies(species0); - tracker.registerSpecies(species1); - tracker.registerSpecies(speciesResult); - - tracker.researchMutation(mutation); - player.addChatMessage(new ChatComponentTranslation("for.chat.memorizednote")); - - player.addChatMessage(new ChatComponentTranslation("for.chat.memorizednote2", - EnumChatFormatting.GRAY + species0.getName(), - EnumChatFormatting.GRAY + species1.getName(), - EnumChatFormatting.GREEN + speciesResult.getName())); - - return true; - } - - @Override - public void addTooltip(@Nonnull List list) { - ISpeciesRoot root = mutation.getRoot(); - String species1 = mutation.getSpecies0().getName(); - String species2 = mutation.getSpecies1().getName(); - String mutationChanceKey = EnumMutateChance.rateChance(mutation.getBaseChance()).toString().toLowerCase(Locale.ENGLISH); - String mutationChance = StringUtil.localize("researchNote.chance." + mutationChanceKey); - String speciesResult = mutation.getResultTemplate().get(root.getKaryotypeKey()).getName(); - - list.add(StringUtil.localize("researchNote.discovery.0")); - list.add(StringUtil.localize("researchNote.discovery.1").replace("%SPEC1", species1).replace("%SPEC2", species2)); - list.add(StringUtil.localizeAndFormat("researchNote.discovery.2", mutationChance)); - list.add(StringUtil.localizeAndFormat("researchNote.discovery.3", speciesResult)); - - if (mutation.getSpecialConditions().size() > 0) { - for (String line : mutation.getSpecialConditions()) { - list.add(EnumChatFormatting.GOLD + line); - } - } - } -} diff --git a/src/main/java/forestry/core/genetics/research/ResearchNoteSpecies.java b/src/main/java/forestry/core/genetics/research/ResearchNoteSpecies.java deleted file mode 100644 index c58abd6d2..000000000 --- a/src/main/java/forestry/core/genetics/research/ResearchNoteSpecies.java +++ /dev/null @@ -1,43 +0,0 @@ -package forestry.core.genetics.research; - -import javax.annotation.Nonnull; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - -import com.mojang.authlib.GameProfile; - -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; -import forestry.core.utils.StringUtil; - -public class ResearchNoteSpecies extends ResearchNote { - public static final String SPECIES_NBT_KEY = "spe"; - @Nonnull - private final IAlleleSpecies species; - - public ResearchNoteSpecies(@Nonnull GameProfile researcher, @Nonnull IAlleleSpecies species) { - super(EnumNoteType.SPECIES, researcher); - this.species = species; - } - - @Override - public void writeToNBT(@Nonnull NBTTagCompound nbt) { - super.writeToNBT(nbt); - nbt.setString(SPECIES_NBT_KEY, species.getUID()); - } - - @Override - public void addTooltip(@Nonnull List list) { - list.add("researchNote.discovered.0"); - list.add(StringUtil.localizeAndFormat("researchNote.discovered.1", species.getName(), species.getBinomial())); - } - - @Override - public boolean registerResults(@Nonnull World world, @Nonnull EntityPlayer player) { - //TODO: implement or remove this type of research - return false; - } -} diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index c38db6580..ab26799e1 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -24,6 +24,7 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; @@ -42,20 +43,20 @@ import forestry.core.gui.widgets.ItemStackWidget; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; -public abstract class GuiAlyzer extends GuiForestry { +public abstract class GuiAlyzer extends GuiForestry { protected static final int COLUMN_0 = 12; protected static final int COLUMN_1 = 90; protected static final int COLUMN_2 = 155; - private final ISpeciesRoot speciesRoot; - private final IBreedingTracker breedingTracker; + private final ISpeciesRoot speciesRoot; + private final IBreedingTracker breedingTracker; private final String guiName; protected final Map iconStacks = new HashMap<>(); - protected GuiAlyzer(ISpeciesRoot speciesRoot, EntityPlayer player, ContainerAlyzer container, IInventory inventory, String guiName) { + protected GuiAlyzer(ISpeciesRoot speciesRoot, EntityPlayer player, ContainerAlyzer container, IInventory inventory, String guiName) { super(Constants.TEXTURE_PATH_GUI + "/beealyzer2.png", container, inventory); this.xSize = 246; @@ -75,7 +76,7 @@ public abstract class GuiAlyzer extends GuiForestry individual, C chromosome, boolean inactive) { + protected final void drawLine(String text, int x, IIndividual individual, IChromosomeType chromosome, boolean inactive) { if (!inactive) { textLayout.drawLine(text, x, getColorCoding(individual.getGenome().getActiveAllele(chromosome).isDominant())); } else { @@ -83,7 +84,7 @@ public abstract class GuiAlyzer extends GuiForestry individual, C chromosome, boolean inactive) { + protected final void drawSplitLine(String text, int x, int maxWidth, IIndividual individual, IChromosomeType chromosome, boolean inactive) { if (!inactive) { textLayout.drawSplitLine(text, x, maxWidth, getColorCoding(individual.getGenome().getActiveAllele(chromosome).isDominant())); } else { @@ -91,12 +92,12 @@ public abstract class GuiAlyzer extends GuiForestry individual, C chromosome) { + protected final void drawRow(String text0, String text1, String text2, IIndividual individual, IChromosomeType chromosome) { textLayout.drawRow(text0, text1, text2, fontColor.get("gui.screen"), getColorCoding(individual.getGenome().getActiveAllele(chromosome).isDominant()), getColorCoding(individual.getGenome().getInactiveAllele(chromosome).isDominant())); } - protected final void drawChromosomeRow(String chromosomeName, IIndividual individual, C chromosome) { + protected final void drawChromosomeRow(String chromosomeName, IIndividual individual, IChromosomeType chromosome) { IAllele active = individual.getGenome().getActiveAllele(chromosome); IAllele inactive = individual.getGenome().getInactiveAllele(chromosome); textLayout.drawRow(chromosomeName, active.getName(), inactive.getName(), @@ -104,7 +105,7 @@ public abstract class GuiAlyzer extends GuiForestry individual, C chromosome, String customPrimaryName, String customSecondaryName) { + protected final void drawSpeciesRow(String text0, IIndividual individual, IChromosomeType chromosome, String customPrimaryName, String customSecondaryName) { IAlleleSpecies primary = individual.getGenome().getPrimary(); IAlleleSpecies secondary = individual.getGenome().getSecondary(); @@ -164,7 +165,7 @@ public abstract class GuiAlyzer extends GuiForestry individual) { + protected final void drawAnalyticsPageClassification(IIndividual individual) { textLayout.startPage(); @@ -231,7 +232,7 @@ public abstract class GuiAlyzer extends GuiForestry individual) { + protected void drawAnalyticsPageMutations(IIndividual individual) { textLayout.startPage(COLUMN_0, COLUMN_1, COLUMN_2); textLayout.drawLine(StringUtil.localize("gui.beealyzer.mutations") + ":", COLUMN_0); @@ -239,20 +240,20 @@ public abstract class GuiAlyzer extends GuiForestry, IAllele> combinations = new HashMap<>(); + HashMap combinations = new HashMap<>(); - for (IMutation mutation : speciesRoot.getCombinations(individual.getGenome().getPrimary())) { + for (IMutation mutation : speciesRoot.getCombinations(individual.getGenome().getPrimary())) { combinations.put(mutation, individual.getGenome().getPrimary()); } - for (IMutation mutation : speciesRoot.getCombinations(individual.getGenome().getSecondary())) { + for (IMutation mutation : speciesRoot.getCombinations(individual.getGenome().getSecondary())) { combinations.put(mutation, individual.getGenome().getSecondary()); } int columnWidth = 50; int x = 0; - for (Map.Entry, IAllele> mutation : combinations.entrySet()) { + for (Map.Entry mutation : combinations.entrySet()) { if (breedingTracker.isDiscovered(mutation.getKey())) { drawMutationInfo(mutation.getKey(), mutation.getValue(), COLUMN_0 + x); @@ -275,20 +276,19 @@ public abstract class GuiAlyzer extends GuiForestry combination, IAllele species, int x) { + protected void drawMutationInfo(IMutation combination, IAllele species, int x) { ItemStack partnerBee = iconStacks.get(combination.getPartner(species).getUID()); widgetManager.add(new ItemStackWidget(widgetManager, x, textLayout.getLineY(), partnerBee)); drawProbabilityArrow(combination, guiLeft + x + 18, guiTop + textLayout.getLineY() + 4); - C speciesChromosome = combination.getRoot().getKaryotypeKey(); - IAllele result = combination.getResultTemplate().get(speciesChromosome); + IAllele result = combination.getTemplate()[EnumBeeChromosome.SPECIES.ordinal()]; ItemStack resultBee = iconStacks.get(result.getUID()); widgetManager.add(new ItemStackWidget(widgetManager, x + 33, textLayout.getLineY(), resultBee)); } - private void drawUnknownMutation(IMutation combination, int x) { + private void drawUnknownMutation(IMutation combination, int x) { drawQuestionMark(guiLeft + x, guiTop + textLayout.getLineY()); @@ -302,7 +302,7 @@ public abstract class GuiAlyzer extends GuiForestry combination, int x, int y) { + private void drawProbabilityArrow(IMutation combination, int x, int y) { float chance = combination.getBaseChance(); int line = 247; int column = 100; diff --git a/src/main/java/forestry/core/gui/GuiNaturalistInventory.java b/src/main/java/forestry/core/gui/GuiNaturalistInventory.java index a8030ac4d..d82da8f6c 100755 --- a/src/main/java/forestry/core/gui/GuiNaturalistInventory.java +++ b/src/main/java/forestry/core/gui/GuiNaturalistInventory.java @@ -21,10 +21,9 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import forestry.api.apiculture.IApiaristTracker; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; @@ -36,13 +35,13 @@ import forestry.core.network.packets.PacketGuiSelectRequest; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; -public class GuiNaturalistInventory extends GuiForestry { - private final ISpeciesRoot speciesRoot; - private final IBreedingTracker breedingTracker; +public class GuiNaturalistInventory extends GuiForestry { + private final ISpeciesRoot speciesRoot; + private final IBreedingTracker breedingTracker; private final HashMap iconStacks = new HashMap<>(); private final int pageCurrent, pageMax; - public GuiNaturalistInventory(ISpeciesRoot speciesRoot, EntityPlayer player, Container container, IPagedInventory inventory, int page, int maxPages) { + public GuiNaturalistInventory(ISpeciesRoot speciesRoot, EntityPlayer player, Container container, IPagedInventory inventory, int page, int maxPages) { super(Constants.TEXTURE_PATH_GUI + "/apiaristinventory.png", container, inventory); this.speciesRoot = speciesRoot; @@ -53,7 +52,7 @@ public class GuiNaturalistInventory extends GuiForest xSize = 196; ySize = 202; - for (IIndividual individual : speciesRoot.getIndividualTemplates()) { + for (IIndividual individual : speciesRoot.getIndividualTemplates()) { iconStacks.put(individual.getIdent(), speciesRoot.getMemberStack(individual, 0)); } @@ -66,7 +65,7 @@ public class GuiNaturalistInventory extends GuiForest String header = StringUtil.localize("gui.page") + " " + (pageCurrent + 1) + "/" + pageMax; fontRendererObj.drawString(header, guiLeft + 95 + textLayout.getCenteredOffset(header, 98), guiTop + 10, fontColor.get("gui.title")); - IIndividual individual = getIndividualAtPosition(i, j); + IIndividual individual = getIndividualAtPosition(i, j); if (individual == null) { displayBreedingStatistics(10); } @@ -75,10 +74,8 @@ public class GuiNaturalistInventory extends GuiForest RenderHelper.enableGUIStandardItemLighting(); textLayout.startPage(); - IGenome genome = individual.getGenome(); - displaySpeciesInformation(true, genome.getPrimary(), iconStacks.get(individual.getIdent()), 10); - C speciesChromosomeType = genome.getSpeciesRoot().getKaryotypeKey(); - if (!individual.isPureBred(speciesChromosomeType)) { + displaySpeciesInformation(true, individual.getGenome().getPrimary(), iconStacks.get(individual.getIdent()), 10); + if (!individual.isPureBred(EnumTreeChromosome.SPECIES)) { displaySpeciesInformation(individual.isAnalyzed(), individual.getGenome().getSecondary(), iconStacks.get(individual.getGenome().getSecondary().getUID()), 10); } @@ -110,7 +107,7 @@ public class GuiNaturalistInventory extends GuiForest } } - private IIndividual getIndividualAtPosition(int x, int y) { + private IIndividual getIndividualAtPosition(int x, int y) { Slot slot = getSlotAtPosition(x, y); if (slot == null) { return null; @@ -170,7 +167,7 @@ public class GuiNaturalistInventory extends GuiForest int columnWidth = 16; int column = 10; - for (IMutation combination : speciesRoot.getCombinations(species)) { + for (IMutation combination : speciesRoot.getCombinations(species)) { if (combination.isSecret()) { continue; } diff --git a/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java b/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java index 4b06c6846..2c42cda93 100644 --- a/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/FakeInventoryAdapter.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.inventory; -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -136,7 +134,7 @@ public class FakeInventoryAdapter implements IInventoryAdapter { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { } diff --git a/src/main/java/forestry/core/inventory/InventoryAdapter.java b/src/main/java/forestry/core/inventory/InventoryAdapter.java index f717c4ac5..71e5fb01f 100755 --- a/src/main/java/forestry/core/inventory/InventoryAdapter.java +++ b/src/main/java/forestry/core/inventory/InventoryAdapter.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.core.inventory; -import javax.annotation.Nonnull; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; @@ -196,7 +195,7 @@ public class InventoryAdapter implements IInventoryAdapter, IStreamable { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { InventoryUtil.writeToNBT(this, nbttagcompound); } diff --git a/src/main/java/forestry/core/inventory/InventoryPlain.java b/src/main/java/forestry/core/inventory/InventoryPlain.java index fd5b332a0..e979931c3 100644 --- a/src/main/java/forestry/core/inventory/InventoryPlain.java +++ b/src/main/java/forestry/core/inventory/InventoryPlain.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.inventory; -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -136,7 +134,7 @@ public class InventoryPlain implements IInventory, INbtWritable, INbtReadable { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { InventoryUtil.writeToNBT(this, nbttagcompound); } diff --git a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java index 044c14160..6a37be6d6 100644 --- a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java +++ b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java @@ -21,7 +21,6 @@ import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorSource; import forestry.api.core.IErrorState; import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import forestry.apiculture.items.ItemRegistryApiculture; @@ -29,7 +28,7 @@ import forestry.core.errors.EnumErrorCode; import forestry.plugins.ForestryPluginUids; import forestry.plugins.PluginApiculture; -public abstract class ItemInventoryAlyzer extends ItemInventory implements IErrorSource { +public abstract class ItemInventoryAlyzer extends ItemInventory implements IErrorSource { public static final int SLOT_SPECIMEN = 0; public static final int SLOT_ANALYZE_1 = 1; public static final int SLOT_ANALYZE_2 = 2; @@ -38,9 +37,9 @@ public abstract class ItemInventoryAlyzer extends Ite public static final int SLOT_ANALYZE_5 = 6; public static final int SLOT_ENERGY = 5; - private final ISpeciesRoot speciesRoot; + private final ISpeciesRoot speciesRoot; - public ItemInventoryAlyzer(ISpeciesRoot speciesRoot, EntityPlayer player, ItemStack itemstack) { + public ItemInventoryAlyzer(ISpeciesRoot speciesRoot, EntityPlayer player, ItemStack itemstack) { super(player, 7, itemstack); this.speciesRoot = speciesRoot; } @@ -76,7 +75,7 @@ public abstract class ItemInventoryAlyzer extends Ite return; } - IIndividual individual = speciesRoot.getMember(specimen); + IIndividual individual = speciesRoot.getMember(specimen); // No individual, abort if (individual == null) { return; @@ -94,7 +93,7 @@ public abstract class ItemInventoryAlyzer extends Ite individual.analyze(); if (player != null) { - IBreedingTracker breedingTracker = speciesRoot.getBreedingTracker(player.worldObj, player.getGameProfile()); + IBreedingTracker breedingTracker = speciesRoot.getBreedingTracker(player.worldObj, player.getGameProfile()); breedingTracker.registerSpecies(individual.getGenome().getPrimary()); breedingTracker.registerSpecies(individual.getGenome().getSecondary()); } diff --git a/src/main/java/forestry/core/multiblock/FakeMultiblockController.java b/src/main/java/forestry/core/multiblock/FakeMultiblockController.java index 9c53113d6..7191739aa 100644 --- a/src/main/java/forestry/core/multiblock/FakeMultiblockController.java +++ b/src/main/java/forestry/core/multiblock/FakeMultiblockController.java @@ -151,7 +151,7 @@ public abstract class FakeMultiblockController implements IMultiblockControllerI } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { } diff --git a/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java b/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java index 7344bf83b..5664e41f5 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java @@ -13,8 +13,6 @@ package forestry.core.multiblock; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multiset; -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -90,7 +88,7 @@ public abstract class MultiblockControllerForestry extends MultiblockControllerB /* INbtWritable */ @Override - public void writeToNBT(@Nonnull NBTTagCompound data) { + public void writeToNBT(NBTTagCompound data) { accessHandler.writeToNBT(data); } diff --git a/src/main/java/forestry/core/multiblock/MultiblockLogic.java b/src/main/java/forestry/core/multiblock/MultiblockLogic.java index c4f8c3788..deda9a24d 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockLogic.java +++ b/src/main/java/forestry/core/multiblock/MultiblockLogic.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.multiblock; -import javax.annotation.Nonnull; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.world.World; @@ -114,7 +112,7 @@ public abstract class MultiblockLogic i } @Override - public void writeToNBT(@Nonnull NBTTagCompound data) { + public void writeToNBT(NBTTagCompound data) { if (isMultiblockSaveDelegate() && isConnected()) { NBTTagCompound multiblockData = new NBTTagCompound(); this.controller.writeToNBT(multiblockData); diff --git a/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java b/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java index fdaf1ad3a..83b1b5dac 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java @@ -14,6 +14,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraft.world.World; @@ -29,7 +30,6 @@ import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; import forestry.core.tiles.IFilterSlotDelegate; import forestry.core.tiles.ILocatable; -import forestry.core.utils.PlayerUtil; public abstract class MultiblockTileEntityForestry extends MultiblockTileEntityBase implements ISidedInventory, IFilterSlotDelegate, ILocatable, IGuiHandlerTile { private GameProfile owner; @@ -50,7 +50,7 @@ public abstract class MultiblockTileEntityForestry e super.readFromNBT(data); if (data.hasKey("owner")) { - owner = PlayerUtil.readGameProfileFromNBT(data.getCompoundTag("owner")); + owner = NBTUtil.readGameProfileFromNBT(data.getCompoundTag("owner")); } getInternalInventory().readFromNBT(data); diff --git a/src/main/java/forestry/core/network/PacketHandler.java b/src/main/java/forestry/core/network/PacketHandler.java index 0fcbc5af5..7cd602102 100644 --- a/src/main/java/forestry/core/network/PacketHandler.java +++ b/src/main/java/forestry/core/network/PacketHandler.java @@ -12,7 +12,6 @@ package forestry.core.network; import java.io.InputStream; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.NetHandlerPlayServer; @@ -24,6 +23,8 @@ import net.minecraftforge.fml.common.network.FMLNetworkEvent.ServerCustomPacketE import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; +import forestry.core.proxy.Proxies; + import io.netty.buffer.ByteBufInputStream; public class PacketHandler { @@ -54,7 +55,7 @@ public class PacketHandler { @SubscribeEvent public void onPacket(ClientCustomPacketEvent event) { DataInputStreamForestry data = getStream(event.packet); - EntityPlayer player = Minecraft.getMinecraft().thePlayer; + EntityPlayer player = Proxies.common.getPlayer(); try { byte packetIdOrdinal = data.readByte(); diff --git a/src/main/java/forestry/core/network/packets/PacketGenomeTrackerSync.java b/src/main/java/forestry/core/network/packets/PacketGenomeTrackerSync.java index 4b93e459d..923a5eb30 100644 --- a/src/main/java/forestry/core/network/packets/PacketGenomeTrackerSync.java +++ b/src/main/java/forestry/core/network/packets/PacketGenomeTrackerSync.java @@ -25,6 +25,7 @@ import forestry.core.genetics.BreedingTracker; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.IForestryPacketClient; import forestry.core.network.PacketIdClient; +import forestry.core.proxy.Proxies; public class PacketGenomeTrackerSync extends PacketNBT implements IForestryPacketClient { @@ -42,7 +43,7 @@ public class PacketGenomeTrackerSync extends PacketNBT implements IForestryPacke ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(type); if (root != null) { - tracker = root.getBreedingTracker(player.getEntityWorld(), player.getGameProfile()); + tracker = root.getBreedingTracker(Proxies.common.getRenderWorld(), player.getGameProfile()); } if (tracker != null) { tracker.decodeFromNBT(getTagCompound()); diff --git a/src/main/java/forestry/core/proxy/ProxyRenderClient.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java index c3e73965c..54c31a1d1 100644 --- a/src/main/java/forestry/core/proxy/ProxyRenderClient.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -34,6 +34,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; + import forestry.apiculture.entities.EntityFXBee; import forestry.apiculture.render.ParticleRenderer; import forestry.apiculture.render.TextureHabitatLocator; diff --git a/src/main/java/forestry/core/tiles/EscritoireGame.java b/src/main/java/forestry/core/tiles/EscritoireGame.java index 16ccfe445..0fc1a0a7c 100644 --- a/src/main/java/forestry/core/tiles/EscritoireGame.java +++ b/src/main/java/forestry/core/tiles/EscritoireGame.java @@ -59,7 +59,7 @@ public class EscritoireGame implements INbtWritable, INbtReadable, IStreamable { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setInteger("bountyLevel", bountyLevel); nbttagcompound.setLong("lastUpdate", lastUpdate); gameBoard.writeToNBT(nbttagcompound); @@ -97,7 +97,7 @@ public class EscritoireGame implements INbtWritable, INbtReadable, IStreamable { } /* INTERACTION */ - public void initialize(@Nonnull ItemStack specimen) { + public void initialize(ItemStack specimen) { if (gameBoard.initialize(specimen)) { status = Status.PLAYING; bountyLevel = BOUNTY_MAX; diff --git a/src/main/java/forestry/core/tiles/EscritoireGameBoard.java b/src/main/java/forestry/core/tiles/EscritoireGameBoard.java index 23378ee05..04fc38479 100644 --- a/src/main/java/forestry/core/tiles/EscritoireGameBoard.java +++ b/src/main/java/forestry/core/tiles/EscritoireGameBoard.java @@ -24,7 +24,6 @@ import net.minecraft.nbt.NBTTagList; import forestry.api.core.INbtWritable; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; @@ -61,24 +60,19 @@ public class EscritoireGameBoard implements INbtWritable, IStreamable { } } - public boolean initialize(@Nonnull ItemStack specimen) { - IIndividual individual = AlleleManager.alleleRegistry.getIndividual(specimen); + public boolean initialize(ItemStack specimen) { + IIndividual individual = AlleleManager.alleleRegistry.getIndividual(specimen); if (individual == null) { return false; } - return initialize(individual); - } - - private boolean initialize(@Nonnull IIndividual individual) { - - IGenome genome = individual.getGenome(); - ISpeciesRoot root = genome.getPrimary().getRoot(); + IGenome genome = individual.getGenome(); + ISpeciesRoot root = genome.getPrimary().getRoot(); tokenCount = getTokenCount(genome); for (int i = 0; i < tokenCount / 2; i++) { - IIndividual token = root.templateAsIndividual(root.getRandomTemplate(rand)); + IIndividual token = root.templateAsIndividual(root.getRandomTemplate(rand)); ItemStack pair = root.getMemberStack(token, 0); gameTokens.add(new EscritoireGameToken(pair)); gameTokens.add(new EscritoireGameToken(pair)); @@ -176,7 +170,7 @@ public class EscritoireGameBoard implements INbtWritable, IStreamable { tokenCount = 0; } - private static int getTokenCount(@Nonnull IGenome genome) { + private static int getTokenCount(IGenome genome) { IAlleleSpecies species1 = genome.getPrimary(); IAlleleSpecies species2 = genome.getSecondary(); @@ -196,7 +190,7 @@ public class EscritoireGameBoard implements INbtWritable, IStreamable { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { if (tokenCount > 0) { nbttagcompound.setInteger("TokenCount", tokenCount); NBTTagList nbttaglist = new NBTTagList(); diff --git a/src/main/java/forestry/core/tiles/EscritoireGameToken.java b/src/main/java/forestry/core/tiles/EscritoireGameToken.java index 2b9c108b4..bbeebcf07 100644 --- a/src/main/java/forestry/core/tiles/EscritoireGameToken.java +++ b/src/main/java/forestry/core/tiles/EscritoireGameToken.java @@ -143,7 +143,7 @@ public class EscritoireGameToken implements INbtWritable, IStreamable { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setInteger("state", state.ordinal()); if (tokenStack != null) { diff --git a/src/main/java/forestry/core/tiles/TileEscritoire.java b/src/main/java/forestry/core/tiles/TileEscritoire.java index c36129bb3..b59644708 100644 --- a/src/main/java/forestry/core/tiles/TileEscritoire.java +++ b/src/main/java/forestry/core/tiles/TileEscritoire.java @@ -21,7 +21,6 @@ import com.mojang.authlib.GameProfile; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.core.gui.ContainerEscritoire; import forestry.core.gui.GuiEscritoire; @@ -61,6 +60,10 @@ public class TileEscritoire extends TileBase implements ISidedInventory, ISlotPi public void choose(GameProfile gameProfile, int index) { game.choose(index); + processTurnResult(gameProfile); + } + + private void processTurnResult(GameProfile gameProfile) { if (getGame().getStatus() != EscritoireGame.Status.SUCCESS) { return; } @@ -70,11 +73,7 @@ public class TileEscritoire extends TileBase implements ISidedInventory, ISlotPi return; } - processTurnResult(gameProfile, individual); - } - - private void processTurnResult(GameProfile gameProfile, IIndividual individual) { - IAlleleSpecies species = individual.getGenome().getPrimary(); + IAlleleSpecies species = individual.getGenome().getPrimary(); for (ItemStack itemstack : species.getResearchBounty(worldObj, gameProfile, individual, game.getBountyLevel())) { InventoryUtil.addStack(getInternalInventory(), itemstack, InventoryEscritoire.SLOT_RESULTS_1, InventoryEscritoire.SLOTS_RESULTS_COUNT, true); } diff --git a/src/main/java/forestry/core/tiles/TileNaturalistChest.java b/src/main/java/forestry/core/tiles/TileNaturalistChest.java index 822e64caf..08953741e 100644 --- a/src/main/java/forestry/core/tiles/TileNaturalistChest.java +++ b/src/main/java/forestry/core/tiles/TileNaturalistChest.java @@ -10,13 +10,11 @@ ******************************************************************************/ package forestry.core.tiles; -import javax.annotation.Nonnull; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; -import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; import forestry.core.gui.ContainerNaturalistInventory; import forestry.core.gui.GuiHandler; @@ -26,17 +24,16 @@ import forestry.core.inventory.InventoryNaturalistChest; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; -public abstract class TileNaturalistChest extends TileBase implements IPagedInventory { +public abstract class TileNaturalistChest extends TileBase implements IPagedInventory { private static final float lidAngleVariationPerTick = 0.1F; public static final AxisAlignedBB chestBoundingBox = AxisAlignedBB.fromBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F); - @Nonnull - private final ISpeciesRoot speciesRoot; + private final ISpeciesRoot speciesRoot; public float lidAngle; public float prevLidAngle; private int numPlayersUsing; - public TileNaturalistChest(@Nonnull ISpeciesRoot speciesRoot) { + public TileNaturalistChest(ISpeciesRoot speciesRoot) { super("naturalist.chest"); this.speciesRoot = speciesRoot; setInternalInventory(new InventoryNaturalistChest(this, speciesRoot)); @@ -114,7 +111,7 @@ public abstract class TileNaturalistChest extends Til @Override public Object getGui(EntityPlayer player, int page) { ContainerNaturalistInventory container = new ContainerNaturalistInventory(player.inventory, this, page); - return new GuiNaturalistInventory<>(speciesRoot, player, container, this, page, 5); + return new GuiNaturalistInventory(speciesRoot, player, container, this, page, 5); } @Override diff --git a/src/main/java/forestry/core/utils/GeneticsUtil.java b/src/main/java/forestry/core/utils/GeneticsUtil.java index 55a116f8e..7eab77fb9 100644 --- a/src/main/java/forestry/core/utils/GeneticsUtil.java +++ b/src/main/java/forestry/core/utils/GeneticsUtil.java @@ -183,34 +183,33 @@ public class GeneticsUtil { return null; } - IIndividual individual = getGeneticEquivalent(foreign); - if (!(individual instanceof ITree)) { + IIndividual tree = getGeneticEquivalent(foreign); + if (!(tree instanceof ITree)) { return null; } - ITree tree = (ITree) individual; ItemStack ersatz = TreeManager.treeRoot.getMemberStack(tree, EnumGermlingType.SAPLING.ordinal()); ersatz.stackSize = foreign.stackSize; return ersatz; } - public static int getResearchComplexity(IAlleleSpecies species, C speciesChromosome) { - return 1 + getGeneticAdvancement(species, new HashSet>(), speciesChromosome); + public static int getResearchComplexity(IAlleleSpecies species, IChromosomeType speciesChromosome) { + return 1 + getGeneticAdvancement(species, new HashSet(), speciesChromosome); } - private static int getGeneticAdvancement(IAlleleSpecies species, Set> exclude, C speciesChromosome) { + private static int getGeneticAdvancement(IAlleleSpecies species, Set exclude, IChromosomeType speciesChromosome) { int highest = 0; exclude.add(species); - for (IMutation mutation : species.getRoot().getPaths(species, speciesChromosome)) { - highest = getHighestAdvancement(mutation.getSpecies0(), highest, exclude, speciesChromosome); - highest = getHighestAdvancement(mutation.getSpecies1(), highest, exclude, speciesChromosome); + for (IMutation mutation : species.getRoot().getPaths(species, speciesChromosome)) { + highest = getHighestAdvancement(mutation.getAllele0(), highest, exclude, speciesChromosome); + highest = getHighestAdvancement(mutation.getAllele1(), highest, exclude, speciesChromosome); } return 1 + highest; } - private static int getHighestAdvancement(IAlleleSpecies mutationSpecies, int highest, Set> exclude, C speciesChromosome) { + private static int getHighestAdvancement(IAlleleSpecies mutationSpecies, int highest, Set exclude, IChromosomeType speciesChromosome) { if (exclude.contains(mutationSpecies) || AlleleManager.alleleRegistry.isBlacklisted(mutationSpecies.getUID())) { return highest; } diff --git a/src/main/java/forestry/core/utils/PlayerUtil.java b/src/main/java/forestry/core/utils/PlayerUtil.java index 733597ade..96868f11a 100644 --- a/src/main/java/forestry/core/utils/PlayerUtil.java +++ b/src/main/java/forestry/core/utils/PlayerUtil.java @@ -10,13 +10,9 @@ ******************************************************************************/ package forestry.core.utils; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StringUtils; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -78,19 +74,4 @@ public abstract class PlayerUtil { } return player; } - - public static void writeGameProfile(@Nonnull NBTTagCompound tagCompound, @Nonnull GameProfile profile) { - if (!StringUtils.isNullOrEmpty(profile.getName())) { - tagCompound.setString("Name", profile.getName()); - } - - if (profile.getId() != null) { - tagCompound.setString("Id", profile.getId().toString()); - } - } - - @Nullable - public static GameProfile readGameProfileFromNBT(@Nonnull NBTTagCompound compound) { - return net.minecraft.nbt.NBTUtil.readGameProfileFromNBT(compound); - } } diff --git a/src/main/java/forestry/factory/recipes/MemorizedRecipe.java b/src/main/java/forestry/factory/recipes/MemorizedRecipe.java index d5420c784..9750d56c4 100644 --- a/src/main/java/forestry/factory/recipes/MemorizedRecipe.java +++ b/src/main/java/forestry/factory/recipes/MemorizedRecipe.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.factory.recipes; -import javax.annotation.Nonnull; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -127,7 +126,7 @@ public final class MemorizedRecipe implements INbtWritable, INbtReadable, IStrea } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { InventoryUtil.writeToNBT(craftMatrix, nbttagcompound); nbttagcompound.setLong("LastUsed", lastUsed); nbttagcompound.setBoolean("Locked", locked); diff --git a/src/main/java/forestry/factory/recipes/RecipeMemory.java b/src/main/java/forestry/factory/recipes/RecipeMemory.java index 179b21b4b..80a276a4c 100644 --- a/src/main/java/forestry/factory/recipes/RecipeMemory.java +++ b/src/main/java/forestry/factory/recipes/RecipeMemory.java @@ -184,7 +184,7 @@ public class RecipeMemory implements INbtWritable, IStreamable { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { NBTTagList nbttaglist = new NBTTagList(); for (MemorizedRecipe recipe : memorizedRecipes) { if (recipe != null) { diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 2ef9a569f..4fb897e4a 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.farming.multiblock; -import javax.annotation.Nonnull; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -297,7 +296,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen } @Override - public void writeToNBT(@Nonnull NBTTagCompound data) { + public void writeToNBT(NBTTagCompound data) { super.writeToNBT(data); sockets.writeToNBT(data); hydrationManager.writeToNBT(data); diff --git a/src/main/java/forestry/farming/multiblock/FarmFertilizerManager.java b/src/main/java/forestry/farming/multiblock/FarmFertilizerManager.java index 109a4910a..a35ea124c 100644 --- a/src/main/java/forestry/farming/multiblock/FarmFertilizerManager.java +++ b/src/main/java/forestry/farming/multiblock/FarmFertilizerManager.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.farming.multiblock; -import javax.annotation.Nonnull; import java.io.IOException; import net.minecraft.nbt.NBTTagCompound; @@ -69,7 +68,7 @@ public class FarmFertilizerManager implements INbtWritable, INbtReadable, IStrea } @Override - public void writeToNBT(@Nonnull NBTTagCompound data) { + public void writeToNBT(NBTTagCompound data) { data.setInteger("StoredFertilizer", storedFertilizer); } diff --git a/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java b/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java index 06cf578a4..bc439e87a 100644 --- a/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java +++ b/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java @@ -90,7 +90,7 @@ public class FarmHydrationManager implements IFarmLedgerDelegate, INbtWritable, } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setInteger("HydrationDelay", hydrationDelay); nbttagcompound.setInteger("TicksSinceRainfall", ticksSinceRainfall); } diff --git a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java index 5179bf4f7..d5d546a78 100755 --- a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java +++ b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.lepidopterology.entities; -import com.google.common.collect.ImmutableMap; - import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.BlockFlower; @@ -40,21 +38,20 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.ITreeRoot; import forestry.api.arboriculture.TreeManager; import forestry.api.core.IToolScoop; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import forestry.api.lepidopterology.ButterflyChromosome; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyGenome; import forestry.api.lepidopterology.IButterflyRoot; -import forestry.api.lepidopterology.IButterflyTracker; import forestry.api.lepidopterology.IEntityButterfly; +import forestry.api.lepidopterology.ILepidopteristTracker; import forestry.core.utils.BlockUtil; import forestry.core.utils.ItemStackUtil; import forestry.lepidopterology.genetics.Butterfly; @@ -78,7 +75,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly private Vec3 flightTarget; private int exhaustion; private IButterfly contained; - private ITree pollen; + private IIndividual pollen; public int cooldownPollination = 0; public int cooldownEgg = 0; @@ -256,12 +253,12 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly /* POLLEN */ @Override - public ITree getPollen() { + public IIndividual getPollen() { return pollen; } @Override - public void setPollen(ITree pollen) { + public void setPollen(IIndividual pollen) { this.pollen = pollen; } @@ -382,7 +379,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly if (!worldObj.isRemote) { IButterflyRoot root = contained.getGenome().getPrimary().getRoot(); - IButterflyTracker tracker = root.getBreedingTracker(worldObj, player.getGameProfile()); + ILepidopteristTracker tracker = root.getBreedingTracker(worldObj, player.getGameProfile()); ItemStack itemStack = root.getMemberStack(contained.copy(), EnumFlutterType.BUTTERFLY.ordinal()); tracker.registerCatch(contained); @@ -402,9 +399,9 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly } // Drop pollen if any - ITree pollen = getPollen(); + IIndividual pollen = getPollen(); if (pollen != null) { - ITreeRoot root = pollen.getGenome().getSpeciesRoot(); + ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(pollen.getClass()); ItemStack pollenStack = root.getMemberStack(pollen, EnumGermlingType.POLLEN.ordinal()); ItemStackUtil.dropItemStackAsEntity(pollenStack, worldObj, posX, posY, posZ); } @@ -513,7 +510,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly return null; } IButterflyRoot root = species.getRoot(); - ImmutableMap template = root.getTemplate(species.getUID()); + IAllele[] template = root.getTemplate(species.getUID()); IButterfly butterfly = root.templateAsIndividual(template); return root.getMemberStack(butterfly, EnumFlutterType.BUTTERFLY.ordinal()); } diff --git a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffect.java b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffect.java index fb3de77d3..47f7e5e73 100644 --- a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffect.java +++ b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffect.java @@ -12,7 +12,7 @@ package forestry.lepidopterology.genetics; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IEffectData; -import forestry.api.lepidopterology.ButterflyChromosome; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.IAlleleButterflyEffect; import forestry.api.lepidopterology.IEntityButterfly; import forestry.core.genetics.alleles.AlleleCategorized; @@ -23,7 +23,7 @@ public class AlleleButterflyEffect extends AlleleCategorized implements IAlleleB public static void createAlleles() { butterflyNone = new AlleleButterflyEffectNone(); - AlleleManager.alleleRegistry.registerAllele(butterflyNone, ButterflyChromosome.EFFECT); + AlleleManager.alleleRegistry.registerAllele(butterflyNone, EnumButterflyChromosome.EFFECT); } protected AlleleButterflyEffect(String valueName, boolean isDominant) { diff --git a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffectNone.java b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffectNone.java index 4420e26e6..079f29b60 100644 --- a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffectNone.java +++ b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffectNone.java @@ -10,14 +10,11 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; -import javax.annotation.Nonnull; - public class AlleleButterflyEffectNone extends AlleleButterflyEffect { public AlleleButterflyEffectNone() { super("none", false); } - @Nonnull @Override public String getUnlocalizedName() { return "for.lepidopterology.effect.none"; diff --git a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java index 131c0b2e1..af3844213 100755 --- a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java +++ b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java @@ -27,19 +27,16 @@ import net.minecraftforge.common.BiomeDictionary; import forestry.api.core.IModelProvider; import forestry.api.core.ISpriteProvider; -import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; -import forestry.api.lepidopterology.ButterflyChromosome; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumFlutterType; -import forestry.api.lepidopterology.IAlleleButterflySpecies; -import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; +import forestry.api.lepidopterology.IAlleleButterflySpeciesCustom; import forestry.api.lepidopterology.IButterflyRoot; import forestry.core.genetics.alleles.AlleleSpecies; import forestry.lepidopterology.render.TextureAtlasButterfly; -public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButterflySpecies, IAlleleButterflySpeciesBuilder, ISpriteProvider { +public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButterflySpeciesCustom, ISpriteProvider { private final String texture; private final Color serumColour; private float rarity = 0.1f; @@ -57,13 +54,6 @@ public class AlleleButterflySpecies extends AlleleSpecies i this.texture = texturePath; } - // TODO: break this into a separate builder class - @Override - public IAlleleButterflySpecies build() { - AlleleManager.alleleRegistry.registerAllele(this, ButterflyChromosome.SPECIES); - return this; - } - @Override public IButterflyRoot getRoot() { return ButterflyManager.butterflyRoot; @@ -143,7 +133,7 @@ public class AlleleButterflySpecies extends AlleleSpecies i } @Override - public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) { + public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) { return new ItemStack[]{getRoot().getMemberStack(individual.copy(), EnumFlutterType.SERUM.ordinal())}; } diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java index 982f814c0..4d27031bf 100755 --- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java +++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; -import com.google.common.collect.ImmutableMap; - import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; @@ -33,21 +31,25 @@ import net.minecraftforge.common.BiomeDictionary; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IChromosome; +import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; -import forestry.api.lepidopterology.ButterflyChromosome; import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyGenome; +import forestry.api.lepidopterology.IButterflyMutation; import forestry.api.lepidopterology.IButterflyNursery; import forestry.api.lepidopterology.IEntityButterfly; +import forestry.core.genetics.Chromosome; import forestry.core.genetics.GenericRatings; import forestry.core.genetics.IndividualLiving; import forestry.core.utils.StringUtil; -public class Butterfly extends IndividualLiving implements IButterfly { +public class Butterfly extends IndividualLiving implements IButterfly { private static final Random rand = new Random(); @@ -80,24 +82,24 @@ public class Butterfly extends IndividualLiving implements public void addTooltip(List list) { IAlleleButterflySpecies primary = genome.getPrimary(); IAlleleButterflySpecies secondary = genome.getSecondary(); - if (!isPureBred(ButterflyChromosome.SPECIES)) { + if (!isPureBred(EnumButterflyChromosome.SPECIES)) { list.add(EnumChatFormatting.BLUE + StringUtil.localize("butterflies.hybrid").replaceAll("%PRIMARY", primary.getName()).replaceAll("%SECONDARY", secondary.getName())); } if (getMate() != null) { list.add(EnumChatFormatting.RED + StringUtil.localize("gui.fecundated").toUpperCase(Locale.ENGLISH)); } - list.add(EnumChatFormatting.YELLOW + genome.getActiveAllele(ButterflyChromosome.SIZE).getName()); - list.add(EnumChatFormatting.DARK_GREEN + genome.getActiveAllele(ButterflyChromosome.SPEED).getName()); - list.add(genome.getActiveAllele(ButterflyChromosome.LIFESPAN).getName() + ' ' + StringUtil.localize("gui.life")); + list.add(EnumChatFormatting.YELLOW + genome.getActiveAllele(EnumButterflyChromosome.SIZE).getName()); + list.add(EnumChatFormatting.DARK_GREEN + genome.getActiveAllele(EnumButterflyChromosome.SPEED).getName()); + list.add(genome.getActiveAllele(EnumButterflyChromosome.LIFESPAN).getName() + ' ' + StringUtil.localize("gui.life")); - IAlleleTolerance tempTolerance = (IAlleleTolerance) getGenome().getActiveAllele(ButterflyChromosome.TEMPERATURE_TOLERANCE); + IAlleleTolerance tempTolerance = (IAlleleTolerance) getGenome().getActiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE); list.add(EnumChatFormatting.GREEN + "T: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getTemperature()) + " / " + tempTolerance.getName()); - IAlleleTolerance humidTolerance = (IAlleleTolerance) getGenome().getActiveAllele(ButterflyChromosome.TEMPERATURE_TOLERANCE); + IAlleleTolerance humidTolerance = (IAlleleTolerance) getGenome().getActiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE); list.add(EnumChatFormatting.GREEN + "H: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getHumidity()) + " / " + humidTolerance.getName()); - list.add(EnumChatFormatting.RED + GenericRatings.rateActivityTime(genome.getNeverSleeps(), genome.getPrimary().isNocturnal())); + list.add(EnumChatFormatting.RED + GenericRatings.rateActivityTime(genome.getNocturnal(), genome.getPrimary().isNocturnal())); if (genome.getTolerantFlyer()) { list.add(EnumChatFormatting.WHITE + StringUtil.localize("gui.flyer.tooltip")); @@ -190,13 +192,67 @@ public class Butterfly extends IndividualLiving implements if (mate == null) { return null; } - ImmutableMap chromosomes = createOffspringChromosomes(nursery.getWorld(), nursery.getOwner(), nursery.getCoordinates(), genome, mate); - IButterflyGenome genome = ButterflyManager.butterflyRoot.chromosomesAsGenome(chromosomes); - return new Butterfly(genome); + + IChromosome[] chromosomes = new IChromosome[genome.getChromosomes().length]; + IChromosome[] parent1 = genome.getChromosomes(); + IChromosome[] parent2 = mate.getChromosomes(); + + // Check for mutation. Replace one of the parents with the mutation + // template if mutation occured. + IChromosome[] mutated1 = mutateSpecies(nursery, genome, mate); + if (mutated1 != null) { + parent1 = mutated1; + } + IChromosome[] mutated2 = mutateSpecies(nursery, mate, genome); + if (mutated2 != null) { + parent2 = mutated2; + } + + for (int i = 0; i < parent1.length; i++) { + if (parent1[i] != null && parent2[i] != null) { + chromosomes[i] = Chromosome.inheritChromosome(rand, parent1[i], parent2[i]); + } + } + + return new Butterfly(new ButterflyGenome(chromosomes)); + } + + private static IChromosome[] mutateSpecies(IButterflyNursery nursery, IGenome genomeOne, IGenome genomeTwo) { + + IChromosome[] parent1 = genomeOne.getChromosomes(); + IChromosome[] parent2 = genomeTwo.getChromosomes(); + + IGenome genome0; + IGenome genome1; + IAllele allele0; + IAllele allele1; + + if (rand.nextBoolean()) { + allele0 = parent1[EnumButterflyChromosome.SPECIES.ordinal()].getPrimaryAllele(); + allele1 = parent2[EnumButterflyChromosome.SPECIES.ordinal()].getSecondaryAllele(); + + genome0 = genomeOne; + genome1 = genomeTwo; + } else { + allele0 = parent2[EnumButterflyChromosome.SPECIES.ordinal()].getPrimaryAllele(); + allele1 = parent1[EnumButterflyChromosome.SPECIES.ordinal()].getSecondaryAllele(); + + genome0 = genomeTwo; + genome1 = genomeOne; + } + + for (IButterflyMutation mutation : ButterflyManager.butterflyRoot.getMutations(true)) { + float chance = mutation.getChance(nursery, allele0, allele1, genome0, genome1); + if (chance > rand.nextFloat() * 100) { + return ButterflyManager.butterflyRoot.templateAsChromosomes(mutation.getTemplate()); + } + } + + return null; } private boolean isActiveThisTime(boolean isDayTime) { - if (getGenome().getNeverSleeps()) { + if (getGenome().getNocturnal()) { return true; } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java index 5ff82004f..aa596b25c 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java @@ -10,16 +10,13 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; -import com.google.common.collect.ImmutableMap; - -import java.util.EnumMap; -import java.util.Map; +import java.util.Arrays; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleRegistry; import forestry.api.genetics.IClassification; -import forestry.api.lepidopterology.ButterflyChromosome; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.core.genetics.IBranchDefinition; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; @@ -50,7 +47,7 @@ public enum ButterflyBranchDefinition implements IBranchDefinition { Siproeta, Speyeria; - private static ImmutableMap defaultTemplate; + private static IAllele[] defaultTemplate; private final IClassification branch; @@ -59,26 +56,24 @@ public enum ButterflyBranchDefinition implements IBranchDefinition { } @Override - public Map getTemplate() { + public IAllele[] getTemplate() { if (defaultTemplate == null) { - Map defaultTemplateBuilder = new EnumMap<>(ButterflyChromosome.class); - AlleleHelper.instance.set(defaultTemplateBuilder, ButterflyChromosome.SIZE, EnumAllele.Size.SMALL); - AlleleHelper.instance.set(defaultTemplateBuilder, ButterflyChromosome.SPEED, EnumAllele.Speed.SLOWEST); - AlleleHelper.instance.set(defaultTemplateBuilder, ButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); - AlleleHelper.instance.set(defaultTemplateBuilder, ButterflyChromosome.METABOLISM, 3); - AlleleHelper.instance.set(defaultTemplateBuilder, ButterflyChromosome.FERTILITY, 3); - AlleleHelper.instance.set(defaultTemplateBuilder, ButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE); - AlleleHelper.instance.set(defaultTemplateBuilder, ButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE); - AlleleHelper.instance.set(defaultTemplateBuilder, ButterflyChromosome.NOCTURNAL, false); - AlleleHelper.instance.set(defaultTemplateBuilder, ButterflyChromosome.TOLERANT_FLYER, false); - AlleleHelper.instance.set(defaultTemplateBuilder, ButterflyChromosome.FIRE_RESIST, false); - AlleleHelper.instance.set(defaultTemplateBuilder, ButterflyChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.VANILLA); - AlleleHelper.instance.set(defaultTemplateBuilder, ButterflyChromosome.EFFECT, AlleleButterflyEffect.butterflyNone); + defaultTemplate = new IAllele[EnumButterflyChromosome.values().length]; - defaultTemplate = ImmutableMap.copyOf(defaultTemplateBuilder); + AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALL); + AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWEST); + AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); + AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.METABOLISM, 3); + AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.FERTILITY, 3); + AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE); + AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE); + AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.NOCTURNAL, false); + AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.TOLERANT_FLYER, false); + AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.FIRE_RESIST, false); + AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.VANILLA); + AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.EFFECT, AlleleButterflyEffect.butterflyNone); } - - return new EnumMap<>(defaultTemplate); + return Arrays.copyOf(defaultTemplate, defaultTemplate.length); } @Override diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java index 3b7ee7987..4192987bf 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java @@ -10,11 +10,9 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; -import com.google.common.collect.ImmutableMap; - import java.awt.Color; +import java.util.Arrays; import java.util.Locale; -import java.util.Map; import net.minecraft.item.ItemStack; @@ -22,11 +20,10 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; -import forestry.api.lepidopterology.ButterflyChromosome; import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.EnumFlutterType; -import forestry.api.lepidopterology.IAlleleButterflySpecies; -import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; +import forestry.api.lepidopterology.IAlleleButterflySpeciesCustom; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyGenome; import forestry.core.config.Constants; @@ -36,275 +33,275 @@ import forestry.core.genetics.alleles.EnumAllele; public enum ButterflyDefinition implements IButterflyDefinition { CabbageWhite(ButterflyBranchDefinition.Pieris, "cabbageWhite", "rapae", new Color(0xccffee), true, 1.0f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); } }, Brimstone(ButterflyBranchDefinition.Gonepteryx, "brimstone", "rhamni", new Color(0xf0ee38), true, 1.0f), Aurora(ButterflyBranchDefinition.Anthocharis, "orangeTip", "cardamines", new Color(0xe34f05), true, 0.5f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.SMALLER); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALLER); } }, Postillion(ButterflyBranchDefinition.Colias, "postillion", "croceus", new Color(0xd77e04), true, 0.5f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SPEED, EnumAllele.Speed.SLOW); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOW); } }, PalaenoSulphur(ButterflyBranchDefinition.Colias, "palaenoSulphur", "palaeno", new Color(0xf8fba3), true, 0.4f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); } }, Reseda(ButterflyBranchDefinition.Pontia, "reseda", "edusa", new Color(0x747d48), true, 0.3f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); } }, SpringAzure(ButterflyBranchDefinition.Celastrina, "springAzure", "argiolus", new Color(0xb8cae2), true, 0.3f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.SMALLER); - AlleleHelper.instance.set(alleles, ButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALLER); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); } }, GozoraAzure(ButterflyBranchDefinition.Celastrina, "gozoraAzure", "gozora", new Color(0x6870e7), true, 0.2f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.SMALLER); - AlleleHelper.instance.set(alleles, ButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALLER); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); } }, CitrusSwallow(ButterflyBranchDefinition.Papilio, "swallowtailC", "demodocus", new Color(0xeae389), false, 1.0f) { @Override - protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { + protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) { species.setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.LARGE); - AlleleHelper.instance.set(alleles, ButterflyChromosome.FERTILITY, 10); - AlleleHelper.instance.set(alleles, ButterflyChromosome.METABOLISM, 8); - AlleleHelper.instance.set(alleles, ButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); - AlleleHelper.instance.set(alleles, ButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, ButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.LARGE); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 10); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.METABOLISM, 8); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); } }, EmeraldPeacock(ButterflyBranchDefinition.Papilio, "emeraldPeacock", "palinurus", new Color(0x7cfe80), true, 0.1f) { @Override - protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { + protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) { species.setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.LARGE); - AlleleHelper.instance.set(alleles, ButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); - AlleleHelper.instance.set(alleles, ButterflyChromosome.FERTILITY, 5); - AlleleHelper.instance.set(alleles, ButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, ButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.LARGE); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 5); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); } }, ThoasSwallow(ButterflyBranchDefinition.Papilio, "swallowtailT", "thoas", new Color(0xeac783), false, 0.2f) { @Override - protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { + protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) { species.setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.LARGE); - AlleleHelper.instance.set(alleles, ButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.LARGE); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); } }, Spicebush(ButterflyBranchDefinition.Papilio, "swallowtailS", "troilus", new Color(0xeefeff), true, 0.5f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); } }, BlackSwallow(ButterflyBranchDefinition.Papilio, "swallowtailB", "polyxenes", new Color(0xeac783), true, 1.0f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SPEED, EnumAllele.Speed.SLOW); - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.LARGE); - AlleleHelper.instance.set(alleles, ButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); - AlleleHelper.instance.set(alleles, ButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, ButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOW); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.LARGE); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); } }, ZebraSwallow(ButterflyBranchDefinition.Protographium, "swallowtailZ", "marcellus", new Color(0xeafeff), true, 0.5f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); } }, Glasswing(ButterflyBranchDefinition.Greta, "glasswing", "oto", new Color(0x583732), true, 0.1f) { @Override - protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { + protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) { species.setTemperature(EnumTemperature.WARM); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.SMALLER); - AlleleHelper.instance.set(alleles, ButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); - AlleleHelper.instance.set(alleles, ButterflyChromosome.FERTILITY, 5); - AlleleHelper.instance.set(alleles, ButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALLER); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 5); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); } }, SpeckledWood(ButterflyBranchDefinition.Pararge, "speckledWood", "aegeria", new Color(0x947245), true, 1.0f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.FERTILITY, 2); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 2); } }, MSpeckledWood(ButterflyBranchDefinition.Pararge, "speckledWoodM", "xiphia", new Color(0x402919), true, 0.5f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.FERTILITY, 2); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 2); } }, CSpeckledWood(ButterflyBranchDefinition.Pararge, "speckledWoodC", "xiphioides", new Color(0x51372a), true, 0.5f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.FERTILITY, 2); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 2); } }, MBlueMorpho(ButterflyBranchDefinition.Morpho, "blueMorphoM", "menelaus", new Color(0x72e1fd), true, 0.5f) { @Override - protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { + protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) { species.setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.LARGER); - AlleleHelper.instance.set(alleles, ButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); - AlleleHelper.instance.set(alleles, ButterflyChromosome.FERTILITY, 2); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.LARGER); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 2); } }, PBlueMorpho(ButterflyBranchDefinition.Morpho, "blueMorphoP", "peleides", new Color(0x6ecce8), true, 0.25f) { @Override - protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { + protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) { species.setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.LARGER); - AlleleHelper.instance.set(alleles, ButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); - AlleleHelper.instance.set(alleles, ButterflyChromosome.FERTILITY, 2); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.LARGER); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 2); } }, RBlueMorpho(ButterflyBranchDefinition.Morpho, "blueMorphoR", "rhetenor", new Color(0x00bef8), true, 0.1f) { @Override - protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { + protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) { species.setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.LARGER); - AlleleHelper.instance.set(alleles, ButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); - AlleleHelper.instance.set(alleles, ButterflyChromosome.FERTILITY, 2); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.LARGER); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 2); } }, Comma(ButterflyBranchDefinition.Polygonia, "comma", "c-album", new Color(0xf89505), true, 0.3f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); } }, Batesia(ButterflyBranchDefinition.Batesia, "paintedBeauty", "hypochlora", new Color(0xfe7763), true, 0.3f) { @Override - protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { + protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) { species.setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.LARGE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.LARGE); } }, BlueWing(ButterflyBranchDefinition.Myscelia, "blueWing", "ethusa", new Color(0x3a93cc), true, 0.3f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); - AlleleHelper.instance.set(alleles, ButterflyChromosome.METABOLISM, 5); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.METABOLISM, 5); } }, Monarch(ButterflyBranchDefinition.Danaus, "monarch", "plexippus", new Color(0xffa722), true, 0.2f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); } }, BlueDuke(ButterflyBranchDefinition.Bassarona, "blueDuke", "durga", new Color(0x304240), true, 0.5f) { @Override - protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { + protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) { species.setTemperature(EnumTemperature.COLD); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); } }, GlassyTiger(ButterflyBranchDefinition.Parantica, "glassyTiger", "aglea", new Color(0x5b3935), true, 0.3f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); } }, Postman(ButterflyBranchDefinition.Heliconius, "postman", "melpomene", new Color(0xf7302d), true, 0.3f), Malachite(ButterflyBranchDefinition.Siproeta, "malachite", "stelenes", new Color(0xbdff53), true, 0.5f) { @Override - protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { + protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) { species.setTemperature(EnumTemperature.WARM) .setHumidity(EnumHumidity.DAMP); } @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); - AlleleHelper.instance.set(alleles, ButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); - AlleleHelper.instance.set(alleles, ButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); } }, LLacewing(ButterflyBranchDefinition.Cethosia, "leopardLacewing", "cyane", new Color(0xfb8a06), true, 0.7f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); - AlleleHelper.instance.set(alleles, ButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); } }, DianaFrit(ButterflyBranchDefinition.Speyeria, "dianaFritillary", "diana", new Color(0xffac05), true, 0.6f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.SMALLER); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALLER); } }; - private final IAlleleButterflySpecies species; + private final IAlleleButterflySpeciesCustom species; private final ButterflyBranchDefinition branch; - private ImmutableMap template; + private IAllele[] template; private IButterflyGenome genome; ButterflyDefinition(ButterflyBranchDefinition branchDefinition, String speciesName, String binomial, Color serumColor, boolean dominant, float rarity) { @@ -317,10 +314,8 @@ public enum ButterflyDefinition implements IButterflyDefinition { String texture = "forestry:" + Constants.TEXTURE_PATH_ENTITIES + "/butterflies/" + uid + ".png"; - IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, texture, dominant, branchDefinition.getBranch(), binomial, serumColor); - speciesBuilder.setRarity(rarity); - setSpeciesProperties(speciesBuilder); - this.species = speciesBuilder.build(); + species = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, texture, dominant, branchDefinition.getBranch(), binomial, serumColor); + species.setRarity(rarity); } public static void initButterflies() { @@ -330,30 +325,28 @@ public enum ButterflyDefinition implements IButterflyDefinition { } private void init() { + setSpeciesProperties(species); - - Map templateBuilder = branch.getTemplate(); - AlleleHelper.instance.set(templateBuilder, ButterflyChromosome.SPECIES, species); - setAlleles(templateBuilder); - - template = ImmutableMap.copyOf(templateBuilder); + template = branch.getTemplate(); + AlleleHelper.instance.set(template, EnumButterflyChromosome.SPECIES, species); + setAlleles(template); genome = ButterflyManager.butterflyRoot.templateAsGenome(template); ButterflyManager.butterflyRoot.registerTemplate(template); } - protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { + protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) { } - protected void setAlleles(Map alleles) { + protected void setAlleles(IAllele[] alleles) { } @Override - public final ImmutableMap getTemplate() { - return template; + public final IAllele[] getTemplate() { + return Arrays.copyOf(template, template.length); } @Override diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyFactory.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyFactory.java index 1f9f84b89..45afe55a7 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyFactory.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyFactory.java @@ -12,13 +12,17 @@ package forestry.lepidopterology.genetics; import java.awt.Color; +import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; -import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; +import forestry.api.lepidopterology.EnumButterflyChromosome; +import forestry.api.lepidopterology.IAlleleButterflySpeciesCustom; import forestry.api.lepidopterology.IButterflyFactory; public class ButterflyFactory implements IButterflyFactory { @Override - public IAlleleButterflySpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String texturePath, boolean isDominant, IClassification branch, String binomial, Color serumColour) { - return new AlleleButterflySpecies(uid, unlocalizedName, authority, unlocalizedDescription, texturePath, isDominant, branch, binomial, serumColour); + public IAlleleButterflySpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String texturePath, boolean isDominant, IClassification branch, String binomial, Color serumColour) { + IAlleleButterflySpeciesCustom species = new AlleleButterflySpecies(uid, unlocalizedName, authority, unlocalizedDescription, texturePath, isDominant, branch, binomial, serumColour); + AlleleManager.alleleRegistry.registerAllele(species, EnumButterflyChromosome.SPECIES); + return species; } } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java index b7e569e50..4e134c7c9 100755 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java @@ -10,10 +10,6 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -24,24 +20,24 @@ import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IChromosome; import forestry.api.genetics.IFlowerProvider; -import forestry.api.lepidopterology.ButterflyChromosome; +import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.IAlleleButterflyEffect; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterflyGenome; -import forestry.api.lepidopterology.IButterflyRoot; import forestry.core.genetics.Genome; import forestry.core.genetics.alleles.AlleleBoolean; import forestry.core.genetics.alleles.AlleleTolerance; -public class ButterflyGenome extends Genome implements IButterflyGenome { +public class ButterflyGenome extends Genome implements IButterflyGenome { /* CONSTRUCTOR */ public ButterflyGenome(NBTTagCompound nbttagcompound) { super(nbttagcompound); } - public ButterflyGenome(ImmutableMap chromosomes) { + public ButterflyGenome(IChromosome[] chromosomes) { super(chromosomes); } @@ -56,85 +52,82 @@ public class ButterflyGenome extends Genome implements IBut return (IAlleleButterflySpecies) species; } - return (IAlleleButterflySpecies) getActiveAllele(itemStack, ButterflyChromosome.SPECIES, ButterflyManager.butterflyRoot); + return (IAlleleButterflySpecies) getActiveAllele(itemStack, EnumButterflyChromosome.SPECIES, ButterflyManager.butterflyRoot); } /* SPECIES */ - @Nonnull @Override public IAlleleButterflySpecies getPrimary() { - return (IAlleleButterflySpecies) getActiveAllele(ButterflyChromosome.SPECIES); + return (IAlleleButterflySpecies) getActiveAllele(EnumButterflyChromosome.SPECIES); } - @Nonnull @Override public IAlleleButterflySpecies getSecondary() { - return (IAlleleButterflySpecies) getInactiveAllele(ButterflyChromosome.SPECIES); + return (IAlleleButterflySpecies) getInactiveAllele(EnumButterflyChromosome.SPECIES); } @Override public float getSize() { - return ((IAlleleFloat) getActiveAllele(ButterflyChromosome.SIZE)).getValue(); + return ((IAlleleFloat) getActiveAllele(EnumButterflyChromosome.SIZE)).getValue(); } @Override public int getLifespan() { - return ((IAlleleInteger) getActiveAllele(ButterflyChromosome.LIFESPAN)).getValue(); + return ((IAlleleInteger) getActiveAllele(EnumButterflyChromosome.LIFESPAN)).getValue(); } @Override public float getSpeed() { - return ((IAlleleFloat) getActiveAllele(ButterflyChromosome.SPEED)).getValue(); + return ((IAlleleFloat) getActiveAllele(EnumButterflyChromosome.SPEED)).getValue(); } @Override public int getMetabolism() { - return ((IAlleleInteger) getActiveAllele(ButterflyChromosome.METABOLISM)).getValue(); + return ((IAlleleInteger) getActiveAllele(EnumButterflyChromosome.METABOLISM)).getValue(); } @Override public int getFertility() { - return ((IAlleleInteger) getActiveAllele(ButterflyChromosome.FERTILITY)).getValue(); + return ((IAlleleInteger) getActiveAllele(EnumButterflyChromosome.FERTILITY)).getValue(); } @Override public EnumTolerance getToleranceTemp() { - return ((AlleleTolerance) getActiveAllele(ButterflyChromosome.TEMPERATURE_TOLERANCE)).getValue(); + return ((AlleleTolerance) getActiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE)).getValue(); } @Override public EnumTolerance getToleranceHumid() { - return ((AlleleTolerance) getActiveAllele(ButterflyChromosome.HUMIDITY_TOLERANCE)).getValue(); + return ((AlleleTolerance) getActiveAllele(EnumButterflyChromosome.HUMIDITY_TOLERANCE)).getValue(); } @Override - public boolean getNeverSleeps() { - return ((AlleleBoolean) getActiveAllele(ButterflyChromosome.NOCTURNAL)).getValue(); + public boolean getNocturnal() { + return ((AlleleBoolean) getActiveAllele(EnumButterflyChromosome.NOCTURNAL)).getValue(); } @Override public boolean getTolerantFlyer() { - return ((AlleleBoolean) getActiveAllele(ButterflyChromosome.TOLERANT_FLYER)).getValue(); + return ((AlleleBoolean) getActiveAllele(EnumButterflyChromosome.TOLERANT_FLYER)).getValue(); } @Override public boolean getFireResist() { - return ((AlleleBoolean) getActiveAllele(ButterflyChromosome.FIRE_RESIST)).getValue(); + return ((AlleleBoolean) getActiveAllele(EnumButterflyChromosome.FIRE_RESIST)).getValue(); } @Override public IFlowerProvider getFlowerProvider() { - return ((IAlleleFlowers) getActiveAllele(ButterflyChromosome.FLOWER_PROVIDER)).getProvider(); + return ((IAlleleFlowers) getActiveAllele(EnumButterflyChromosome.FLOWER_PROVIDER)).getProvider(); } @Override public IAlleleButterflyEffect getEffect() { - return (IAlleleButterflyEffect) getActiveAllele(ButterflyChromosome.EFFECT); + return (IAlleleButterflyEffect) getActiveAllele(EnumButterflyChromosome.EFFECT); } - @Nonnull @Override - public IButterflyRoot getSpeciesRoot() { + public ISpeciesRoot getSpeciesRoot() { return ButterflyManager.butterflyRoot; } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java old mode 100644 new mode 100755 similarity index 60% rename from src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java rename to src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java index db45e14d5..1b342ed92 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java @@ -10,14 +10,9 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; -import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; 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; import net.minecraft.item.Item; @@ -27,46 +22,37 @@ import net.minecraft.world.World; import com.mojang.authlib.GameProfile; -import net.minecraftforge.fml.common.FMLCommonHandler; - import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosome; +import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; -import forestry.api.lepidopterology.ButterflyChromosome; import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyGenome; -import forestry.api.lepidopterology.IButterflyMode; import forestry.api.lepidopterology.IButterflyMutation; import forestry.api.lepidopterology.IButterflyRoot; -import forestry.api.lepidopterology.IButterflyTracker; +import forestry.api.lepidopterology.ILepidopteristTracker; import forestry.core.genetics.SpeciesRoot; import forestry.core.utils.EntityUtil; -import forestry.core.utils.Log; import forestry.lepidopterology.entities.EntityButterfly; -import forestry.plugins.PluginArboriculture; import forestry.plugins.PluginLepidopterology; -public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { +public class ButterflyHelper extends SpeciesRoot implements IButterflyRoot { private static int butterflySpeciesCount = -1; public static final String UID = "rootButterflies"; - public ButterflyRoot() { - super(ButterflyChromosome.class); - } - @Override public String getUID() { return UID; } @Override - public Class getMemberClass() { + public Class getMemberClass() { return IButterfly.class; } @@ -177,34 +163,26 @@ public class ButterflyRoot extends SpeciesRoot implements I } /* GENOME CONVERSIONS */ - @Nonnull @Override - public IButterfly templateAsIndividual(ImmutableMap template) { + public IButterfly templateAsIndividual(IAllele[] template) { return new Butterfly(templateAsGenome(template)); } - @Nonnull @Override - public IButterfly templateAsIndividual(ImmutableMap templateActive, ImmutableMap templateInactive) { + public IButterfly templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive) { return new Butterfly(templateAsGenome(templateActive, templateInactive)); } @Override - public IButterflyGenome templateAsGenome(ImmutableMap template) { + public IButterflyGenome templateAsGenome(IAllele[] template) { return new ButterflyGenome(templateAsChromosomes(template)); } @Override - public IButterflyGenome templateAsGenome(ImmutableMap templateActive, ImmutableMap templateInactive) { + public IButterflyGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive) { return new ButterflyGenome(templateAsChromosomes(templateActive, templateInactive)); } - @Nonnull - @Override - public IButterflyGenome chromosomesAsGenome(ImmutableMap chromosomes) { - return new ButterflyGenome(chromosomes); - } - /* TEMPLATES */ private static final ArrayList butterflyTemplates = new ArrayList<>(); @@ -214,28 +192,28 @@ public class ButterflyRoot extends SpeciesRoot implements I } @Override - public ImmutableMap getDefaultTemplate() { + public IAllele[] getDefaultTemplate() { return MothDefinition.Brimstone.getTemplate(); } @Override - public void registerTemplate(String identifier, ImmutableMap template) { - super.registerTemplate(identifier, template); + public void registerTemplate(String identifier, IAllele[] template) { butterflyTemplates.add(ButterflyManager.butterflyRoot.templateAsIndividual(template)); + speciesTemplates.put(identifier, template); } /* MUTATIONS */ private static final ArrayList butterflyMutations = new ArrayList<>(); @Override - public void registerMutation(IMutation mutation) { - if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getResultTemplate().get(ButterflyChromosome.SPECIES).getUID())) { + public void registerMutation(IMutation mutation) { + if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getTemplate()[0].getUID())) { return; } - if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getSpecies0().getUID())) { + if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele0().getUID())) { return; } - if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getSpecies1().getUID())) { + if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele1().getUID())) { return; } @@ -251,15 +229,14 @@ public class ButterflyRoot extends SpeciesRoot implements I } /* BREEDING TRACKER */ - @Nonnull @Override - public IButterflyTracker getBreedingTracker(@Nonnull World world, @Nonnull GameProfile player) { - String filename = "ButterflyTracker." + (player == null ? "common" : player.getId()); - ButterflyTracker tracker = (ButterflyTracker) world.loadItemData(ButterflyTracker.class, filename); + public ILepidopteristTracker getBreedingTracker(World world, GameProfile player) { + String filename = "LepidopteristTracker." + (player == null ? "common" : player.getId()); + LepidopteristTracker tracker = (LepidopteristTracker) world.loadItemData(LepidopteristTracker.class, filename); // Create a tracker if there is none yet. if (tracker == null) { - tracker = new ButterflyTracker(filename); + tracker = new LepidopteristTracker(filename); world.setItemData(filename, tracker); } @@ -269,74 +246,14 @@ public class ButterflyRoot extends SpeciesRoot implements I return tracker; } - @Nonnull @Override - public ButterflyChromosome[] getKaryotype() { - return ButterflyChromosome.values(); - } - - @Nonnull - @Override - public ButterflyChromosome getKaryotypeKey() { - return ButterflyChromosome.SPECIES; - } - - /** Modes */ - private static IButterflyMode activeMode; - @Nonnull - private final List modes = new ArrayList<>(); - - @Nonnull - @Override - public List getModes() { - return this.modes; + public IChromosomeType[] getKaryotype() { + return EnumButterflyChromosome.values(); } @Override - public void resetMode() { - activeMode = null; + public IChromosomeType getKaryotypeKey() { + return EnumButterflyChromosome.SPECIES; } - @Nonnull - @Override - public IButterflyMode getMode(@Nonnull World world) { - if (activeMode != null) { - return activeMode; - } - - IButterflyTracker tracker = getBreedingTracker(world, null); - String mode = tracker.getModeName(); - if (mode == null || mode.isEmpty()) { - mode = PluginArboriculture.treekeepingMode; - } - - setMode(world, mode); - FMLCommonHandler.instance().getFMLLogger().debug("Set Treekeeping mode for a world to " + mode); - - return activeMode; - } - - @Override - public void registerMode(@Nonnull IButterflyMode mode) { - modes.add(mode); - } - - @Override - public void setMode(@Nonnull World world, @Nonnull String name) { - activeMode = getMode(name); - getBreedingTracker(world, null).setModeName(name); - } - - @Nonnull - @Override - public IButterflyMode getMode(@Nonnull String name) { - for (IButterflyMode mode : modes) { - if (mode.getName().equals(name) || mode.getName().equals(name.toLowerCase(Locale.ENGLISH))) { - return mode; - } - } - - Log.error("Failed to find a Butterfly mode called '%s', reverting to fallback."); - return modes.get(0); - } } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyMode.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyMode.java deleted file mode 100644 index 7178616b0..000000000 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyMode.java +++ /dev/null @@ -1,31 +0,0 @@ -package forestry.lepidopterology.genetics; - -import javax.annotation.Nonnull; - -import forestry.api.genetics.IGenome; -import forestry.api.lepidopterology.ButterflyChromosome; -import forestry.api.lepidopterology.IButterflyMode; - -public class ButterflyMode implements IButterflyMode { - public static final IButterflyMode normal = new ButterflyMode("NORMAL", 1f); - - @Nonnull - private final String name; - private final float mutationModifier; - - private ButterflyMode(@Nonnull String name, float mutationModifier) { - this.name = name; - this.mutationModifier = mutationModifier; - } - - @Nonnull - @Override - public String getName() { - return name; - } - - @Override - public float getMutationModifier(IGenome genome0, IGenome genome1) { - return mutationModifier; - } -} diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyTracker.java b/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java old mode 100644 new mode 100755 similarity index 79% rename from src/main/java/forestry/lepidopterology/genetics/ButterflyTracker.java rename to src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java index 96cf8d3ee..b830828b9 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyTracker.java +++ b/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java @@ -12,28 +12,28 @@ package forestry.lepidopterology.genetics; import net.minecraft.entity.player.EntityPlayer; +import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; -import forestry.api.lepidopterology.ButterflyChromosome; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; -import forestry.api.lepidopterology.IButterflyTracker; +import forestry.api.lepidopterology.ILepidopteristTracker; import forestry.core.genetics.BreedingTracker; -public class ButterflyTracker extends BreedingTracker implements IButterflyTracker { +public class LepidopteristTracker extends BreedingTracker implements ILepidopteristTracker { /** Required for creation from map storage */ - public ButterflyTracker(String s) { + public LepidopteristTracker(String s) { super(s); } @Override - protected IButterflyTracker getBreedingTracker(EntityPlayer player) { + protected IBreedingTracker getBreedingTracker(EntityPlayer player) { return ButterflyManager.butterflyRoot.getBreedingTracker(player.worldObj, player.getGameProfile()); } @Override protected String speciesRootUID() { - return ButterflyRoot.UID; + return ButterflyHelper.UID; } @Override diff --git a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java index 7588e22a7..e9ca5868a 100644 --- a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java @@ -10,21 +10,18 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; -import com.google.common.collect.ImmutableMap; - import java.awt.Color; +import java.util.Arrays; import java.util.Locale; -import java.util.Map; import net.minecraft.item.ItemStack; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; -import forestry.api.lepidopterology.ButterflyChromosome; import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.EnumFlutterType; -import forestry.api.lepidopterology.IAlleleButterflySpecies; -import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; +import forestry.api.lepidopterology.IAlleleButterflySpeciesCustom; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyGenome; import forestry.core.config.Constants; @@ -35,20 +32,20 @@ public enum MothDefinition implements IButterflyDefinition { Brimstone(ButterflyBranchDefinition.Opisthograptis, "brimstone", "luteolata", new Color(0xffea40), true, 1.0f), LatticedHeath(ButterflyBranchDefinition.Chiasmia, "latticeHeath", "clathrata", new Color(0xf2f0be), true, 0.5f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.SMALLEST); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALLEST); } }, Atlas(ButterflyBranchDefinition.Attacus, "atlas", "atlas", new Color(0xd96e3d), false, 0.1f) { @Override - protected void setAlleles(Map alleles) { - AlleleHelper.instance.set(alleles, ButterflyChromosome.SIZE, EnumAllele.Size.LARGEST); + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.LARGEST); } }; - private final IAlleleButterflySpecies species; + private final IAlleleButterflySpeciesCustom species; private final ButterflyBranchDefinition branch; - private ImmutableMap template; + private IAllele[] template; private IButterflyGenome genome; MothDefinition(ButterflyBranchDefinition branchDefinition, String speciesName, String binomial, Color serumColor, boolean dominant, float rarity) { @@ -61,11 +58,9 @@ public enum MothDefinition implements IButterflyDefinition { String texture = "forestry:" + Constants.TEXTURE_PATH_ENTITIES + "/butterflies/" + uid + ".png"; - IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, texture, dominant, branchDefinition.getBranch(), binomial, serumColor); - speciesBuilder.setRarity(rarity); - speciesBuilder.setNocturnal(); - setSpeciesProperties(speciesBuilder); - this.species = speciesBuilder.build(); + species = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, texture, dominant, branchDefinition.getBranch(), binomial, serumColor); + species.setRarity(rarity); + species.setNocturnal(); } public static void initMoths() { @@ -75,28 +70,28 @@ public enum MothDefinition implements IButterflyDefinition { } private void init() { - Map templateBuilder = branch.getTemplate(); - AlleleHelper.instance.set(templateBuilder, ButterflyChromosome.SPECIES, species); - setAlleles(templateBuilder); + setSpeciesProperties(species); - template = ImmutableMap.copyOf(templateBuilder); + template = branch.getTemplate(); + AlleleHelper.instance.set(template, EnumButterflyChromosome.SPECIES, species); + setAlleles(template); genome = ButterflyManager.butterflyRoot.templateAsGenome(template); ButterflyManager.butterflyRoot.registerTemplate(template); } - protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { + protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) { } - protected void setAlleles(Map alleles) { + protected void setAlleles(IAllele[] alleles) { } @Override - public final ImmutableMap getTemplate() { - return template; + public final IAllele[] getTemplate() { + return Arrays.copyOf(template, template.length); } @Override diff --git a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java index ef11535c0..7583f287a 100755 --- a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java @@ -19,8 +19,8 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleFlowers; import forestry.api.genetics.IAlleleInteger; import forestry.api.genetics.IAlleleTolerance; -import forestry.api.lepidopterology.ButterflyChromosome; import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterfly; import forestry.core.genetics.GenericRatings; @@ -33,7 +33,7 @@ import forestry.lepidopterology.genetics.ButterflyGenome; import forestry.lepidopterology.inventory.ItemInventoryFlutterlyzer; import forestry.plugins.PluginLepidopterology; -public class GuiFlutterlyzer extends GuiAlyzer { +public class GuiFlutterlyzer extends GuiAlyzer { public GuiFlutterlyzer(EntityPlayer player, ItemInventoryFlutterlyzer inventory) { super(ButterflyManager.butterflyRoot, player, new ContainerAlyzer(inventory, player), inventory, "gui.flutterlyzer"); @@ -102,42 +102,42 @@ public class GuiFlutterlyzer extends GuiAlyzer { textLayout.newLine(); textLayout.newLine(); - drawSpeciesRow(StringUtil.localize("gui.species"), butterfly, ButterflyChromosome.SPECIES, null, null); + drawSpeciesRow(StringUtil.localize("gui.species"), butterfly, EnumButterflyChromosome.SPECIES, null, null); textLayout.newLine(); - drawRow(StringUtil.localize("gui.size"), butterfly.getGenome().getActiveAllele(ButterflyChromosome.SIZE).getName(), - butterfly.getGenome().getInactiveAllele(ButterflyChromosome.SIZE).getName(), butterfly, ButterflyChromosome.SPEED); + drawRow(StringUtil.localize("gui.size"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SIZE).getName(), + butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.SIZE).getName(), butterfly, EnumButterflyChromosome.SPEED); textLayout.newLine(); - drawRow(StringUtil.localize("gui.lifespan"), butterfly.getGenome().getActiveAllele(ButterflyChromosome.LIFESPAN).getName(), - butterfly.getGenome().getInactiveAllele(ButterflyChromosome.LIFESPAN).getName(), butterfly, - ButterflyChromosome.LIFESPAN); + drawRow(StringUtil.localize("gui.lifespan"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.LIFESPAN).getName(), + butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.LIFESPAN).getName(), butterfly, + EnumButterflyChromosome.LIFESPAN); textLayout.newLine(); - drawRow(StringUtil.localize("gui.speed"), butterfly.getGenome().getActiveAllele(ButterflyChromosome.SPEED).getName(), - butterfly.getGenome().getInactiveAllele(ButterflyChromosome.SPEED).getName(), butterfly, ButterflyChromosome.SPEED); + drawRow(StringUtil.localize("gui.speed"), butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.SPEED).getName(), + butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.SPEED).getName(), butterfly, EnumButterflyChromosome.SPEED); textLayout.newLine(); drawRow(StringUtil.localize("gui.metabolism"), GenericRatings.rateMetabolism(butterfly.getGenome().getMetabolism()), - GenericRatings.rateMetabolism(((IAlleleInteger) butterfly.getGenome().getInactiveAllele(ButterflyChromosome.METABOLISM)).getValue()), butterfly, ButterflyChromosome.METABOLISM); + GenericRatings.rateMetabolism(((IAlleleInteger) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.METABOLISM)).getValue()), butterfly, EnumButterflyChromosome.METABOLISM); textLayout.newLine(); textLayout.drawLine(StringUtil.localize("gui.fertility"), COLUMN_0); - drawFertilityInfo(butterfly.getGenome().getFertility(), COLUMN_1, getColorCoding(butterfly.getGenome().getActiveAllele(ButterflyChromosome.FERTILITY) + drawFertilityInfo(butterfly.getGenome().getFertility(), COLUMN_1, getColorCoding(butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.FERTILITY) .isDominant()), 8); - drawFertilityInfo(((IAlleleInteger) butterfly.getGenome().getInactiveAllele(ButterflyChromosome.FERTILITY)).getValue(), COLUMN_2, getColorCoding(butterfly - .getGenome().getInactiveAllele(ButterflyChromosome.FERTILITY).isDominant()), 8); + drawFertilityInfo(((IAlleleInteger) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FERTILITY)).getValue(), COLUMN_2, getColorCoding(butterfly + .getGenome().getInactiveAllele(EnumButterflyChromosome.FERTILITY).isDominant()), 8); textLayout.newLine(); drawRow(StringUtil.localize("gui.flowers"), butterfly.getGenome().getFlowerProvider().getDescription(), - ((IAlleleFlowers) butterfly.getGenome().getInactiveAllele(ButterflyChromosome.FLOWER_PROVIDER)).getProvider() - .getDescription(), butterfly, ButterflyChromosome.FLOWER_PROVIDER); + ((IAlleleFlowers) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FLOWER_PROVIDER)).getProvider() + .getDescription(), butterfly, EnumButterflyChromosome.FLOWER_PROVIDER); textLayout.newLine(); drawRow(StringUtil.localize("gui.effect"), butterfly.getGenome().getEffect().getName(), - butterfly.getGenome().getInactiveAllele(ButterflyChromosome.EFFECT).getName(), butterfly, - ButterflyChromosome.EFFECT); + butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.EFFECT).getName(), butterfly, + EnumButterflyChromosome.EFFECT); textLayout.newLine(); @@ -154,11 +154,11 @@ public class GuiFlutterlyzer extends GuiAlyzer { textLayout.newLine(); drawRow(StringUtil.localize("gui.climate"), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getTemperature()), - AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getTemperature()), butterfly, ButterflyChromosome.SPECIES); + AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getTemperature()), butterfly, EnumButterflyChromosome.SPECIES); textLayout.newLine(); - IAlleleTolerance tempToleranceActive = (IAlleleTolerance) butterfly.getGenome().getActiveAllele(ButterflyChromosome.TEMPERATURE_TOLERANCE); - IAlleleTolerance tempToleranceInactive = (IAlleleTolerance) butterfly.getGenome().getInactiveAllele(ButterflyChromosome.TEMPERATURE_TOLERANCE); + IAlleleTolerance tempToleranceActive = (IAlleleTolerance) butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE); + IAlleleTolerance tempToleranceInactive = (IAlleleTolerance) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE); textLayout.drawLine(" " + StringUtil.localize("gui.tolerance"), COLUMN_0); drawToleranceInfo(tempToleranceActive, COLUMN_1); drawToleranceInfo(tempToleranceInactive, COLUMN_2); @@ -166,11 +166,11 @@ public class GuiFlutterlyzer extends GuiAlyzer { textLayout.newLine(); drawRow(StringUtil.localize("gui.humidity"), AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getHumidity()), - AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getHumidity()), butterfly, ButterflyChromosome.SPECIES); + AlleleManager.climateHelper.toDisplay(butterfly.getGenome().getPrimary().getHumidity()), butterfly, EnumButterflyChromosome.SPECIES); textLayout.newLine(); - IAlleleTolerance humidToleranceActive = (IAlleleTolerance) butterfly.getGenome().getActiveAllele(ButterflyChromosome.HUMIDITY_TOLERANCE); - IAlleleTolerance humidToleranceInactive = (IAlleleTolerance) butterfly.getGenome().getInactiveAllele(ButterflyChromosome.HUMIDITY_TOLERANCE); + IAlleleTolerance humidToleranceActive = (IAlleleTolerance) butterfly.getGenome().getActiveAllele(EnumButterflyChromosome.HUMIDITY_TOLERANCE); + IAlleleTolerance humidToleranceInactive = (IAlleleTolerance) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.HUMIDITY_TOLERANCE); textLayout.drawLine(" " + StringUtil.localize("gui.tolerance"), COLUMN_0); drawToleranceInfo(humidToleranceActive, COLUMN_1); drawToleranceInfo(humidToleranceInactive, COLUMN_2); @@ -182,13 +182,13 @@ public class GuiFlutterlyzer extends GuiAlyzer { String no = StringUtil.localize("no"); String diurnal0, diurnal1, nocturnal0, nocturnal1; - if (butterfly.getGenome().getNeverSleeps()) { + if (butterfly.getGenome().getNocturnal()) { nocturnal0 = diurnal0 = yes; } else { nocturnal0 = butterfly.getGenome().getPrimary().isNocturnal() ? yes : no; diurnal0 = !butterfly.getGenome().getPrimary().isNocturnal() ? yes : no; } - if (((AlleleBoolean) butterfly.getGenome().getInactiveAllele(ButterflyChromosome.NOCTURNAL)).getValue()) { + if (((AlleleBoolean) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.NOCTURNAL)).getValue()) { nocturnal1 = diurnal1 = yes; } else { nocturnal1 = butterfly.getGenome().getSecondary().isNocturnal() ? yes : no; @@ -206,17 +206,17 @@ public class GuiFlutterlyzer extends GuiAlyzer { textLayout.newLine(); String primary = StringUtil.readableBoolean(butterfly.getGenome().getTolerantFlyer(), yes, no); - String secondary = StringUtil.readableBoolean(((AlleleBoolean) butterfly.getGenome().getInactiveAllele(ButterflyChromosome.TOLERANT_FLYER)).getValue(), yes, + String secondary = StringUtil.readableBoolean(((AlleleBoolean) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.TOLERANT_FLYER)).getValue(), yes, no); - drawRow(StringUtil.localize("gui.flyer"), primary, secondary, butterfly, ButterflyChromosome.TOLERANT_FLYER); + drawRow(StringUtil.localize("gui.flyer"), primary, secondary, butterfly, EnumButterflyChromosome.TOLERANT_FLYER); textLayout.newLine(); primary = StringUtil.readableBoolean(butterfly.getGenome().getFireResist(), yes, no); - secondary = StringUtil.readableBoolean(((AlleleBoolean) butterfly.getGenome().getInactiveAllele(ButterflyChromosome.FIRE_RESIST)).getValue(), yes, + secondary = StringUtil.readableBoolean(((AlleleBoolean) butterfly.getGenome().getInactiveAllele(EnumButterflyChromosome.FIRE_RESIST)).getValue(), yes, no); - drawRow(StringUtil.localize("gui.fireresist"), primary, secondary, butterfly, ButterflyChromosome.FIRE_RESIST); + drawRow(StringUtil.localize("gui.fireresist"), primary, secondary, butterfly, EnumButterflyChromosome.FIRE_RESIST); textLayout.endPage(); } diff --git a/src/main/java/forestry/lepidopterology/inventory/ItemInventoryFlutterlyzer.java b/src/main/java/forestry/lepidopterology/inventory/ItemInventoryFlutterlyzer.java index 36997ad75..1b9d3d6fe 100644 --- a/src/main/java/forestry/lepidopterology/inventory/ItemInventoryFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/inventory/ItemInventoryFlutterlyzer.java @@ -15,13 +15,12 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import forestry.api.lepidopterology.ButterflyChromosome; import forestry.api.lepidopterology.ButterflyManager; import forestry.core.config.Config; import forestry.core.gui.IHintSource; import forestry.core.inventory.ItemInventoryAlyzer; -public class ItemInventoryFlutterlyzer extends ItemInventoryAlyzer implements IHintSource { +public class ItemInventoryFlutterlyzer extends ItemInventoryAlyzer implements IHintSource { public ItemInventoryFlutterlyzer(EntityPlayer player, ItemStack itemStack) { super(ButterflyManager.butterflyRoot, player, itemStack); diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index 94b8e6ed4..aa4d4ebb0 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -31,6 +31,7 @@ import forestry.api.core.Tabs; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflySpecies; @@ -99,7 +100,7 @@ public class ItemButterflyGE extends ItemGE { public void addCreativeItems(List itemList, boolean hideSecrets) { - for (IButterfly individual : ButterflyManager.butterflyRoot.getIndividualTemplates()) { + for (IIndividual individual : ButterflyManager.butterflyRoot.getIndividualTemplates()) { // Don't show secret butterflies unless ordered to. if (hideSecrets && individual.isSecret() && !Config.isDebug) { continue; diff --git a/src/main/java/forestry/lepidopterology/tiles/TileLepidopteristChest.java b/src/main/java/forestry/lepidopterology/tiles/TileLepidopteristChest.java index a93d0e72b..083405cb2 100644 --- a/src/main/java/forestry/lepidopterology/tiles/TileLepidopteristChest.java +++ b/src/main/java/forestry/lepidopterology/tiles/TileLepidopteristChest.java @@ -10,11 +10,10 @@ ******************************************************************************/ package forestry.lepidopterology.tiles; -import forestry.api.lepidopterology.ButterflyChromosome; import forestry.api.lepidopterology.ButterflyManager; import forestry.core.tiles.TileNaturalistChest; -public class TileLepidopteristChest extends TileNaturalistChest { +public class TileLepidopteristChest extends TileNaturalistChest { public TileLepidopteristChest() { super(ButterflyManager.butterflyRoot); } diff --git a/src/main/java/forestry/mail/Letter.java b/src/main/java/forestry/mail/Letter.java index d085936a0..1d627bc65 100755 --- a/src/main/java/forestry/mail/Letter.java +++ b/src/main/java/forestry/mail/Letter.java @@ -62,7 +62,7 @@ public class Letter implements ILetter { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setBoolean("PRC", isProcessed); diff --git a/src/main/java/forestry/mail/MailAddress.java b/src/main/java/forestry/mail/MailAddress.java index cb7e19a6b..3af1515f8 100644 --- a/src/main/java/forestry/mail/MailAddress.java +++ b/src/main/java/forestry/mail/MailAddress.java @@ -15,6 +15,7 @@ import java.util.Locale; import java.util.UUID; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; import com.mojang.authlib.GameProfile; @@ -68,7 +69,7 @@ public class MailAddress implements INbtWritable, IMailAddress { gameProfile = invalidGameProfile; } else if (nbt.hasKey("profile")) { NBTTagCompound profileTag = nbt.getCompoundTag("profile"); - gameProfile = PlayerUtil.readGameProfileFromNBT(profileTag); + gameProfile = NBTUtil.readGameProfileFromNBT(profileTag); } this.type = type; @@ -135,12 +136,12 @@ public class MailAddress implements INbtWritable, IMailAddress { } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setString("TP", type.toString()); if (gameProfile != null) { NBTTagCompound profileNbt = new NBTTagCompound(); - PlayerUtil.writeGameProfile(profileNbt, gameProfile); + NBTUtil.writeGameProfile(profileNbt, gameProfile); nbttagcompound.setTag("profile", profileNbt); } } diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index 8158230cd..fd27fad15 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -10,13 +10,13 @@ ******************************************************************************/ package forestry.mail; -import javax.annotation.Nonnull; import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraft.world.World; @@ -36,7 +36,6 @@ import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.InventoryAdapter; import forestry.core.utils.InventoryUtil; import forestry.core.utils.ItemStackUtil; -import forestry.core.utils.PlayerUtil; import forestry.core.utils.StringUtil; import forestry.mail.inventory.InventoryTradeStation; import forestry.mail.items.EnumStampDefinition; @@ -87,7 +86,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve @Override public void readFromNBT(NBTTagCompound nbttagcompound) { if (nbttagcompound.hasKey("owner")) { - owner = PlayerUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner")); + owner = NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner")); } if (nbttagcompound.hasKey("address")) { @@ -100,10 +99,10 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve } @Override - public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { + public void writeToNBT(NBTTagCompound nbttagcompound) { if (owner != null) { NBTTagCompound nbt = new NBTTagCompound(); - PlayerUtil.writeGameProfile(nbt, owner); + NBTUtil.writeGameProfile(nbt, owner); nbttagcompound.setTag("owner", nbt); } diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 91304acaa..f119c27aa 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -160,11 +160,11 @@ public class PluginApiculture extends BlankForestryPlugin { AlleleManager.alleleRegistry.registerSpeciesRoot(BeeManager.beeRoot); // Modes - BeeManager.beeRoot.registerMode(BeekeepingMode.easy); - BeeManager.beeRoot.registerMode(BeekeepingMode.normal); - BeeManager.beeRoot.registerMode(BeekeepingMode.hard); - BeeManager.beeRoot.registerMode(BeekeepingMode.hardcore); - BeeManager.beeRoot.registerMode(BeekeepingMode.insane); + BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.easy); + BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.normal); + BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.hard); + BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.hardcore); + BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.insane); } @Override @@ -177,8 +177,6 @@ public class PluginApiculture extends BlankForestryPlugin { public void preInit() { super.preInit(); - BeeDefinition.preInit(); - MinecraftForge.EVENT_BUS.register(this); blocks.apiculture.addDefinitions(BlockTypeApiculture.VALUES); @@ -214,7 +212,7 @@ public class PluginApiculture extends BlankForestryPlugin { } } - List beekeepingModes = BeeManager.beeRoot.getModes(); + List beekeepingModes = BeeManager.beeRoot.getBeekeepingModes(); String[] validBeekeepingModeNames = new String[beekeepingModes.size()]; for (int i = 0; i < beekeepingModes.size(); i++) { validBeekeepingModeNames[i] = beekeepingModes.get(i).getName(); @@ -262,6 +260,8 @@ public class PluginApiculture extends BlankForestryPlugin { createAlleles(); BeeDefinition.initBees(); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.speciesArgrarian", BeeDefinition.AGRARIAN.getGenome().getPrimary()); + // Hives createHives(); registerBeehiveDrops(); diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 0181e1410..62e482063 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -50,8 +50,8 @@ import forestry.arboriculture.commands.CommandTree; import forestry.arboriculture.genetics.TreeBranchDefinition; import forestry.arboriculture.genetics.TreeDefinition; import forestry.arboriculture.genetics.TreeFactory; +import forestry.arboriculture.genetics.TreeHelper; import forestry.arboriculture.genetics.TreeMutationFactory; -import forestry.arboriculture.genetics.TreeRoot; import forestry.arboriculture.genetics.TreekeepingMode; import forestry.arboriculture.genetics.alleles.AlleleGrowth; import forestry.arboriculture.genetics.alleles.AlleleLeafEffect; @@ -94,15 +94,15 @@ public class PluginArboriculture extends BlankForestryPlugin { TreeManager.woodItemAccess = new WoodItemAccess(); // Init tree interface - TreeManager.treeRoot = new TreeRoot(); + TreeManager.treeRoot = new TreeHelper(); AlleleManager.alleleRegistry.registerSpeciesRoot(TreeManager.treeRoot); // Modes - TreeManager.treeRoot.registerMode(TreekeepingMode.easy); - TreeManager.treeRoot.registerMode(TreekeepingMode.normal); - TreeManager.treeRoot.registerMode(TreekeepingMode.hard); - TreeManager.treeRoot.registerMode(TreekeepingMode.hardcore); - TreeManager.treeRoot.registerMode(TreekeepingMode.insane); + TreeManager.treeRoot.registerTreekeepingMode(TreekeepingMode.easy); + TreeManager.treeRoot.registerTreekeepingMode(TreekeepingMode.normal); + TreeManager.treeRoot.registerTreekeepingMode(TreekeepingMode.hard); + TreeManager.treeRoot.registerTreekeepingMode(TreekeepingMode.hardcore); + TreeManager.treeRoot.registerTreekeepingMode(TreekeepingMode.insane); } @Override diff --git a/src/main/java/forestry/plugins/PluginFluids.java b/src/main/java/forestry/plugins/PluginFluids.java index ad001927a..6751b286e 100644 --- a/src/main/java/forestry/plugins/PluginFluids.java +++ b/src/main/java/forestry/plugins/PluginFluids.java @@ -80,9 +80,9 @@ public class PluginFluids extends BlankForestryPlugin { } } else { GameRegistry.UniqueIdentifier blockID = GameRegistry.findUniqueIdentifierFor(fluidBlock); - Log.warning("Pre-existing {} fluid block detected, deferring to {}:{}, " + Log.warning("Pre-existing {0} fluid block detected, deferring to {1}:{2}, " + "this may cause issues if the server/client have different mod load orders, " - + "recommended that you disable all but one instance of the fluid blocks via your configs.", fluid.getName(), blockID.modId, blockID.name); + + "recommended that you disable all but one instance of {0} fluid blocks via your configs.", fluid.getName(), blockID.modId, blockID.name); } } } diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index cfc8e1423..7bda0d45c 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -45,7 +45,7 @@ import forestry.lepidopterology.genetics.AlleleButterflyEffect; import forestry.lepidopterology.genetics.ButterflyBranchDefinition; import forestry.lepidopterology.genetics.ButterflyDefinition; import forestry.lepidopterology.genetics.ButterflyFactory; -import forestry.lepidopterology.genetics.ButterflyRoot; +import forestry.lepidopterology.genetics.ButterflyHelper; import forestry.lepidopterology.genetics.MothDefinition; import forestry.lepidopterology.items.ItemButterflyGE; import forestry.lepidopterology.items.ItemRegistryLepidopterology; @@ -67,7 +67,7 @@ public class PluginLepidopterology extends BlankForestryPlugin { @Override public void setupAPI() { - ButterflyManager.butterflyRoot = new ButterflyRoot(); + ButterflyManager.butterflyRoot = new ButterflyHelper(); AlleleManager.alleleRegistry.registerSpeciesRoot(ButterflyManager.butterflyRoot); ButterflyManager.butterflyFactory = new ButterflyFactory(); diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index f9167b4de..76a42a4de 100644 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -142,12 +142,12 @@ public class PluginManager { if (plugin.canBeDisabled()) { if (!isEnabled(config, plugin)) { iterator.remove(); - Log.info("Plugin disabled: {}", plugin); + Log.info("Plugin disabled: {0}", plugin); continue; } if (!plugin.isAvailable()) { iterator.remove(); - Log.info("Plugin {} failed to load: {}", plugin, plugin.getFailMessage()); + Log.info("Plugin {0} failed to load: {1}", plugin, plugin.getFailMessage()); continue; } } @@ -168,7 +168,7 @@ public class PluginManager { ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class); String pluginId = info.pluginID(); toLoad.remove(pluginId); - Log.warning("Plugin {} is missing dependencies: {}", pluginId, dependencies); + Log.warning("Plugin {0} is missing dependencies: {1}", pluginId, dependencies); } } } while (changed); @@ -199,24 +199,24 @@ public class PluginManager { configurePlugins(forestryPlugins); for (IForestryPlugin plugin : loadedPlugins) { - Log.debug("Setup Start: {}", plugin); + Log.debug("Setup Start: {0}", plugin); plugin.setupAPI(); plugin.registerItemsAndBlocks(); - Log.debug("Setup Complete: {}", plugin); + Log.debug("Setup Complete: {0}", plugin); } stage = Stage.SETUP_DISABLED; for (IForestryPlugin plugin : unloadedPlugins) { - Log.debug("Disabled-Setup Start: {}", plugin); + Log.debug("Disabled-Setup Start: {0}", plugin); plugin.disabledSetupAPI(); - Log.debug("Disabled-Setup Complete: {}", plugin); + Log.debug("Disabled-Setup Complete: {0}", plugin); } } public static void runPreInit() { stage = Stage.PRE_INIT; for (IForestryPlugin plugin : loadedPlugins) { - Log.debug("Pre-Init Start: {}", plugin); + Log.debug("Pre-Init Start: {0}", plugin); registerHandlers(plugin); plugin.preInit(); if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.BUILDCRAFT_STATEMENTS)) { @@ -226,26 +226,26 @@ public class PluginManager { plugin.registerBackpackItems(); plugin.registerCrates(); } - Log.debug("Pre-Init Complete: {}", plugin); + Log.debug("Pre-Init Complete: {0}", plugin); } } public static void runInit() { stage = Stage.INIT; for (IForestryPlugin plugin : loadedPlugins) { - Log.debug("Init Start: {}", plugin); + Log.debug("Init Start: {0}", plugin); plugin.doInit(); plugin.registerRecipes(); - Log.debug("Init Complete: {}", plugin); + Log.debug("Init Complete: {0}", plugin); } } public static void runPostInit() { stage = Stage.POST_INIT; for (IForestryPlugin plugin : loadedPlugins) { - Log.debug("Post-Init Start: {}", plugin); + Log.debug("Post-Init Start: {0}", plugin); plugin.postInit(); - Log.debug("Post-Init Complete: {}", plugin); + Log.debug("Post-Init Complete: {0}", plugin); } stage = Stage.FINISHED; diff --git a/src/main/java/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java index 3e6b1069b..a490481bc 100755 --- a/src/main/java/forestry/storage/items/ItemBackpack.java +++ b/src/main/java/forestry/storage/items/ItemBackpack.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.storage.items; -import javax.annotation.Nonnull; import java.util.List; import java.util.Locale; @@ -52,17 +51,14 @@ import forestry.storage.gui.GuiBackpackT2; import forestry.storage.inventory.ItemInventoryBackpack; public class ItemBackpack extends ItemWithGui { - @Nonnull private final IBackpackDefinition definition; - @Nonnull private final EnumBackpackType type; - public ItemBackpack(@Nonnull IBackpackDefinition definition, @Nonnull EnumBackpackType type) { + public ItemBackpack(IBackpackDefinition definition, EnumBackpackType type) { this.definition = definition; this.type = type; } - @Nonnull public IBackpackDefinition getDefinition() { return definition; } diff --git a/src/main/java/forestry/storage/items/ItemBackpackNaturalist.java b/src/main/java/forestry/storage/items/ItemBackpackNaturalist.java index bc7f481f9..7b8f7e18a 100644 --- a/src/main/java/forestry/storage/items/ItemBackpackNaturalist.java +++ b/src/main/java/forestry/storage/items/ItemBackpackNaturalist.java @@ -10,12 +10,9 @@ ******************************************************************************/ package forestry.storage.items; -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; import forestry.api.storage.EnumBackpackType; import forestry.api.storage.IBackpackDefinition; @@ -25,11 +22,10 @@ import forestry.core.gui.GuiNaturalistInventory; import forestry.storage.gui.ContainerNaturalistBackpack; import forestry.storage.inventory.ItemInventoryBackpackPaged; -public class ItemBackpackNaturalist extends ItemBackpack { - @Nonnull - private final ISpeciesRoot speciesRoot; +public class ItemBackpackNaturalist extends ItemBackpack { + private final ISpeciesRoot speciesRoot; - public ItemBackpackNaturalist(@Nonnull ISpeciesRoot speciesRoot, @Nonnull IBackpackDefinition definition, @Nonnull EnumBackpackType type) { + public ItemBackpackNaturalist(ISpeciesRoot speciesRoot, IBackpackDefinition definition, EnumBackpackType type) { super(definition, type); this.speciesRoot = speciesRoot; } @@ -43,7 +39,7 @@ public class ItemBackpackNaturalist extends ItemBackp public Object getGui(EntityPlayer player, ItemStack heldItem, int page) { ItemInventoryBackpackPaged inventory = new ItemInventoryBackpackPaged(player, Constants.SLOTS_BACKPACK_APIARIST, heldItem, this); ContainerNaturalistBackpack container = new ContainerNaturalistBackpack(player, inventory, page); - return new GuiNaturalistInventory<>(speciesRoot, player, container, inventory, page, 5); + return new GuiNaturalistInventory(speciesRoot, player, container, inventory, page, 5); } @Override diff --git a/src/main/java/forestry/storage/items/ItemRegistryStorage.java b/src/main/java/forestry/storage/items/ItemRegistryStorage.java index a1847c737..be6d49393 100644 --- a/src/main/java/forestry/storage/items/ItemRegistryStorage.java +++ b/src/main/java/forestry/storage/items/ItemRegistryStorage.java @@ -49,7 +49,7 @@ public class ItemRegistryStorage extends ItemRegistry { if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { definition = BackpackManager.definitions.get("apiarist"); - apiaristBackpack = new ItemBackpackNaturalist<>(BeeManager.beeRoot, definition, EnumBackpackType.APIARIST); + apiaristBackpack = new ItemBackpackNaturalist(BeeManager.beeRoot, definition, EnumBackpackType.APIARIST); apiaristBackpack.setCreativeTab(Tabs.tabApiculture); registerItem(apiaristBackpack, "apiaristBag"); } else { @@ -58,7 +58,7 @@ public class ItemRegistryStorage extends ItemRegistry { if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) { definition = BackpackManager.definitions.get("lepidopterist"); - lepidopteristBackpack = new ItemBackpackNaturalist<>(ButterflyManager.butterflyRoot, definition, EnumBackpackType.APIARIST); + lepidopteristBackpack = new ItemBackpackNaturalist(ButterflyManager.butterflyRoot, definition, EnumBackpackType.APIARIST); lepidopteristBackpack.setCreativeTab(Tabs.tabLepidopterology); registerItem(lepidopteristBackpack, "lepidopteristBag"); } else {