updateBuildScript & spotlessApply

89 files changed, 5576 insertions, 5294 deletions

diff --git a/src/main/java/client/ClientProxy.java b/src/main/java/client/ClientProxy.java
index 5ed713f827..9eb07c62a4 100644
--- a/src/main/java/client/ClientProxy.java
+++ b/src/main/java/client/ClientProxy.java
@@ -8,7 +8,6 @@ import common.tileentities.TE_BeamTransmitter;
 import common.tileentities.TE_SpaceElevatorCapacitor;
 import common.tileentities.TE_SpaceElevatorTether;
 import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 
@@ -27,7 +26,6 @@ public class ClientProxy extends CommonProxy {
     public void init(final FMLInitializationEvent e) {
         super.init(e);
         // Register Simple Block Renderers
-        //RenderingRegistry.registerBlockHandler(ConduitRenderer.getInstance());
+        // RenderingRegistry.registerBlockHandler(ConduitRenderer.getInstance());
     }
-
 }
diff --git a/src/main/java/client/GTTexture.java b/src/main/java/client/GTTexture.java
index 2ede4976fb..345bb8f790 100644
--- a/src/main/java/client/GTTexture.java
+++ b/src/main/java/client/GTTexture.java
@@ -2,14 +2,11 @@ package client;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.objects.GT_CopiedBlockTexture;
 import kekztech.KekzCore;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 
-import java.util.HashMap;
-
 public class GTTexture implements IIconContainer, Runnable {
 
     public static final GTTexture TFFT_CASING = new GTTexture("blocks/TFFTCasing");
diff --git a/src/main/java/client/gui/GUIContainer_ModularNuclearReactor.java b/src/main/java/client/gui/GUIContainer_ModularNuclearReactor.java
index d6f2a61ce4..eabbb26ff1 100644
--- a/src/main/java/client/gui/GUIContainer_ModularNuclearReactor.java
+++ b/src/main/java/client/gui/GUIContainer_ModularNuclearReactor.java
@@ -1,46 +1,40 @@
-package client.gui;

-

-import org.lwjgl.opengl.GL11;

-

-import common.container.Container_ModularNuclearReactor;

-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

-import kekztech.KekzCore;

-import net.minecraft.client.Minecraft;

-import net.minecraft.client.gui.inventory.GuiContainer;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.entity.player.InventoryPlayer;

-import net.minecraft.util.ResourceLocation;

-

-public class GUIContainer_ModularNuclearReactor extends GuiContainer {

-	

-	private ResourceLocation texture = new ResourceLocation(KekzCore.MODID, "textures/gui/MultiblockDisplay_REACTOR.png");

-	 

-    private InventoryPlayer inventory;

-    private IGregTechTileEntity te;

- 

-    public GUIContainer_ModularNuclearReactor(IGregTechTileEntity te, EntityPlayer player)

-    {

-        super(new Container_ModularNuclearReactor(te, player));

-        inventory = player.inventory;

-        this.te = te;

-    }

- 

-    @Override

-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)

-    {

-        Minecraft.getMinecraft().renderEngine.bindTexture(texture);

- 

-        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

-        

-        final int x = (super.width - super.xSize) / 2;

-		final int y = (super.height - super.ySize) / 2;

-		super.drawTexturedModalRect(x, y, 0, 0, super.xSize, super.ySize);

-    }

- 

-    @Override

-    protected void drawGuiContainerForegroundLayer(int par1, int par2)

-    {

-       

-    }

-

-}

