Buildscript + Spotless (#318)

* Convert AES.java to readable class

* Buildscript

* Spotless

10 files changed, 791 insertions, 645 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
index 3716359d7a..add656087d 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
@@ -30,169 +30,353 @@ import net.minecraft.item.ItemStack;
 
 public class BOP_Block_Registrator {
 
-	public static Block log_Rainforest;
-	public static Block leaves_Rainforest;
-	public static Block sapling_Rainforest;
-	public static Block log_Pine;
-	public static Block leaves_Pine;
-	public static Block sapling_Pine;
+    public static Block log_Rainforest;
+    public static Block leaves_Rainforest;
+    public static Block sapling_Rainforest;
+    public static Block log_Pine;
+    public static Block leaves_Pine;
+    public static Block sapling_Pine;
 
-	//Runs Each tree Type separately
-	public static final void run(){
-		registerTree_Rainforest();
-		registerTree_Pine();
-	}
+    // Runs Each tree Type separately
+    public static final void run() {
+        registerTree_Rainforest();
+        registerTree_Pine();
+    }
 
+    private static final boolean registerTree_Rainforest() {
+        log_Rainforest = new LogRainforestTree();
+        leaves_Rainforest = new LeavesRainforestTree();
+        sapling_Rainforest = new SaplingRainforestTree();
+        ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(log_Rainforest), "logWood", true);
+        ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(leaves_Rainforest), "treeLeaves", true);
+        ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(sapling_Rainforest), "treeSapling", true);
+        return true;
+    }
 
-	private static final boolean registerTree_Rainforest(){
-		log_Rainforest = new LogRainforestTree();
-		leaves_Rainforest = new LeavesRainforestTree();
-		sapling_Rainforest = new SaplingRainforestTree();
-		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(log_Rainforest), "logWood", true);
-		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(leaves_Rainforest), "treeLeaves", true);
-		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(sapling_Rainforest), "treeSapling", true);		
-		return true;
-	}
+    private static final boolean registerTree_Pine() {
+        log_Pine = new LogPineTree();
+        leaves_Pine = new LeavesPineTree();
+        sapling_Pine = new SaplingPineTree();
+        ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(log_Pine), "logWood", true);
+        ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(leaves_Pine), "treeLeaves", true);
+        ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(sapling_Pine), "treeSapling", true);
+        return true;
+    }
 
-	private static final boolean registerTree_Pine(){
-		log_Pine = new LogPineTree();
-		leaves_Pine = new LeavesPineTree();
-		sapling_Pine = new SaplingPineTree();
-		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(log_Pine), "logWood", true);
-		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(leaves_Pine), "treeLeaves", true);
-		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(sapling_Pine), "treeSapling", true);		
-		return true;
-	}
+    public static final void recipes() {
+        // Rainforest Oak
+        addLogRecipes(ItemUtils.getSimpleStack(log_Rainforest));
+        addSaplingRecipes(ItemUtils.getSimpleStack(sapling_Rainforest));
+        // Pine
+        addLogRecipes(ItemUtils.getSimpleStack(log_Pine));
+        addSaplingRecipes(ItemUtils.getSimpleStack(sapling_Pine));
+    }
 
-	public static final void recipes() {		
-		// Rainforest Oak
-		addLogRecipes(ItemUtils.getSimpleStack(log_Rainforest));
-		addSaplingRecipes(ItemUtils.getSimpleStack(sapling_Rainforest));
-		// Pine
-		addLogRecipes(ItemUtils.getSimpleStack(log_Pine));
-		addSaplingRecipes(ItemUtils.getSimpleStack(sapling_Pine));
+    public static final void addLogRecipes(final ItemStack aStack) {
+        RecipeUtils.addShapelessGregtechRecipe(
+                new ItemStack[] {aStack},
+                ItemUtils.getSimpleStack(
+                        Item.getItemFromBlock(Blocks.planks), GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 4));
+        RecipeUtils.recipeBuilder(
+                CI.craftingToolSaw,
+                null,
+                null,
+                aStack,
+                null,
+                null,
+                null,
+                null,
+                null,
+                ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.planks), 4));
+        GT_ModHandler.addPulverisationRecipe(
+                GT_Utility.copyAmount(1L, aStack),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L),
+                80,
+                false);
+        GT_ModHandler.addCraftingRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L),
+                GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                new Object[] {"sLf", 'L', GT_Utility.copyAmount(1L, aStack)});
+        GT_Values.RA.addLatheRecipe(
+                GT_Utility.copyAmount(1L, aStack),
+                GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 4L),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L),
+                160,
+                8);
 
