Buildscript + Spotless (#318)

* Convert AES.java to readable class

* Buildscript

* Spotless

11 files changed, 2733 insertions, 2417 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
index 123df8fe0f..467602ce04 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
@@ -1,82 +1,84 @@
 package gtPlusPlus.xmod.gregtech.common.blocks.textures;
 
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-
 import gregtech.api.enums.Textures;
-
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
 
 public class CasingTextureHandler {
 
-	//private static final TexturesGregtech59 gregtech59 = new TexturesGregtech59();
-	//private static final TexturesGregtech58 gregtech58 = new TexturesGregtech58();
-	private static final TexturesCentrifugeMultiblock gregtechX = new TexturesCentrifugeMultiblock();
-
-	public static  IIcon getIcon(final int aSide, final int aMeta) { //Texture ID's. case 0 == ID[57]
-		if ((aMeta >= 0) && (aMeta < 16)) {
-			switch (aMeta) {
-			//Centrifuge
-			case 0:
-				return TexturesGtBlock.Casing_Material_Centrifuge.getIcon();
-				//Coke Oven Frame
-			case 1:
-				return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon();
-				//Coke Oven Casing Tier 1
-			case 2:
-				return Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon();
-				//Coke Oven Casing Tier 2
-			case 3:
-				return Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon();
-				//Material Press Casings
-			case 4:
-				return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
-				//Electrolyzer Casings
-			case 5:
-				return TexturesGtBlock.Casing_Material_Potin.getIcon();
-				//Broken Blue Fusion Casings
-			case 6:
-				return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();
-				//Maceration Stack Casings
-			case 7:
-				return TexturesGtBlock.Casing_Material_Tumbaga.getIcon();
-				//Broken Pink Fusion Casings
-			case 8:
-				return TexturesGtBlock.TEXTURE_ORGANIC_PANEL_A_GLOWING.getIcon();
-				//Matter Fabricator Casings
-			case 9:
-				return TexturesGtBlock.TEXTURE_METAL_PANEL_F.getIcon();
-				//Iron Blast Fuance Textures
-			case 10:
-				return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
-				//Multitank Exterior Casing
-			case 11:
-				return TexturesGtBlock.Casing_Material_Grisium.getIcon();
-				//Reactor Casing I
-			case 12:
-				return TexturesGtBlock.Casing_Material_Stellite.getIcon();
-				//Reactor Casing II
-			case 13:
-				return TexturesGtBlock.Casing_Material_Zeron100.getIcon();
-			case 14:
-				return TexturesGtBlock.Casing_Staballoy_Firebox.getIcon();
-			case 15:
-				return TexturesGtBlock.Casing_Material_ZirconiumCarbide.getIcon();
-
-			default:
-				return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon();
+    // private static final TexturesGregtech59 gregtech59 = new TexturesGregtech59();
+    // private static final TexturesGregtech58 gregtech58 = new TexturesGregtech58();
+    private static final TexturesCentrifugeMultiblock gregtechX = new TexturesCentrifugeMultiblock();
 
-			}
-		}
-		return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon();
-	}
+    public static IIcon getIcon(final int aSide, final int aMeta) { // Texture ID's. case 0 == ID[57]
+        if ((aMeta >= 0) && (aMeta < 16)) {
+            switch (aMeta) {
+                    // Centrifuge
+                case 0:
+                    return TexturesGtBlock.Casing_Material_Centrifuge.getIcon();
+                    // Coke Oven Frame
+                case 1:
+                    return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon();
+                    // Coke Oven Casing Tier 1
+                case 2:
+                    return Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon();
+                    // Coke Oven Casing Tier 2
+                case 3:
+                    return Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon();
+                    // Material Press Casings
+                case 4:
+                    return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
+                    // Electrolyzer Casings
+                case 5:
+                    return TexturesGtBlock.Casing_Material_Potin.getIcon();
+                    // Broken Blue Fusion Casings
+                case 6:
+                    return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();
+                    // Maceration Stack Casings
+                case 7:
+                    return TexturesGtBlock.Casing_Material_Tumbaga.getIcon();
+                    // Broken Pink Fusion Casings
+                case 8:
+                    return TexturesGtBlock.TEXTURE_ORGANIC_PANEL_A_GLOWING.getIcon();
+                    // Matter Fabricator Casings
+                case 9:
+                    return TexturesGtBlock.TEXTURE_METAL_PANEL_F.getIcon();
+                    // Iron Blast Fuance Textures
+                case 10:
+                    return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
+                    // Multitank Exterior Casing
+                case 11:
+                    return TexturesGtBlock.Casing_Material_Grisium.getIcon();
+                    // Reactor Casing I
+                case 12:
+                    return TexturesGtBlock.Casing_Material_Stellite.getIcon();
+                    // Reactor Casing II
+                case 13:
+                    return TexturesGtBlock.Casing_Material_Zeron100.getIcon();
+                case 14:
+                    return TexturesGtBlock.Casing_Staballoy_Firebox.getIcon();
+                case 15:
+                    return TexturesGtBlock.Casing_Material_ZirconiumCarbide.getIcon();
 
+                default:
+                    return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon();
+            }
+        }
+        return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon();
+    }
 
-	public static IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide, final GregtechMetaCasingBlocks thisBlock) {
-		/*if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
-			return gregtech59.handleCasingsGT59(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);
-		}
-		return gregtech58.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);*/
-		return gregtechX.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);
-	}
-}
\ No newline at end of file
+    public static IIcon handleCasingsGT(
+            final IBlockAccess aWorld,
+            final int xCoord,
+            final int yCoord,
+            final int zCoord,
+            final int aSide,
+            final GregtechMetaCasingBlocks thisBlock) {
+        /*if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
+        	return gregtech59.handleCasingsGT59(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);
+        }
+        return gregtech58.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);*/
+        return gregtechX.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
index c980997c64..20519c0bb1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
@@ -1,57 +1,53 @@
 package gtPlusPlus.xmod.gregtech.common.blocks.textures;
 
-import net.minecraft.util.IIcon;
-
 import gregtech.api.enums.Textures;
+import net.minecraft.util.IIcon;
 
 public class CasingTextureHandler2 {
 
-	public static  IIcon getIcon(final int aSide, final int aMeta) { //Texture ID's. case 0 == ID[57]
-		if ((aMeta >= 0) && (aMeta < 16)) {
-			switch (aMeta) {
-				case 0:
-					return TexturesGtBlock.Casing_Material_RedSteel.getIcon();
-				case 1:
-					return TexturesGtBlock.Casing_Material_HastelloyX.getIcon();
-				case 2:
-					return TexturesGtBlock.Casing_Material_HastelloyN.getIcon();
-				case 3:
-					return TexturesGtBlock.Casing_Material_Fluid_IncoloyDS.getIcon();
-				case 4:
-					return TexturesGtBlock.Casing_Material_Grisium.getIcon();		
-				case 5:
-					return TexturesGtBlock.Casing_Machine_Metal_Panel_A.getIcon();
-				case 6:
-					return TexturesGtBlock.Casing_Machine_Metal_Grate_A.getIcon();
-				case 7:
-					return TexturesGtBlock.Casing_Redox_1.getIcon();
-				case 8:
-					return TexturesGtBlock.Casing_Machine_Metal_Sheet_A.getIcon();
-				case 9:
-					return TexturesGtBlock.Overlay_Machine_Cyber_A.getIcon();
-				case 10:
-					return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();
-				case 11:
-					return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon();
-				case 12:
-					return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
-				case 13:
-					if (aSide <2) {
-						return TexturesGtBlock.TEXTURE_TECH_A.getIcon();					
-					}
-					else {
-						return TexturesGtBlock.TEXTURE_TECH_B.getIcon();					
-					}
-				case 14:
-					return Textures.BlockIcons.RENDERING_ERROR.getIcon();
-				case 15:
-					return TexturesGtBlock.Casing_Machine_Acacia_Log.getIcon();
-				default:
-					return TexturesGtBlock.Overlay_UU_Matter.getIcon();
-
-			}
-		}
-		return TexturesGtBlock._PlaceHolder.getIcon();
-	}
-
-}
\ No newline at end of file
+    public static IIcon getIcon(final int aSide, final int aMeta) { // Texture ID's. case 0 == ID[57]
+        if ((aMeta >= 0) && (aMeta < 16)) {
+            switch (aMeta) {
+                case 0:
+                    return TexturesGtBlock.Casing_Material_RedSteel.getIcon();
+                case 1:
+                    return TexturesGtBlock.Casing_Material_HastelloyX.getIcon();
+                case 2:
+                    return TexturesGtBlock.Casing_Material_HastelloyN.getIcon();
+                case 3:
+                    return TexturesGtBlock.Casing_Material_Fluid_IncoloyDS.getIcon();
+                case 4:
+                    return TexturesGtBlock.Casing_Material_Grisium.getIcon();
+                case 5:
+                    return TexturesGtBlock.Casing_Machine_Metal_Panel_A.getIcon();
+                case 6:
+                    return TexturesGtBlock.Casing_Machine_Metal_Grate_A.getIcon();
+                case 7:
+                    return TexturesGtBlock.Casing_Redox_1.getIcon();
+                case 8:
+                    return TexturesGtBlock.Casing_Machine_Metal_Sheet_A.getIcon();
+                case 9:
+                    return TexturesGtBlock.Overlay_Machine_Cyber_A.getIcon();
+                case 10:
+                    return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();
+                case 11:
+                    return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon();
+                case 12:
+                    return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
+                case 13:
+                    if (aSide < 2) {
+                        return TexturesGtBlock.TEXTURE_TECH_A.getIcon();
+                    } else {
+                        return TexturesGtBlock.TEXTURE_TECH_B.getIcon();
+                    }
+                case 14:
+                    return Textures.BlockIcons.RENDERING_ERROR.getIcon();
+                case 15:
+                    return TexturesGtBlock.Casing_Machine_Acacia_Log.getIcon();
+                default:
+                    return TexturesGtBlock.Overlay_UU_Matter.getIcon();
+            }
+        }
+        return TexturesGtBlock._PlaceHolder.getIcon();
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
index 019a432013..da2a09c7d2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
@@ -1,68 +1,66 @@
 package gtPlusPlus.xmod.gregtech.common.blocks.textures;
 
-import net.minecraft.util.IIcon;
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks3;
+import net.minecraft.util.IIcon;
 
 public class CasingTextureHandler3 {
 
-	public static  IIcon getIcon(final int aSide, final int aMeta) { //Texture ID's. case 0 == ID[57]
-		if ((aMeta >= 0) && (aMeta < 16)) {
-			switch (aMeta) {
-			case 0:
-				//Aquatic Casing
-				return TexturesGtBlock.TEXTURE_METAL_PANEL_B.getIcon();
-			case 1:
-				//Inconel Reinforced Casing
-				return TexturesGtBlock.TEXTURE_METAL_PANEL_D.getIcon();
-			case 2:
-				//Multi-Use Casing
-				return TexturesGtBlock.TEXTURE_METAL_PANEL_C.getIcon();
-			case 3:
-				//Trinium Plated Mining Platform Casing
-				return TexturesGtBlock.Casing_Trinium_Naquadah_Vent.getIcon();
-			case 4:
-				//Vanadium Redox IV
-				return TexturesGtBlock.Casing_Redox_2.getIcon();
-			case 5:
-				//Vanadium Redox LuV
-				return TexturesGtBlock.Casing_Redox_3.getIcon();
-			case 6:
-				//Vanadium Redox ZPM
-				return TexturesGtBlock.Casing_Redox_4.getIcon();
-			case 7:
-				//Vanadium Redox UV
-				return TexturesGtBlock.Casing_Redox_5.getIcon();
-			case 8:
-				//Vanadium Redox MAX
-				return TexturesGtBlock.Casing_Redox_6.getIcon();
-			case 9:
-				//Amazon Warehouse Casing
-				return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon();
-			case 10:
-				//Adv. Vac. Freezer
-				return TexturesGtBlock.TEXTURE_CASING_ADVANCED_CRYOGENIC.getIcon();
-			case 11:
-				//Adv. EBF
-				return TexturesGtBlock.TEXTURE_CASING_ADVANCED_VOLCNUS.getIcon();
-			case 12:
-				return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II.getIcon();
-			case 13:
-				return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II_INNER.getIcon();
-			case 14:
-				return TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA.getIcon();
-			case 15:
-				return TexturesGtBlock.TEXTURE_MAGIC_PANEL_A.getIcon();
-
-			default:
-				return TexturesGtBlock._PlaceHolder.getIcon();
-
-			}
-		}
-		return TexturesGtBlock._PlaceHolder.getIcon();
-	}
+    public static IIcon getIcon(final int aSide, final int aMeta) { // Texture ID's. case 0 == ID[57]
+        if ((aMeta >= 0) && (aMeta < 16)) {
+            switch (aMeta) {
+                case 0:
+                    // Aquatic Casing
+                    return TexturesGtBlock.TEXTURE_METAL_PANEL_B.getIcon();
+                case 1:
+                    // Inconel Reinforced Casing
+                    return TexturesGtBlock.TEXTURE_METAL_PANEL_D.getIcon();
+                case 2:
+                    // Multi-Use Casing
+                    return TexturesGtBlock.TEXTURE_METAL_PANEL_C.getIcon();
+                case 3:
+                    // Trinium Plated Mining Platform Casing
+                    return TexturesGtBlock.Casing_Trinium_Naquadah_Vent.getIcon();
+                case 4:
+                    // Vanadium Redox IV
+                    return TexturesGtBlock.Casing_Redox_2.getIcon();
+                case 5:
+                    // Vanadium Redox LuV
+                    return TexturesGtBlock.Casing_Redox_3.getIcon();
+                case 6:
+                    // Vanadium Redox ZPM
+                    return TexturesGtBlock.Casing_Redox_4.getIcon();
+                case 7:
+                    // Vanadium Redox UV
+                    return TexturesGtBlock.Casing_Redox_5.getIcon();
+                case 8:
+                    // Vanadium Redox MAX
+                    return TexturesGtBlock.Casing_Redox_6.getIcon();
+                case 9:
+                    // Amazon Warehouse Casing
+                    return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon();
+                case 10:
+                    // Adv. Vac. Freezer
+                    return TexturesGtBlock.TEXTURE_CASING_ADVANCED_CRYOGENIC.getIcon();
+                case 11:
+                    // Adv. EBF
+                    return TexturesGtBlock.TEXTURE_CASING_ADVANCED_VOLCNUS.getIcon();
+                case 12:
+                    return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II.getIcon();
+                case 13:
+                    return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II_INNER.getIcon();
+                case 14:
+                    return TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA.getIcon();
+                case 15:
+                    return TexturesGtBlock.TEXTURE_MAGIC_PANEL_A.getIcon();
 
-	static {
-		GregtechMetaCasingBlocks3.mConnectedMachineTextures = true;
-	}
+                default:
+                    return TexturesGtBlock._PlaceHolder.getIcon();
+            }
+        }
+        return TexturesGtBlock._PlaceHolder.getIcon();
+    }
 
-}
\ No newline at end of file
+    static {
+        GregtechMetaCasingBlocks3.mConnectedMachineTextures = true;
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
index 6326dd2c29..2eef9d37f0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.xmod.gregtech.common.blocks.textures;
 
-import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
@@ -12,155 +11,166 @@ import net.minecraft.world.IBlockAccess;
 
 public class TexturesCentrifugeMultiblock {
 
-	private static CustomIcon GT8_1_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE1");
-	private static CustomIcon GT8_1 = new CustomIcon("iconsets/LARGECENTRIFUGE1");
-	private static CustomIcon GT8_2_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE2");
-	private static CustomIcon GT8_2 = new CustomIcon("iconsets/LARGECENTRIFUGE2");
-	private static CustomIcon GT8_3_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE3");
-	private static CustomIcon GT8_3 = new CustomIcon("iconsets/LARGECENTRIFUGE3");
-	private static CustomIcon GT8_4_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE4");
-	private static CustomIcon GT8_4 = new CustomIcon("iconsets/LARGECENTRIFUGE4");
-	private static CustomIcon GT8_5_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE5");
-	private static CustomIcon GT8_5 = new CustomIcon("iconsets/LARGECENTRIFUGE5");
-	private static CustomIcon GT8_6_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE6");
-	private static CustomIcon GT8_6 = new CustomIcon("iconsets/LARGECENTRIFUGE6");
-	private static CustomIcon GT8_7_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE7");
-	private static CustomIcon GT8_7 = new CustomIcon("iconsets/LARGECENTRIFUGE7");
-	private static CustomIcon GT8_8_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE8");
-	private static CustomIcon GT8_8 = new CustomIcon("iconsets/LARGECENTRIFUGE8");
-	private static CustomIcon GT8_9_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE9");
-	private static CustomIcon GT8_9 = new CustomIcon("iconsets/LARGECENTRIFUGE9");
+    private static CustomIcon GT8_1_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE1");
+    private static CustomIcon GT8_1 = new CustomIcon("iconsets/LARGECENTRIFUGE1");
+    private static CustomIcon GT8_2_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE2");
+    private static CustomIcon GT8_2 = new CustomIcon("iconsets/LARGECENTRIFUGE2");
+    private static CustomIcon GT8_3_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE3");
+    private static CustomIcon GT8_3 = new CustomIcon("iconsets/LARGECENTRIFUGE3");
+    private static CustomIcon GT8_4_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE4");
+    private static CustomIcon GT8_4 = new CustomIcon("iconsets/LARGECENTRIFUGE4");
+    private static CustomIcon GT8_5_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE5");
+    private static CustomIcon GT8_5 = new CustomIcon("iconsets/LARGECENTRIFUGE5");
+    private static CustomIcon GT8_6_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE6");
+    private static CustomIcon GT8_6 = new CustomIcon("iconsets/LARGECENTRIFUGE6");
+    private static CustomIcon GT8_7_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE7");
+    private static CustomIcon GT8_7 = new CustomIcon("iconsets/LARGECENTRIFUGE7");
+    private static CustomIcon GT8_8_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE8");
+    private static CustomIcon GT8_8 = new CustomIcon("iconsets/LARGECENTRIFUGE8");
+    private static CustomIcon GT8_9_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE9");
+    private static CustomIcon GT8_9 = new CustomIcon("iconsets/LARGECENTRIFUGE9");
 
-	private static CustomIcon frontFace_0 = (GT8_1);
-	private static CustomIcon frontFaceActive_0 = (GT8_1_Active);
-	private static CustomIcon frontFace_1 = (GT8_2);
-	private static CustomIcon frontFaceActive_1 = (GT8_2_Active);
-	private static CustomIcon frontFace_2 = (GT8_3);
-	private static CustomIcon frontFaceActive_2 = (GT8_3_Active);
-	private static CustomIcon frontFace_3 = (GT8_4);
-	private static CustomIcon frontFaceActive_3 = (GT8_4_Active);
-	private static CustomIcon frontFace_4 = (GT8_5);
-	private static CustomIcon frontFaceActive_4 = (GT8_5_Active);
-	private static CustomIcon frontFace_5 = (GT8_6);
-	private static CustomIcon frontFaceActive_5 = (GT8_6_Active);
-	private static CustomIcon frontFace_6 = (GT8_7);
-	private static CustomIcon frontFaceActive_6 = (GT8_7_Active);
-	private static CustomIcon frontFace_7 = (GT8_8);
-	private static CustomIcon frontFaceActive_7 = (GT8_8_Active);
-	private static CustomIcon frontFace_8 = (GT8_9);
-	private static CustomIcon frontFaceActive_8 = (GT8_9_Active);
+    private static CustomIcon frontFace_0 = (GT8_1);
+    private static CustomIcon frontFaceActive_0 = (GT8_1_Active);
+    private static CustomIcon frontFace_1 = (GT8_2);
+    private static CustomIcon frontFaceActive_1 = (GT8_2_Active);
+    private static CustomIcon frontFace_2 = (GT8_3);
+    private static CustomIcon frontFaceActive_2 = (GT8_3_Active);
+    private static CustomIcon frontFace_3 = (GT8_4);
+    private static CustomIcon frontFaceActive_3 = (GT8_4_Active);
+    private static CustomIcon frontFace_4 = (GT8_5);
+    private static CustomIcon frontFaceActive_4 = (GT8_5_Active);
+    private static CustomIcon frontFace_5 = (GT8_6);
+    private static CustomIcon frontFaceActive_5 = (GT8_6_Active);
+    private static CustomIcon frontFace_6 = (GT8_7);
+    private static CustomIcon frontFaceActive_6 = (GT8_7_Active);
+    private static CustomIcon frontFace_7 = (GT8_8);
+    private static CustomIcon frontFaceActive_7 = (GT8_8_Active);
+    private static CustomIcon frontFace_8 = (GT8_9);
+    private static CustomIcon frontFaceActive_8 = (GT8_9_Active);
 
-	CustomIcon[] CENTRIFUGE = new CustomIcon[]{
-			frontFace_0,
-			frontFace_1,
-			frontFace_2,
-			frontFace_3,
-			frontFace_4,
-			frontFace_5,
-			frontFace_6,
-			frontFace_7,
-			frontFace_8
-	};
+    CustomIcon[] CENTRIFUGE = new CustomIcon[] {
+        frontFace_0,
+        frontFace_1,
+        frontFace_2,
+        frontFace_3,
+        frontFace_4,
+        frontFace_5,
+        frontFace_6,
+        frontFace_7,
+        frontFace_8
+    };
 
-	CustomIcon[] CENTRIFUGE_ACTIVE = new CustomIcon[]{
-			frontFaceActive_0,
-			frontFaceActive_1,
-			frontFaceActive_2,
-			frontFaceActive_3,
-			frontFaceActive_4,
-			frontFaceActive_5,
-			frontFaceActive_6,
-			frontFaceActive_7,
-			frontFaceActive_8
-	};
+    CustomIcon[] CENTRIFUGE_ACTIVE = new CustomIcon[] {
+        frontFaceActive_0,
+        frontFaceActive_1,
+        frontFaceActive_2,
+        frontFaceActive_3,
+        frontFaceActive_4,
+        frontFaceActive_5,
+        frontFaceActive_6,
+        frontFaceActive_7,
+        frontFaceActive_8
+    };
 
-	public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide, final GregtechMetaCasingBlocks thisBlock) {
-		return this.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);
-	}
+    public IIcon handleCasingsGT(
+            final IBlockAccess aWorld,
+            final int xCoord,
+            final int yCoord,
+            final int zCoord,
+            final int aSide,
+            final GregtechMetaCasingBlocks thisBlock) {
+        return this.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);
+    }
 
-	private static int isCentrifugeControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) {
-		TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-		if (!(tTileEntity instanceof IGregTechTileEntity)) return 0;
-		IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity;
-		if (tTile.getMetaTileEntity() instanceof GregtechMetaTileEntity_IndustrialCentrifuge && tTile.getFrontFacing() == aSide)
-			return tTile.isActive() ? 1 : 2;
-		return 0;
-	}
+    private static int isCentrifugeControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) {
+        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
+        if (!(tTileEntity instanceof IGregTechTileEntity)) return 0;
+        IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity;
+        if (tTile.getMetaTileEntity() instanceof GregtechMetaTileEntity_IndustrialCentrifuge
+                && tTile.getFrontFacing() == aSide) return tTile.isActive() ? 1 : 2;
+        return 0;
+    }
 
