Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge (#53)

* Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge

* updateBuildScript & spotlessApply

6 files changed, 142 insertions, 48 deletions

diff --git a/src/main/java/goodgenerator/client/ClientProxy.java b/src/main/java/goodgenerator/client/ClientProxy.java
index e97cbd6e86..df6c962106 100644
--- a/src/main/java/goodgenerator/client/ClientProxy.java
+++ b/src/main/java/goodgenerator/client/ClientProxy.java
@@ -1,21 +1,23 @@
 package goodgenerator.client;
 
-import goodgenerator.common.CommonProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import goodgenerator.common.CommonProxy;
 
 public class ClientProxy extends CommonProxy {
     @Override
-    public void preInit(FMLPreInitializationEvent event){
+    public void preInit(FMLPreInitializationEvent event) {
         super.preInit(event);
     }
+
     @Override
-    public void init(FMLInitializationEvent event){
+    public void init(FMLInitializationEvent event) {
         super.init(event);
     }
+
     @Override
-    public void postInit(FMLPostInitializationEvent event){
+    public void postInit(FMLPostInitializationEvent event) {
         super.postInit(event);
     }
 }
diff --git a/src/main/java/goodgenerator/client/GUI/LargeFusionComputerGUIClient.java b/src/main/java/goodgenerator/client/GUI/LargeFusionComputerGUIClient.java
index 58b0f7bc0d..51899b09cd 100644
--- a/src/main/java/goodgenerator/client/GUI/LargeFusionComputerGUIClient.java
+++ b/src/main/java/goodgenerator/client/GUI/LargeFusionComputerGUIClient.java
@@ -9,7 +9,8 @@ import net.minecraft.util.StatCollector;
 
 public class LargeFusionComputerGUIClient extends GT_GUIContainer_MultiMachineEM {
 
-    public LargeFusionComputerGUIClient(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) {
+    public LargeFusionComputerGUIClient(
+            InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) {
         super(new YOTTankGUIContainer(aInventoryPlayer, aTileEntity), aName, aTextureFile, true, true, true);
     }
 
@@ -17,9 +18,18 @@ public class LargeFusionComputerGUIClient extends GT_GUIContainer_MultiMachineEM
     protected void drawGuiContainerForegroundLayer(int par1, int par2) {
         super.drawGuiContainerForegroundLayer(par1, par2);
         if (this.mContainer.mDisplayErrorCode == 0) {
-            fontRendererObj.drawString(StatCollector.translateToLocal("gui.LargeFusion.0") + " " + GT_Utility.formatNumbers(this.mContainer.mStorage) + " EU", 7, 40, 16448255);
-            fontRendererObj.drawString(StatCollector.translateToLocal("gui.LargeFusion.1") + " " + GT_Utility.formatNumbers(this.mContainer.mEnergy) + " EU", 7, 48, 16448255);
+            fontRendererObj.drawString(
+                    StatCollector.translateToLocal("gui.LargeFusion.0") + " "
+                            + GT_Utility.formatNumbers(this.mContainer.mStorage) + " EU",
+                    7,
+                    40,
+                    16448255);
+            fontRendererObj.drawString(
+                    StatCollector.translateToLocal("gui.LargeFusion.1") + " "
+                            + GT_Utility.formatNumbers(this.mContainer.mEnergy) + " EU",
+                    7,
+                    48,
+                    16448255);
         }
     }
-
 }
diff --git a/src/main/java/goodgenerator/client/GUI/NeutronActivatorGUIClient.java b/src/main/java/goodgenerator/client/GUI/NeutronActivatorGUIClient.java
index c3f7992a17..1bd0b09f99 100644
--- a/src/main/java/goodgenerator/client/GUI/NeutronActivatorGUIClient.java
+++ b/src/main/java/goodgenerator/client/GUI/NeutronActivatorGUIClient.java
@@ -1,9 +1,9 @@
 package goodgenerator.client.GUI;
 
-import goodgenerator.common.container.NeutronActivatorGUIContainer;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import goodgenerator.common.container.NeutronActivatorGUIContainer;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.StatCollector;
@@ -13,7 +13,8 @@ public class NeutronActivatorGUIClient extends GT_GUIContainer_MultiMachineEM {
 
     private final NeutronActivatorGUIContainer containerNeutronActivator;
 
-    public NeutronActivatorGUIClient(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) {
+    public NeutronActivatorGUIClient(
+            InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) {
         super(new NeutronActivatorGUIContainer(aInventoryPlayer, aTileEntity), aName, aTextureFile, true, true, true);
         containerNeutronActivator = (NeutronActivatorGUIContainer) this.mContainer;
     }
@@ -39,5 +40,4 @@ public class NeutronActivatorGUIClient extends GT_GUIContainer_MultiMachineEM {
         num2 /= 1000F;
         return String.format("%.1fM", num2);
     }
-
 }
diff --git a/src/main/java/goodgenerator/client/GUI/NeutronSensorGUIClient.java b/src/main/java/goodgenerator/client/GUI/NeutronSensorGUIClient.java
index 5070d80ead..b2ddd6b04a 100644
--- a/src/main/java/goodgenerator/client/GUI/NeutronSensorGUIClient.java
+++ b/src/main/java/goodgenerator/client/GUI/NeutronSensorGUIClient.java
@@ -1,10 +1,10 @@
 package goodgenerator.client.GUI;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import goodgenerator.main.GoodGenerator;
 import goodgenerator.network.MessageSetNeutronSensorData;
 import goodgenerator.util.CharExchanger;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.client.gui.GuiTextField;
@@ -20,15 +20,16 @@ public class NeutronSensorGUIClient extends GT_GUIContainerMetaTile_Machine {
     private GuiTextField TextBox;
     private String context;
 
-    public NeutronSensorGUIClient(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aTexture, String text) {
+    public NeutronSensorGUIClient(
+            InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aTexture, String text) {
         super(aInventoryPlayer, aTileEntity, aTexture);
         this.mName = "Neutron Sensor";
         this.mContainer.detectAndSendChanges();
         if (text == null) this.context = "";
-            else this.context = text;
+        else this.context = text;
     }
 
-    public void initGui(){
+    public void initGui() {
         super.initGui();
         this.TextBox = new GuiTextField(this.fontRendererObj, 8, 48, 100, 18);
         TextBox.setMaxStringLength(20);
@@ -44,12 +45,18 @@ public class NeutronSensorGUIClient extends GT_GUIContainerMetaTile_Machine {
         if (TextBox.getText() != null) {
             if (isValidSuffix(TextBox.getText())) {
                 if (CharExchanger.isValidCompareExpress(rawProcessExp(TextBox.getText())))
-                    this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.NeutronSensor.2"), 120, 53, 0x077d02);
-                else this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.NeutronSensor.3"), 120, 53, 0xff0000);
-            }
-            else this.fontRendererObj.drawString(StatCollector.translateToLocal("gui.NeutronSensor.3"), 120, 53, 0xff0000);
+                    this.fontRendererObj.drawString(
+                            StatCollector.translateToLocal("gui.NeutronSensor.2"), 120, 53, 0x077d02);
+                else
+                    this.fontRendererObj.drawString(
+                            StatCollector.translateToLocal("gui.NeutronSensor.3"), 120, 53, 0xff0000);
+            } else
+                this.fontRendererObj.drawString(
+                        StatCollector.translateToLocal("gui.NeutronSensor.3"), 120, 53, 0xff0000);
         }
-        this.mc.getTextureManager().bindTexture(new ResourceLocation(GoodGenerator.MOD_ID + ":textures/gui/NeutronSensorGUI.png"));
+        this.mc
+                .getTextureManager()
+                .bindTexture(new ResourceLocation(GoodGenerator.MOD_ID + ":textures/gui/NeutronSensorGUI.png"));
     }
 
     protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
@@ -60,8 +67,7 @@ public class NeutronSensorGUIClient extends GT_GUIContainerMetaTile_Machine {
     }
 
     protected void keyTyped(char par1, int par2) {
-        if (!this.TextBox.isFocused())
-            super.keyTyped(par1, par2);
+        if (!this.TextBox.isFocused()) super.keyTyped(par1, par2);
         if (par2 == 1) this.mc.thePlayer.closeScreen();
         this.TextBox.textboxKeyTyped(par1, par2);
     }
@@ -79,13 +85,14 @@ public class NeutronSensorGUIClient extends GT_GUIContainerMetaTile_Machine {
     @Override
     public void onGuiClosed() {
         if (CharExchanger.isValidCompareExpress(rawProcessExp(TextBox.getText())))
-            GoodGenerator.CHANNEL.sendToServer(new MessageSetNeutronSensorData(mContainer.mTileEntity, TextBox.getText()));
+            GoodGenerator.CHANNEL.sendToServer(
+                    new MessageSetNeutronSensorData(mContainer.mTileEntity, TextBox.getText()));
         super.onGuiClosed();
     }
 
     protected String rawProcessExp(String exp) {
         StringBuilder ret = new StringBuilder();
-        for (char c: exp.toCharArray()) {
+        for (char c : exp.toCharArray()) {
             if (exp.length() - ret.length() == 3) {
                 if (Character.isDigit(c)) ret.append(c);
                 break;
@@ -105,6 +112,10 @@ public class NeutronSensorGUIClient extends GT_GUIContainerMetaTile_Machine {
         if (exp.charAt(index) != 'E' && exp.charAt(index) != 'e') return false;
         index = exp.length() - 3;
         if (index < 0) return false;
-        return exp.charAt(index) == 'M' || exp.charAt(index) == 'm' || exp.charAt(index) == 'K' || exp.charAt(index) == 'k' || Character.isDigit(exp.charAt(index));
+        return exp.charAt(index) == 'M'
+                || exp.charAt(index) == 'm'
+                || exp.charAt(index) == 'K'
+                || exp.charAt(index) == 'k'
+                || Character.isDigit(exp.charAt(index));
     }
 }
diff --git a/src/main/java/goodgenerator/client/GUI/YOTTankGUIClient.java b/src/main/java/goodgenerator/client/GUI/YOTTankGUIClient.java
index 82d8b19e35..e4a93fb6e2 100644
--- a/src/main/java/goodgenerator/client/GUI/YOTTankGUIClient.java
+++ b/src/main/java/goodgenerator/client/GUI/YOTTankGUIClient.java
@@ -1,8 +1,8 @@
 package goodgenerator.client.GUI;
 
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM;
 import goodgenerator.common.container.YOTTankGUIContainer;
 import goodgenerator.util.CharExchanger;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.StatCollector;
@@ -11,7 +11,8 @@ public class YOTTankGUIClient extends GT_GUIContainer_MultiMachineEM {
 
     private final YOTTankGUIContainer containerYOTTank;
 
-    public YOTTankGUIClient(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) {
+    public YOTTankGUIClient(
+            InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) {
         super(new YOTTankGUIContainer(aInventoryPlayer, aTileEntity), aName, aTextureFile, true, true, true);
         containerYOTTank = (YOTTankGUIContainer) this.mContainer;
     }
@@ -20,9 +21,24 @@ public class YOTTankGUIClient extends GT_GUIContainer_MultiMachineEM {
     protected void drawGuiContainerForegroundLayer(int par1, int par2) {
         super.drawGuiContainerForegroundLayer(par1, par2);
         if (this.mContainer.mDisplayErrorCode == 0) {
-            fontRendererObj.drawString(StatCollector.translateToLocal("gui.YOTTank.0") + " " + CharExchanger.formatNumber(containerYOTTank.getCap()) + " L", 7, 40, 16448255);
-            fontRendererObj.drawString(StatCollector.translateToLocal("gui.YOTTank.1") + " " + CharExchanger.formatNumber(containerYOTTank.getFluidName()), 7, 48, 16448255);
-            fontRendererObj.drawString(StatCollector.translateToLocal("gui.YOTTank.2") + " " + CharExchanger.formatNumber(containerYOTTank.getStorage()) + " L", 7, 56, 16448255);
+            fontRendererObj.drawString(
+                    StatCollector.translateToLocal("gui.YOTTank.0") + " "
+                            + CharExchanger.formatNumber(containerYOTTank.getCap()) + " L",
+                    7,
+                    40,
+                    16448255);
+            fontRendererObj.drawString(
+                    StatCollector.translateToLocal("gui.YOTTank.1") + " "
+                            + CharExchanger.formatNumber(containerYOTTank.getFluidName()),
+                    7,
+                    48,
+                    16448255);
+            fontRendererObj.drawString(
+                    StatCollector.translateToLocal("gui.YOTTank.2") + " "
+                            + CharExchanger.formatNumber(containerYOTTank.getStorage()) + " L",
+                    7,
+                    56,
+                    16448255);
         }
     }
 }
diff --git a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java
index 6fad73ba21..d9ddd62d97 100644
--- a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java
+++ b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java
@@ -1,5 +1,9 @@
 package goodgenerator.client.render;
 
+import static gregtech.common.render.GT_Renderer_Block.*;
+import static net.minecraftforge.common.util.ForgeDirection.*;
+import static net.minecraftforge.common.util.ForgeDirection.EAST;
+
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import goodgenerator.blocks.regularBlock.ITextureBlock;
@@ -10,10 +14,6 @@ import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
 import org.lwjgl.opengl.GL11;
 
-import static gregtech.common.render.GT_Renderer_Block.*;
-import static net.minecraftforge.common.util.ForgeDirection.*;
-import static net.minecraftforge.common.util.ForgeDirection.EAST;
-
 public class BlockRenderHandler implements ISimpleBlockRenderingHandler {
 
     public static final float blockMin = 0.0F;
@@ -39,12 +39,18 @@ public class BlockRenderHandler implements ISimpleBlockRenderingHandler {
             ITextureBlock tc = (ITextureBlock) aBlock;
             aBlock.setBlockBoundsForItemRender();
             aRenderer.setRenderBoundsFromBlock(aBlock);
-            renderNegativeYFacing(null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) DOWN.ordinal()), true);
-            renderPositiveYFacing(null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) UP.ordinal()), true);
-            renderNegativeZFacing(null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) NORTH.ordinal()), true);
-            renderPositiveZFacing(null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) SOUTH.ordinal()), true);
-            renderNegativeXFacing(null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) WEST.ordinal()), true);
-            renderPositiveXFacing(null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) EAST.ordinal()), true);
+            renderNegativeYFacing(
+                    null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) DOWN.ordinal()), true);
+            renderPositiveYFacing(
+                    null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) UP.ordinal()), true);
+            renderNegativeZFacing(
+                    null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) NORTH.ordinal()), true);
+            renderPositiveZFacing(
+                    null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) SOUTH.ordinal()), true);
+            renderNegativeXFacing(
+                    null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) WEST.ordinal()), true);
+            renderPositiveXFacing(
+                    null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) EAST.ordinal()), true);
         }
 
         aBlock.setBlockBounds(blockMin, blockMin, blockMin, blockMax, blockMax, blockMax);