-	}
+        if (!CORE.GTNH) {
+            GT_Values.RA.addAssemblerRecipe(
+                    GT_Utility.copyAmount(1L, aStack),
+                    ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]),
+                    Materials.SeedOil.getFluid(50L),
+                    ItemList.FR_Stick.get(1L, new Object[0]),
+                    16,
+                    8);
+            GT_Values.RA.addAssemblerRecipe(
+                    GT_Utility.copyAmount(8L, aStack),
+                    ItemList.Circuit_Integrated.getWithDamage(0L, 8L, new Object[0]),
+                    Materials.SeedOil.getFluid(250L),
+                    ItemList.FR_Casing_Impregnated.get(1L, new Object[0]),
+                    64,
+                    16);
+            GT_Values.RA.addChemicalBathRecipe(
+                    GT_Utility.copyAmount(1L, aStack),
+                    Materials.Creosote.getFluid(1000L),
+                    GT_ModHandler.getModItem("Railcraft", "tile.railcraft.cube", 1L, 8),
+                    null,
+                    null,
+                    null,
+                    16,
+                    16);
+        }
 
-	public static final void addLogRecipes(final ItemStack aStack) {		
-		RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aStack}, ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.planks), GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 4));
-		RecipeUtils.recipeBuilder(
-				CI.craftingToolSaw, null, null,
-				aStack, null, null,
-				null, null, null,
-				ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.planks), 4));		
-		GT_ModHandler.addPulverisationRecipe(GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 6L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), 80, false);
-		GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "sLf", 'L', GT_Utility.copyAmount(1L, aStack) });
-		GT_Values.RA.addLatheRecipe(GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), 160, 8);
+        final short aMeta = (short) aStack.getItemDamage();
+        if (aMeta == 32767) {
+            if (GT_Utility.areStacksEqual(
+                    GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null),
+                    new ItemStack(Items.coal, 1, 1))) {
+                addPyrolyeOvenRecipes(aStack);
+                if (GregTech_API.sRecipeFile.get(
+                        ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
+                    GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack));
+                }
+            }
+            for (int i = 0; i < 32767; ++i) {
+                if (GT_Utility.areStacksEqual(
+                        GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null),
+                        new ItemStack(Items.coal, 1, 1))) {
+                    addPyrolyeOvenRecipes(aStack);
+                    if (GregTech_API.sRecipeFile.get(
+                            ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
+                        GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i));
+                    }
+                }
+                final ItemStack tStack = GT_ModHandler.getRecipeOutput(new ItemStack(aStack.getItem(), 1, i));
+                if (tStack == null) {
+                    if (i >= 16) {
+                        break;
+                    }
+                } else {
+                    final ItemStack tPlanks = GT_Utility.copy(tStack);
+                    tPlanks.stackSize = tPlanks.stackSize * 3 / 2;
+                    GT_Values.RA.addCutterRecipe(
+                            new ItemStack(aStack.getItem(), 1, i),
+                            Materials.Lubricant.getFluid(1L),
+                            GT_Utility.copy(tPlanks),
+                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L),
+                            200,
+                            8);
+                    GT_Values.RA.addCutterRecipe(
+                            new ItemStack(aStack.getItem(), 1, i),
+                            GT_Utility.copyAmount(
+                                    GT_Mod.gregtechproxy.mNerfedWoodPlank
+                                            ? ((long) tStack.stackSize)
+                                            : ((long) (tStack.stackSize * 5 / 4)),
+                                    tStack),
+                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L),
+                            200,
+                            8);
+                    GT_ModHandler.addSawmillRecipe(
+                            new ItemStack(aStack.getItem(), 1, i),
+                            tPlanks,
+                            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L));
+                    GT_ModHandler.removeRecipe(new ItemStack(aStack.getItem(), 1, i));
+                    GT_ModHandler.addCraftingRecipe(
+                            GT_Utility.copyAmount(
+                                    GT_Mod.gregtechproxy.mNerfedWoodPlank
+                                            ? ((long) tStack.stackSize)
+                                            : ((long) (tStack.stackSize * 5 / 4)),
+                                    tStack),
+                            new Object[] {"s", "L", 'L', new ItemStack(aStack.getItem(), 1, i)});
+                    GT_ModHandler.addShapelessCraftingRecipe(
+                            GT_Utility.copyAmount(
+                                    tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack),
+                            new Object[] {new ItemStack(aStack.getItem(), 1, i)});
+                }
+            }
+        } else {
+            if (GT_Utility.areStacksEqual(
+                    GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null),
+                    new ItemStack(Items.coal, 1, 1))) {
+                addPyrolyeOvenRecipes(aStack);
+                if (GregTech_API.sRecipeFile.get(
+                        ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
+                    GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack));
+                }
+            }
+            final ItemStack tStack2 = GT_ModHandler.getRecipeOutput(GT_Utility.copyAmount(1L, aStack));
+            if (tStack2 != null) {
+                final ItemStack tPlanks2 = GT_Utility.copy(tStack2);
+                tPlanks2.stackSize = tPlanks2.stackSize * 3 / 2;
+                GT_Values.RA.addCutterRecipe(
+                        GT_Utility.copyAmount(1L, aStack),
+                        Materials.Lubricant.getFluid(1L),
+                        GT_Utility.copy(tPlanks2),
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L),
+                        200,
+                        8);
+                GT_Values.RA.addCutterRecipe(
+                        GT_Utility.copyAmount(1L, aStack),
+                        GT_Utility.copyAmount(
+                                GT_Mod.gregtechproxy.mNerfedWoodPlank
+                                        ? ((long) tStack2.stackSize)
+                                        : ((long) (tStack2.stackSize * 5 / 4)),
+                                tStack2),
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L),
+                        200,
+                        8);
+                GT_ModHandler.addSawmillRecipe(
+                        GT_Utility.copyAmount(1L, aStack),
+                        tPlanks2,
+                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L));
+                GT_ModHandler.removeRecipe(GT_Utility.copyAmount(1L, aStack));
+                GT_ModHandler.addCraftingRecipe(
+                        GT_Utility.copyAmount(
+                                GT_Mod.gregtechproxy.mNerfedWoodPlank
+                                        ? ((long) tStack2.stackSize)
+                                        : ((long) (tStack2.stackSize * 5 / 4)),
+                                tStack2),
+                        new Object[] {"s", "L", 'L', GT_Utility.copyAmount(1L, aStack)});
+                GT_ModHandler.addShapelessCraftingRecipe(
+                        GT_Utility.copyAmount(
+                                tStack2.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack2),
+                        new Object[] {GT_Utility.copyAmount(1L, aStack)});
+            }
+        }
+        if (GT_Utility.areStacksEqual(
+                GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null),
+                new ItemStack(Items.coal, 1, 1))) {
+            addPyrolyeOvenRecipes(aStack);
+            if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
+                GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack));
+            }
+        }
+    }
 
