Update buildscript & apply spotless (#1306)

* Update dependencies

* Update buildscript, apply spotless

3 files changed, 109 insertions, 82 deletions

diff --git a/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java b/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java
index 41726b4fc5..8c8852c189 100644
--- a/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java
+++ b/src/main/java/gregtech/common/bees/GT_AlleleBeeSpecies.java
@@ -5,45 +5,53 @@ 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;
 
-import java.awt.*;
-
 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) {
-        super(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, primaryColor.getRGB(), secondaryColor.getRGB());
+    public GT_AlleleBeeSpecies(
+            String uid,
+            boolean dominant,
+            String unlocalizedName,
+            String authority,
+            String unlocalizedDescription,
+            IClassification branch,
+            String binomial,
+            Color primaryColor,
+            Color secondaryColor) {
+        super(
+                uid,
+                unlocalizedName,
+                authority,
+                unlocalizedDescription,
+                dominant,
+                branch,
+                binomial,
+                primaryColor.getRGB(),
+                secondaryColor.getRGB());
         AlleleManager.alleleRegistry.registerAllele(this, EnumBeeChromosome.SPECIES);
     }
 
     @Override
     public IAlleleBeeSpeciesCustom addProduct(ItemStack product, Float chance) {
         if (product == null || product.getItem() == null) {
-            product=new ItemStack(Items.boat);
+            product = new ItemStack(Items.boat);
         }
         if (chance <= 0.0f || chance > 1.0f) {
             chance = 0.1f;
         }
-        return super.addProduct(product,chance);
+        return super.addProduct(product, chance);
     }
 
     @Override
     public IAlleleBeeSpeciesCustom addSpecialty(ItemStack specialty, Float chance) {
         if (specialty == null || specialty.getItem() == null) {
-            specialty=new ItemStack(Items.boat);
+            specialty = new ItemStack(Items.boat);
         }
         if (chance <= 0.0f || chance > 1.0f) {
             chance = 0.1f;
         }
         return super.addSpecialty(specialty, chance);
     }
-
 }
diff --git a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java
index 4a47bfa46e..46175730e9 100644
--- a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java
+++ b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java
@@ -10,12 +10,11 @@ import forestry.core.genetics.alleles.*;
 import forestry.core.utils.vect.IVect;
 import forestry.plugins.PluginManager;
 import gregtech.GT_Mod;
-import org.apache.commons.lang3.reflect.FieldUtils;
-
 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 {
 
@@ -31,35 +30,28 @@ public class GT_AlleleHelper extends AlleleHelper {
         }
 
         if (PluginManager.Module.APICULTURE.isEnabled() || PluginManager.Module.ARBORICULTURE.isEnabled()) {
-            createAlleles(EnumAllele.Territory.class,
-                    EnumBeeChromosome.TERRITORY,
-                    EnumTreeChromosome.TERRITORY
-            );
+            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,
+            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,
+                    EnumButterflyChromosome.HUMIDITY_TOLERANCE);
+            createAlleles(
+                    EnumAllele.Flowers.class,
                     EnumBeeChromosome.FLOWER_PROVIDER,
-                    EnumButterflyChromosome.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()) {
@@ -70,18 +62,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()) {
@@ -91,11 +95,11 @@ public class GT_AlleleHelper extends AlleleHelper {
         Map<Integer, IAlleleInteger> integers = new HashMap<>();
         for (int i = 1; i <= 10; i++) {
             IAlleleInteger alleleInteger = new AlleleInteger(modId, "i", i + "d", i, true);
-            AlleleManager.alleleRegistry.registerAllele(alleleInteger,
+            AlleleManager.alleleRegistry.registerAllele(
+                    alleleInteger,
                     EnumTreeChromosome.GIRTH,
                     EnumButterflyChromosome.METABOLISM,
-                    EnumButterflyChromosome.FERTILITY
-            );
+                    EnumButterflyChromosome.FERTILITY);
             integers.put(i, alleleInteger);
         }
         alleleMaps.put(Integer.class, integers);
@@ -104,34 +108,31 @@ public class GT_AlleleHelper extends AlleleHelper {
         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,
+            AlleleManager.alleleRegistry.registerAllele(
+                    alleleBoolean,
                     EnumBeeChromosome.NOCTURNAL,
                     EnumBeeChromosome.TOLERANT_FLYER,
                     EnumBeeChromosome.CAVE_DWELLING,
                     EnumButterflyChromosome.NOCTURNAL,
                     EnumButterflyChromosome.TOLERANT_FLYER,
-                    EnumButterflyChromosome.FIRE_RESIST
-            );
+                    EnumButterflyChromosome.FIRE_RESIST);
         }
         alleleMaps.put(Boolean.class, booleans);
     }
+
     @SuppressWarnings("unchecked")
-    public static void initialisation(){
+    public static void initialisation() {
         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();
         }
 
         AlleleHelper.instance = helper;
-        //AlleleHelper.instance.init();
+        // AlleleHelper.instance.init();
     }
 
     @Override
@@ -143,14 +144,15 @@ public class GT_AlleleHelper extends AlleleHelper {
         }
 
         if (!chromosomeType.getAlleleClass().isInstance(allele)) {
-            GT_Mod.GT_FML_LOGGER.info("chromosomeType is not an instance of allele!"+allele.getName());
+            GT_Mod.GT_FML_LOGGER.info("chromosomeType is not an instance of allele!" + allele.getName());
             return;
         }
 
         // 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 + " Got: " + chromosomeType);
+        //			throw new IllegalArgumentException("Allele can't applied to this Chromosome type. Expected: " + validTypes
+        // + " Got: " + chromosomeType);
         //		}
 
         alleles[chromosomeType.ordinal()] = allele;
@@ -213,7 +215,9 @@ 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);
@@ -225,15 +229,18 @@ 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 a4a162ddae..357c7b9c36 100644
--- a/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java
+++ b/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java
@@ -7,14 +7,12 @@ 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;
 
-import java.lang.reflect.Field;
-import java.util.List;
-
-
 public class GT_Bee_Mutation extends BeeMutation {
 
     private final float split;
@@ -31,7 +29,12 @@ 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;
@@ -45,7 +48,8 @@ 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);
@@ -54,14 +58,21 @@ 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);
-        if (f == null)
-            f = FieldUtils.getField(Mutation.class, "mutationConditions", true);
-        if (f == null)
-            return mutationChance;
+        if (f == null) f = FieldUtils.getField(Mutation.class, "mutationConditions", true);
+        if (f == null) return mutationChance;
         try {
             mutationConditions = f.get(this) instanceof List ? (List<IMutationCondition>) f.get(this) : null;
         } catch (IllegalAccessException e) {
@@ -70,7 +81,8 @@ public class GT_Bee_Mutation extends BeeMutation {
 
         if (mutationConditions != null)
             for (IMutationCondition mutationCondition : mutationConditions) {
-                mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1, climate);
+                mutationChance *=
+                        mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1, climate);
                 if (mutationChance == 0) {
                     return 0;
                 }