Update buildscript & apply spotless (#1306)

* Update dependencies

* Update buildscript, apply spotless

5 files changed, 2075 insertions, 1195 deletions

diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
index e7a34e13d3..c0a89e723c 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -15,6 +15,7 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import ic2.core.Ic2Items;
+import java.util.concurrent.ConcurrentHashMap;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -27,11 +28,9 @@ import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
 import net.minecraftforge.fluids.FluidStack;
 import thaumcraft.api.ThaumcraftApiHelper;
 
-import java.util.concurrent.ConcurrentHashMap;
-
 public class GT_Achievements {
     public static int oreReg = -1;
-    public static int assReg=-1;
+    public static int assReg = -1;
     public ConcurrentHashMap<String, Achievement> achievementList;
     public ConcurrentHashMap<String, Boolean> issuedAchievements;
     public int adjX = 5;
@@ -41,10 +40,16 @@ public class GT_Achievements {
         this.achievementList = new ConcurrentHashMap<>();
         this.issuedAchievements = new ConcurrentHashMap<>();
 
-        for(GT_Recipe recipe: GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList)
+        for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList)
             registerAssAchievement(recipe);
 
-        registerAchievement("flintpick", 0, 0, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null), "", false);
+        registerAchievement(
+                "flintpick",
+                0,
+                0,
+                GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null),
+                "",
+                false);
         registerAchievement("crops", -4, 0, GT_ModHandler.getIC2Item("crop", 1L), "flintpick", false);
         registerAchievement("havestlead", -4, 2, ItemList.Crop_Drop_Plumbilia.get(1), "crops", false);
         registerAchievement("havestcopper", -2, 1, ItemList.Crop_Drop_Coppon.get(1), "crops", false);
@@ -55,33 +60,107 @@ public class GT_Achievements {
         registerAchievement("havestsilver", -4, -5, ItemList.Crop_Drop_Argentia.get(1), "havestiron", false);
         registerAchievement("havestemeralds", -2, -8, ItemList.Crop_Drop_BobsYerUncleRanks.get(1), "havestgold", false);
 
-        registerAchievement("tools", 0, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Iron, Materials.Wood, null), "flintpick", false);
-        registerAchievement("driltime", 2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.DRILL_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null), "tools", false);
-        registerAchievement("brrrr", 2, 6, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null), "driltime", false);
-        registerAchievement("highpowerdrill", 3, 5, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.DRILL_HV, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), "driltime", false);
-        registerAchievement("hammertime", 3, 7, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.JACKHAMMER, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), "highpowerdrill", false);
+        registerAchievement(
+                "tools",
+                0,
+                4,
+                GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
+                        GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Iron, Materials.Wood, null),
+                "flintpick",
+                false);
+        registerAchievement(
+                "driltime",
+                2,
+                4,
+                GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
+                        GT_MetaGenerated_Tool_01.DRILL_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null),
+                "tools",
+                false);
+        registerAchievement(
+                "brrrr",
+                2,
+                6,
+                GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
+                        GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null),
+                "driltime",
+                false);
+        registerAchievement(
+                "highpowerdrill",
+                3,
+                5,
+                GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
+                        GT_MetaGenerated_Tool_01.DRILL_HV, 1, Materials.TungstenSteel, Materials.TungstenSteel, null),
+                "driltime",
+                false);
+        registerAchievement(
+                "hammertime",
+                3,
+                7,
+                GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
+                        GT_MetaGenerated_Tool_01.JACKHAMMER, 1, Materials.TungstenSteel, Materials.TungstenSteel, null),
+                "highpowerdrill",
+                false);
         registerAchievement("repair", 4, 5, ItemList.Machine_HV_Disassembler.get(1), "highpowerdrill", false);
 
-        registerAchievement("unitool", -2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, Materials.Steel, Materials.Iron, null), "tools", false);
+        registerAchievement(
+                "unitool",
+                -2,
+                4,
+                GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(
+                        GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, Materials.Steel, Materials.Iron, null),
+                "tools",
+                false);
         registerAchievement("recycling", -4, 4, ItemList.Machine_LV_ArcFurnace.get(1), "unitool", false);
 