-		if (!CORE.GTNH) {
-			GT_Values.RA.addAssemblerRecipe(GT_Utility.copyAmount(1L, aStack), ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), Materials.SeedOil.getFluid(50L), ItemList.FR_Stick.get(1L, new Object[0]), 16, 8);
-			GT_Values.RA.addAssemblerRecipe(GT_Utility.copyAmount(8L, aStack), ItemList.Circuit_Integrated.getWithDamage(0L, 8L, new Object[0]), Materials.SeedOil.getFluid(250L), ItemList.FR_Casing_Impregnated.get(1L, new Object[0]), 64, 16);		
-			GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, aStack), Materials.Creosote.getFluid(1000L), GT_ModHandler.getModItem("Railcraft", "tile.railcraft.cube", 1L, 8), null, null, null, 16, 16);
-		}
+    public static void addSaplingRecipes(final ItemStack aStack) {
+        GT_ModHandler.addPulverisationRecipe(
+                GT_Utility.copyAmount(1L, aStack),
+                GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L),
+                null,
+                0,
+                false);
+        GT_ModHandler.addCompressionRecipe(
+                GT_Utility.copyAmount(8L, aStack), ItemList.IC2_Plantball.get(1L, new Object[0]));
+        GT_Values.RA.addLatheRecipe(
+                GT_Utility.copyAmount(1L, aStack),
+                GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L),
+                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Wood, 1L),
+                16,
+                8);
+    }
 