-	public IIcon handleCasingsGT58(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide, final GregtechMetaCasingBlocks thisBlock) {
-		final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
-		if (tMeta != 0) {
-			return CasingTextureHandler.getIcon(aSide, tMeta);
-		}
-		int tInvertLeftRightMod = aSide % 2 * 2 - 1;
-		switch (aSide / 2) {
-			case 0:
-				for (int i = -1; i < 2; i++) {
-					for (int j = -1; j < 2; j++) {
-						if (i == 0 && j == 0)
-							continue;
-						if (isCentrifugeControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide) != 0) {
-							IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld.getTileEntity(xCoord + j, yCoord, zCoord + i)).getMetaTileEntity();
-							return getIconByIndex(tMetaTileEntity, 4 - i * 3 - j);
-						}
-					}
-				}
-				break;
-			case 1:
-				for (int i = -1; i < 2; i++) {
-					for (int j = -1; j < 2; j++) {
-						if (i == 0 && j == 0)
-							continue;
-						if (isCentrifugeControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide) != 0) {
-							IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld.getTileEntity(xCoord + j, yCoord + i, zCoord)).getMetaTileEntity();
-							return getIconByIndex(tMetaTileEntity, 4 + i * 3 - j * tInvertLeftRightMod);
-						}
-					}
-				}
-				break;
-			case 2:
-				for (int i = -1; i < 2; i++) {
-					for (int j = -1; j < 2; j++) {
-						if (i == 0 && j == 0)
-							continue;
-						if (isCentrifugeControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide) != 0) {
-							IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aWorld.getTileEntity(xCoord, yCoord + i, zCoord + j)).getMetaTileEntity();
-							return getIconByIndex(tMetaTileEntity, 4 + i * 3 + j * tInvertLeftRightMod);
-						}
-					}
-				}
-				break;
-		}
-		return TexturesGtBlock.Casing_Material_Centrifuge.getIcon();
-	}
-	
-	public boolean isCentrifugeRunning(IMetaTileEntity aTile) {
-		if (aTile == null) {
-			return false;
-		}
-		else {
-			return aTile.getBaseMetaTileEntity().isActive();
-		}
-		
-		
-	}
-	
-	public boolean isUsingAnimatedTexture(IMetaTileEntity aMetaTileEntity) {
-			if (aMetaTileEntity != null) {
-				if (aMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge) {
-					return ((GregtechMetaTileEntity_IndustrialCentrifuge) aMetaTileEntity).usingAnimations();
-				}
-			}		
-		return false;
-	}
+    public IIcon handleCasingsGT58(
+            final IBlockAccess aWorld,
+            final int xCoord,
+            final int yCoord,
+            final int zCoord,
+            final int aSide,
+            final GregtechMetaCasingBlocks thisBlock) {
+        final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
+        if (tMeta != 0) {
+            return CasingTextureHandler.getIcon(aSide, tMeta);
+        }
+        int tInvertLeftRightMod = aSide % 2 * 2 - 1;
+        switch (aSide / 2) {
+            case 0:
+                for (int i = -1; i < 2; i++) {
+                    for (int j = -1; j < 2; j++) {
+                        if (i == 0 && j == 0) continue;
+                        if (isCentrifugeControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide) != 0) {
+                            IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity)
+                                            aWorld.getTileEntity(xCoord + j, yCoord, zCoord + i))
+                                    .getMetaTileEntity();
+                            return getIconByIndex(tMetaTileEntity, 4 - i * 3 - j);
+                        }
+                    }
+                }
+                break;
+            case 1:
+                for (int i = -1; i < 2; i++) {
+                    for (int j = -1; j < 2; j++) {
+                        if (i == 0 && j == 0) continue;
+                        if (isCentrifugeControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide) != 0) {
+                            IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity)
+                                            aWorld.getTileEntity(xCoord + j, yCoord + i, zCoord))
+                                    .getMetaTileEntity();
+                            return getIconByIndex(tMetaTileEntity, 4 + i * 3 - j * tInvertLeftRightMod);
+                        }
+                    }
+                }
+                break;
+            case 2:
+                for (int i = -1; i < 2; i++) {
+                    for (int j = -1; j < 2; j++) {
+                        if (i == 0 && j == 0) continue;
+                        if (isCentrifugeControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide) != 0) {
+                            IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity)
+                                            aWorld.getTileEntity(xCoord, yCoord + i, zCoord + j))
+                                    .getMetaTileEntity();
+                            return getIconByIndex(tMetaTileEntity, 4 + i * 3 + j * tInvertLeftRightMod);
+                        }
+                    }
+                }
+                break;
+        }
+        return TexturesGtBlock.Casing_Material_Centrifuge.getIcon();
+    }
 
