[ci skip] spotlessApply with the new settings

30 files changed, 627 insertions, 965 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
index 493d50490a..1ad9fbad13 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java
@@ -1,5 +1,12 @@
 package gtPlusPlus.xmod.forestry;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
 import binnie.extratrees.genetics.ExtraTreeSpecies;
 import cpw.mods.fml.common.Optional;
 import forestry.api.arboriculture.EnumGermlingType;
@@ -12,11 +19,6 @@ import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
 import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntityTreeFarm;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
 
 public class HANDLER_FR {
 
@@ -42,8 +44,8 @@ public class HANDLER_FR {
         }
     }
 
-    public static boolean createBlockBreakParticles(
-            final World world, final int x, final int y, final int z, final Block block) {
+    public static boolean createBlockBreakParticles(final World world, final int x, final int y, final int z,
+            final Block block) {
         if (LoadedMods.Forestry) {
             createBlockBreakParticles_INTERNAL(world, x, y, z, block);
         }
@@ -51,8 +53,8 @@ public class HANDLER_FR {
     }
 
     @Optional.Method(modid = "Forestry")
-    private static void createBlockBreakParticles_INTERNAL(
-            final World world, final int x, final int y, final int z, final Block block) {
+    private static void createBlockBreakParticles_INTERNAL(final World world, final int x, final int y, final int z,
+            final Block block) {
         if (LoadedMods.Forestry) {
             Class oClass;
             try {
@@ -70,11 +72,8 @@ public class HANDLER_FR {
                             int.class);
                     mParticles.invoke(oProxy, world, x, y, z, block, 0);
                 }
-            } catch (SecurityException
-                    | IllegalAccessException
-                    | IllegalArgumentException
-                    | InvocationTargetException e) {
-            }
+            } catch (SecurityException | IllegalAccessException | IllegalArgumentException
+                    | InvocationTargetException e) {}
         }
     }
 
@@ -88,13 +87,13 @@ public class HANDLER_FR {
                 aLog = TreeManager.woodItemAccess.getLog(woodType, false);
 
                 GregtechMetaTileEntityTreeFarm.sLogCache.put(value.getUID(), aLog);
-                GregtechMetaTileEntityTreeFarm.sLogCache.put(
-                        value.getUID() + "fireproof", TreeManager.woodItemAccess.getLog(woodType, true));
+                GregtechMetaTileEntityTreeFarm.sLogCache
+                        .put(value.getUID() + "fireproof", TreeManager.woodItemAccess.getLog(woodType, true));
             } else {
                 aLog = ReflectionUtils.getField(value, "vanillaWood");
 
-                GregtechMetaTileEntityTreeFarm.sLogCache.put(
-                        value.getUID(), ReflectionUtils.getField(value, "vanillaWood"));
+                GregtechMetaTileEntityTreeFarm.sLogCache
+                        .put(value.getUID(), ReflectionUtils.getField(value, "vanillaWood"));
             }
 
             GregtechMetaTileEntityTreeFarm.addFakeRecipeToNEI(aSaplingStack, aLog);
@@ -104,8 +103,8 @@ public class HANDLER_FR {
     @Optional.Method(modid = "ExtraTrees")
     private static void mapExtraTreesSaplingToLog() {
         for (ExtraTreeSpecies value : ExtraTreeSpecies.values()) {
-            ItemStack aSaplingStack = TreeManager.treeRoot.getMemberStack(
-                    TreeManager.treeRoot.templateAsIndividual(value.getTemplate()), 0);
+            ItemStack aSaplingStack = TreeManager.treeRoot
+                    .getMemberStack(TreeManager.treeRoot.templateAsIndividual(value.getTemplate()), 0);
             ItemStack aLog = null;
             if (value.getLog() != null) {
                 aLog = value.getLog().getItemStack();
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java
index ea95479cf7..ef33baab5a 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java
@@ -1,12 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser Public License v3
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-3.0.txt
+ * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
+ * at http://www.gnu.org/licenses/lgpl-3.0.txt
  *
- * Various Contributors including, but not limited to:
- * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
+ * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
+ * MysteriousAges
  ******************************************************************************/
 package gtPlusPlus.xmod.forestry.bees.blocks;
 
@@ -15,6 +13,7 @@ import forestry.core.blocks.BlockBase;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 
 public class BlockDenseBeeHouse extends BlockBase<BlockApicultureType> {
+
     public BlockDenseBeeHouse() {
         super();
         setCreativeTab(AddToCreativeTab.tabBOP);
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java
index 02f74b55ae..f873963b7f 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java
@@ -1,14 +1,16 @@
 package gtPlusPlus.xmod.forestry.bees.blocks;
 
-import cpw.mods.fml.common.registry.GameRegistry;
-import forestry.core.utils.StringUtil;
-import forestry.plugins.PluginManager;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
+import cpw.mods.fml.common.registry.GameRegistry;
+import forestry.core.utils.StringUtil;
+import forestry.plugins.PluginManager;
+
 public abstract class FR_BlockRegistry {
+
     protected static <T extends Block> T registerBlock(T block, Class<? extends ItemBlock> itemClass, String name) {
         if (PluginManager.getStage() != PluginManager.Stage.SETUP) {
             throw new RuntimeException("Tried to register Block outside of Setup");
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
index 5423ae803b..031061bfc3 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java
@@ -32,64 +32,38 @@ public enum CustomCombs {
 
     // Trash
     SALT("salt", true, Materials.Salt, 75),
-    SAND("sand", true, Materials.Sand, 100),
-    ;
+    SAND("sand", true, Materials.Sand, 100),;
 
     private static int[][] colours = new int[][] {
-        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, // SILICON
-        {Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75)}, // RUBBER
-        {Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175)}, // PLASTIC
-        {Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75)}, // PTFE
-        {Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)}, // PBS
-        // Unused
-        {Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14)}, // Biofuel
-        {Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32)}, // Ethanol
-        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
-        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
-        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
-        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
-        {Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150)}, // Fluorine
-        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
-        {Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5)}, // Force
-        {Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170)}, // Nikolite
-        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
-        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
-        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
-        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)}, //
-        {Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)},
-        {0x666666, 0x525252},
-        {0x2E8F5B, 0xDCC289},
-        {0x4C4C4C, 0x333333},
-        {0x808080, 0x999999},
-        {0x57CFFB, 0xBBEEFF},
-        {0x7D0F0F, 0xD11919},
-        {0x1947D1, 0x476CDA},
-        {0xE6005C, 0xCC0052},
-        {0x0033CC, 0x00248F},
-        {0xCCFFFF, 0xA3CCCC},
-        {0x248F24, 0xCCFFCC},
-        {0x248F24, 0x2EB82E},
-        {0xD4D4D4, 0x58300B},
-        {0xFF6600, 0xE65C00},
-        {0xD4D4D4, 0xDDDDDD},
-        {0x666699, 0xA3A3CC},
-        {0xDA9147, 0xDE9C59},
-        {0x808080, 0x999999},
-        {0x8585AD, 0x9D9DBD},
-        {0xF0DEF0, 0xF2E1F2},
-        {0xC2C2D6, 0xCECEDE},
-        {0xE6B800, 0xCFA600},
-        {0x008AB8, 0xD6D6FF},
-        {0xD5D5D5, 0xAAAAAA},
-        {0xCC99FF, 0xDBB8FF},
-        {0xEBA1EB, 0xF2C3F2},
-        {0x62626D, 0x161620},
-        {0xE6E6E6, 0xFFFFCC},
-        {0xDADADA, 0xD1D1E0},
-        {0x19AF19, 0x169E16},
-        {0x335C33, 0x6B8F00},
-        {0x003300, 0x002400},
-    };
+            { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // SILICON
+            { Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75) }, // RUBBER
+            { Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175) }, // PLASTIC
+            { Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75) }, // PTFE
+            { Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14) }, // PBS
+            // Unused
+            { Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14) }, // Biofuel
+            { Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32) }, // Ethanol
+            { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+            { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+            { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+            { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+            { Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150) }, // Fluorine
+            { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+            { Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5) }, // Force
+            { Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170) }, // Nikolite
+            { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+            { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+            { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+            { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, //
+            { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, { 0x666666, 0x525252 },
+            { 0x2E8F5B, 0xDCC289 }, { 0x4C4C4C, 0x333333 }, { 0x808080, 0x999999 }, { 0x57CFFB, 0xBBEEFF },
+            { 0x7D0F0F, 0xD11919 }, { 0x1947D1, 0x476CDA }, { 0xE6005C, 0xCC0052 }, { 0x0033CC, 0x00248F },
+            { 0xCCFFFF, 0xA3CCCC }, { 0x248F24, 0xCCFFCC }, { 0x248F24, 0x2EB82E }, { 0xD4D4D4, 0x58300B },
+            { 0xFF6600, 0xE65C00 }, { 0xD4D4D4, 0xDDDDDD }, { 0x666699, 0xA3A3CC }, { 0xDA9147, 0xDE9C59 },
+            { 0x808080, 0x999999 }, { 0x8585AD, 0x9D9DBD }, { 0xF0DEF0, 0xF2E1F2 }, { 0xC2C2D6, 0xCECEDE },
+            { 0xE6B800, 0xCFA600 }, { 0x008AB8, 0xD6D6FF }, { 0xD5D5D5, 0xAAAAAA }, { 0xCC99FF, 0xDBB8FF },
+            { 0xEBA1EB, 0xF2C3F2 }, { 0x62626D, 0x161620 }, { 0xE6E6E6, 0xFFFFCC }, { 0xDADADA, 0xD1D1E0 },
+            { 0x19AF19, 0x169E16 }, { 0x335C33, 0x6B8F00 }, { 0x003300, 0x002400 }, };
     public boolean showInList;
     public Materials material;
     public int chance;
@@ -107,9 +81,10 @@ public enum CustomCombs {
     }
 
     public String getName() {
-        //		return "gt.comb."+this.name;
+        // return "gt.comb."+this.name;
         return GT_LanguageManager.addStringLocalization(
-                "comb." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb");
+                "comb." + this.name,
+                this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb");
     }
 
     public int[] getColours() {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
index 633178c851..624d8161d6 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
@@ -1,5 +1,15 @@
 package gtPlusPlus.xmod.forestry.bees.custom;
 
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Locale;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.BiomeDictionary.Type;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.text.WordUtils;
+
 import forestry.api.apiculture.*;
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
@@ -11,21 +21,12 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.Locale;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.BiomeDictionary.Type;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.commons.lang3.text.WordUtils;
 
 public enum GTPP_Bee_Definition implements IBeeDefinition {
-    SILICON(
-            GTPP_Branch_Definition.ORGANIC,
-            "Silicon",
-            true,
-            Utils.rgbtoHexValue(75, 75, 75),
+
+    SILICON(GTPP_Branch_Definition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75),
             Utils.rgbtoHexValue(125, 125, 125)) {
+
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getSlagComb(), 0.10f);
@@ -41,17 +42,16 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
 
         @Override
         protected void registerMutations() {
-            IBeeMutationCustom tMutation =
-                    registerMutation(getGregtechBeeType("SLIMEBALL"), getGregtechBeeType("STICKYRESIN"), 10);
+            IBeeMutationCustom tMutation = registerMutation(
+                    getGregtechBeeType("SLIMEBALL"),
+                    getGregtechBeeType("STICKYRESIN"),
+                    10);
         }
     },
 
-    RUBBER(
-            GTPP_Branch_Definition.ORGANIC,
-            "Rubber",
-            true,
-            Utils.rgbtoHexValue(55, 55, 55),
+    RUBBER(GTPP_Branch_Definition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55),
             Utils.rgbtoHexValue(75, 75, 75)) {
+
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getSlagComb(), 0.10f);
@@ -67,17 +67,16 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
 
         @Override
         protected void registerMutations() {
-            IBeeMutationCustom tMutation =
-                    registerMutation(getGregtechBeeType("SLIMEBALL"), getGregtechBeeType("STICKYRESIN"), 10);
+            IBeeMutationCustom tMutation = registerMutation(
+                    getGregtechBeeType("SLIMEBALL"),
+                    getGregtechBeeType("STICKYRESIN"),
+                    10);
         }
     },
 
-    PLASTIC(
-            GTPP_Branch_Definition.ORGANIC,
-            "Plastic",
-            true,
-            Utils.rgbtoHexValue(245, 245, 245),
+    PLASTIC(GTPP_Branch_Definition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245),
             Utils.rgbtoHexValue(175, 175, 175)) {
+
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getStoneComb(), 0.30f);
@@ -97,12 +96,9 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
         }
     },
 
-    PTFE(
-            GTPP_Branch_Definition.ORGANIC,
-            "Ptfe",
-            true,
-            Utils.rgbtoHexValue(150, 150, 150),
+    PTFE(GTPP_Branch_Definition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150),
             Utils.rgbtoHexValue(75, 75, 75)) {
+
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getStoneComb(), 0.30f);
@@ -123,6 +119,7 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
     },
 
     PBS(GTPP_Branch_Definition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) {
+
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getStoneComb(), 0.30f);
@@ -145,12 +142,9 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
     /**
      * Fuels
      */
-    BIOMASS(
-            GTPP_Branch_Definition.ORGANIC,
-            "Biomass",
-            true,
-            Utils.rgbtoHexValue(33, 225, 24),
+    BIOMASS(GTPP_Branch_Definition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24),
             Utils.rgbtoHexValue(23, 175, 14)) {
+
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.40f);
@@ -171,12 +165,9 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
         }
     },
 
-    ETHANOL(
-            GTPP_Branch_Definition.ORGANIC,
-            "Ethanol",
-            true,
-            Utils.rgbtoHexValue(255, 128, 0),
+    ETHANOL(GTPP_Branch_Definition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0),
             Utils.rgbtoHexValue(220, 156, 32)) {
+
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.SAND), 0.40f);
@@ -200,12 +191,9 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
     /**
      * Materials
      */
-    FLUORINE(
-            GTPP_Branch_Definition.ORGANIC,
-            "Fluorine",
-            true,
-            Utils.rgbtoHexValue(30, 230, 230),
+    FLUORINE(GTPP_Branch_Definition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230),
             Utils.rgbtoHexValue(10, 150, 150)) {
+
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getStoneComb(), 0.40f);
@@ -221,8 +209,10 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
 
         @Override
         protected void registerMutations() {
-            IBeeMutationCustom tMutation =
-                    registerMutation(getGregtechBeeType("LAPIS"), getGregtechBeeType("SAPPHIRE"), 5);
+            IBeeMutationCustom tMutation = registerMutation(
+                    getGregtechBeeType("LAPIS"),
+                    getGregtechBeeType("SAPPHIRE"),
+                    5);
             tMutation.restrictBiomeType(Type.COLD);
         }
     },