+package client.gui;
+
+import common.container.Container_ModularNuclearReactor;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import kekztech.KekzCore;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+
+public class GUIContainer_ModularNuclearReactor extends GuiContainer {
+
+    private ResourceLocation texture =
+            new ResourceLocation(KekzCore.MODID, "textures/gui/MultiblockDisplay_REACTOR.png");
+
+    private InventoryPlayer inventory;
+    private IGregTechTileEntity te;
+
+    public GUIContainer_ModularNuclearReactor(IGregTechTileEntity te, EntityPlayer player) {
+        super(new Container_ModularNuclearReactor(te, player));
+        inventory = player.inventory;
+        this.te = te;
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+        Minecraft.getMinecraft().renderEngine.bindTexture(texture);
+
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+
+        final int x = (super.width - super.xSize) / 2;
+        final int y = (super.height - super.ySize) / 2;
+        super.drawTexturedModalRect(x, y, 0, 0, super.xSize, super.ySize);
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {}
+}
diff --git a/src/main/java/client/gui/Gui_ItemProxyEndpoint.java b/src/main/java/client/gui/Gui_ItemProxyEndpoint.java
index f978ed6495..4f80e5d7e3 100644
--- a/src/main/java/client/gui/Gui_ItemProxyEndpoint.java
+++ b/src/main/java/client/gui/Gui_ItemProxyEndpoint.java
@@ -1,7 +1,5 @@
 package client.gui;
 
-import org.lwjgl.opengl.GL11;
-
 import common.container.Container_ItemProxyEndpoint;
 import kekztech.KekzCore;
 import net.minecraft.client.Minecraft;
@@ -12,40 +10,42 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
 
 public class Gui_ItemProxyEndpoint extends GuiContainer {
-	
-	private final ResourceLocation texture = new ResourceLocation(KekzCore.MODID, "textures/gui/ItemTechReceiverNode.png");
-	
-	private final InventoryPlayer inventory;
-	private final IInventory te;
-	
-	public Gui_ItemProxyEndpoint(TileEntity te, EntityPlayer player) {
-		super(new Container_ItemProxyEndpoint(te, player));
-		inventory = player.inventory;
-		this.te = (IInventory) te;
-		
-	}
-
-	@Override
-	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
-		
-		Minecraft.getMinecraft().renderEngine.bindTexture(texture);
-		GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-		
-		final int x = (super.width - super.xSize) / 2;
-		final int y = (super.height - super.ySize) / 2;
-		
-		super.drawTexturedModalRect(x, y, 0, 0, super.xSize, super.ySize);
-	}
-	
-	@Override
-	protected void drawGuiContainerForegroundLayer(int p1, int p2) {
-		super.fontRendererObj.drawString(
-				I18n.format(te.getInventoryName()),
-				(super.xSize / 2) - (fontRendererObj.getStringWidth(I18n.format(te.getInventoryName())) / 2),
-				6, 4210752, false);
-		super.fontRendererObj.drawString(
-				I18n.format(inventory.getInventoryName()), 8, super.ySize - 96 + 2, 4210752);
-	}
+
+    private final ResourceLocation texture =
+            new ResourceLocation(KekzCore.MODID, "textures/gui/ItemTechReceiverNode.png");
+
+    private final InventoryPlayer inventory;
+    private final IInventory te;
+
+    public Gui_ItemProxyEndpoint(TileEntity te, EntityPlayer player) {
+        super(new Container_ItemProxyEndpoint(te, player));
+        inventory = player.inventory;
+        this.te = (IInventory) te;
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
+
+        Minecraft.getMinecraft().renderEngine.bindTexture(texture);
+        GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+
+        final int x = (super.width - super.xSize) / 2;
+        final int y = (super.height - super.ySize) / 2;
+
+        super.drawTexturedModalRect(x, y, 0, 0, super.xSize, super.ySize);
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int p1, int p2) {
+        super.fontRendererObj.drawString(
+                I18n.format(te.getInventoryName()),
+                (super.xSize / 2) - (fontRendererObj.getStringWidth(I18n.format(te.getInventoryName())) / 2),
+                6,
+                4210752,
+                false);
+        super.fontRendererObj.drawString(I18n.format(inventory.getInventoryName()), 8, super.ySize - 96 + 2, 4210752);
+    }
 }
diff --git a/src/main/java/client/gui/Gui_ItemProxySource.java b/src/main/java/client/gui/Gui_ItemProxySource.java
index a811f01bbe..a4a4a5c38f 100644
--- a/src/main/java/client/gui/Gui_ItemProxySource.java
+++ b/src/main/java/client/gui/Gui_ItemProxySource.java
@@ -1,7 +1,5 @@
 package client.gui;
 
-import org.lwjgl.opengl.GL11;
-
 import common.container.Container_ItemProxySource;
 import kekztech.KekzCore;
 import net.minecraft.client.Minecraft;
@@ -12,40 +10,41 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
 
 public class Gui_ItemProxySource extends GuiContainer {
-	
-	private final ResourceLocation texture = new ResourceLocation(KekzCore.MODID, "textures/gui/ItemTech4by4.png");
-	
-	private final InventoryPlayer inventory;
-	private final IInventory te;
-	
-	public Gui_ItemProxySource(TileEntity te, EntityPlayer player) {