-		final short aMeta = (short)aStack.getItemDamage();
-		if (aMeta == 32767) {
-			if (GT_Utility.areStacksEqual(GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1))) {
-				addPyrolyeOvenRecipes(aStack);
-				if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
-					GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack));
-				}
-			}
-			for (int i = 0; i < 32767; ++i) {
-				if (GT_Utility.areStacksEqual(GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), new ItemStack(Items.coal, 1, 1))) {
-					addPyrolyeOvenRecipes(aStack);
-					if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
-						GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i));
-					}
-				}
-				final ItemStack tStack = GT_ModHandler.getRecipeOutput(new ItemStack(aStack.getItem(), 1, i));
-				if (tStack == null) {
-					if (i >= 16) {
-						break;
-					}
-				}
-				else {
-					final ItemStack tPlanks = GT_Utility.copy(tStack);
-					tPlanks.stackSize = tPlanks.stackSize * 3 / 2;
-					GT_Values.RA.addCutterRecipe(new ItemStack(aStack.getItem(), 1, i), Materials.Lubricant.getFluid(1L), GT_Utility.copy(tPlanks), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), 200, 8);
-					GT_Values.RA.addCutterRecipe(new ItemStack(aStack.getItem(), 1, i), GT_Utility.copyAmount(GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long)tStack.stackSize) : ((long)(tStack.stackSize * 5 / 4)), tStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), 200, 8);
-					GT_ModHandler.addSawmillRecipe(new ItemStack(aStack.getItem(), 1, i), tPlanks, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L));
-					GT_ModHandler.removeRecipe(new ItemStack(aStack.getItem(), 1, i));
-					GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long)tStack.stackSize) : ((long)(tStack.stackSize * 5 / 4)), tStack), new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) });
-					GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), new Object[] { new ItemStack(aStack.getItem(), 1, i) });
-				}
-			}
-		}
-		else {
-			if (GT_Utility.areStacksEqual(GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1))) {
-				addPyrolyeOvenRecipes(aStack);
-				if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
-					GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack));
-				}
-			}
-			final ItemStack tStack2 = GT_ModHandler.getRecipeOutput(GT_Utility.copyAmount(1L, aStack));
-			if (tStack2 != null) {
-				final ItemStack tPlanks2 = GT_Utility.copy(tStack2);
-				tPlanks2.stackSize = tPlanks2.stackSize * 3 / 2;
-				GT_Values.RA.addCutterRecipe(GT_Utility.copyAmount(1L, aStack), Materials.Lubricant.getFluid(1L), GT_Utility.copy(tPlanks2), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), 200, 8);
-				GT_Values.RA.addCutterRecipe(GT_Utility.copyAmount(1L, aStack), GT_Utility.copyAmount(GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long)tStack2.stackSize) : ((long)(tStack2.stackSize * 5 / 4)), tStack2), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L), 200, 8);
-				GT_ModHandler.addSawmillRecipe(GT_Utility.copyAmount(1L, aStack), tPlanks2, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L));
-				GT_ModHandler.removeRecipe(GT_Utility.copyAmount(1L, aStack));
-				GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long)tStack2.stackSize) : ((long)(tStack2.stackSize * 5 / 4)), tStack2), new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) });
-				GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(tStack2.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack2), new Object[] { GT_Utility.copyAmount(1L, aStack) });
-			}
-		}
-		if (GT_Utility.areStacksEqual(GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1))) {
-			addPyrolyeOvenRecipes(aStack);
-			if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) {
-				GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack));
-			}
-		}
-	}
+    public static void addPyrolyeOvenRecipes(final ItemStack logStack) {
 
-	public static void addSaplingRecipes(final ItemStack aStack) {
-		GT_ModHandler.addPulverisationRecipe(GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L), null, 0, false);
-		GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(8L, aStack), ItemList.IC2_Plantball.get(1L, new Object[0]));
-		GT_Values.RA.addLatheRecipe(GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Wood, 1L), 16, 8);
-	}
+        Materials aOilHeavy = MaterialUtils.getMaterial("OilHeavy");
+        Materials aCharcoalByproducts = MaterialUtils.getMaterial("CharcoalByproducts");
+        Materials aWoodGas = MaterialUtils.getMaterial("WoodGas");
+        Materials aWoodVinegar = MaterialUtils.getMaterial("WoodVinegar");
+        Materials aWoodTar = MaterialUtils.getMaterial("WoodTar");
 