@@ -230,12 +220,9 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
     // Coke
 
     // Force
-    FORCE(
-            GTPP_Branch_Definition.METAL,
-            "Force",
-            true,
-            Utils.rgbtoHexValue(250, 250, 20),
+    FORCE(GTPP_Branch_Definition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20),
             Utils.rgbtoHexValue(200, 200, 5)) {
+
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getStoneComb(), 0.30f);
@@ -253,19 +240,18 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
 
         @Override
         protected void registerMutations() {
-            IBeeMutationCustom tMutation =
-                    registerMutation(getGregtechBeeType("STEEL"), getGregtechBeeType("GOLD"), 10);
+            IBeeMutationCustom tMutation = registerMutation(
+                    getGregtechBeeType("STEEL"),
+                    getGregtechBeeType("GOLD"),
+                    10);
             tMutation.restrictBiomeType(Type.HOT);
         }
     },
 
     // Nikolite
-    NIKOLITE(
-            GTPP_Branch_Definition.METAL,
-            "Nikolite",
-            true,
-            Utils.rgbtoHexValue(60, 180, 200),
+    NIKOLITE(GTPP_Branch_Definition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200),
             Utils.rgbtoHexValue(40, 150, 170)) {
+
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
             beeSpecies.addProduct(getStoneComb(), 0.30f);
@@ -281,493 +267,203 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
 
         @Override
         protected void registerMutations() {
-            IBeeMutationCustom tMutation =
-                    registerMutation(getGregtechBeeType("ALUMINIUM"), getGregtechBeeType("SILVER"), 8);
+            IBeeMutationCustom tMutation = registerMutation(
+                    getGregtechBeeType("ALUMINIUM"),
+                    getGregtechBeeType("SILVER"),
+                    8);
             tMutation.restrictBiomeType(Type.HOT);
         }
     },
 
