updateBuildScript & spotlessApply

65 files changed, 4608 insertions, 4256 deletions

diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java
index 8c145bd634..2a4bf328f7 100644
--- a/src/main/java/common/Blocks.java
+++ b/src/main/java/common/Blocks.java
@@ -5,102 +5,101 @@ import kekztech.KekzCore;
 import net.minecraft.block.Block;
 
 public class Blocks {
-	
-	public static Block yszUnit;
-	public static Block gdcUnit;
-	
-	public static Block tfftCasing;
-	public static Block tfftStorageField1;
-	public static Block tfftStorageField2;
-	public static Block tfftStorageField3;
-	public static Block tfftStorageField4;
-	public static Block tfftStorageField5;
-	public static Block tfftMultiHatch;
-	
-	public static Block reactorChamberOFF;
-	public static Block reactorChamberON;
-	public static Block reactorControlRod;
-	
-	public static Block itemServerDrive;
-	public static Block itemServerRackCasing;
-	public static Block itemServerIOPort;
-	
-	public static Block itemProxyCable;
-	public static Block itemProxySource;
-	public static Block itemProxyEndpoint;
-	
-	public static Block jarThaumiumReinforced;
-	public static Block jarIchor;
-	
-	public static Block lscLapotronicEnergyUnit;
-	public static Block beamTransmitter;
-
-	public static Block spaceElevatorStructure;
-	public static Block spaceElevatorCapacitor;
-	public static Block spaceElevatorTether;
-
-	public static Block largeHexPlate;
-	
-	public static void preInit() {
-		KekzCore.LOGGER.info("Registering blocks...");
-		
-		registerBlocks_SOFC();
-		registerBlocks_TFFT();
-		//registerBlocks_Nuclear();
-		//registerBlocks_ItemProxy();
-		registerBlocks_Jars();
-		registerBlocks_LSC();
-		//registerBlocks_SpaceElevator();
-		registerBlocks_Cosmetics();
-
-		KekzCore.LOGGER.info("Finished registering blocks");
-	}
-	
-	private static void registerBlocks_SOFC() {
-		yszUnit = Block_YSZUnit.registerBlock();
-		gdcUnit = Block_GDCUnit.registerBlock();
-	}
-	
-	private static void registerBlocks_TFFT() {
-		tfftCasing = Block_TFFTCasing.registerBlock();
-		tfftStorageField1 = Block_TFFTStorageFieldBlockT1.registerBlock();
-		tfftStorageField2 = Block_TFFTStorageFieldBlockT2.registerBlock();
-		tfftStorageField3 = Block_TFFTStorageFieldBlockT3.registerBlock();
-		tfftStorageField4 = Block_TFFTStorageFieldBlockT4.registerBlock();
-		tfftStorageField5 = Block_TFFTStorageFieldBlockT5.registerBlock();
-		tfftMultiHatch = Block_TFFTMultiHatch.registerBlock();
-	}
-	
-	/*private static void registerBlocks_Nuclear() {
-		reactorChamberOFF = Block_ReactorChamber_OFF.registerBlock();
-		reactorChamberON = Block_ReactorChamber_ON.registerBlock();
-		reactorControlRod = Block_ControlRod.registerBlock();
-	}
-
-	private static void registerBlocks_ItemProxy() {
-		itemProxyCable = Block_ItemProxyCable.registerBlock();
-		itemProxySource = Block_ItemProxySource.registerBlock();
-		itemProxyEndpoint = Block_ItemProxyEndpoint.registerBlock();
-	}*/
-	
-	private static void registerBlocks_Jars() {
-		jarThaumiumReinforced = Block_ThaumiumReinforcedJar.registerBlock();
-		jarIchor = Block_IchorJar.registerBlock();
-	}
-	
-	private static void registerBlocks_LSC() {
-		lscLapotronicEnergyUnit = Block_LapotronicEnergyUnit.registerBlock();
-		//beamTransmitter = Block_BeamTransmitter.registerBlock();
-	}
-
-	/*private static void registerBlocks_SpaceElevator() {
-		spaceElevatorStructure = Block_SpaceElevator.registerBlock();
-		spaceElevatorCapacitor = Block_SpaceElevatorCapacitor.registerBlock();
-		spaceElevatorTether = Block_SpaceElevatorTether.registerBlock();
-	}*/
-
-	private static void registerBlocks_Cosmetics() {
-		largeHexPlate = Block_LargeHexPlate.registerBlock();
-	}
 
+    public static Block yszUnit;
+    public static Block gdcUnit;
+
+    public static Block tfftCasing;
+    public static Block tfftStorageField1;
+    public static Block tfftStorageField2;
+    public static Block tfftStorageField3;
+    public static Block tfftStorageField4;
+    public static Block tfftStorageField5;
+    public static Block tfftMultiHatch;
+
+    public static Block reactorChamberOFF;
+    public static Block reactorChamberON;
+    public static Block reactorControlRod;
+
+    public static Block itemServerDrive;
+    public static Block itemServerRackCasing;
+    public static Block itemServerIOPort;
+
+    public static Block itemProxyCable;
+    public static Block itemProxySource;
+    public static Block itemProxyEndpoint;
+
+    public static Block jarThaumiumReinforced;
+    public static Block jarIchor;
+
+    public static Block lscLapotronicEnergyUnit;
+    public static Block beamTransmitter;
+
+    public static Block spaceElevatorStructure;
+    public static Block spaceElevatorCapacitor;
+    public static Block spaceElevatorTether;
+
+    public static Block largeHexPlate;
+
+    public static void preInit() {
+        KekzCore.LOGGER.info("Registering blocks...");
+
+        registerBlocks_SOFC();
+        registerBlocks_TFFT();
+        // registerBlocks_Nuclear();
+        // registerBlocks_ItemProxy();
+        registerBlocks_Jars();
+        registerBlocks_LSC();
+        // registerBlocks_SpaceElevator();
+        registerBlocks_Cosmetics();
+
+        KekzCore.LOGGER.info("Finished registering blocks");
+    }
+
+    private static void registerBlocks_SOFC() {
+        yszUnit = Block_YSZUnit.registerBlock();
+        gdcUnit = Block_GDCUnit.registerBlock();
+    }
+
+    private static void registerBlocks_TFFT() {
+        tfftCasing = Block_TFFTCasing.registerBlock();
+        tfftStorageField1 = Block_TFFTStorageFieldBlockT1.registerBlock();
+        tfftStorageField2 = Block_TFFTStorageFieldBlockT2.registerBlock();
+        tfftStorageField3 = Block_TFFTStorageFieldBlockT3.registerBlock();
+        tfftStorageField4 = Block_TFFTStorageFieldBlockT4.registerBlock();
+        tfftStorageField5 = Block_TFFTStorageFieldBlockT5.registerBlock();
+        tfftMultiHatch = Block_TFFTMultiHatch.registerBlock();
+    }
+
+    /*private static void registerBlocks_Nuclear() {
+    	reactorChamberOFF = Block_ReactorChamber_OFF.registerBlock();
+    	reactorChamberON = Block_ReactorChamber_ON.registerBlock();
+    	reactorControlRod = Block_ControlRod.registerBlock();
+    }
+
+    private static void registerBlocks_ItemProxy() {
+    	itemProxyCable = Block_ItemProxyCable.registerBlock();
+    	itemProxySource = Block_ItemProxySource.registerBlock();
+    	itemProxyEndpoint = Block_ItemProxyEndpoint.registerBlock();
+    }*/
+
+    private static void registerBlocks_Jars() {
+        jarThaumiumReinforced = Block_ThaumiumReinforcedJar.registerBlock();
+        jarIchor = Block_IchorJar.registerBlock();
+    }
+
+    private static void registerBlocks_LSC() {
+        lscLapotronicEnergyUnit = Block_LapotronicEnergyUnit.registerBlock();
+        // beamTransmitter = Block_BeamTransmitter.registerBlock();
+    }
+
+    /*private static void registerBlocks_SpaceElevator() {
+    	spaceElevatorStructure = Block_SpaceElevator.registerBlock();
+    	spaceElevatorCapacitor = Block_SpaceElevatorCapacitor.registerBlock();
+    	spaceElevatorTether = Block_SpaceElevatorTether.registerBlock();
+    }*/
+
+    private static void registerBlocks_Cosmetics() {
+        largeHexPlate = Block_LargeHexPlate.registerBlock();
+    }
 }
diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java
index 1e577148fb..bf92f6c697 100644
--- a/src/main/java/common/CommonProxy.java
+++ b/src/main/java/common/CommonProxy.java
@@ -40,5 +40,4 @@ public class CommonProxy {
         // Research
         Researches.postInit();
     }
-
 }
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index eec3020906..558f0b83db 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -14,6 +14,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
+import java.util.HashMap;
 import kekztech.Items;
 import kekztech.KekzCore;
 import net.minecraft.item.ItemStack;
@@ -27,690 +28,834 @@ import thaumcraft.api.aspects.AspectList;
 import thaumcraft.api.crafting.InfusionRecipe;
 import util.Util;
 
-import java.util.HashMap;
-
 public class Recipes {
 
-	public static final HashMap<String, InfusionRecipe> infusionRecipes = new HashMap<>();
-    static Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null ? FluidRegistry.getFluid("molten.indalloy140") : FluidRegistry.getFluid("molten.solderingalloy");
-    static Fluid solderUEV = FluidRegistry.getFluid("molten.mutatedlivingsolder") != null ? FluidRegistry.getFluid("molten.mutatedlivingsolder") : FluidRegistry.getFluid("molten.solderingalloy");
+    public static final HashMap<String, InfusionRecipe> infusionRecipes = new HashMap<>();
+    static Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null
+            ? FluidRegistry.getFluid("molten.indalloy140")
+            : FluidRegistry.getFluid("molten.solderingalloy");
+    static Fluid solderUEV = FluidRegistry.getFluid("molten.mutatedlivingsolder") != null
+            ? FluidRegistry.getFluid("molten.mutatedlivingsolder")
+            : FluidRegistry.getFluid("molten.solderingalloy");
 
     public static void postInit() {
-		KekzCore.LOGGER.info("Registering recipes...");
-
-		registerRecipes_TFFT();
-		registerRecipes_SOFC();
-		//registerRecipes_Nuclear();
-		registerRecipes_Jars();
-		registerRecipes_LSC();
-		//registerRecipes_SpaceElevator();
-		registerRecipes_Cosmetics();
-
-		KekzCore.LOGGER.info("Finished registering recipes");
-	}
-
-	private static void registerRecipes_TFFT() {
-
-		// Controller
-		final Object[] tfft_recipe = {
-				"HFH", "PVP", "CFC",
-				'H', OrePrefixes.pipeMedium.get(Materials.StainlessSteel),
-				'F', ItemList.Field_Generator_MV.get(1L),
-				'P', ItemList.Electric_Pump_HV.get(1L),
-				'V', OrePrefixes.rotor.get(Materials.VibrantAlloy),
-				'C', OrePrefixes.circuit.get(Materials.Data)
-		};
-		GT_ModHandler.addCraftingRecipe(TileEntities.fms.getStackForm(1), tfft_recipe);
-
-		// Blocks
-		final ItemStack[] tfftcasing = {
-				GT_Utility.getIntegratedCircuit(6),
-				GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 3),
-				GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderPearl, 3),
-				GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1),
-			};
-		GT_Values.RA.addAssemblerRecipe(
-				tfftcasing,
-				FluidRegistry.getFluidStack("molten.polytetrafluoroethylene", 144),
-				new ItemStack(Blocks.tfftCasing, 1),
-				200, 256);
-		final ItemStack[] tfftstoragefield1 = {
-			GT_Utility.getIntegratedCircuit(6),
-			GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1),
-			GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PulsatingIron, 1),
-			GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 1),
-			ItemList.Electric_Pump_LV.get(1L)
-		};
-		GT_Values.RA.addAssemblerRecipe(
-				tfftstoragefield1,
-				FluidRegistry.getFluidStack("molten.glass", 144),
-				new ItemStack(Blocks.tfftStorageField1, 1),
-				200, 256);
-		final ItemStack[] tfftstoragefield2 = {
-				GT_Utility.getIntegratedCircuit(6),
-				GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2),
-				GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PulsatingIron, 4),
-				GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1),
-				ItemList.Electric_Pump_MV.get(1L)
-			};
-		GT_Values.RA.addAssemblerRecipe(
-				tfftstoragefield2,
-				FluidRegistry.getFluidStack("molten.plastic", 576),
-				new ItemStack(Blocks.tfftStorageField2, 1),
-				200, 480);
-		final ItemStack[] tfftstoragefield3 = {
-				GT_Utility.getIntegratedCircuit(6),
-				GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 2),
-				GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 2),
-				GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1),
-				ItemList.Field_Generator_MV.get(1L),
-				ItemList.Electric_Pump_HV.get(2L)
-			};
-		GT_Values.RA.addAssemblerRecipe(
-				tfftstoragefield3,
-				FluidRegistry.getFluidStack("molten.epoxid", 576),
-				new ItemStack(Blocks.tfftStorageField3, 1),
-				300, 1920);
-		final ItemStack[] tfftstoragefield4 = {
-				GT_Utility.getIntegratedCircuit(6),
-				GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 4),
-				GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.NiobiumTitanium, 1),
-				GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.TungstenSteel, 1),
-				ItemList.Field_Generator_HV.get(1L),
-				ItemList.Electric_Pump_EV.get(1L)
-			};
-		GT_Values.RA.addAssemblerRecipe(
-				tfftstoragefield4,
-				FluidRegistry.getFluidStack("molten.epoxid", 1152),
-				new ItemStack(Blocks.tfftStorageField4, 1),
-				400, 4098);
-		final ItemStack[] tfftstoragefield5 = {
-				GT_Utility.getIntegratedCircuit(6),
-				GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 4),
-				GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.HSSS, 1),
-				GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Enderium, 1),
-				ItemList.Field_Generator_EV.get(1L),
-				ItemList.Electric_Pump_IV.get(1L)
-			};
-		GT_Values.RA.addAssemblerRecipe(
-				tfftstoragefield5,
-				FluidRegistry.getFluidStack("molten.epoxid", 1152),
-				new ItemStack(Blocks.tfftStorageField5, 1),
-				400, 6147);
-		// Multi Hatch
-		final Object[] multi_hatch_HV = {
-				"PRP", "UFU", "PRP",
-				'P', GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 1),
-				'R', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1),
-				'U', ItemList.Electric_Pump_HV.get(1L),
-				'F', ItemList.Field_Generator_LV.get(1L)
-		};
-		GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.tfftMultiHatch), multi_hatch_HV);
-		final Object[] multi_hatch_IV = {
-				"PRP", "UFU", "PRP",
-				'P', GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 1),
-				'R', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1),
-				'U', ItemList.Electric_Pump_IV.get(1L),
-				'F', ItemList.Field_Generator_HV.get(1L)
-		};
-		GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.tfftMultiHatch), multi_hatch_IV);
-		final Object[] multi_hatch_ZPM = {
-				"PRP", "UFU", "PRP",
-				'P', GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NaquadahAlloy, 1),
-				'R', GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 1),
-				'U', ItemList.Electric_Pump_ZPM.get(1L),
-				'F', ItemList.Field_Generator_IV.get(1L)
-		};
-		GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.tfftMultiHatch), multi_hatch_ZPM);
-
-		// Conversion recipe from deprecated hatch to new one (old hatch is equal to new IV hatch)
-		GT_ModHandler.addShapelessCraftingRecipe(TileEntities.mhIV.getStackForm(1),
-				new ItemStack[]{new ItemStack(Blocks.tfftMultiHatch, 1)});
-	}
-
-	private static void registerRecipes_SOFC() {
-
-		final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance();
-
-		// Controller
-		final Object[] mk1_recipe = {
-				"CCC", "PHP", "FBL",
-				'C', OrePrefixes.circuit.get(Materials.Advanced),
-				'P', ItemList.Electric_Pump_HV.get(1L),
-				'H', ItemList.Hull_HV.get(1L),
-				'F', GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.StainlessSteel, 1),
-				'B', GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Gold, 1),
-				'L', GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 1)
-		};
-		GT_ModHandler.addCraftingRecipe(TileEntities.sofc1.getStackForm(1), mk1_recipe);
-		final Object[] mk2_recipe = {
-				"CCC", "PHP", "FBL",
-				'C', OrePrefixes.circuit.get(Materials.Master),
-				'P', ItemList.Electric_Pump_IV.get(1L),
-				'H', ItemList.Hull_IV.get(1L),
-				'F', GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Ultimate, 1),
-				'B', Util.getStackofAmountFromOreDict("wireGt04SuperconductorEV", 1),
-				'L', GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 1)
-		};
-		GT_ModHandler.addCraftingRecipe(TileEntities.sofc2.getStackForm(1), mk2_recipe);
-
-		// Blocks
-		final ItemStack[] yszUnit = {
-				GT_Utility.getIntegratedCircuit(6),
-				craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 4),
-				GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Yttrium, 1),
-				GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1),
-				ItemList.Electric_Motor_HV.get(1L),
-		};
-		GT_Values.RA.addAssemblerRecipe(
-				yszUnit,
-				Materials.Hydrogen.getGas(4000),
-				new ItemStack(Blocks.yszUnit, 1),
-				1200, 480);
-		final ItemStack[] gdcUnit = {
-				GT_Utility.getIntegratedCircuit(6),
-				craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 8),