-	public static void addPyrolyeOvenRecipes(final ItemStack logStack) {
-
-		Materials aOilHeavy = MaterialUtils.getMaterial("OilHeavy");
-		Materials aCharcoalByproducts = MaterialUtils.getMaterial("CharcoalByproducts");
-		Materials aWoodGas = MaterialUtils.getMaterial("WoodGas");
-		Materials aWoodVinegar = MaterialUtils.getMaterial("WoodVinegar");
-		Materials aWoodTar = MaterialUtils.getMaterial("WoodTar");
-
-
-		CORE.RA.addPyrolyseRecipe(GT_Utility.copyAmount(16L, logStack), GT_Values.NF, 1, MaterialHelper.getGems(Materials.Charcoal, 20), Materials.Creosote.getFluid(4000L), 640, 64);
-		CORE.RA.addPyrolyseRecipe(GT_Utility.copyAmount(16L, logStack), Materials.Nitrogen.getGas(1000L), 2, MaterialHelper.getGems(Materials.Charcoal, 20), Materials.Creosote.getFluid(4000L), 320, 96);
-		
-		if (aOilHeavy != null) {
-			CORE.RA.addPyrolyseRecipe(GT_Utility.copyAmount(16L, logStack), GT_Values.NF, 3, MaterialHelper.getDust(Materials.Ash, 4), aOilHeavy.getFluid(200L), 320, 192);
-			
-		}
-		if (aCharcoalByproducts != null) {
-			CORE.RA.addPyrolyseRecipe(GT_Utility.copyAmount(16L, logStack), GT_Values.NF, 3, MaterialHelper.getGems(Materials.Charcoal, 20), aCharcoalByproducts.getGas(4000L), 640, 64);
-			CORE.RA.addPyrolyseRecipe(GT_Utility.copyAmount(16L, logStack), Materials.Nitrogen.getGas(1000L), 4, MaterialHelper.getGems(Materials.Charcoal, 20), aCharcoalByproducts.getGas(4000L), 320, 96);
-			
-		}
-		if (aWoodGas != null) {
-			CORE.RA.addPyrolyseRecipe(GT_Utility.copyAmount(16L, logStack), GT_Values.NF, 5, MaterialHelper.getGems(Materials.Charcoal, 20), aWoodGas.getGas(1500L), 640, 64);
-			CORE.RA.addPyrolyseRecipe(GT_Utility.copyAmount(16L, logStack), Materials.Nitrogen.getGas(1000L), 6, MaterialHelper.getGems(Materials.Charcoal, 20), aWoodGas.getGas(1500L), 320, 96);
-			
-		}
-		if (aWoodVinegar != null) {
-			CORE.RA.addPyrolyseRecipe(GT_Utility.copyAmount(16L, logStack), GT_Values.NF, 7, MaterialHelper.getGems(Materials.Charcoal, 20), aWoodVinegar.getFluid(3000L), 640, 64);
-			CORE.RA.addPyrolyseRecipe(GT_Utility.copyAmount(16L, logStack), Materials.Nitrogen.getGas(1000L), 8, MaterialHelper.getGems(Materials.Charcoal, 20), aWoodVinegar.getFluid(3000L), 320, 96);
-			
-		}
-		if (aWoodTar != null) {
-			CORE.RA.addPyrolyseRecipe(GT_Utility.copyAmount(16L, logStack), GT_Values.NF, 9, MaterialHelper.getGems(Materials.Charcoal, 20), aWoodTar.getFluid(1500L), 640, 64);
-			CORE.RA.addPyrolyseRecipe(GT_Utility.copyAmount(16L, logStack), Materials.Nitrogen.getGas(1000L), 10, MaterialHelper.getGems(Materials.Charcoal, 20), aWoodTar.getFluid(1500L), 320, 96);
-		
-		}
-	}
+        CORE.RA.addPyrolyseRecipe(
+                GT_Utility.copyAmount(16L, logStack),
+                GT_Values.NF,
+                1,
+                MaterialHelper.getGems(Materials.Charcoal, 20),
+                Materials.Creosote.getFluid(4000L),
+                640,
+                64);
+        CORE.RA.addPyrolyseRecipe(
+                GT_Utility.copyAmount(16L, logStack),
+                Materials.Nitrogen.getGas(1000L),
+                2,
+                MaterialHelper.getGems(Materials.Charcoal, 20),
+                Materials.Creosote.getFluid(4000L),
+                320,
+                96);
 
