updateBuildScript & spotlessApply

9 files changed, 189 insertions, 202 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) {
-		super(new Container_ItemProxySource(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/ItemTech4by4.png");
+
+    private final InventoryPlayer inventory;
+    private final IInventory te;
+
+    public Gui_ItemProxySource(TileEntity te, EntityPlayer player) {
+        super(new Container_ItemProxySource(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/renderer/ConduitRenderer.java b/src/main/java/client/renderer/ConduitRenderer.java
index 9266d22f55..1a653e8896 100644
--- a/src/main/java/client/renderer/ConduitRenderer.java
+++ b/src/main/java/client/renderer/ConduitRenderer.java
@@ -10,84 +10,79 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
 
 public class ConduitRenderer implements ISimpleBlockRenderingHandler {
-	
-	public static final int RID = RenderingRegistry.getNextAvailableRenderId();
-	private static final ConduitRenderer INSTANCE = new ConduitRenderer();
 
-	private ConduitRenderer() {
-		
-	}
-	
-	public static ConduitRenderer getInstance() {
-		return INSTANCE;
-	}
+    public static final int RID = RenderingRegistry.getNextAvailableRenderId();
+    private static final ConduitRenderer INSTANCE = new ConduitRenderer();
 
-	@Override
-	public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
+    private ConduitRenderer() {}
 
-	}
+    public static ConduitRenderer getInstance() {
+        return INSTANCE;
+    }
 
-	@Override
-	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
-			RenderBlocks renderer) {
-		final TileEntity te = world.getTileEntity(x, y, z);
-		if(te instanceof TE_ItemProxyCable) {
-			final TE_ItemProxyCable cable = (TE_ItemProxyCable) te;
-			
-			final float thickness = TE_ItemProxyCable.getThickness();
-			final float space = (1.0f - thickness) / 2.0f;
+    @Override
+    public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {}
 
-			float xThickness = thickness;
-			float xOffset = space;
-			float yThickness = thickness;
-			float yOffset = space;
-			float zThickness = thickness;
-			float zOffset = space;
+    @Override
+    public boolean renderWorldBlock(
+            IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
+        final TileEntity te = world.getTileEntity(x, y, z);
+        if (te instanceof TE_ItemProxyCable) {
+            final TE_ItemProxyCable cable = (TE_ItemProxyCable) te;
 
-			for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
-				if(cable.isConnected(side)) {
-					switch(side) {
-						case DOWN:
-							yOffset = 0.0F;
-							yThickness += space;
-							break;
-						case UP:
-							yThickness += space;
-							break;
-						case NORTH:
-							zOffset = 0.0F;
-							zThickness += space;
-							break;
-						case SOUTH:
-							zThickness += space;
-							break;
-						case WEST:
-							xOffset += 0.0F;
-							xThickness += space;
-							break;
-						case EAST:
-							xThickness += space;
-							break;
-					}
-				}
-			}
+            final float thickness = TE_ItemProxyCable.getThickness();
+            final float space = (1.0f - thickness) / 2.0f;
 
-			block.setBlockBounds(xOffset, yOffset, zOffset,
-					xOffset + xThickness, yOffset + yThickness, zOffset + zThickness);
-			renderer.setRenderBoundsFromBlock(block);
-		}
-		
-		return false;
-	}
+            float xThickness = thickness;
+            float xOffset = space;
+            float yThickness = thickness;
+            float yOffset = space;
+            float zThickness = thickness;
+            float zOffset = space;
 
-	@Override
-	public boolean shouldRender3DInInventory(int modelId) {
-		return true;
-	}
+            for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
+                if (cable.isConnected(side)) {
+                    switch (side) {
+                        case DOWN:
+                            yOffset = 0.0F;
+                            yThickness += space;
+                            break;
+                        case UP:
+                            yThickness += space;
+                            break;
+                        case NORTH:
+                            zOffset = 0.0F;
+                            zThickness += space;
+                            break;
+                        case SOUTH:
+                            zThickness += space;
+                            break;
+                        case WEST:
+                            xOffset += 0.0F;
+                            xThickness += space;
+                            break;
+                        case EAST:
+                            xThickness += space;
+                            break;
+                    }
+                }
+            }
 
-	@Override
-	public int getRenderId() {
-		return ConduitRenderer.RID;
-	}
+            block.setBlockBounds(
+                    xOffset, yOffset, zOffset, xOffset + xThickness, yOffset + yThickness, zOffset + zThickness);
+            renderer.setRenderBoundsFromBlock(block);
+        }
 
+        return false;
+    }
+
+    @Override
+    public boolean shouldRender3DInInventory(int modelId) {
+        return true;
+    }
+
+    @Override
+    public int getRenderId() {
+        return ConduitRenderer.RID;
+    }
 }
diff --git a/src/main/java/client/renderer/TESR_BeamTransmitter.java b/src/main/java/client/renderer/TESR_BeamTransmitter.java
index 81ab52654b..38e588dd43 100644
--- a/src/main/java/client/renderer/TESR_BeamTransmitter.java
+++ b/src/main/java/client/renderer/TESR_BeamTransmitter.java
@@ -12,7 +12,8 @@ import org.lwjgl.opengl.GL11;
 
 public class TESR_BeamTransmitter extends TileEntitySpecialRenderer {
 
-    private static final ResourceLocation beamTexture = new ResourceLocation(KekzCore.MODID, "textures/effects/Tether_beam.png");
+    private static final ResourceLocation beamTexture =
+            new ResourceLocation(KekzCore.MODID, "textures/effects/Tether_beam.png");
 
     @Override
     public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) {
@@ -35,14 +36,16 @@ public class TESR_BeamTransmitter extends TileEntitySpecialRenderer {
         tessellator.startDrawingQuads();
         tessellator.setColorRGBA(255, 255, 255, 32);
         // Variables stuff II
-        final float exactTime = (float)beamTransmitter.getWorldObj().getTotalWorldTime() + partialTick;
+        final float exactTime = (float) beamTransmitter.getWorldObj().getTotalWorldTime() + partialTick;
         final float streamTextureOffset = -exactTime * 0.2F - (float) MathHelper.floor_float(-exactTime * 0.1F);
 
         final double halfBeamWidth = 0.1D;
         final double height = beamTransmitter.getDistanceFromTarget();
         final double uv_x1 = 0.0D;
         final double uv_x2 = 1.0D;
-        final double uv_y1 = -1.0D - streamTextureOffset; // This makes the beam stream upwards if you subtract a time sensitive number from it
+        final double uv_y1 = -1.0D
+                - streamTextureOffset; // This makes the beam stream upwards if you subtract a time sensitive number
+        // from it
         final double uv_y2 = height * (0.5D / (halfBeamWidth * 2)) + uv_y1;
         // Construct mesh with texture
         tessellator.addVertexWithUV(x + 0.5 + halfBeamWidth, y + 0.5, z + 0.5, uv_x2, uv_y2);
diff --git a/src/main/java/client/renderer/TESR_SECapacitor.java b/src/main/java/client/renderer/TESR_SECapacitor.java
index 16c820917d..17f10ece83 100644
--- a/src/main/java/client/renderer/TESR_SECapacitor.java
+++ b/src/main/java/client/renderer/TESR_SECapacitor.java
@@ -9,7 +9,8 @@ import net.minecraft.util.ResourceLocation;
 
 public class TESR_SECapacitor extends TileEntitySpecialRenderer {
 
-    private static final ResourceLocation capSide = new ResourceLocation(KekzCore.MODID, "textures/blocks/SpaceElevatorCapacitor_side_renderbase.png");
+    private static final ResourceLocation capSide =
+            new ResourceLocation(KekzCore.MODID, "textures/blocks/SpaceElevatorCapacitor_side_renderbase.png");
 
     @Override
     public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) {
@@ -38,7 +39,7 @@ public class TESR_SECapacitor extends TileEntitySpecialRenderer {
         // Prepare Tessellator
         tessellator.startDrawingQuads();
         // Render the caps as red if there are maintenance issues
-        if(teCap.isDamaged()) {
+        if (teCap.isDamaged()) {
             final float wave = (float) Math.abs(Math.sin((te.getWorldObj().getTotalWorldTime() + partialTick) / 20.0D));
             final int redSat = 64 + (int) Math.ceil(191 * wave);
             tessellator.setColorRGBA(redSat, 0, 0, 255);
diff --git a/src/main/java/client/renderer/TESR_SETether.java b/src/main/java/client/renderer/TESR_SETether.java
index 2e4fa95cc5..a59954ce3e 100644
--- a/src/main/java/client/renderer/TESR_SETether.java
+++ b/src/main/java/client/renderer/TESR_SETether.java
@@ -10,7 +10,8 @@ import org.lwjgl.opengl.GL11;
 
 public class TESR_SETether extends TileEntitySpecialRenderer {
 
-    private static final ResourceLocation tetherBeamTexture = new ResourceLocation(KekzCore.MODID, "textures/effects/Tether_beam.png");
+    private static final ResourceLocation tetherBeamTexture =
+            new ResourceLocation(KekzCore.MODID, "textures/effects/Tether_beam.png");
 
     @Override
     public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) {
@@ -46,7 +47,7 @@ public class TESR_SETether extends TileEntitySpecialRenderer {
         final double uv_x1 = 0.0D;
         final double uv_x2 = 1.0D;
         final double uv_y1 = -1.0D; // This makes the beam stream upwards if you add a time sensitive number to it
-        final double uv_y2 = (double)(256.0F * beamLengthScale) * (0.5D / halfBeamWidth) + uv_y1;
+        final double uv_y2 = (double) (256.0F * beamLengthScale) * (0.5D / halfBeamWidth) + uv_y1;
         // Construct mesh with texture
         tessellator.addVertexWithUV(x + d_rot1, y + height, z + d_rot2, uv_x2, uv_y2);
         tessellator.addVertexWithUV(x + d_rot1, y, z + d_rot2, uv_x2, uv_y1);
@@ -72,5 +73,4 @@ public class TESR_SETether extends TileEntitySpecialRenderer {
         GL11.glEnable(GL11.GL_TEXTURE_2D);
         GL11.glDepthMask(true);
     }
-
 }