diff options
Diffstat (limited to 'src/main/java/gregtech/common/bees')
3 files changed, 81 insertions, 84 deletions
diff --git a/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java b/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java index 8c8852c189..e3b916db88 100644 --- a/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java +++ b/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java @@ -1,24 +1,20 @@ package gregtech.common.bees; +import java.awt.*; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IAlleleBeeSpeciesCustom; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; import forestry.apiculture.genetics.alleles.AlleleBeeSpecies; -import java.awt.*; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class GT_AlleleBeeSpecies extends AlleleBeeSpecies { - public GT_AlleleBeeSpecies( - String uid, - boolean dominant, - String unlocalizedName, - String authority, - String unlocalizedDescription, - IClassification branch, - String binomial, - Color primaryColor, + + public GT_AlleleBeeSpecies(String uid, boolean dominant, String unlocalizedName, String authority, + String unlocalizedDescription, IClassification branch, String binomial, Color primaryColor, Color secondaryColor) { super( uid, diff --git a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java index 46175730e9..9143536dbd 100644 --- a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java +++ b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java @@ -1,5 +1,12 @@ package gregtech.common.bees; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +import org.apache.commons.lang3.reflect.FieldUtils; + import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.*; @@ -10,11 +17,6 @@ import forestry.core.genetics.alleles.*; import forestry.core.utils.vect.IVect; import forestry.plugins.PluginManager; import gregtech.GT_Mod; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import org.apache.commons.lang3.reflect.FieldUtils; public class GT_AlleleHelper extends AlleleHelper { @@ -33,7 +35,8 @@ public class GT_AlleleHelper extends AlleleHelper { createAlleles(EnumAllele.Territory.class, EnumBeeChromosome.TERRITORY, EnumTreeChromosome.TERRITORY); AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( - "forestry.territoryDefault", get(EnumAllele.Territory.AVERAGE)); + "forestry.territoryDefault", + get(EnumAllele.Territory.AVERAGE)); } if (PluginManager.Module.APICULTURE.isEnabled() || PluginManager.Module.LEPIDOPTEROLOGY.isEnabled()) { @@ -50,8 +53,8 @@ public class GT_AlleleHelper extends AlleleHelper { EnumBeeChromosome.FLOWER_PROVIDER, EnumButterflyChromosome.FLOWER_PROVIDER); - AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( - "forestry.speedNorm", get(EnumAllele.Speed.NORMAL)); + AlleleManager.alleleRegistry + .registerDeprecatedAlleleReplacement("forestry.speedNorm", get(EnumAllele.Speed.NORMAL)); } if (PluginManager.Module.ARBORICULTURE.isEnabled()) { @@ -62,30 +65,33 @@ public class GT_AlleleHelper extends AlleleHelper { 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.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)); + "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.maturitySlower", get(EnumAllele.Maturation.SLOWER)); + "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.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)); + "forestry.maturityFastest", + get(EnumAllele.Maturation.FASTEST)); } if (PluginManager.Module.LEPIDOPTEROLOGY.isEnabled()) { @@ -126,7 +132,9 @@ public class GT_AlleleHelper extends AlleleHelper { try { helper.alleleMaps = (Map<Class<?>, Map<?, ? extends IAllele>>) FieldUtils.readField( - FieldUtils.getField(AlleleHelper.class, "alleleMaps", true), AlleleHelper.instance, true); + FieldUtils.getField(AlleleHelper.class, "alleleMaps", true), + AlleleHelper.instance, + true); } catch (IllegalAccessException e) { e.printStackTrace(); } @@ -149,11 +157,11 @@ public class GT_AlleleHelper extends AlleleHelper { } // uncomment this once all addon mods are using the allele registration with IChromosomeType - // Collection<IChromosomeType> 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 + // Collection<IChromosomeType> 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; } @@ -182,6 +190,7 @@ public class GT_AlleleHelper extends AlleleHelper { IAllele allele = map.get(value); if (allele == null) { allele = new IAllele() { + @Override public String getUID() { return "NOT_FOUND"; @@ -216,8 +225,8 @@ public class GT_AlleleHelper extends AlleleHelper { alleleMaps.put(enumClass, map); } - private static <K extends IAlleleValue<V>, V> IAllele createAllele( - String category, K enumValue, IChromosomeType... types) { + private static <K extends IAlleleValue<V>, V> IAllele createAllele(String category, K enumValue, + IChromosomeType... types) { V value = enumValue.getValue(); boolean isDominant = enumValue.isDominant(); String name = enumValue.toString().toLowerCase(Locale.ENGLISH); @@ -229,18 +238,22 @@ public class GT_AlleleHelper extends AlleleHelper { 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, types); + 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, types); } else if (EnumTolerance.class.isAssignableFrom(valueClass)) { - IAlleleTolerance alleleTolerance = - 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, types); + 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/gregtech/common/bees/GT_Bee_Mutation.java b/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java index 357c7b9c36..7e78ef8fcd 100644 --- a/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java +++ b/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java @@ -1,5 +1,13 @@ package gregtech.common.bees; +import java.lang.reflect.Field; +import java.util.List; + +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; + +import org.apache.commons.lang3.reflect.FieldUtils; + import forestry.api.apiculture.*; import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; @@ -7,11 +15,6 @@ import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; import forestry.apiculture.genetics.BeeMutation; import forestry.core.genetics.mutations.Mutation; -import java.lang.reflect.Field; -import java.util.List; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.World; -import org.apache.commons.lang3.reflect.FieldUtils; public class GT_Bee_Mutation extends BeeMutation { @@ -29,12 +32,8 @@ public class GT_Bee_Mutation extends BeeMutation { } @Override - public float getChance( - IBeeHousing housing, - IAlleleBeeSpecies allele0, - IAlleleBeeSpecies allele1, - IBeeGenome genome0, - IBeeGenome genome1) { + public float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, + IBeeGenome genome0, IBeeGenome genome1) { World world = housing != null ? housing.getWorld() : null; ChunkCoordinates housingCoordinates = housing != null ? housing.getCoordinates() : null; int x = housingCoordinates != null ? housingCoordinates.posX : 0; @@ -48,8 +47,7 @@ public class GT_Bee_Mutation extends BeeMutation { } IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); - IBeeModifier beeModeModifier = - BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier(); + IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier(); processedChance *= beeHousingModifier.getMutationModifier(genome0, genome1, processedChance); processedChance *= beeModeModifier.getMutationModifier(genome0, genome1, processedChance); @@ -58,16 +56,8 @@ public class GT_Bee_Mutation extends BeeMutation { } @SuppressWarnings("unchecked") - private float getBasicChance( - World world, - int x, - int y, - int z, - IAllele allele0, - IAllele allele1, - IGenome genome0, - IGenome genome1, - IClimateProvider climate) { + private float getBasicChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, + IGenome genome1, IClimateProvider climate) { float mutationChance = this.getBaseChance(); List<IMutationCondition> mutationConditions = null; Field f = FieldUtils.getDeclaredField(Mutation.class, "mutationConditions", true); @@ -79,14 +69,12 @@ public class GT_Bee_Mutation extends BeeMutation { e.printStackTrace(); } - if (mutationConditions != null) - for (IMutationCondition mutationCondition : mutationConditions) { - mutationChance *= - mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1, climate); - if (mutationChance == 0) { - return 0; - } + if (mutationConditions != null) for (IMutationCondition mutationCondition : mutationConditions) { + mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1, climate); + if (mutationChance == 0) { + return 0; } + } return mutationChance; } } |