aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/bees
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
committerRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
commit8ac58626bd4caa9e49f58acc6b97ac031f6c2107 (patch)
tree0a8c7b737f1f2607fa6875309f4c6a5c2b8b3331 /src/main/java/gregtech/common/bees
parentd795cf740c3b48b602d3bfb708ed9e6c492ad37d (diff)
downloadGT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.gz
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.bz2
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.zip
Update spotless config to 0.2.2
Diffstat (limited to 'src/main/java/gregtech/common/bees')
-rw-r--r--src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java22
-rw-r--r--src/main/java/gregtech/common/bees/GT_AlleleHelper.java152
-rw-r--r--src/main/java/gregtech/common/bees/GT_Bee_Mutation.java6
3 files changed, 76 insertions, 104 deletions
diff --git a/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java b/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java
index e3b916db88..d4aa78ecf3 100644
--- a/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java
+++ b/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java
@@ -14,18 +14,18 @@ import forestry.apiculture.genetics.alleles.AlleleBeeSpecies;
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,
- Color secondaryColor) {
+ String unlocalizedDescription, IClassification branch, String binomial, Color primaryColor,
+ Color secondaryColor) {
super(
- uid,
- unlocalizedName,
- authority,
- unlocalizedDescription,
- dominant,
- branch,
- binomial,
- primaryColor.getRGB(),
- secondaryColor.getRGB());
+ uid,
+ unlocalizedName,
+ authority,
+ unlocalizedDescription,
+ dominant,
+ branch,
+ binomial,
+ primaryColor.getRGB(),
+ secondaryColor.getRGB());
AlleleManager.alleleRegistry.registerAllele(this, EnumBeeChromosome.SPECIES);
}
diff --git a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java
index 8c605f95c6..c9e37f7824 100644
--- a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java
+++ b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java
@@ -34,28 +34,26 @@ public class GT_AlleleHelper extends AlleleHelper {
if (PluginManager.Module.APICULTURE.isEnabled() || PluginManager.Module.ARBORICULTURE.isEnabled()) {
createAlleles(EnumAllele.Territory.class, EnumBeeChromosome.TERRITORY, EnumTreeChromosome.TERRITORY);
- AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement(
- "forestry.territoryDefault",
- get(EnumAllele.Territory.AVERAGE));
+ AlleleManager.alleleRegistry
+ .registerDeprecatedAlleleReplacement("forestry.territoryDefault", get(EnumAllele.Territory.AVERAGE));
}
if (PluginManager.Module.APICULTURE.isEnabled() || PluginManager.Module.LEPIDOPTEROLOGY.isEnabled()) {
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);
+ 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);
+ EnumAllele.Flowers.class,
+ 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()) {
@@ -66,42 +64,30 @@ 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.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));
+ 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 (PluginManager.Module.LEPIDOPTEROLOGY.isEnabled()) {
@@ -112,10 +98,10 @@ public class GT_AlleleHelper extends AlleleHelper {
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);
+ alleleInteger,
+ EnumTreeChromosome.GIRTH,
+ EnumButterflyChromosome.METABOLISM,
+ EnumButterflyChromosome.FERTILITY);
integers.put(i, alleleInteger);
}
alleleMaps.put(Integer.class, integers);
@@ -125,13 +111,13 @@ public class GT_AlleleHelper extends AlleleHelper {
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);
+ alleleBoolean,
+ EnumBeeChromosome.NOCTURNAL,
+ EnumBeeChromosome.TOLERANT_FLYER,
+ EnumBeeChromosome.CAVE_DWELLING,
+ EnumButterflyChromosome.NOCTURNAL,
+ EnumButterflyChromosome.TOLERANT_FLYER,
+ EnumButterflyChromosome.FIRE_RESIST);
}
alleleMaps.put(Boolean.class, booleans);
}
@@ -141,10 +127,8 @@ public class GT_AlleleHelper extends AlleleHelper {
GT_AlleleHelper helper = new GT_AlleleHelper();
try {
- helper.alleleMaps = (Map<Class<?>, Map<?, ? extends IAllele>>) FieldUtils.readField(
- FieldUtils.getField(AlleleHelper.class, "alleleMaps", true),
- AlleleHelper.instance,
- true);
+ helper.alleleMaps = (Map<Class<?>, Map<?, ? extends IAllele>>) FieldUtils
+ .readField(FieldUtils.getField(AlleleHelper.class, "alleleMaps", true), AlleleHelper.instance, true);
} catch (IllegalAccessException e) {
e.printStackTrace();
}
@@ -162,7 +146,7 @@ public class GT_AlleleHelper extends AlleleHelper {
}
if (!chromosomeType.getAlleleClass()
- .isInstance(allele)) {
+ .isInstance(allele)) {
GT_Mod.GT_FML_LOGGER.info("chromosomeType is not an instance of allele!" + allele.getName());
return;
}
@@ -228,7 +212,7 @@ public class GT_AlleleHelper extends AlleleHelper {
private <K extends Enum<K> & IAlleleValue<V>, V> void createAlleles(Class<K> enumClass, IChromosomeType... types) {
String category = enumClass.getSimpleName()
- .toLowerCase(Locale.ENGLISH);
+ .toLowerCase(Locale.ENGLISH);
EnumMap<K, IAllele> map = new EnumMap<>(enumClass);
for (K enumValue : enumClass.getEnumConstants()) {
IAllele allele = createAllele(category, enumValue, types);
@@ -238,11 +222,11 @@ public class GT_AlleleHelper extends AlleleHelper {
}
private static <K extends IAlleleValue<V>, V> IAllele createAllele(String category, K enumValue,
- IChromosomeType... types) {
+ IChromosomeType... types) {
V value = enumValue.getValue();
boolean isDominant = enumValue.isDominant();
String name = enumValue.toString()
- .toLowerCase(Locale.ENGLISH);
+ .toLowerCase(Locale.ENGLISH);
Class<?> valueClass = value.getClass();
if (Float.class.isAssignableFrom(valueClass)) {
@@ -251,34 +235,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);
+ 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 b79fb98c73..17a764e2b9 100644
--- a/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java
+++ b/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java
@@ -33,7 +33,7 @@ public class GT_Bee_Mutation extends BeeMutation {
@Override
public float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1,
- IBeeGenome genome0, IBeeGenome genome1) {
+ 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,7 +48,7 @@ public class GT_Bee_Mutation extends BeeMutation {
IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing);
IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world)
- .getBeeModifier();
+ .getBeeModifier();
processedChance *= beeHousingModifier.getMutationModifier(genome0, genome1, processedChance);
processedChance *= beeModeModifier.getMutationModifier(genome0, genome1, processedChance);
@@ -58,7 +58,7 @@ 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) {
+ IGenome genome1, IClimateProvider climate) {
float mutationChance = this.getBaseChance();
List<IMutationCondition> mutationConditions = null;
Field f = FieldUtils.getDeclaredField(Mutation.class, "mutationConditions", true);