-        registerAchievement("crushed", 0, 6, GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L), "tools", false);
-        registerAchievement("cleandust", 0, 10, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), "crushed", false);
-        registerAchievement("washing", -2, 6, GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Iron, 1L), "crushed", false);
-        registerAchievement("spinit", -4, 6, GT_OreDictUnificator.get(OrePrefixes.crushedCentrifuged, Materials.Redstone, 1L), "crushed", false);
-        if(!GregTech_API.mIC2Classic){
-        	registerAchievement("newfuel", -4, 8, ItemList.ThoriumCell_4.get(1), "spinit", false);
-        	registerAchievement("newmetal", -4, 10, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L), "newfuel", false);
-        	registerAchievement("reflect", -2, 9, ItemList.Neutron_Reflector.get(1), "newfuel", false);
+        registerAchievement(
+                "crushed", 0, 6, GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L), "tools", false);
+        registerAchievement(
+                "cleandust",
+                0,
+                10,
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L),
+                "crushed",
+                false);
+        registerAchievement(
+                "washing",
+                -2,
+                6,
+                GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Iron, 1L),
+                "crushed",
+                false);
+        registerAchievement(
+                "spinit",
+                -4,
+                6,
+                GT_OreDictUnificator.get(OrePrefixes.crushedCentrifuged, Materials.Redstone, 1L),
+                "crushed",
+                false);
+        if (!GregTech_API.mIC2Classic) {
+            registerAchievement("newfuel", -4, 8, ItemList.ThoriumCell_4.get(1), "spinit", false);
+            registerAchievement(
+                    "newmetal",
+                    -4,
+                    10,
+                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L),
+                    "newfuel",
+                    false);
+            registerAchievement("reflect", -2, 9, ItemList.Neutron_Reflector.get(1), "newfuel", false);
         }
-        registerAchievement("bronze", 2, 0, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 1L), "flintpick", false);
-        registerAchievement("simplyeco", 2, 2, ItemList.Machine_Bronze_Boiler_Solar.get(1, ItemList.Machine_HP_Solar.get(1L)), "bronze", false);
+        registerAchievement(
+                "bronze", 2, 0, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 1L), "flintpick", false);
+        registerAchievement(
+                "simplyeco",
+                2,
+                2,
+                ItemList.Machine_Bronze_Boiler_Solar.get(1, ItemList.Machine_HP_Solar.get(1L)),
+                "bronze",
+                false);
         registerAchievement("firststeam", 2, -2, ItemList.Machine_Bronze_Boiler.get(1), "bronze", false);
         registerAchievement("alloysmelter", 2, -4, ItemList.Machine_Bronze_AlloySmelter.get(1), "firststeam", false);
         registerAchievement("macerator", 0, -2, ItemList.Machine_Bronze_Macerator.get(1), "firststeam", false);
         registerAchievement("extract", 0, -4, ItemList.Machine_Bronze_Extractor.get(1), "alloysmelter", false);
 
-        registerAchievement("smallparts", 0, -5, ItemList.Circuit_Primitive.get(1), "alloysmelter", false);        
+        registerAchievement("smallparts", 0, -5, ItemList.Circuit_Primitive.get(1), "alloysmelter", false);
         registerAchievement("gtbasiccircuit", 0, -8, Ic2Items.electronicCircuit.copy(), "smallparts", false);
         registerAchievement("bettercircuits", 0, -9, ItemList.Circuit_Good.get(1), "gtbasiccircuit", false);
         registerAchievement("stepforward", -2, -9, Ic2Items.advancedCircuit.copy(), "bettercircuits", false);
