[ci skip] spotlessApply with the new settings

4 files changed, 31 insertions, 24 deletions

diff --git a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java
index c42da6895f..3ad3cdd7eb 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java
@@ -1,11 +1,13 @@
 package gtPlusPlus.plugin.villagers.trade;
 
-import gtPlusPlus.core.recipe.common.CI;
 import java.util.Random;
+
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.village.MerchantRecipe;
 import net.minecraft.village.MerchantRecipeList;
 
+import gtPlusPlus.core.recipe.common.CI;
+
 public class TradeHandlerBanker extends TradeHandlerBase {
 
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java
index 1e1e326201..fa95404f49 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java
@@ -1,24 +1,24 @@
 /*******************************************************************************
- * 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.plugin.villagers.trade;
 
-import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
 import java.util.Random;
+
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.village.MerchantRecipeList;
 
+import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
+
 public abstract class TradeHandlerBase implements IVillageTradeHandler {
 
     @SuppressWarnings("unchecked")
     @Override
-    public abstract void manipulateTradesForVillager(
-            EntityVillager villager, MerchantRecipeList recipeList, Random random);
+    public abstract void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList,
+            Random random);
 }
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java
index bd2acc9bfe..1b67e2b478 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java
@@ -1,11 +1,13 @@
 package gtPlusPlus.plugin.villagers.trade;
 
-import gtPlusPlus.core.recipe.common.CI;
 import java.util.Random;
+
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.village.MerchantRecipe;
 import net.minecraft.village.MerchantRecipeList;
 
+import gtPlusPlus.core.recipe.common.CI;
+
 public class TradeHandlerTechnician extends TradeHandlerBase {
 
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java
index f866bd7aa6..4b0e99471a 100644
--- a/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java
+++ b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java
@@ -1,16 +1,18 @@
 package gtPlusPlus.plugin.villagers.trade;
 
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 import java.util.Collections;
 import java.util.Random;
+
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.village.MerchantRecipe;
 import net.minecraft.village.MerchantRecipeList;
 
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
 public class TradeHandlerTrader extends TradeHandlerBase {
 
     public TradeHandlerTrader() {
@@ -33,15 +35,16 @@ public class TradeHandlerTrader extends TradeHandlerBase {
         if (Ore2 == null) {
             Ore2 = ELEMENT.getInstance().LEAD.getOre(1);
         }
-        recipeList.add(new MerchantRecipe(
-                ItemUtils.getItemStackOfAmountFromOreDict("logWood", 32),
-                ELEMENT.getInstance().IRON.getOre(1)));
-        recipeList.add(new MerchantRecipe(
-                ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 32),
-                ELEMENT.getInstance().COPPER.getOre(1)));
-        recipeList.add(new MerchantRecipe(
-                ItemUtils.getSimpleStack(Blocks.obsidian, 6),
-                ELEMENT.getInstance().TIN.getOre(1)));
+        recipeList.add(
+                new MerchantRecipe(
+                        ItemUtils.getItemStackOfAmountFromOreDict("logWood", 32),
+                        ELEMENT.getInstance().IRON.getOre(1)));
+        recipeList.add(
+                new MerchantRecipe(
+                        ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 32),
+                        ELEMENT.getInstance().COPPER.getOre(1)));
+        recipeList.add(
+                new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.obsidian, 6), ELEMENT.getInstance().TIN.getOre(1)));
         recipeList.add(new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.glowstone, 32), Ore1));
         recipeList.add(new MerchantRecipe(ItemUtils.getSimpleStack(Blocks.piston, 32), Ore2));
         Collections.shuffle(recipeList);