@@ -55,19 +61,68 @@ public class BlockRenderHandler implements ISimpleBlockRenderingHandler {
     }
 
     @Override
-    public boolean renderWorldBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, RenderBlocks aRenderer) {
+    public boolean renderWorldBlock(
+            IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, RenderBlocks aRenderer) {
         aRenderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion;
         aRenderer.useInventoryTint = false;
         if (aBlock instanceof ITextureBlock) {
             aBlock.setBlockBounds(blockMin, blockMin, blockMin, blockMax, blockMax, blockMax);
             aRenderer.setRenderBoundsFromBlock(aBlock);
             ITextureBlock tc = (ITextureBlock) aBlock;
-            renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tc.getTexture(aBlock, (byte) DOWN.ordinal(), aWorld, aX, aY, aZ), true);
-            renderPositiveYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tc.getTexture(aBlock, (byte) UP.ordinal(), aWorld, aX, aY, aZ), true);
-            renderNegativeZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tc.getTexture(aBlock, (byte) NORTH.ordinal(), aWorld, aX, aY, aZ), true);
-            renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tc.getTexture(aBlock, (byte) SOUTH.ordinal(), aWorld, aX, aY, aZ), true);
-            renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tc.getTexture(aBlock, (byte) WEST.ordinal(), aWorld, aX, aY, aZ), true);
-            renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tc.getTexture(aBlock, (byte) EAST.ordinal(), aWorld, aX, aY, aZ), true);
+            renderNegativeYFacing(
+                    aWorld,
+                    aRenderer,
+                    aBlock,
+                    aX,
+                    aY,
+                    aZ,
+                    tc.getTexture(aBlock, (byte) DOWN.ordinal(), aWorld, aX, aY, aZ),
+                    true);
+            renderPositiveYFacing(
+                    aWorld,
+                    aRenderer,
+                    aBlock,
+                    aX,
+                    aY,
+                    aZ,
+                    tc.getTexture(aBlock, (byte) UP.ordinal(), aWorld, aX, aY, aZ),
+                    true);
+            renderNegativeZFacing(
+                    aWorld,
+                    aRenderer,
+                    aBlock,
+                    aX,
+                    aY,
+                    aZ,
+                    tc.getTexture(aBlock, (byte) NORTH.ordinal(), aWorld, aX, aY, aZ),
+                    true);
+            renderPositiveZFacing(
+                    aWorld,
+                    aRenderer,
+                    aBlock,
+                    aX,
+                    aY,
+                    aZ,
+                    tc.getTexture(aBlock, (byte) SOUTH.ordinal(), aWorld, aX, aY, aZ),
+                    true);
+            renderNegativeXFacing(
+                    aWorld,
+                    aRenderer,
+                    aBlock,
+                    aX,
+                    aY,
+                    aZ,
+                    tc.getTexture(aBlock, (byte) WEST.ordinal(), aWorld, aX, aY, aZ),
+                    true);
+            renderPositiveXFacing(
+                    aWorld,
+                    aRenderer,
+                    aBlock,
+                    aX,
+                    aY,
+                    aZ,
+                    tc.getTexture(aBlock, (byte) EAST.ordinal(), aWorld, aX, aY, aZ),
+                    true);
         }
         return false;
     }