-/*
-
-
-CLAY(GTPP_Branch_Definition.ORGANIC, "Clay", true, 0x19d0ec, 0xffdc16) {
-       @Override
-       protected void setSpeciesProperties(IAlleleBeeSpeciesCustom 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);
-           beeSpecies.setHumidity(EnumHumidity.DAMP);
-           beeSpecies.setTemperature(EnumTemperature.NORMAL);
-       }
-
-       @Override
-       protected void setAlleles(IAllele[] template) {
-           template = BeeDefinition.MEADOWS.getTemplate();
-       }
-
-       @Override
-       protected void registerMutations() {
-           IBeeMutationCustom tMutation = registerMutation(getSpecies("Industrious"), getSpecies("Diligent"), 20);
-       }
-   },
-   SLIMEBALL(GTPP_Branch_Definition.ORGANIC, "SlimeBall", true, 0x4E9E55, 0x00FF15) {
-       @Override
-       protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
-           beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 15), 0.30f);
-           beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.STICKY), 0.30f);
-           beeSpecies.setHumidity(EnumHumidity.DAMP);
-           beeSpecies.setTemperature(EnumTemperature.NORMAL);
-       }
-
-       @Override
-       protected void setAlleles(IAllele[] template) {
-           template = BeeDefinition.MARSHY.getTemplate();
-       }
-
-       @Override
-       protected void registerMutations() {
-       	IBeeMutationCustom tMutation = registerMutation(getSpecies("Marshy"), CLAY.species, 15);
-       }
-   },
-   PEAT(GTPP_Branch_Definition.ORGANIC, "Peat", true, 0x906237, 0x58300B) {
-       @Override
-       protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
-           beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LIGNIE), 0.30f);
-           beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.15f);
-           beeSpecies.setHumidity(EnumHumidity.NORMAL);
-           beeSpecies.setTemperature(EnumTemperature.NORMAL);
-       }
-
-       @Override
-       protected void setAlleles(IAllele[] template) {
-           template = BeeDefinition.RURAL.getTemplate();
-       }
-
-       @Override
-       protected void registerMutations() {
-       	IBeeMutationCustom tMutation = registerMutation(getSpecies("Rural"), CLAY.species, 20);
-       }
-   },
-   STICKYRESIN(GTPP_Branch_Definition.ORGANIC, "StickyResin", true, 0x2E8F5B, 0xDCC289) {
-       @Override
-       protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
-           beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
-           beeSpecies.addProduct(ItemList.IC2_Resin.get(1, new Object[0]), 0.15f);
-           beeSpecies.setHumidity(EnumHumidity.NORMAL);
-           beeSpecies.setTemperature(EnumTemperature.NORMAL);
-       }
-
-       @Override
-       protected void setAlleles(IAllele[] template) {
-           template = BeeDefinition.MEADOWS.getTemplate();
-       }
-
-       @Override
-       protected void registerMutations() {
-       	IBeeMutationCustom tMutation = registerMutation(SLIMEBALL.species, PEAT.species, 25);
-       }
-   },
-   COAL(GTPP_Branch_Definition.ORGANIC, "Coal", true, 0x666666, 0x525252) {
-       @Override
-       protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
-           beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.LIGNIE), 0.30f);
-           beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.COAL), 0.15f);
-           beeSpecies.setHumidity(EnumHumidity.NORMAL);
-           beeSpecies.setTemperature(EnumTemperature.NORMAL);
-       }
-
-       @Override
-       protected void setAlleles(IAllele[] template) {
-           template = BeeDefinition.AUSTERE.getTemplate();
-       }
-
-       @Override
-       protected void registerMutations() {
-       	IBeeMutationCustom tMutation = registerMutation(getSpecies("Industrious"), PEAT.species, 18);
-       }
-   },
-   OIL(GTPP_Branch_Definition.ORGANIC, "Oil", true, 0x4C4C4C, 0x333333) {
-       @Override
-       protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
-           beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f);
-           beeSpecies.addProduct(GTPP_Bees.combs.getStackForType(CustomCombs.OIL), 0.15f);
-           beeSpecies.setHumidity(EnumHumidity.DAMP);
-           beeSpecies.setTemperature(EnumTemperature.NORMAL);
-           beeSpec