+        if (aOilHeavy != null) {
+            CORE.RA.addPyrolyseRecipe(
+                    GT_Utility.copyAmount(16L, logStack),
+                    GT_Values.NF,
+                    3,
+                    MaterialHelper.getDust(Materials.Ash, 4),
+                    aOilHeavy.getFluid(200L),
+                    320,
+                    192);
+        }
+        if (aCharcoalByproducts != null) {
+            CORE.RA.addPyrolyseRecipe(
+                    GT_Utility.copyAmount(16L, logStack),
+                    GT_Values.NF,
+                    3,
+                    MaterialHelper.getGems(Materials.Charcoal, 20),
+                    aCharcoalByproducts.getGas(4000L),
+                    640,
+                    64);
+            CORE.RA.addPyrolyseRecipe(
+                    GT_Utility.copyAmount(16L, logStack),
+                    Materials.Nitrogen.getGas(1000L),
+                    4,
+                    MaterialHelper.getGems(Materials.Charcoal, 20),
+                    aCharcoalByproducts.getGas(4000L),
+                    320,
+                    96);
+        }
+        if (aWoodGas != null) {
+            CORE.RA.addPyrolyseRecipe(
+                    GT_Utility.copyAmount(16L, logStack),
+                    GT_Values.NF,
+                    5,
+                    MaterialHelper.getGems(Materials.Charcoal, 20),
+                    aWoodGas.getGas(1500L),
+                    640,
+                    64);
+            CORE.RA.addPyrolyseRecipe(
+                    GT_Utility.copyAmount(16L, logStack),
+                    Materials.Nitrogen.getGas(1000L),
+                    6,
+                    MaterialHelper.getGems(Materials.Charcoal, 20),
+                    aWoodGas.getGas(1500L),
+                    320,
+                    96);
+        }
+        if (aWoodVinegar != null) {
+            CORE.RA.addPyrolyseRecipe(
+                    GT_Utility.copyAmount(16L, logStack),
+                    GT_Values.NF,
+                    7,
+                    MaterialHelper.getGems(Materials.Charcoal, 20),
+                    aWoodVinegar.getFluid(3000L),
+                    640,
+                    64);
+            CORE.RA.addPyrolyseRecipe(
+                    GT_Utility.copyAmount(16L, logStack),
+                    Materials.Nitrogen.getGas(1000L),
+                    8,
+                    MaterialHelper.getGems(Materials.Charcoal, 20),
+                    aWoodVinegar.getFluid(3000L),
+                    320,
+                    96);
+        }
+        if (aWoodTar != null) {
+            CORE.RA.addPyrolyseRecipe(
+                    GT_Utility.copyAmount(16L, logStack),
+                    GT_Values.NF,
+                    9,
+                    MaterialHelper.getGems(Materials.Charcoal, 20),
+                    aWoodTar.getFluid(1500L),
+                    640,
+                    64);
+            CORE.RA.addPyrolyseRecipe(
+                    GT_Utility.copyAmount(16L, logStack),
+                    Materials.Nitrogen.getGas(1000L),
+                    10,
+                    MaterialHelper.getGems(Materials.Charcoal, 20),
+                    aWoodTar.getFluid(1500L),
+                    320,
+                    96);
+        }
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
index 5c86c45591..c2d534dfb6 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
@@ -1,13 +1,16 @@
 package gtPlusPlus.xmod.bop.blocks.base;
 