@@ -90,11 +169,13 @@ public class GT_Achievements {
         registerAchievement("gtlogiccircuit", -9, -10, ItemList.Circuit_Basic.get(1), "gtlogicwafer", false);
         registerAchievement("gtcleanroom", -11, -10, ItemList.Machine_Multi_Cleanroom.get(1), "gtlogiccircuit", false);
         registerAchievement("energyflow", -13, -10, ItemList.Circuit_Nanoprocessor.get(1), "gtcleanroom", false);
-        registerAchievement("gtquantumprocessor", -13, -12, ItemList.Circuit_Quantumprocessor.get(1), "energyflow", false);
-        registerAchievement("gtcrystalprocessor", -11, -12, ItemList.Circuit_Crystalprocessor.get(1), "gtquantumprocessor", false);
+        registerAchievement(
+                "gtquantumprocessor", -13, -12, ItemList.Circuit_Quantumprocessor.get(1), "energyflow", false);
+        registerAchievement(
+                "gtcrystalprocessor", -11, -12, ItemList.Circuit_Crystalprocessor.get(1), "gtquantumprocessor", false);
         registerAchievement("gtwetware", -9, -12, ItemList.Circuit_Neuroprocessor.get(1), "gtcrystalprocessor", false);
         registerAchievement("gtwetmain", -7, -12, ItemList.Circuit_Wetwaremainframe.get(1), "gtwetware", false);
-        
+
         registerAchievement("orbs", -10, -14, ItemList.Energy_LapotronicOrb.get(1), "energyflow", false);
         registerAchievement("thatspower", -8, -14, ItemList.Energy_LapotronicOrb2.get(1), "orbs", false);
         registerAchievement("datasaving", -2, -12, ItemList.Tool_DataOrb.get(1), "stepforward", false);
@@ -103,13 +184,27 @@ public class GT_Achievements {
         registerAchievement("whereistheocean", 2, -14, ItemList.Quantum_Tank_IV.get(1), "superbuffer", false);
         registerAchievement("luck", 2, -6, ItemList.ZPM.get(1), "", false);
 
-        registerAchievement("steel", 4, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), "bronze", false);
+        registerAchievement(
+                "steel", 4, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), "bronze", false);
         registerAchievement("highpressure", 4, 2, ItemList.Machine_Steel_Boiler.get(1), "steel", false);
-        registerAchievement("extremepressure", 4, 4, ItemList.Machine_Multi_LargeBoiler_Steel.get(1), "highpressure", false);
+        registerAchievement(
+                "extremepressure", 4, 4, ItemList.Machine_Multi_LargeBoiler_Steel.get(1), "highpressure", false);
         registerAchievement("cheapermac", 6, 1, ItemList.Machine_LV_Hammer.get(1), "steel", false);
-        registerAchievement("complexalloys", 6, 3, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.BlueSteel, 1L), "cheapermac", false);
-
-        registerAchievement("magneticiron", 4, -2, GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), "steel", false);
+        registerAchievement(
+                "complexalloys",
+                6,
+                3,
+                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.BlueSteel, 1L),
+                "cheapermac",
+                false);
+
+        registerAchievement(
+                "magneticiron",
+                4,
+                -2,
+                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L),
+                "steel",
+                false);
         registerAchievement("lvmotor", 4, -6, ItemList.Electric_Motor_LV.get(1), "magneticiron", false);
         registerAchievement("pumpcover", 2, -8, ItemList.Electric_Pump_LV.get(1), "lvmotor", false);
         registerAchievement("closeit", 2, -10, ItemList.Cover_Shutter.get(1), "pumpcover", false);
@@ -128,7 +223,13 @@ public class GT_Achievements {
         registerAchievement("ebf", 8, -6, ItemList.Machine_Multi_BlastFurnace.get(1), "steampower", false);
         registerAchievement("energyhatch", 12, -6, ItemList.Hatch_Energy_LV.get(1), "ebf", false);
 
-        registerAchievement("gtaluminium", 8, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 1L), "steel", false);
+        registerAchievement(
+                "gtaluminium",
+                8,
+                0,
+                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 1L),
+                "steel",
+                false);
         registerAchievement("highpowersmelt", 8, 2, ItemList.Machine_Multi_Furnace.get(1), "gtaluminium", false);
         registerAchievement("oilplant", 8, 4, ItemList.Distillation_Tower.get(1), "highpowersmelt", false);
         registerAchievement("factory", 8, 6, ItemList.Processing_Array.get(1), "oilplant", false);
@@ -136,7 +237,8 @@ public class GT_Achievements {
         registerAchievement("maintainance", 10, -2, ItemList.Hatch_Maintenance.get(1), "upgradeebf", false);
 
         registerAchievement("upgrade", 10, 0, ItemList.Casing_Coil_Kanthal.get(1), "gtaluminium", false);
-        registerAchievement("titan", 14, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), "upgrade", false);
+        registerAchievement(
+                "titan", 14, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), "upgrade", false);
         registerAchievement("magic", 14, 3, ItemList.MagicEnergyConverter_LV.get(1), "titan", false);
         registerAchievement("highmage", 10, 3, ItemList.MagicEnergyAbsorber_HV.get(1), "magic", false);
         registerAchievement("artificaldia", 12, 2, ItemList.IC2_Industrial_Diamond.get(1), "titan", false);
