[ci skip] spotlessApply with the new settings

8 files changed, 95 insertions, 92 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
index 00062dc0ec..c74bb116b0 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -1,26 +1,25 @@
 /*******************************************************************************
- * 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.items;
 
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.registry.GameRegistry;
-import forestry.core.utils.StringUtil;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraftforge.common.ChestGenHooks;
 
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.registry.GameRegistry;
+import forestry.core.utils.StringUtil;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+
 public class FR_ItemRegistry {
 
     // ----- Apiary Frames ----------------------
@@ -58,18 +57,24 @@ public class FR_ItemRegistry {
         // Magic Bee like Frames
 
         if (!CORE.GTNH) {
-            hiveFrameVoid =
-                    new MB_ItemFrame(MB_FrameType.VOID, EnumRarity.rare, "Makes your bee die in the blink of an eye.");
+            hiveFrameVoid = new MB_ItemFrame(
+                    MB_FrameType.VOID,
+                    EnumRarity.rare,
+                    "Makes your bee die in the blink of an eye.");
         } else {
             hiveFrameVoid = new MB_ItemFrame(
-                    MB_FrameType.USELESS, EnumRarity.common, "No more cheaty frames for GTNH players.");
+                    MB_FrameType.USELESS,
+                    EnumRarity.common,
+                    "No more cheaty frames for GTNH players.");
         }
 
         hiveFrameAccelerated = new MB_ItemFrame(
                 MB_FrameType.ACCELERATED,
                 "Longevity for bees isn't very common, especially if they're working harder.");
         hiveFrameMutagenic = new MB_ItemFrame(
-                MB_FrameType.MUTAGENIC, EnumRarity.epic, "Evolution of the fittest, finest and fastest.");
+                MB_FrameType.MUTAGENIC,
+                EnumRarity.epic,
+                "Evolution of the fittest, finest and fastest.");
         hiveFrameBusy = new MB_ItemFrame(MB_FrameType.BUSY, "Your bee will work harder and longer than you expected.");
         ChestGenHooks.addItem(
                 ChestGenHooks.STRONGHOLD_CORRIDOR,
@@ -78,7 +83,8 @@ public class FR_ItemRegistry {
                 ChestGenHooks.STRONGHOLD_LIBRARY,
                 new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 3, 18));
         ChestGenHooks.addItem(
-                ChestGenHooks.DUNGEON_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 14));
+                ChestGenHooks.DUNGEON_CHEST,
+                new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 14));
         ChestGenHooks.addItem(
                 ChestGenHooks.MINESHAFT_CORRIDOR,
                 new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 9));
@@ -105,13 +111,19 @@ public class FR_ItemRegistry {
         }
 
         // Frame Items added by bartimaeusnek
-        hiveFrameDecay =
-                new MB_ItemFrame(MB_FrameType.DECAYING, EnumRarity.uncommon, "Who really needs stable genetics?");
+        hiveFrameDecay = new MB_ItemFrame(
+                MB_FrameType.DECAYING,
+                EnumRarity.uncommon,
+                "Who really needs stable genetics?");
         hiveFrameSlow = new MB_ItemFrame(MB_FrameType.SLOWING, EnumRarity.common, "The journey is its own reward.");
         hiveFrameStalilize = new MB_ItemFrame(
-                MB_FrameType.STABILIZING, EnumRarity.rare, "If you wish your bees to keep their form.");
-        hiveFrameArborist =
-                new MB_ItemFrame(MB_FrameType.ARBORISTS, EnumRarity.common, "Who need Bees when you can have Trees?");
+                MB_FrameType.STABILIZING,
+                EnumRarity.rare,
+                "If you wish your bees to keep their form.");
+        hiveFrameArborist = new MB_ItemFrame(
+                MB_FrameType.ARBORISTS,
+                EnumRarity.common,
+                "Who need Bees when you can have Trees?");
         ChestGenHooks.addItem(
                 ChestGenHooks.PYRAMID_JUNGLE_CHEST,
                 new WeightedRandomChestContent(new ItemStack(hiveFrameArborist), 1, 4, 24));
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java
index 4312e36714..8ce963fa7a 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.forestry.bees.items;
 import net.minecraft.util.StatCollector;
 
 public class FR_StringUtil {
+
     public static String getLocalizedString(final String key) {
         if (StatCollector.canTranslate(key)) {
             return StatCollector.translateToLocal(key);
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
index dcbb8b94a1..b7130aff3a 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
@@ -4,6 +4,7 @@ import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeModifier;
 
 public enum MB_FrameType implements IBeeModifier {
+
     // ExtraBees Clone Frames
     // Name, FrameHP, territory (1f), Mutation rate, lifespan rate, production rate, genetic decay (1f)
     COCOA("Chocolate", 240, 1.0f, 1.0f, 0.50f, 1.50f, 1f),
@@ -39,30 +40,14 @@ public enum MB_FrameType implements IBeeModifier {
     private final boolean isSunlit;
     private final boolean isHellish;
 
-    MB_FrameType(
-            final String name,
-            final int damage,
-            final float territory,
-            final float mutation,
-            final float lifespan,
-            final float production,
-            final float geneticDecay) {
+    MB_FrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
+            final float production, final float geneticDecay) {
         this(name, damage, territory, mutation, lifespan, production, 1f, geneticDecay, false, false, false, false);
     }
 
-    MB_FrameType(
-            final String name,
-            final int damage,
-            final float territory,
-            final float mutation,
-            final float lifespan,
-            final float production,
-            final float flowering,
-            final float geneticDecay,
-            final boolean sealed,
-            final boolean lit,
-            final boolean sunlit,
-            final boolean hellish) {
+    MB_FrameType(final String name, final int damage, final float territory, final float mutation, final float lifespan,
+            final float production, final float flowering, final float geneticDecay, final boolean sealed,
+            final boolean lit, final boolean sunlit, final boolean hellish) {
         this.frameName = name;
         this.maxDamage = damage;
 
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
index db2a8e317f..d2f3747cc3 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java
@@ -1,12 +1,7 @@
 package gtPlusPlus.xmod.forestry.bees.items;
 
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.apiculture.*;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
 import java.util.List;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
@@ -14,7 +9,15 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import forestry.api.apiculture.*;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+
 public class MB_ItemFrame extends Item implements IHiveFrame {
+
     private final MB_FrameType type;
     private EnumRarity rarity_value = EnumRarity.uncommon;
     private final String toolTip;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
index df1b3be843..9ca749e599 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java
@@ -1,5 +1,14 @@
 package gtPlusPlus.xmod.forestry.bees.items.output;
 
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.fluids.FluidStack;
+
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -11,13 +20,6 @@ import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType;
 import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType;
 import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-import java.util.List;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.fluids.FluidStack;
 
 public class GTPP_Comb extends Item {
 
@@ -94,20 +96,16 @@ public class GTPP_Comb extends Item {
 
         addChemicalRecipe(
                 GTPP_CombType.DRAGONBLOOD,
-                new ItemStack[] {
-                    GT_ModHandler.getModItem("Forestry", "refractoryWax", 1L, 0),
-                    GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.DRAGONBLOOD),
-                    GTPP_Bees.drop.getStackForType(GTPP_DropType.DRAGONBLOOD)
-                },
-                new int[] {3000, 1500, 500});
+                new ItemStack[] { GT_ModHandler.getModItem("Forestry", "refractoryWax", 1L, 0),
+                        GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.DRAGONBLOOD),
+                        GTPP_Bees.drop.getStackForType(GTPP_DropType.DRAGONBLOOD) },
+                new int[] { 3000, 1500, 500 });
         addChemicalRecipe(
                 GTPP_CombType.FORCE,
-                new ItemStack[] {
-                    GT_ModHandler.getModItem("Forestry", "beeswax", 1L, 0),
-                    GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.FORCE),
-                    GTPP_Bees.drop.getStackForType(GTPP_DropType.FORCE)
-                },
-                new int[] {5000, 3000, 1000});
+                new ItemStack[] { GT_ModHandler.getModItem("Forestry", "beeswax", 1L, 0),
+                        GTPP_Bees.propolis.getStackForType(GTPP_PropolisType.FORCE),
+                        GTPP_Bees.drop.getStackForType(GTPP_DropType.FORCE) },
+                new int[] { 5000, 3000, 1000 });
     }
 
     public static void addChemicalRecipe(GTPP_CombType aInputStack, ItemStack[] aOutputs, int[] aChances) {
@@ -115,9 +113,7 @@ public class GTPP_Comb extends Item {
         long aEU = aMat.vVoltageMultiplier;
         int aTier = Math.max(aMat.vTier / 2, 1);
         CORE.RA.addChemicalPlantRecipe(
-                new ItemStack[] {
-                    aInputStack.getStackForType(aTier),
-                },
+                new ItemStack[] { aInputStack.getStackForType(aTier), },
                 new FluidStack[] {},
                 aOutputs,
                 new FluidStack[] {},
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
index b32ac5c601..873c2859c8 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java
@@ -1,5 +1,14 @@
 package gtPlusPlus.xmod.forestry.bees.items.output;
 
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.fluids.FluidStack;
+
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -9,13 +18,6 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.forestry.bees.handler.GTPP_DropType;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-import java.util.List;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.fluids.FluidStack;
 
 public class GTPP_Drop extends Item {
 
@@ -88,8 +90,8 @@ public class GTPP_Drop extends Item {
         return GTPP_DropType.get(stack.getItemDamage()).getName();
     }
 
-    private static final int[] sFluidOutputs =
-            new int[] {144, 136, 128, 120, 112, 104, 96, 88, 80, 72, 64, 48, 32, 16, 8, 4};
+    private static final int[] sFluidOutputs = new int[] { 144, 136, 128, 120, 112, 104, 96, 88, 80, 72, 64, 48, 32, 16,
+            8, 4 };
 
     public static void initDropsRecipes() {
         ItemStack tDrop;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java
index 7fd8a7ec20..ffd1ec7cbb 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java
@@ -1,18 +1,20 @@
 package gtPlusPlus.xmod.forestry.bees.items.output;
 
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.core.Tabs;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType;
 import java.util.List;
+
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import forestry.api.core.Tabs;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PollenType;
+
 public class GTPP_Pollen extends Item {
 
     @SideOnly(Side.CLIENT)
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
index e6976f0512..78425a96d0 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java
@@ -1,5 +1,13 @@
 package gtPlusPlus.xmod.forestry.bees.items.output;
 
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -8,12 +16,6 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.forestry.bees.handler.GTPP_PropolisType;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
-import java.util.List;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
 
 public class GTPP_Propolis extends Item {