diff --git a/api/forestry b/api/forestry index 6bf135b52..e66447e58 160000 --- a/api/forestry +++ b/api/forestry @@ -1 +1 @@ -Subproject commit 6bf135b52c19480f4a9d3f61392d1ac86f68b1d9 +Subproject commit e66447e58d631dbb73b2e6f0d3bc35b90c45c7ba diff --git a/src/main/java/forestry/apiculture/genetics/BeeFactory.java b/src/main/java/forestry/apiculture/genetics/BeeFactory.java index 4b13e073f..094813ff5 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeFactory.java +++ b/src/main/java/forestry/apiculture/genetics/BeeFactory.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.apiculture.genetics; +import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IAlleleBeeSpeciesCustom; import forestry.api.apiculture.IBeeFactory; import forestry.api.genetics.AlleleManager; @@ -20,7 +21,7 @@ public class BeeFactory implements IBeeFactory { @Override 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); + AlleleManager.alleleRegistry.registerAllele(species, EnumBeeChromosome.SPECIES); return species; } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java index ea274251b..961dfd56e 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java @@ -10,15 +10,21 @@ ******************************************************************************/ package forestry.apiculture.genetics.alleles; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.potion.Potion; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.Vec3; 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; import forestry.api.apiculture.IBeeModifier; +import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IEffectData; import forestry.core.genetics.alleles.AlleleCategorized; import forestry.core.proxy.Proxies; @@ -47,6 +53,34 @@ public abstract class AlleleEffect extends AlleleCategorized implements IAlleleB public static IAlleleBeeEffect effectFertile; public static IAlleleBeeEffect effectMycophilic; + public static void createAlleles() { + List beeEffects = Arrays.asList( + effectNone = new AlleleEffectNone("none", true), + effectAggressive = new AlleleEffectAggressive(), + effectHeroic = new AlleleEffectHeroic(), + effectBeatific = new AlleleEffectPotion("beatific", false, Potion.regeneration, 100), + effectMiasmic = new AlleleEffectPotion("miasmic", false, Potion.poison, 600, 100, 0.1f), + effectMisanthrope = new AlleleEffectMisanthrope(), + effectGlacial = new AlleleEffectGlacial(), + effectRadioactive = new AlleleEffectRadioactive(), + effectCreeper = new AlleleEffectCreeper(), + effectIgnition = new AlleleEffectIgnition(), + effectExploration = new AlleleEffectExploration(), + effectFestiveEaster = new AlleleEffectNone("festiveEaster", true), + effectSnowing = new AlleleEffectSnowing(), + effectDrunkard = new AlleleEffectPotion("drunkard", false, Potion.confusion, 100), + effectReanimation = new AlleleEffectResurrection("reanimation", AlleleEffectResurrection.getReanimationList()), + effectResurrection = new AlleleEffectResurrection("resurrection", AlleleEffectResurrection.getResurrectionList()), + effectRepulsion = new AlleleEffectRepulsion(), + effectFertile = new AlleleEffectFertile(), + effectMycophilic = new AlleleEffectFungification() + ); + + for (IAlleleBeeEffect beeEffect : beeEffects) { + AlleleManager.alleleRegistry.registerAllele(beeEffect, EnumBeeChromosome.EFFECT); + } + } + protected AlleleEffect(String valueName, boolean isDominant) { super("forestry", "effect", valueName, isDominant); } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeBranchDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeBranchDefinition.java index 6356cebe2..43ca3e2a1 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeBranchDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeBranchDefinition.java @@ -86,7 +86,7 @@ public enum TreeBranchDefinition implements IBranchDefinition { defaultTemplate = new IAllele[EnumTreeChromosome.values().length]; AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.FRUITS, AlleleFruit.fruitNone); - AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.GROWTH, AlleleGrowth.growthLightlevel); + 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); diff --git a/src/main/java/forestry/arboriculture/genetics/TreeFactory.java b/src/main/java/forestry/arboriculture/genetics/TreeFactory.java index 6cc1e4521..ad1cdba10 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeFactory.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeFactory.java @@ -13,6 +13,7 @@ package forestry.arboriculture.genetics; import java.awt.Color; import forestry.api.arboriculture.EnumLeafType; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleTreeSpeciesCustom; import forestry.api.arboriculture.IGermlingIconProvider; import forestry.api.arboriculture.ILeafIconProvider; @@ -27,7 +28,7 @@ public class TreeFactory implements ITreeFactory { @Override public IAlleleTreeSpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, ILeafIconProvider leafIconProvider, IGermlingIconProvider germlingIconProvider, ITreeGenerator generator) { IAlleleTreeSpeciesCustom treeSpecies = new AlleleTreeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, leafIconProvider, germlingIconProvider, generator); - AlleleManager.alleleRegistry.registerAllele(treeSpecies); + AlleleManager.alleleRegistry.registerAllele(treeSpecies, EnumTreeChromosome.SPECIES); return treeSpecies; } diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java index ac9acfd3a..01a0ae2f9 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleFruit.java @@ -10,9 +10,23 @@ ******************************************************************************/ package forestry.arboriculture.genetics.alleles; +import java.util.Arrays; +import java.util.List; + +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.genetics.AlleleManager; +import forestry.arboriculture.FruitProviderNone; +import forestry.arboriculture.FruitProviderPod; +import forestry.arboriculture.FruitProviderRandom; +import forestry.arboriculture.FruitProviderRipening; import forestry.core.genetics.alleles.AlleleCategorized; +import forestry.core.items.ItemFruit; public class AlleleFruit extends AlleleCategorized implements IAlleleFruit { @@ -29,6 +43,30 @@ public class AlleleFruit extends AlleleCategorized implements IAlleleFruit { public static IAlleleFruit fruitPlum; public static IAlleleFruit fruitJujube; + public static void createAlleles() { + List fruitAlleles = Arrays.asList( + fruitNone = new AlleleFruit("none", new FruitProviderNone("none", null)), + fruitApple = new AlleleFruit("apple", new FruitProviderRandom("apple", EnumFruitFamily.POMES, new ItemStack(Items.apple), 1.0f).setColour(0xff2e2e).setOverlay("pomes")), + fruitCocoa = new AlleleFruit("cocoa", new FruitProviderPod("cocoa", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.COCOA)), + // .setColours(0xecdca5, 0xc4d24a), true); + fruitChestnut = new AlleleFruit("chestnut", new FruitProviderRipening("chestnut", EnumFruitFamily.NUX, ItemFruit.EnumFruit.CHESTNUT.getStack(), 1.0f).setRipeningPeriod(6).setColours(0x7f333d, 0xc4d24a).setOverlay("nuts"), true), + fruitWalnut = new AlleleFruit("walnut", new FruitProviderRipening("walnut", EnumFruitFamily.NUX, ItemFruit.EnumFruit.WALNUT.getStack(), 1.0f).setRipeningPeriod(8).setColours(0xfba248, 0xc4d24a).setOverlay("nuts"), true), + fruitCherry = new AlleleFruit("cherry", new FruitProviderRipening("cherry", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.CHERRY.getStack(), 1.0f).setColours(0xff2e2e, 0xc4d24a).setOverlay("berries"), true), + fruitDates = new AlleleFruit("dates", new FruitProviderPod("dates", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.DATES, ItemFruit.EnumFruit.DATES.getStack(4))), + fruitPapaya = new AlleleFruit("papaya", new FruitProviderPod("papaya", EnumFruitFamily.JUNGLE, FruitProviderPod.EnumPodType.PAPAYA, ItemFruit.EnumFruit.PAPAYA.getStack())), + // Allele.fruitCoconut = new AlleleFruit("fruitCoconut", new + // FruitProviderPod("coconut", jungle, EnumPodType.COCONUT, new + // ItemStack[] { new ItemStack( + // ForestryItem.fruits, 1, EnumFruit.COCONUT.ordinal()) })); + fruitLemon = new AlleleFruit("lemon", new FruitProviderRipening("lemon", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.LEMON.getStack(), 1.0f).setColours(0xeeee00, 0x99ff00).setOverlay("citrus"), true), + fruitPlum = new AlleleFruit("plum", new FruitProviderRipening("plum", EnumFruitFamily.PRUNES, ItemFruit.EnumFruit.PLUM.getStack(), 1.0f).setColours(0x663446, 0xeeff1a).setOverlay("plums"), true) + ); + + for (IAlleleFruit fruitAllele : fruitAlleles) { + AlleleManager.alleleRegistry.registerAllele(fruitAllele, EnumTreeChromosome.FRUITS); + } + } + private final IFruitProvider provider; public AlleleFruit(String name, IFruitProvider provider) { diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleGrowth.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleGrowth.java index 45eb0d444..4f98efd27 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleGrowth.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleGrowth.java @@ -10,16 +10,35 @@ ******************************************************************************/ 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.genetics.AlleleManager; +import forestry.arboriculture.genetics.GrowthProvider; +import forestry.arboriculture.genetics.GrowthProviderTropical; import forestry.core.genetics.alleles.AlleleCategorized; public class AlleleGrowth extends AlleleCategorized implements IAlleleGrowth { - public static IAlleleGrowth growthLightlevel; + public static IAlleleGrowth growthLightLevel; public static IAlleleGrowth growthAcacia; public static IAlleleGrowth growthTropical; + public static void createAlleles() { + List growthAlleles = Arrays.asList( + growthLightLevel = new AlleleGrowth("lightlevel", new GrowthProvider()), + growthAcacia = new AlleleGrowth("acacia", new GrowthProvider()), + growthTropical = new AlleleGrowth("tropical", new GrowthProviderTropical()) + ); + + for (IAlleleGrowth alleleGrowth : growthAlleles) { + AlleleManager.alleleRegistry.registerAllele(alleleGrowth, EnumTreeChromosome.GROWTH); + } + } + private final IGrowthProvider provider; public AlleleGrowth(String name, IGrowthProvider provider) { diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffect.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffect.java index 21f87a2fb..79c3b0425 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffect.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleLeafEffect.java @@ -13,8 +13,10 @@ package forestry.arboriculture.genetics.alleles; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleLeafEffect; import forestry.api.arboriculture.ITreeGenome; +import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IEffectData; import forestry.core.genetics.alleles.Allele; import forestry.core.genetics.alleles.AlleleCategorized; @@ -25,6 +27,11 @@ public class AlleleLeafEffect extends AlleleCategorized implements IAlleleLeafEf public static Allele leavesNone; + public static void createAlleles() { + leavesNone = new AlleleLeafEffectNone(); + AlleleManager.alleleRegistry.registerAllele(leavesNone, EnumTreeChromosome.EFFECT); + } + protected AlleleLeafEffect(String valueName, boolean isDominant) { super("forestry", "leaves", valueName, isDominant); } diff --git a/src/main/java/forestry/core/genetics/alleles/Allele.java b/src/main/java/forestry/core/genetics/alleles/Allele.java index 4fcde88cd..6c4833080 100644 --- a/src/main/java/forestry/core/genetics/alleles/Allele.java +++ b/src/main/java/forestry/core/genetics/alleles/Allele.java @@ -12,7 +12,6 @@ package forestry.core.genetics.alleles; import net.minecraft.util.StatCollector; -import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; public abstract class Allele implements IAllele { @@ -22,17 +21,9 @@ public abstract class Allele implements IAllele { private final String unlocalizedName; protected Allele(String uid, String unlocalizedName, boolean isDominant) { - this(uid, unlocalizedName, isDominant, true); - } - - protected Allele(String uid, String unlocalizedName, boolean isDominant, boolean doRegister) { this.uid = uid; this.isDominant = isDominant; this.unlocalizedName = unlocalizedName; - - if (doRegister) { - AlleleManager.alleleRegistry.registerAllele(this); - } } @Override diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleCategorized.java b/src/main/java/forestry/core/genetics/alleles/AlleleCategorized.java index bd9404646..b0f712796 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleCategorized.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleCategorized.java @@ -15,7 +15,7 @@ import net.minecraft.util.StatCollector; */ public abstract class AlleleCategorized extends Allele { protected AlleleCategorized(String modId, String category, String valueName, boolean isDominant) { - super(getUid(modId, category, valueName), getUnlocalizedName(modId, category, valueName), isDominant, true); + super(getUid(modId, category, valueName), getUnlocalizedName(modId, category, valueName), isDominant); } private static String getUid(String modId, String category, String valueName) { diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleFactory.java b/src/main/java/forestry/core/genetics/alleles/AlleleFactory.java index 464df142e..4b99be470 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleFactory.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleFactory.java @@ -10,38 +10,86 @@ ******************************************************************************/ package forestry.core.genetics.alleles; +import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleArea; import forestry.api.genetics.IAlleleBoolean; import forestry.api.genetics.IAlleleFactory; import forestry.api.genetics.IAlleleFloat; import forestry.api.genetics.IAlleleFlowers; import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IFlowerProvider; import forestry.apiculture.genetics.alleles.AlleleFlowers; public class AlleleFactory implements IAlleleFactory { + @Override - public IAlleleFlowers createFlowers(String modId, String category, String name, IFlowerProvider flowerProvider, boolean isDominant) { - return new AlleleFlowers(modId, category, name, flowerProvider, isDominant); + public IAlleleFloat createFloat(String modId, String category, String valueName, float value, boolean isDominant, IChromosomeType... types) { + IAlleleFloat alleleFloat = new AlleleFloat(modId, category, valueName, value, isDominant); + AlleleManager.alleleRegistry.registerAllele(alleleFloat, types); + return alleleFloat; + } + + @Override + public IAlleleArea createArea(String modId, String category, String valueName, int xDimValue, int yDimValue, int zDimValue, boolean isDominant, IChromosomeType... types) { + IAlleleArea alleleArea = new AlleleArea(modId, category, valueName, new int[]{xDimValue, yDimValue, zDimValue}, isDominant); + AlleleManager.alleleRegistry.registerAllele(alleleArea, types); + return alleleArea; + } + + @Override + public IAlleleInteger createInteger(String modId, String category, String valueName, int value, boolean isDominant, IChromosomeType... types) { + IAlleleInteger alleleInteger = new AlleleInteger(modId, category, valueName, value, isDominant); + AlleleManager.alleleRegistry.registerAllele(alleleInteger, types); + return alleleInteger; + } + + @Override + public IAlleleBoolean createBoolean(String modId, String category, boolean value, boolean isDominant, IChromosomeType... types) { + IAlleleBoolean alleleBoolean = new AlleleBoolean(modId, category, value, isDominant); + AlleleManager.alleleRegistry.registerAllele(alleleBoolean, types); + return alleleBoolean; + } + + @Override + public IAlleleFlowers createFlowers(String modId, String category, String valueName, IFlowerProvider value, boolean isDominant, IChromosomeType... types) { + IAlleleFlowers alleleFlowers = new AlleleFlowers(modId, category, valueName, value, isDominant); + AlleleManager.alleleRegistry.registerAllele(alleleFlowers, types); + return alleleFlowers; } @Override public IAlleleFloat createFloat(String modId, String category, String name, float value, boolean isDominant) { - return new AlleleFloat(modId, category, name, value, isDominant); + IAlleleFloat alleleFloat = new AlleleFloat(modId, category, name, value, isDominant); + AlleleManager.alleleRegistry.registerAllele(alleleFloat); + return alleleFloat; } @Override public IAlleleArea createArea(String modId, String category, String name, int xDim, int yDim, int zDim, boolean isDominant) { - return new AlleleArea(modId, category, name, new int[]{xDim, yDim, zDim}, isDominant); + IAlleleArea alleleArea = new AlleleArea(modId, category, name, new int[]{xDim, yDim, zDim}, isDominant); + AlleleManager.alleleRegistry.registerAllele(alleleArea); + return alleleArea; } @Override public IAlleleInteger createInteger(String modId, String category, String valueName, int value, boolean isDominant) { - return new AlleleInteger(modId, category, valueName, value, isDominant); + IAlleleInteger alleleInteger = new AlleleInteger(modId, category, valueName, value, isDominant); + AlleleManager.alleleRegistry.registerAllele(alleleInteger); + return alleleInteger; } @Override public IAlleleBoolean createBoolean(String modId, String category, boolean value, boolean isDominant) { - return new AlleleBoolean(modId, category, value, isDominant); + IAlleleBoolean alleleBoolean = new AlleleBoolean(modId, category, value, isDominant); + AlleleManager.alleleRegistry.registerAllele(alleleBoolean); + return alleleBoolean; + } + + @Override + public IAlleleFlowers createFlowers(String modId, String category, String name, IFlowerProvider flowerProvider, boolean isDominant) { + IAlleleFlowers alleleFlowers = new AlleleFlowers(modId, category, name, flowerProvider, isDominant); + AlleleManager.alleleRegistry.registerAllele(alleleFlowers); + return alleleFlowers; } } diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java b/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java index 0c525db96..2f735fb61 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleHelper.java @@ -15,12 +15,16 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleBoolean; import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IChromosomeType; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.apiculture.flowers.FlowerProvider; import forestry.core.config.Constants; import forestry.core.utils.vect.IVect; @@ -35,32 +39,49 @@ public class AlleleHelper implements IAlleleHelper { public void init() { if (PluginManager.Module.APICULTURE.isEnabled()) { - createAlleles(EnumAllele.Fertility.class); - createAlleles(EnumAllele.Flowering.class); + createAlleles(EnumAllele.Fertility.class, EnumBeeChromosome.FERTILITY); + createAlleles(EnumAllele.Flowering.class, EnumBeeChromosome.FLOWERING); } if (PluginManager.Module.APICULTURE.isEnabled() || PluginManager.Module.ARBORICULTURE.isEnabled()) { - createAlleles(EnumAllele.Territory.class); + createAlleles(EnumAllele.Territory.class, + EnumBeeChromosome.TERRITORY, + EnumTreeChromosome.TERRITORY + ); AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.territoryDefault", get(EnumAllele.Territory.AVERAGE)); } if (PluginManager.Module.APICULTURE.isEnabled() || PluginManager.Module.LEPIDOPTEROLOGY.isEnabled()) { - createAlleles(EnumAllele.Speed.class); - createAlleles(EnumAllele.Lifespan.class); - createAlleles(EnumAllele.Tolerance.class); - createAlleles(EnumAllele.Flowers.class); + createAlleles(EnumAllele.Speed.class, + EnumBeeChromosome.SPEED, + EnumButterflyChromosome.SPEED + ); + createAlleles(EnumAllele.Lifespan.class, + EnumBeeChromosome.LIFESPAN, + EnumButterflyChromosome.LIFESPAN + ); + createAlleles(EnumAllele.Tolerance.class, + EnumBeeChromosome.TEMPERATURE_TOLERANCE, + EnumBeeChromosome.HUMIDITY_TOLERANCE, + EnumButterflyChromosome.TEMPERATURE_TOLERANCE, + EnumButterflyChromosome.HUMIDITY_TOLERANCE + ); + createAlleles(EnumAllele.Flowers.class, + EnumBeeChromosome.FLOWER_PROVIDER, + EnumButterflyChromosome.FLOWER_PROVIDER + ); AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("forestry.speedNorm", get(EnumAllele.Speed.NORMAL)); } if (PluginManager.Module.ARBORICULTURE.isEnabled()) { - createAlleles(EnumAllele.Height.class); - createAlleles(EnumAllele.Saplings.class); - createAlleles(EnumAllele.Yield.class); - createAlleles(EnumAllele.Fireproof.class); - createAlleles(EnumAllele.Maturation.class); - createAlleles(EnumAllele.Sappiness.class); + 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)); @@ -77,12 +98,17 @@ public class AlleleHelper implements IAlleleHelper { } if (PluginManager.Module.LEPIDOPTEROLOGY.isEnabled()) { - createAlleles(EnumAllele.Size.class); + 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, + EnumTreeChromosome.GIRTH, + EnumButterflyChromosome.METABOLISM, + EnumButterflyChromosome.FERTILITY + ); integers.put(i, alleleInteger); } alleleMaps.put(Integer.class, integers); @@ -90,6 +116,16 @@ public class AlleleHelper implements IAlleleHelper { Map booleans = new HashMap<>(); booleans.put(true, new AlleleBoolean(modId, "bool", true, false)); booleans.put(false, new AlleleBoolean(modId, "bool", false, false)); + for (IAlleleBoolean alleleBoolean : booleans.values()) { + AlleleManager.alleleRegistry.registerAllele(alleleBoolean, + EnumBeeChromosome.NOCTURNAL, + EnumBeeChromosome.TOLERANT_FLYER, + EnumBeeChromosome.CAVE_DWELLING, + EnumButterflyChromosome.NOCTURNAL, + EnumButterflyChromosome.TOLERANT_FLYER, + EnumButterflyChromosome.FIRE_RESIST + ); + } alleleMaps.put(Boolean.class, booleans); } @@ -115,6 +151,13 @@ public class AlleleHelper implements IAlleleHelper { if (!chromosomeType.getAlleleClass().isInstance(allele)) { throw new IllegalArgumentException("Allele is the wrong type. Expected: " + chromosomeType + " Got: " + allele); } + + // 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[chromosomeType.ordinal()] = allele; } @@ -133,35 +176,37 @@ public class AlleleHelper implements IAlleleHelper { set(alleles, chromosomeType, get(value)); } - private & IAlleleValue, V> void createAlleles(Class enumClass) { + private & IAlleleValue, V> void createAlleles(Class enumClass, IChromosomeType... types) { String category = enumClass.getSimpleName().toLowerCase(Locale.ENGLISH); EnumMap map = new EnumMap<>(enumClass); for (K enumValue : enumClass.getEnumConstants()) { - IAllele allele = createAllele(category, enumValue); + IAllele allele = createAllele(category, enumValue, types); map.put(enumValue, allele); } alleleMaps.put(enumClass, map); } - private static , V> IAllele createAllele(String category, K enumValue) { + private static , V> IAllele createAllele(String category, K enumValue, IChromosomeType... types) { V value = enumValue.getValue(); boolean isDominant = enumValue.isDominant(); String name = enumValue.toString().toLowerCase(Locale.ENGLISH); Class valueClass = value.getClass(); if (Float.class.isAssignableFrom(valueClass)) { - return AlleleManager.alleleFactory.createFloat(modId, category, name, (Float) value, isDominant); + return AlleleManager.alleleFactory.createFloat(modId, category, name, (Float) value, isDominant, types); } else if (Integer.class.isAssignableFrom(valueClass)) { - return AlleleManager.alleleFactory.createInteger(modId, category, name, (Integer) value, isDominant); + return AlleleManager.alleleFactory.createInteger(modId, category, name, (Integer) value, isDominant, types); } else if (IVect.class.isAssignableFrom(valueClass)) { IVect area = (IVect) value; - return AlleleManager.alleleFactory.createArea(modId, category, name, area.getX(), area.getY(), area.getZ(), isDominant); + return AlleleManager.alleleFactory.createArea(modId, category, name, area.getX(), area.getY(), area.getZ(), isDominant, types); } else if (Boolean.class.isAssignableFrom(valueClass)) { - return AlleleManager.alleleFactory.createBoolean(modId, category, (Boolean) value, isDominant); + return AlleleManager.alleleFactory.createBoolean(modId, category, (Boolean) value, isDominant, types); } else if (EnumTolerance.class.isAssignableFrom(valueClass)) { - return new AlleleTolerance(modId, category, name, (EnumTolerance) value, isDominant); + IAlleleTolerance alleleTolerance = new AlleleTolerance(modId, category, name, (EnumTolerance) value, isDominant); + AlleleManager.alleleRegistry.registerAllele(alleleTolerance, types); + return alleleTolerance; } else if (FlowerProvider.class.isAssignableFrom(valueClass)) { - return AlleleManager.alleleFactory.createFlowers(modId, category, name, (FlowerProvider) value, isDominant); + return AlleleManager.alleleFactory.createFlowers(modId, category, name, (FlowerProvider) value, isDominant, types); } throw new RuntimeException("could not create allele for category: " + category + " and value " + valueClass); } diff --git a/src/main/java/forestry/core/genetics/alleles/AllelePlantType.java b/src/main/java/forestry/core/genetics/alleles/AllelePlantType.java index bede51470..3d669e446 100644 --- a/src/main/java/forestry/core/genetics/alleles/AllelePlantType.java +++ b/src/main/java/forestry/core/genetics/alleles/AllelePlantType.java @@ -10,32 +10,49 @@ ******************************************************************************/ package forestry.core.genetics.alleles; +import java.util.Arrays; import java.util.EnumSet; +import java.util.List; import java.util.Locale; import net.minecraftforge.common.EnumPlantType; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllelePlantType; public class AllelePlantType extends AlleleCategorized implements IAllelePlantType { - public static final Allele plantTypeNone = new AllelePlantType("none", EnumSet.noneOf(EnumPlantType.class), true); - public static final Allele plantTypePlains = new AllelePlantType(EnumPlantType.Plains); - public static final Allele plantTypeDesert = new AllelePlantType(EnumPlantType.Desert); - public static final Allele plantTypeBeach = new AllelePlantType(EnumPlantType.Beach); - public static final Allele plantTypeCave = new AllelePlantType(EnumPlantType.Cave); - public static final Allele plantTypeWater = new AllelePlantType(EnumPlantType.Water); - public static final Allele plantTypeNether = new AllelePlantType(EnumPlantType.Nether); - public static final Allele plantTypeCrop = new AllelePlantType(EnumPlantType.Crop); + public static IAllelePlantType plantTypeNone; + public static IAllelePlantType plantTypePlains; + public static IAllelePlantType plantTypeDesert; + public static IAllelePlantType plantTypeBeach; + public static IAllelePlantType plantTypeCave; + public static IAllelePlantType plantTypeWater; + public static IAllelePlantType plantTypeNether; + public static IAllelePlantType plantTypeCrop; + + public static void createAlleles() { + List alleles = Arrays.asList( + plantTypeNone = new AllelePlantType("none", EnumSet.noneOf(EnumPlantType.class), true), + plantTypePlains = new AllelePlantType(EnumPlantType.Plains), + plantTypeDesert = new AllelePlantType(EnumPlantType.Desert), + plantTypeBeach = new AllelePlantType(EnumPlantType.Beach), + plantTypeCave = new AllelePlantType(EnumPlantType.Cave), + plantTypeWater = new AllelePlantType(EnumPlantType.Water), + plantTypeNether = new AllelePlantType(EnumPlantType.Nether), + plantTypeCrop = new AllelePlantType(EnumPlantType.Crop) + ); + + for (IAllelePlantType allele : alleles) { + AlleleManager.alleleRegistry.registerAllele(allele, EnumTreeChromosome.PLANT); + } + } private final EnumSet types; protected AllelePlantType(EnumPlantType type) { - this(type, false); - } - - protected AllelePlantType(EnumPlantType type, boolean isDominant) { - this(type.toString().toLowerCase(Locale.ENGLISH), EnumSet.of(type), isDominant); + this(type.toString().toLowerCase(Locale.ENGLISH), EnumSet.of(type), false); } protected AllelePlantType(String name, EnumSet types, boolean isDominant) { diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java index 8acc0d4ea..40a4d247b 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.core.genetics.alleles; +import com.google.common.collect.HashMultimap; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -25,6 +27,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleHandler; import forestry.api.genetics.IAlleleRegistry; import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IClassification; import forestry.api.genetics.IClassification.EnumClassLevel; import forestry.api.genetics.IFruitFamily; @@ -105,6 +108,8 @@ public class AlleleRegistry implements IAlleleRegistry { /* ALLELES */ private final LinkedHashMap alleleMap = new LinkedHashMap<>(ALLELE_ARRAY_SIZE); + 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); @@ -156,6 +161,18 @@ public class AlleleRegistry implements IAlleleRegistry { } } + @Override + 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); + typesByAllele.put(allele, chromosomeType); + } + registerAllele(allele); + } + @Override public void registerDeprecatedAlleleReplacement(String deprecatedUID, IAllele replacementAllele) { if (deprecatedAlleleMap.containsKey(deprecatedUID)) { @@ -176,6 +193,16 @@ public class AlleleRegistry implements IAlleleRegistry { return allele; } + @Override + public Collection getRegisteredAlleles(IChromosomeType type) { + return Collections.unmodifiableSet(allelesByType.get(type)); + } + + // 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)); + } + /* CLASSIFICATIONS */ @Override public void registerClassification(IClassification branch) { diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java index 22923cdbc..d8be0798a 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleSpecies.java @@ -47,7 +47,7 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCust private EnumHumidity humidity = EnumHumidity.NORMAL; protected AlleleSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial) { - super(uid, unlocalizedName, isDominant, false); + super(uid, unlocalizedName, isDominant); this.branch = branch; this.binomial = binomial; diff --git a/src/main/java/forestry/lepidopterology/genetics/AlleleEffect.java b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffect.java similarity index 69% rename from src/main/java/forestry/lepidopterology/genetics/AlleleEffect.java rename to src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffect.java index d51ac3f76..47f7e5e73 100644 --- a/src/main/java/forestry/lepidopterology/genetics/AlleleEffect.java +++ b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffect.java @@ -10,17 +10,23 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; +import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IEffectData; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.IAlleleButterflyEffect; import forestry.api.lepidopterology.IEntityButterfly; -import forestry.core.genetics.alleles.Allele; import forestry.core.genetics.alleles.AlleleCategorized; -public class AlleleEffect extends AlleleCategorized implements IAlleleButterflyEffect { +public class AlleleButterflyEffect extends AlleleCategorized implements IAlleleButterflyEffect { - public static Allele butterflyNone; + public static IAlleleButterflyEffect butterflyNone; - public AlleleEffect(String valueName, boolean isDominant) { + public static void createAlleles() { + butterflyNone = new AlleleButterflyEffectNone(); + AlleleManager.alleleRegistry.registerAllele(butterflyNone, EnumButterflyChromosome.EFFECT); + } + + protected AlleleButterflyEffect(String valueName, boolean isDominant) { super("forestry", "bf", valueName, isDominant); } diff --git a/src/main/java/forestry/lepidopterology/genetics/AlleleEffectNone.java b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffectNone.java similarity index 85% rename from src/main/java/forestry/lepidopterology/genetics/AlleleEffectNone.java rename to src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffectNone.java index 766d96cf5..079f29b60 100644 --- a/src/main/java/forestry/lepidopterology/genetics/AlleleEffectNone.java +++ b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflyEffectNone.java @@ -10,8 +10,8 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; -public class AlleleEffectNone extends AlleleEffect { - public AlleleEffectNone() { +public class AlleleButterflyEffectNone extends AlleleButterflyEffect { + public AlleleButterflyEffectNone() { super("none", false); } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java index c6f7bdba5..aa596b25c 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java @@ -71,7 +71,7 @@ public enum ButterflyBranchDefinition implements IBranchDefinition { 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, AlleleEffect.butterflyNone); + AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.EFFECT, AlleleButterflyEffect.butterflyNone); } return Arrays.copyOf(defaultTemplate, defaultTemplate.length); } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyFactory.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyFactory.java index 7f891b66f..45afe55a7 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyFactory.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyFactory.java @@ -14,6 +14,7 @@ import java.awt.Color; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.IAlleleButterflySpeciesCustom; import forestry.api.lepidopterology.IButterflyFactory; @@ -21,7 +22,7 @@ public class ButterflyFactory implements IButterflyFactory { @Override 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); + AlleleManager.alleleRegistry.registerAllele(species, EnumButterflyChromosome.SPECIES); return species; } } diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index e10c89ba2..5b95834c2 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -27,7 +27,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; import net.minecraft.util.IIcon; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; @@ -85,21 +84,6 @@ import forestry.apiculture.genetics.BeekeepingMode; import forestry.apiculture.genetics.HiveDrop; import forestry.apiculture.genetics.JubilanceFactory; import forestry.apiculture.genetics.alleles.AlleleEffect; -import forestry.apiculture.genetics.alleles.AlleleEffectAggressive; -import forestry.apiculture.genetics.alleles.AlleleEffectCreeper; -import forestry.apiculture.genetics.alleles.AlleleEffectExploration; -import forestry.apiculture.genetics.alleles.AlleleEffectFertile; -import forestry.apiculture.genetics.alleles.AlleleEffectFungification; -import forestry.apiculture.genetics.alleles.AlleleEffectGlacial; -import forestry.apiculture.genetics.alleles.AlleleEffectHeroic; -import forestry.apiculture.genetics.alleles.AlleleEffectIgnition; -import forestry.apiculture.genetics.alleles.AlleleEffectMisanthrope; -import forestry.apiculture.genetics.alleles.AlleleEffectNone; -import forestry.apiculture.genetics.alleles.AlleleEffectPotion; -import forestry.apiculture.genetics.alleles.AlleleEffectRadioactive; -import forestry.apiculture.genetics.alleles.AlleleEffectRepulsion; -import forestry.apiculture.genetics.alleles.AlleleEffectResurrection; -import forestry.apiculture.genetics.alleles.AlleleEffectSnowing; import forestry.apiculture.items.ItemArmorApiarist; import forestry.apiculture.items.ItemBeeGE; import forestry.apiculture.items.ItemBeealyzer; @@ -159,7 +143,6 @@ import forestry.core.recipes.ShapedRecipeCustom; import forestry.core.tiles.MachineDefinition; import forestry.core.tiles.TileAnalyzer; import forestry.core.utils.EntityUtil; -import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.Stack; import forestry.core.utils.StringUtil; @@ -1003,37 +986,13 @@ public class PluginApiculture extends ForestryPlugin { apidae.addMemberGroup(beeBranch.getBranch()); } - // / BEES // EFFECTS 1800 - 1899 - AlleleEffect.effectNone = new AlleleEffectNone("none", true); - AlleleEffect.effectAggressive = new AlleleEffectAggressive(); - AlleleEffect.effectHeroic = new AlleleEffectHeroic(); - AlleleEffect.effectBeatific = new AlleleEffectPotion("beatific", false, Potion.regeneration, 100); - AlleleEffect.effectMiasmic = new AlleleEffectPotion("miasmic", false, Potion.poison, 600, 100, 0.1f); - AlleleEffect.effectMisanthrope = new AlleleEffectMisanthrope(); - AlleleEffect.effectGlacial = new AlleleEffectGlacial(); - AlleleEffect.effectRadioactive = new AlleleEffectRadioactive(); - AlleleEffect.effectCreeper = new AlleleEffectCreeper(); - AlleleEffect.effectIgnition = new AlleleEffectIgnition(); - AlleleEffect.effectExploration = new AlleleEffectExploration(); - AlleleEffect.effectFestiveEaster = new AlleleEffectNone("festiveEaster", true); - AlleleEffect.effectSnowing = new AlleleEffectSnowing(); - AlleleEffect.effectDrunkard = new AlleleEffectPotion("drunkard", false, Potion.confusion, 100); - AlleleEffect.effectReanimation = new AlleleEffectResurrection("reanimation", AlleleEffectResurrection.getReanimationList()); - AlleleEffect.effectResurrection = new AlleleEffectResurrection("resurrection", AlleleEffectResurrection.getResurrectionList()); - AlleleEffect.effectRepulsion = new AlleleEffectRepulsion(); - AlleleEffect.effectFertile = new AlleleEffectFertile(); - AlleleEffect.effectMycophilic = new AlleleEffectFungification(); + AlleleEffect.createAlleles(); } public static double getSecondPrincessChance() { return secondPrincessChance; } - private static void parseAdditionalFlowers(String list, ArrayList target) { - List flowers = ItemStackUtil.parseItemStackStrings(list, 0); - target.addAll(flowers); - } - private static void parseBeeBlacklist(String list) { String[] items = list.split("[;]+"); parseBeeBlacklist(items); diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index fa5b7b491..77eeee17d 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -31,7 +31,6 @@ import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.VillagerRegistry; -import forestry.api.arboriculture.EnumFruitFamily; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.TreeManager; @@ -40,11 +39,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; -import forestry.arboriculture.FruitProviderNone; -import forestry.arboriculture.FruitProviderPod; -import forestry.arboriculture.FruitProviderPod.EnumPodType; -import forestry.arboriculture.FruitProviderRandom; -import forestry.arboriculture.FruitProviderRipening; import forestry.arboriculture.GuiHandlerArboriculture; import forestry.arboriculture.VillageHandlerArboriculture; import forestry.arboriculture.WoodItemAccess; @@ -57,8 +51,6 @@ import forestry.arboriculture.blocks.BlockPlanks; import forestry.arboriculture.blocks.BlockSapling; import forestry.arboriculture.blocks.BlockSlab; import forestry.arboriculture.commands.CommandTree; -import forestry.arboriculture.genetics.GrowthProvider; -import forestry.arboriculture.genetics.GrowthProviderTropical; import forestry.arboriculture.genetics.TreeBranchDefinition; import forestry.arboriculture.genetics.TreeDefinition; import forestry.arboriculture.genetics.TreeFactory; @@ -68,7 +60,6 @@ import forestry.arboriculture.genetics.TreekeepingMode; import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.arboriculture.genetics.alleles.AlleleGrowth; import forestry.arboriculture.genetics.alleles.AlleleLeafEffect; -import forestry.arboriculture.genetics.alleles.AlleleLeafEffectNone; import forestry.arboriculture.items.ItemBlockLeaves; import forestry.arboriculture.items.ItemBlockWood; import forestry.arboriculture.items.ItemGermlingGE; @@ -88,6 +79,7 @@ import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.config.GameMode; import forestry.core.fluids.Fluids; +import forestry.core.genetics.alleles.AllelePlantType; import forestry.core.items.ItemBlockForestry; import forestry.core.items.ItemFruit.EnumFruit; import forestry.core.network.PacketIdClient; @@ -362,31 +354,10 @@ public class PluginArboriculture extends ForestryPlugin { TreeBranchDefinition.createAlleles(); - // FRUITS - AlleleFruit.fruitNone = new AlleleFruit("none", new FruitProviderNone("none", null)); - AlleleFruit.fruitApple = new AlleleFruit("apple", new FruitProviderRandom("apple", EnumFruitFamily.POMES, new ItemStack(Items.apple), 1.0f).setColour(0xff2e2e).setOverlay("pomes")); - AlleleFruit.fruitCocoa = new AlleleFruit("cocoa", new FruitProviderPod("cocoa", EnumFruitFamily.JUNGLE, EnumPodType.COCOA)); - // .setColours(0xecdca5, 0xc4d24a), true); - AlleleFruit.fruitChestnut = new AlleleFruit("chestnut", new FruitProviderRipening("chestnut", EnumFruitFamily.NUX, EnumFruit.CHESTNUT.getStack(), 1.0f).setRipeningPeriod(6).setColours(0x7f333d, 0xc4d24a).setOverlay("nuts"), true); - AlleleFruit.fruitWalnut = new AlleleFruit("walnut", new FruitProviderRipening("walnut", EnumFruitFamily.NUX, EnumFruit.WALNUT.getStack(), 1.0f).setRipeningPeriod(8).setColours(0xfba248, 0xc4d24a).setOverlay("nuts"), true); - AlleleFruit.fruitCherry = new AlleleFruit("cherry", new FruitProviderRipening("cherry", EnumFruitFamily.PRUNES, EnumFruit.CHERRY.getStack(), 1.0f).setColours(0xff2e2e, 0xc4d24a).setOverlay("berries"), true); - AlleleFruit.fruitDates = new AlleleFruit("dates", new FruitProviderPod("dates", EnumFruitFamily.JUNGLE, EnumPodType.DATES, EnumFruit.DATES.getStack(4))); - AlleleFruit.fruitPapaya = new AlleleFruit("papaya", new FruitProviderPod("papaya", EnumFruitFamily.JUNGLE, EnumPodType.PAPAYA, EnumFruit.PAPAYA.getStack())); - // Allele.fruitCoconut = new AlleleFruit("fruitCoconut", new - // FruitProviderPod("coconut", jungle, EnumPodType.COCONUT, new - // ItemStack[] { new ItemStack( - // ForestryItem.fruits, 1, EnumFruit.COCONUT.ordinal()) })); - AlleleFruit.fruitLemon = new AlleleFruit("lemon", new FruitProviderRipening("lemon", EnumFruitFamily.PRUNES, EnumFruit.LEMON.getStack(), 1.0f).setColours(0xeeee00, 0x99ff00).setOverlay("citrus"), true); - AlleleFruit.fruitPlum = new AlleleFruit("plum", new FruitProviderRipening("plum", EnumFruitFamily.PRUNES, EnumFruit.PLUM.getStack(), 1.0f).setColours(0x663446, 0xeeff1a).setOverlay("plums"), true); - - // / TREES // GROWTH PROVIDER 1350 - 1399 - AlleleGrowth.growthLightlevel = new AlleleGrowth("lightlevel", new GrowthProvider()); - AlleleGrowth.growthAcacia = new AlleleGrowth("acacia", new GrowthProvider()); - AlleleGrowth.growthTropical = new AlleleGrowth("tropical", new GrowthProviderTropical()); - - // / TREES // EFFECTS 1900 - 1999 - AlleleLeafEffect.leavesNone = new AlleleLeafEffectNone(); - + AlleleFruit.createAlleles(); + AlleleGrowth.createAlleles(); + AlleleLeafEffect.createAlleles(); + AllelePlantType.createAlleles(); } private static void registerErsatzGenomes() { diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index b2a20e61d..ccaa11863 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -45,8 +45,7 @@ import forestry.lepidopterology.ButterflySpawner; import forestry.lepidopterology.GuiHandlerLepidopterology; import forestry.lepidopterology.commands.CommandButterfly; import forestry.lepidopterology.entities.EntityButterfly; -import forestry.lepidopterology.genetics.AlleleEffect; -import forestry.lepidopterology.genetics.AlleleEffectNone; +import forestry.lepidopterology.genetics.AlleleButterflyEffect; import forestry.lepidopterology.genetics.ButterflyBranchDefinition; import forestry.lepidopterology.genetics.ButterflyDefinition; import forestry.lepidopterology.genetics.ButterflyFactory; @@ -84,7 +83,7 @@ public class PluginLepidopterology extends ForestryPlugin { ForestryBlock.lepidopterology.block().setCreativeTab(Tabs.tabLepidopterology); ButterflyBranchDefinition.createAlleles(); - AlleleEffect.butterflyNone = new AlleleEffectNone(); + AlleleButterflyEffect.createAlleles(); } @Override