-import java.util.List;
-import java.util.Random;
-
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import java.util.List;
+import java.util.Random;
 import net.minecraft.block.BlockLeaves;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -18,92 +21,87 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-
 public class LeavesBase extends BlockLeaves {
 
-	protected IIcon[][] leafTextures = new IIcon[2][];
-	protected String[][] leafType = new String[][] {{}, {}};
-	protected String[] treeType = new String[] {};
-	protected ItemStack[] bonusDrops;
-
-	@SuppressWarnings("deprecation")
-	public LeavesBase(String blockNameLocalized, String blockNameUnlocalized, ItemStack[] bonusDrops){
-		this.bonusDrops = bonusDrops;
-		String blockName = "block"+Utils.sanitizeString(blockNameLocalized)+"Leaves";
-		GameRegistry.registerBlock(this, ItemBlock.class, blockName);
-		this.setBlockName(blockName);
-		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), "treeLeaves", true);
-		this.setCreativeTab(AddToCreativeTab.tabBOP);
-		LanguageRegistry.addName(this, blockNameLocalized+" Leaves");
-		Blocks.fire.setFireInfo(this, 80, 150);
-	}
-
-	private final void setVanillaVariable(Object toSet, Object value){
-		toSet = value;
-	}
-
-	@Override
-	public int quantityDropped(Random p_149745_1_){
-		return p_149745_1_.nextInt(20) == 0 ? 1 : 0;
-	}
-
-
-	@Override//Drops when Leaf is broken
-	protected void func_150124_c(World world, int x, int y, int z, int meta, int randomChance){
-		Logger.INFO("Dropping Bonus Drops");
-		for (int i = 0; i < this.bonusDrops.length; ++i){
-			if (this.bonusDrops[i] != null && world.rand.nextInt(randomChance) == 0){
-				this.dropBlockAsItem(world, x, y, z, ItemUtils.getSimpleStack(this.bonusDrops[i], 1));
-			}
-		}
-	}
-
-	/**
-	 * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks)
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void getSubBlocks(Item item, CreativeTabs tab, @SuppressWarnings("rawtypes") List metaList){
-		for (int i = 0; i < this.treeType.length; ++i){
-			metaList.add(new ItemStack(item, 1, i));
-		}
-	}
-
-	/**
-	 * Gets the block's texture. Args: side, meta
-	 */
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int p_149691_1_, int metaID){    	
-		return (metaID & 3) == 1 ? this.leafTextures[this.field_150127_b][1] : this.leafTextures[this.field_150127_b][0];
-	}
-
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister iIcon){
-		for (int i = 0; i < leafType.length; ++i){
-			this.leafTextures[i] = new IIcon[leafType[i].length];
-			for (int j = 0; j < leafType[i].length; ++j){
-				this.leafTextures[i][j] = iIcon.registerIcon(CORE.MODID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]);
-			}
-		}
-		setVanillaVariable(this.field_150129_M, this.leafTextures);
-	}
-
-	@Override
-	public String[] func_150125_e()
-	{
-		return treeType;
-	}
-}
\ No newline at end of file
+    protected IIcon[][] leafTextures = new IIcon[2][];
+    protected String[][] leafType = new String[][] {{}, {}};
+    protected String[] treeType = new String[] {};
+    protected ItemStack[] bonusDrops;
+
+    @SuppressWarnings("deprecation")
+    public LeavesBase(String blockNameLocalized, String blockNameUnlocalized, ItemStack[] bonusDrops) {
+        this.bonusDrops = bonusDrops;
+        String blockName = "block" + Utils.sanitizeString(blockNameLocalized) + "Leaves";
+        GameRegistry.registerBlock(this, ItemBlock.class, blockName);
+        this.setBlockName(blockName);
+        ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), "treeLeaves", true);
+        this.setCreativeTab(AddToCreativeTab.tabBOP);
+        LanguageRegistry.addName(this, blockNameLocalized + " Leaves");
+        Blocks.fire.setFireInfo(this, 80, 150);
+    }
+
+    private final void setVanillaVariable(Object toSet, Object value) {
+        toSet = value;
+    }
+
+    @Override
+    public int quantityDropped(Random p_149745_1_) {
+        return p_149745_1_.nextInt(20) == 0 ? 1 : 0;
+    }
+
+    @Override // Drops when Leaf is broken
+    protected void func_150124_c(World world, int x, int y, int z, int meta, int randomChance) {
+        Logger.INFO("Dropping Bonus Drops");
+        for (int i = 0; i < this.bonusDrops.length; ++i) {
+            if (this.bonusDrops[i] != null && world.rand.nextInt(randomChance) == 0) {
+                this.dropBlockAsItem(world, x, y, z, ItemUtils.getSimpleStack(this.bonusDrops[i], 1));
+            }
+        }
+    }
+
+    /**
+     * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks)
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void getSubBlocks(Item item, CreativeTabs tab, @SuppressWarnings("rawtypes") List metaList) {
+        for (int i = 0; i < this.treeType.length; ++i) {
+            metaList.add(new ItemStack(item, 1, i));
+        }
+    }
+
+    /**
+     * Gets the block's texture. Args: side, meta
+     */
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(int p_149691_1_, int metaID) {
+        return (metaID & 3) == 1
+                ? this.leafTextures[this.field_150127_b][1]
+                : this.leafTextures[this.field_150127_b][0];
+    }
+
+    @Override
+    public boolean isOpaqueCube() {
+        return false;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister iIcon) {
+        for (int i = 0; i < leafType.length; ++i) {
+            this.leafTextures[i] = new IIcon[leafType[i].length];
+            for (int j = 0; j < leafType[i].length; ++j) {
+                this.leafTextures[i][j] =
+                        iIcon.registerIcon(CORE.MODID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]);
+            }
+        }
+        setVanillaVariable(this.field_150129_M, this.leafTextures);
+    }
+
+    @Override
+    public String[] func_150125_e() {
+        return treeType;
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
index 8e8ca0ed0a..4c8a905834 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
@@ -1,12 +1,14 @@
 package gtPlusPlus.xmod.bop