@@ -144,8 +246,15 @@ public class GT_Achievements {
         registerAchievement("efficientsteam", 11, 1, ItemList.LargeSteamTurbine.get(1), "muchsteam", false);
 
         registerAchievement("upgrade2", 16, 0, ItemList.Casing_Coil_Nichrome.get(1), "titan", false);
-        registerAchievement("tungsten", 16, 2, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tungsten, 1L), "upgrade2", false);
-        registerAchievement("osmium", 16, -2, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), "upgrade2", false);
+        registerAchievement(
+                "tungsten",
+                16,
+                2,
+                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tungsten, 1L),
+                "upgrade2",
+                false);
+        registerAchievement(
+                "osmium", 16, -2, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), "upgrade2", false);
         registerAchievement("hightech", 15, -3, ItemList.Field_Generator_LV.get(1), "osmium", false);
         registerAchievement("amplifier", 16, -5, ItemList.Machine_LV_Amplifab.get(1), "hightech", false);
         registerAchievement("scanning", 13, -3, ItemList.Machine_HV_Scanner.get(1), "hightech", false);
@@ -153,11 +262,24 @@ public class GT_Achievements {
         registerAchievement("universal", 15, -6, ItemList.Machine_LV_Massfab.get(1), "hightech", false);
         registerAchievement("replication", 17, -6, ItemList.Machine_LV_Replicator.get(1), "universal", false);
 
-        registerAchievement("tungstensteel", 16, 4, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L), "tungsten", false);
+        registerAchievement(
+                "tungstensteel",
+                16,
+                4,
+                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L),
+                "tungsten",
+                false);
         registerAchievement("upgrade3", 15, 5, ItemList.Casing_Coil_TungstenSteel.get(1), "tungstensteel", false);
-        registerAchievement("hssg", 13, 5, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1L), "upgrade3", false);
+        registerAchievement(
+                "hssg", 13, 5, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1L), "upgrade3", false);
         registerAchievement("upgrade4", 11, 5, ItemList.Casing_Coil_HSSG.get(1), "hssg", false);
-        registerAchievement("stargatematerial", 11, 7, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1L), "upgrade4", false);
+        registerAchievement(
+                "stargatematerial",
+                11,
+                7,
+                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1L),
+                "upgrade4",
+                false);
         registerAchievement("conducting", 14, 6, ItemList.Casing_Coil_Superconductor.get(1), "upgrade3", false);
         registerAchievement("fusion", 15, 7, ItemList.FusionComputer_LuV.get(1), "tungstensteel", false);
         registerAchievement("higherefficency", 15, 9, ItemList.Generator_Plasma_IV.get(1), "fusion", false);
@@ -167,30 +289,43 @@ public class GT_Achievements {
         registerAchievement("tothelimit", 13, 9, ItemList.Generator_Plasma_LuV.get(1), "advancing", false);
         registerAchievement("fullefficiency", 12, 10, ItemList.Generator_Plasma_ZPMV.get(1), "tothelimit", false);
         registerAchievement("upgrade5", 9, 9, ItemList.Casing_Coil_Naquadah.get(1), "stargateliquid", false);
-        registerAchievement("alienmetallurgy", 9, 7, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1L), "upgrade5", false);
+        registerAchievement(
+                "alienmetallurgy",
+                9,
+                7,
+                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1L),
+                "upgrade5",
+                false);
         registerAchievement("over9000", 7, 7, ItemList.Casing_Coil_NaquadahAlloy.get(1), "alienmetallurgy", false);
-        registerAchievement("finalpreparations", 7, 9, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadria, 1L), "over9000", false);
+        registerAchievement(
+                "finalpreparations",
+                7,
+                9,
+                GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadria, 1L),
+                "over9000",
+                false);
         registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1), "finalpreparations", false);