-	public IIcon getIconByIndex(IMetaTileEntity aMetaTileEntity, int aIndex) {
-		if (isUsingAnimatedTexture(aMetaTileEntity)) {
-			if (isCentrifugeRunning(aMetaTileEntity)) {
-				return this.CENTRIFUGE_ACTIVE[aIndex].getIcon();				
-			}
-		}
-		return this.CENTRIFUGE[aIndex].getIcon();
-	}
-	
+    public boolean isCentrifugeRunning(IMetaTileEntity aTile) {
+        if (aTile == null) {
+            return false;
+        } else {
+            return aTile.getBaseMetaTileEntity().isActive();
+        }
+    }
+
+    public boolean isUsingAnimatedTexture(IMetaTileEntity aMetaTileEntity) {
+        if (aMetaTileEntity != null) {
+            if (aMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge) {
+                return ((GregtechMetaTileEntity_IndustrialCentrifuge) aMetaTileEntity).usingAnimations();
+            }
+        }
+        return false;
+    }
+
+    public IIcon getIconByIndex(IMetaTileEntity aMetaTileEntity, int aIndex) {
+        if (isUsingAnimatedTexture(aMetaTileEntity)) {
+            if (isCentrifugeRunning(aMetaTileEntity)) {
+                return this.CENTRIFUGE_ACTIVE[aIndex].getIcon();
+            }
+        }
+        return this.CENTRIFUGE[aIndex].getIcon();
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java
index e772f0f48c..2298e0731e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java
@@ -1,443 +1,536 @@
 package gtPlusPlus.xmod.gregtech.common.blocks.textures;
 
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-
 import g