-        if(GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false)) {
+        if (GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false)) {
             registerAchievement("zpmage", 8, 10, ItemList.Energy_Module.get(1), "denseaspossible", false);
             registerAchievement("uvage", 10, 10, ItemList.Energy_Cluster.get(1), "zpmage", false);
             registerAchievement("whatnow", 12, 10, ItemList.ZPM2.get(1), "uvage", false);
-        }else {
+        } else {
             registerAchievement("whatnow", 8, 10, ItemList.ZPM2.get(1), "denseaspossible", false);
         }
 
         if (GT_Mod.gregtechproxy.mAchievements) {
-            AchievementPage.registerAchievementPage(new AchievementPage("GregTech 5", (Achievement[]) this.achievementList.values().toArray(
-                    new Achievement[this.achievementList.size()])));
+            AchievementPage.registerAchievementPage(new AchievementPage("GregTech 5", (Achievement[])
+                    this.achievementList.values().toArray(new Achievement[this.achievementList.size()])));
             MinecraftForge.EVENT_BUS.register(this);
             FMLCommonHandler.instance().bus().register(this);
         }
     }
 
-    public static void registerOre(Materials aMaterial, int min, int max, int chance, boolean overworld, boolean nether, boolean end) {
-    }
+    public static void registerOre(
+            Materials aMaterial, int min, int max, int chance, boolean overworld, boolean nether, boolean end) {}
 
-    public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement, boolean special) {
+    public Achievement registerAchievement(
+            String textId, int x, int y, ItemStack icon, Achievement requirement, boolean special) {
         if (!GT_Mod.gregtechproxy.mAchievements) {
             return null;
         }
@@ -198,7 +333,7 @@ public class GT_Achievements {
         if (special) {
             achievement.setSpecial();
         }
-        ((StatBase)achievement).registerStat();
+        ((StatBase) achievement).registerStat();
         if (GT_Values.D2) {
             GT_Log.out.println("achievement." + textId + "=");
             GT_Log.out.println("achievement." + textId + ".desc=");
@@ -207,16 +342,18 @@ public class GT_Achievements {
         return achievement;
     }
 
-    public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, String requirement, boolean special) {
+    public Achievement registerAchievement(
+            String textId, int x, int y, ItemStack icon, String requirement, boolean special) {
         if (!GT_Mod.gregtechproxy.mAchievements) {
             return null;
         }
         ;
-        Achievement achievement = new Achievement(textId, textId, this.adjX + x, this.adjY + y, icon, getAchievement(requirement));
+        Achievement achievement =
+                new Achievement(textId, textId, this.adjX + x, this.adjY + y, icon, getAchievement(requirement));
         if (special) {
             achievement.setSpecial();
         }
-        ((StatBase)achievement).registerStat();
+        ((StatBase) achievement).registerStat();
         if (GT_Values.D2) {
             GT_Log.out.println("achievement." + textId + "=");
             GT_Log.out.println("achievement." + textId + ".desc=");
@@ -232,8 +369,13 @@ public class GT_Achievements {
     public Achievement registerAssAchievement(GT_Recipe recipe) {
         if (this.achievementList.get(recipe.getOutput(0).getUnlocalizedName()) == null) {
             assReg++;
-            return registerAchievement(recipe.getOutput(0).getUnlocalizedName(), -(11 + assReg % 5), ((assReg) / 5) - 8, recipe.getOutput(0)
-                    , AchievementList.openInventory, false);
+            return registerAchievement(
+                    recipe.getOutput(0).getUnlocalizedName(),
+                    -(11 + assReg % 5),
+                    ((assReg) / 5) - 8,
+                    recipe.getOutput(0),
+                    AchievementList.openInventory,
+                    false);
         }
         return null;
     }
@@ -284,7 +426,6 @@ public class GT_Achievements {
         if (stack.getUnlocalizedName().equals("ic2.itemPartIndustrialDiamond")) {
             issueAchievement(player, "artificaldia");
             issueAchievement(player, "buildCoalDiamond");
-
         }
     }
 
@@ -381,7 +522,7 @@ public class GT_Achievements {
             } else if (stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.alloysmelter")) {
                 issueAchievement(player, "alloysmelter");
                 issueAchievement(player, "buildElecFurnace");
-                if(stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.alloysmelter.tier.3")){
+                if (stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.alloysmelter.tier.3")) {
                     issueAchievement(player, "buildIndFurnace");
                 }
             } else if (stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.extractor")) {
@@ -399,7 +540,7 @@ public class GT_Achievements {
             } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.automation.chestbuffer.tier.")) {
                 issueAchievement(player, "buffer");
                 issueAchievement(player, "buildBatBox");
-                if(stack.getUnlocalizedName().startsWith("gt.blockmachines.automation.chestbuffer.tier.3")){
+                if (stack.getUnlocalizedName().startsWith("gt.blockmachines.automation.chestbuffer.tier.3")) {
                     issueAchievement(player, "buildMFE");
                 }
             } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicgenerator.steamturbine.tier.")) {
@@ -421,9 +562,11 @@ public class GT_Achievements {
                 issueAchievement(player, "energyhatch");
             } else if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.processingarray")) {
                 issueAchievement(player, "factory");
-            } else if (stack.getUnlocalizedName().equals("gt.blockmachines.basicgenerator.magicenergyconverter.tier.01")) {
+            } else if (stack.getUnlocalizedName()
+                    .equals("gt.blockmachines.basicgenerator.magicenergyconverter.tier.01")) {
                 issueAchievement(player, "magic");
-            } else if (stack.getUnlocalizedName().equals("gt.blockmachines.basicgenerator.magicenergyabsorber.tier.03")) {
+            } else if (stack.getUnlocalizedName()
+                    .equals("gt.blockmachines.basicgenerator.magicenergyabsorber.tier.03")) {
                 issueAchievement(player, "highmage");
             } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.amplifab.tier.")) {
                 issueAchievement(player, "amplifier");
@@ -482,25 +625,25 @@ public class GT_Achievements {
             return;
         }
         ItemData data = GT_OreDictUnificator.getItemData(stack);
-        if (data != null && data.mPrefix!=null) {
+        if (data != null && data.mPrefix != null) {
             if (data.mPrefix == OrePrefixes.dust) {
                 if (data.mMaterial.mMaterial == Materials.Lutetium) {
                     issueAchievement(player, "newmetal");
                 }
-                if(data.mMaterial.mMaterial != Materials.Gunpowder){
+                if (data.mMaterial.mMaterial != Materials.Gunpowder) {
                     issueAchievement(player, "cleandust");
                 }
             } else if (data.mPrefix.name().startsWith("ore")) {
-                int data_getAllMaterialStacks_sS=data.getAllMaterialStacks().size();
+                int data_getAllMaterialStacks_sS = data.getAllMaterialStacks().size();
                 for (int i = 0; i < data_getAllMaterialStacks_sS; i++) {
                     issueAchievement(player, data.getAllMaterialStacks().get(i).mMaterial.mName);
                     if (data.getAllMaterialStacks().get(i).mMaterial == Materials.AnyIron) {
                         issueAchievement(player, "iron");
                     }
-                    if(data.getAllMaterialStacks().get(i).mMaterial == Materials.Copper||data.getAllMaterialStacks().get(i).mMaterial == Materials.Tin){
+                    if (data.getAllMaterialStacks().get(i).mMaterial == Materials.Copper
+                            || data.getAllMaterialStacks().get(i).mMaterial == Materials.Tin) {
                         issueAchievement(event.entityPlayer, "mineOre");
                     }
-
                 }
             } else if (data.mPrefix == OrePrefixes.crushed) {
                 issueAchievement(player, "crushed");
@@ -511,14 +654,17 @@ public class GT_Achievements {
             } else if (data.mMaterial.mMaterial == Materials.Steel) {
                 if (data.mPrefix == OrePrefixes.ingot && stack.stackSize == stack.getMaxStackSize()) {
                     issueAchievement(player, "steel");
-                } else if (data.mPrefix == OrePrefixes.nugget && Loader.isModLoaded("Thaumcraft") && ThaumcraftApiHelper.isResearchComplete(player.getDisplayName(), "GT_IRON_TO_STEEL")) {
+                } else if (data.mPrefix == OrePrefixes.nugget
+                        && Loader.isModLoaded("Thaumcraft")
+                        && ThaumcraftApiHelper.isResearchComplete(player.getDisplayName(), "GT_IRON_TO_STEEL")) {
                     issueAchievement(player, "steel");
                 }
-//            } else if (data.mPrefix == OrePrefixes.circuit && data.mMaterial.mMaterial == Materials.Advanced) {
-//                issueAchievement(player, "stepforward");
+                //            } else if (data.mPrefix == OrePrefixes.circuit && data.mMaterial.mMaterial ==
+                // Materials.Advanced) {
+                //                issueAchievement(player, "stepforward");
             }
         }
-//        GT_FML_LOGGER.info(stack.getUnlocalizedName());
+        //        GT_FML_LOGGER.info(stack.getUnlocalizedName());
         if (stack.getUnlocalizedName().startsWith("gt.metaitem.")) {
             switch (stack.getUnlocalizedName()) {
                 case "gt.metaitem.02.32500":
@@ -602,25 +748,29 @@ public class GT_Achievements {
                 case "gt.metaitem.03.32095":
                     issueAchievement(player, "gtwetmain");
                     break;
-            } 
+            }
         } else if (stack.getUnlocalizedName().equals("gt.Thoriumcell")) {
             issueAchievement(player, "newfuel");
-        }else if ((stack.getItem() == Ic2Items.quantumBodyarmor.getItem()) || (stack.getItem() == Ic2Items.quantumBoots.getItem()) ||
-                (stack.getItem() == Ic2Items.quantumHelmet.getItem()) || (stack.getItem() == Ic2Items.quantumLeggings.getItem())) {
+        } else if ((stack.getItem() == Ic2Items.quantumBodyarmor.getItem())
+                || (stack.getItem() == Ic2Items.quantumBoots.getItem())
+                || (stack.getItem() == Ic2Items.quantumHelmet.getItem())
+                || (stack.getItem() == Ic2Items.quantumLeggings.getItem())) {
             issueAchievement(player, "buildQArmor");
         } else if (stack.getUnlocalizedName().equals("ic2.itemPartCircuitAdv")) {
             issueAchievement(player, "stepforward");
-		}
-		if(player.capabilities.isCreativeMode && stack.getUnlocalizedName().equals("gt.metaitem.01.32761")){//Debug Scanner pickup shows all assline recipes.
-            for(GT_Recipe recipe: GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList) {
+        }
+        if (player.capabilities.isCreativeMode
+                && stack.getUnlocalizedName()
+                        .equals("gt.metaitem.01.32761")) { // Debug Scanner pickup shows all assline recipes.
+            for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList) {
                 issueAchievement(player, recipe.getOutput(0).getUnlocalizedName());
-                recipe.mHidden=false;
+                recipe.mHidden = false;
             }
         }
-        for(GT_Recipe recipe: GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList){
-            if(recipe.getOutput(0).getUnlocalizedName().equals(stack.getUnlocalizedName())) {
+        for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList) {
+            if (recipe.getOutput(0).getUnlocalizedName().equals(stack.getUnlocalizedName())) {
                 issueAchievement(player, recipe.getOutput(0).getUnlocalizedName());
-                recipe.mHidden=false;
+                recipe.mHidden = false;
             }
         }
     }
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
index 7be5d054a1..ab9d96ae05 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
@@ -1,5 +1,13 @@
 package gregtech.loaders.misc;
 
+import static forestry.api.apiculture.EnumBeeChromosome.*;
+import static forestry.api.core.EnumHumidity.ARID;
+import static forestry.api.core.EnumHumidity.DAMP;
+import static forestry.api.core.EnumTemperature.*;
+import static forestry.core.genetics.alleles.EnumAllele.*;
+import static gregtech.api.enums.GT_Values.MOD_ID_DC;
+import static gregtech.loaders.misc.GT_BeeDefinitionReference.*;
+
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
 import forestry.api.apiculture.*;
@@ -10,7 +18,6 @@ import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IAlleleFlowers;
 import forestry.api.genetics.IMutationCustom;
 import forestry.apiculture.genetics.Bee;
-import forestry.apiculture.genetics.BeeVariation;
 import forestry.apiculture.genetics.IBeeDefinition;
 import forestry.apiculture.genetics.alleles.AlleleEffect;
 import forestry.core.genetics.alleles.AlleleHelper;
@@ -27,42 +34,37 @@ import gregtech.common.bees.GT_Bee_Mutation;
 import gregtech.common.items.CombType;
 import gregtech.common.items.DropType;
 import gregtech.common.items.PropolisType;
+import java.awt.*;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.function.Consumer;
 import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import org.apache.commons.lang3.text.WordUtils;
 
-import java.awt.*;
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.function.Consumer;
-
-import static forestry.api.apiculture.EnumBeeChromosome.*;
-import static forestry.api.core.EnumHumidity.ARID;
-import static forestry.api.core.EnumHumidity.DAMP;
-import static forestry.api.core.EnumTemperature.*;
-import static forestry.core.genetics.alleles.EnumAllele.*;
-import static gregtech.api.enums.GT_Values.MOD_ID;
-import static gregtech.api.enums.GT_Values.MOD_ID_DC;
-import static gregtech.loaders.misc.GT_BeeDefinitionReference.*;
-
 /**
  * Bride Class for Lambdas
  */
 class GT_BeeDefinitionReference {
-    protected final static byte FORESTRY = 0;
-    protected final static byte EXTRABEES = 1;
-    protected final static byte GENDUSTRY = 2;
-    protected final static byte MAGICBEES = 3;
-    protected final static byte GREGTECH = 4;
+    protected static final byte FORESTRY = 0;
+    protected static final byte EXTRABEES = 1;
+    protected static final byte GENDUSTRY = 2;
+    protected static final byte MAGICBEES = 3;
+    protected static final byte GREGTECH = 4;
+
     private GT_BeeDefinitionReference() {}
 }
 
 public enum GT_BeeDefinition implements IBeeDefinition {
-    //organic
-    CLAY(GT_BranchDefinition.ORGANIC, "Clay", true, new Color(0xC8C8DA), new Color(0x0000FF),
+    // organic
+    CLAY(
+            GT_BranchDefinition.ORGANIC,
+            "Clay",
+            true,
+            new Color(0xC8C8DA),
+            new Color(0x0000FF),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
                 beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f);
@@ -76,11 +78,16 @@ public enum GT_BeeDefinition implements IBeeDefinition {
                 AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.VANILLA);
             },
             dis -> {
-                IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Diligent"), 10);
-                tMutation.requireResource(Blocks.clay, 0); //blockStainedHardenedClay
-            }
-    ),
-    SLIMEBALL(GT_BranchDefinition.ORGANIC, "SlimeBall", true, new Color(0x4E9E55), new Color(0x00FF15),
+                IBeeMutationCustom tMutation =
+                        dis.registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Diligent"), 10);
+                tMutation.requireResource(Blocks.clay, 0); // blockStainedHardenedClay
+            }),
+    SLIMEBALL(
+            GT_BranchDefinition.ORGANIC,
+            "SlimeBall",
+            true,
+            new Color(0x4E9E55),
+            new Color(0x00FF15),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f);
                 beeSpecies.addProduct(new ItemStack(Items.slime_ball, 1), 0.15f);
@@ -103,9 +110,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
                 IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Marshy"), CLAY, 7);
                 if (Loader.isModLoaded("TConstruct"))
                     tMutation.requireResource(GameRegistry.findBlock("TConstruct", "slime.gel"), 1);
-            }
-    ),
-    PEAT(GT_BranchDefinition.ORGANIC, "Peat", true, new Color(0x906237), new Color(0x58300B),
+            }),
+    PEAT(
+            GT_BranchDefinition.ORGANIC,
+            "Peat",
+            true,
+            new Color(0x906237),
+            new Color(0x58300B),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LIGNIE), 0.30f);
                 beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f);
@@ -121,9 +132,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
                 AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER);
                 AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE);
             },
-            dis -> dis.registerMutation(getSpecies(FORESTRY, "Rural"), CLAY, 10)
-    ),
-    STICKYRESIN(GT_BranchDefinition.ORGANIC, "StickyResin", true, new Color(0x2E8F5B), new Color(0xDCC289),
+            dis -> dis.registerMutation(getSpecies(FORESTRY, "Rural"), CLAY, 10)),
+    STICKYRESIN(
+            GT_BranchDefinition.ORGANIC,
+            "StickyResin",
+            true,
+            new Color(0x2E8F5B),
+            new Color(0xDCC289),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
                 beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.15f);
@@ -138,9 +153,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             dis -> {
                 IBeeMutationCustom tMutation = dis.registerMutation(SLIMEBALL, PEAT, 15);
                 tMutation.requireResource("logRubber");
-            }
-    ),
-    COAL(GT_BranchDefinition.ORGANIC, "Coal", true, new Color(0x666666), new Color(0x525252),
+            }),
+    COAL(
+            GT_BranchDefinition.ORGANIC,
+            "Coal",
+            true,
+            new Color(0x666666),