Reformat code

14 files changed, 1990 insertions, 1929 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
index b7a1f3cc02..a869ad8d3a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
@@ -1,9 +1,7 @@
 package gregtech.common.tileentities.machines.basic;

 

-import gregtech.api.enums.GT_Values;

 import gregtech.api.enums.ItemList;

 import gregtech.api.enums.Textures;

-import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.interfaces.ITexture;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.api.metatileentity.MetaTileEntity;

@@ -11,98 +9,91 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachin
 import gregtech.api.objects.GT_RenderedTexture;

 import gregtech.api.util.GT_ModHandler;

 import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;

 import gregtech.api.util.GT_Utility;

 import net.minecraft.item.ItemStack;

 

 public class GT_MetaTileEntity_Boxinator

-  extends GT_MetaTileEntity_BasicMachine

-{

-  public GT_MetaTileEntity_Boxinator(int aID, String aName, String aNameRegional, int aTier)

-  {

-    super(aID, aName, aNameRegional, aTier, 1, "Puts things into Boxes", 2, 1, "Packager.png", "", new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR) });

-  }

-  

-  public GT_MetaTileEntity_Boxinator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName)

-  {

-    super(aName, aTier, 1, aDescription, aTextures, 2, 1, aGUIName, aNEIName);

-  }

-  

-  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

-  {

-    return new GT_MetaTileEntity_Boxinator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

-  }

-  

-  public GT_Recipe.GT_Recipe_Map getRecipeList()

-  {

-    return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes;

-  }

-  

-  public int checkRecipe()

-  {

-    int tCheck = super.checkRecipe();

-    if (tCheck != 0) {

-      return tCheck;

+        extends GT_MetaTileEntity_BasicMachine {

+    public GT_MetaTileEntity_Boxinator(int aID, String aName, String aNameRegional, int aTier) {

+        super(aID, aName, aNameRegional, aTier, 1, "Puts things into Boxes", 2, 1, "Packager.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR)});

     }

-    if ((GT_Utility.isStackValid(getInputAt(0))) && (GT_Utility.isStackValid(getInputAt(1))) && (GT_Utility.getContainerItem(getInputAt(0), true) == null))

-    {

-      if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 1))

-      {

-        this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[] { getInputAt(0) });

-        if (this.mOutputItems[0] != null) {

-          if (canOutput(new ItemStack[] { this.mOutputItems[0] }))

-          {

-            getInputAt(0).stackSize -= 1;

-            this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-            this.mMaxProgresstime = (16 / (1 << this.mTier - 1));

-            return 2;

-          }

-        }

-        return 0;

-      }

-      if ((ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 4))

-      {

-        this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[] { getInputAt(0), getInputAt(0), null, getInputAt(0), getInputAt(0) });

-        if (this.mOutputItems[0] != null) {

-          if (canOutput(new ItemStack[] { this.mOutputItems[0] }))

-          {

-            getInputAt(0).stackSize -= 4;

-            this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-            this.mMaxProgresstime = (32 / (1 << this.mTier - 1));

-            return 2;

-          }

+

+    public GT_MetaTileEntity_Boxinator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {

+        super(aName, aTier, 1, aDescription, aTextures, 2, 1, aGUIName, aNEIName);

+    }

+

+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

+        return new GT_MetaTileEntity_Boxinator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

+    }

+

+    public GT_Recipe.GT_Recipe_Map getRecipeList() {

+        return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes;

+    }

+

+    public int checkRecipe() {

+        int tCheck = super.checkRecipe();

+        if (tCheck != 0) {

+            return tCheck;

         }

-        return 0;

-      }

-      if ((ItemList.Schematic_3by3.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 9))

-      {

-        this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[] { getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0) });

-        if (this.mOutputItems[0] != null) {

-          if (canOutput(new ItemStack[] { this.mOutputItems[0] }))

-          {

-            getInputAt(0).stackSize -= 9;

-            this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-            this.mMaxProgresstime = (64 / (1 << this.mTier - 1));

-            return 2;

-          }

+        if ((GT_Utility.isStackValid(getInputAt(0))) && (GT_Utility.isStackValid(getInputAt(1))) && (GT_Utility.getContainerItem(getInputAt(0), true) == null)) {

+            if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 1)) {

+                this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[]{getInputAt(0)});

+                if (this.mOutputItems[0] != null) {

+                    if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {

+                        getInputAt(0).stackSize -= 1;

+                        this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+                        this.mMaxProgresstime = (16 / (1 << this.mTier - 1));

+                        return 2;

+                    }

+                }

+                return 0;

+            }

+            if ((ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 4)) {

+                this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[]{getInputAt(0), getInputAt(0), null, getInputAt(0), getInputAt(0)});

+                if (this.mOutputItems[0] != null) {

+                    if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {

+                        getInputAt(0).stackSize -= 4;

+                        this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+                        this.mMaxProgresstime = (32 / (1 << this.mTier - 1));

+                        return 2;

+                    }

+                }

+                return 0;

+            }

+            if ((ItemList.Schematic_3by3.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 9)) {

+                this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[]{getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0)});

+                if (this.mOutputItems[0] != null) {

+                    if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {

+                        getInputAt(0).stackSize -= 9;

+                        this.mEUt = (32 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+                        this.mMaxProgresstime = (64 / (1 << this.mTier - 1));

+                        return 2;

+                    }

+                }

+                return 0;

+            }

         }

         return 0;

-      }

     }

-    return 0;

-  }

-  

-  public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)

-  {

-    if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack))

-    {

-      if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) || (ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) || (ItemList.Schematic_3by3.isStackEqual(getInputAt(1)))) {

-    	  if(GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, gregtech.api.enums.GT_Values.V[this.mTier], null, new ItemStack[] { GT_Utility.copyAmount(64L, new Object[] { aStack }), getInputAt(1) }) != null){return true;}

-    	  if(ItemList.Schematic_1by1.isStackEqual(getInputAt(1))&&GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack })!=null)return true;

-    	  if(ItemList.Schematic_2by2.isStackEqual(getInputAt(1))&&GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack, aStack, null, aStack, aStack })!=null){return true;}

-    	  if(ItemList.Schematic_3by3.isStackEqual(getInputAt(1))&&(GT_ModHandler.getRecipeOutput(new ItemStack[] { aStack,aStack,aStack,aStack,aStack,aStack,aStack,aStack,aStack })!=null)){return true;}

-    	  }else{return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.containsInput(aStack);}

+

+    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

+        if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {

+            if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) || (ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) || (ItemList.Schematic_3by3.isStackEqual(getInputAt(1)))) {

+                if (GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, gregtech.api.enums.GT_Values.V[this.mTier], null, new ItemStack[]{GT_Utility.copyAmount(64L, new Object[]{aStack}), getInputAt(1)}) != null) {

+                    return true;

+                }

+                if (ItemList.Schematic_1by1.isStackEqual(getInputAt(1)) && GT_ModHandler.getRecipeOutput(new ItemStack[]{aStack}) != null)

+                    return true;

+                if (ItemList.Schematic_2by2.isStackEqual(getInputAt(1)) && GT_ModHandler.getRecipeOutput(new ItemStack[]{aStack, aStack, null, aStack, aStack}) != null) {

+                    return true;

+                }

+                if (ItemList.Schematic_3by3.isStackEqual(getInputAt(1)) && (GT_ModHandler.getRecipeOutput(new ItemStack[]{aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack}) != null)) {

+                    return true;

+                }

+            } else {

+                return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.containsInput(aStack);

+            }

+        }

+        return false;

     }

-    return false;

-  }

 }

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
index 8504cf3197..8937dfbcf5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
@@ -1,6 +1,5 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -9,71 +8,73 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer;
 import gregtech.api.util.GT_ModHandler;
 
+import static gregtech.api.enums.GT_Values.V;
+
 public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuffer {
 
-	public GT_MetaTileEntity_Charger(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) {
-		super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount);
-	}
+    public GT_MetaTileEntity_Charger(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aSlotCount) {
+        super(aID, aName, aNameRegional, aTier, aDescription, aSlotCount);
+    }
+
+    public GT_MetaTileEntity_Charger(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) {
+        super(aName, aTier, aDescription, aTextures, aSlotCount);
+    }
 
-	public GT_MetaTileEntity_Charger(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) {
-		super(aName, aTier, aDescription, aTextures, aSlotCount);
-	}
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Charger(mName, mTier, mDescription, mTextures, mInventory.length);
+    }
 
-	@Override
-	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GT_MetaTileEntity_Charger(mName, mTier, mDescription, mTextures, mInventory.length);
-	}
-	
-	@Override
-	public long getMinimumStoredEU() {
-		return V[mTier] * 64 * mInventory.length;
-	}
+    @Override
+    public long getMinimumStoredEU() {
+        return V[mTier] * 64 * mInventory.length;
+    }
 
-	@Override
-	public long maxEUStore() {
-		return V[mTier] * 256 * mInventory.length;
-	}
+    @Override
+    public long maxEUStore() {
+        return V[mTier] * 256 * mInventory.length;
+    }
 
-	@Override
-	public long maxAmperesIn() {
-		return mChargeableCount * 8;
-	}
+    @Override
+    public long maxAmperesIn() {
+        return mChargeableCount * 8;
+    }
 
-	@Override
-	public long maxAmperesOut() {
-		return mBatteryCount * 4;
-	}
+    @Override
+    public long maxAmperesOut() {
+        return mBatteryCount * 4;
+    }
 
-	@Override
-	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-		if (aBaseMetaTileEntity.isServerSide()) {
-			super.onPostTick(aBaseMetaTileEntity, aTick);
-			if (this.getBaseMetaTileEntity() instanceof BaseMetaTileEntity) {
-				BaseMetaTileEntity mBaseMetaTileEntity = (BaseMetaTileEntity) getBaseMetaTileEntity();
-				if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) {
-					MetaTileEntity mMetaTileEntity = (MetaTileEntity) mBaseMetaTileEntity.getMetaTileEntity();
-					//for (int t = 0; t < 6; t++) {
-						if (mMetaTileEntity.dechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
-							for (int i = mMetaTileEntity.dechargerSlotStartIndex(), k = mMetaTileEntity.dechargerSlotCount() + i; i < k; i++) {
-								if (mMetaTileEntity.mInventory[i] != null && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
-									mBaseMetaTileEntity.increaseStoredEnergyUnits(GT_ModHandler.dischargeElectricItem(mMetaTileEntity.mInventory[i], (int)Math.min(V[mTier]*15, mBaseMetaTileEntity.getEUCapacity() - mBaseMetaTileEntity.getStoredEU()), (int)Math.min(Integer.MAX_VALUE, mMetaTileEntity.getInputTier()), true, false, false), true);
-									if (mMetaTileEntity.mInventory[i].stackSize <= 0)
-										mMetaTileEntity.mInventory[i] = null;
-								}
-							}
-						}
-						if (mMetaTileEntity.rechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() > 0) {
-							for (int i = mMetaTileEntity.rechargerSlotStartIndex(), k = mMetaTileEntity.rechargerSlotCount() + i; i < k; i++) {
-								if (mBaseMetaTileEntity.getStoredEU() > 0 && mMetaTileEntity.mInventory[i] != null) {
-									mBaseMetaTileEntity.decreaseStoredEU(GT_ModHandler.chargeElectricItem(mMetaTileEntity.mInventory[i], (int)Math.min(V[this.mTier]*15, mBaseMetaTileEntity.getStoredEU()), (int)Math.min(Integer.MAX_VALUE, mMetaTileEntity.getOutputTier()), true, false), true);
-									if (mMetaTileEntity.mInventory[i].stackSize <= 0)
-										mMetaTileEntity.mInventory[i] = null;
-								}
-							}
-						//}
-					}
-				}
-			}
-		}
-	}
+    @Override
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if (aBaseMetaTileEntity.isServerSide()) {
+            super.onPostTick(aBaseMetaTileEntity, aTick);
+            if (this.getBaseMetaTileEntity() instanceof BaseMetaTileEntity) {
+                BaseMetaTileEntity mBaseMetaTileEntity = (BaseMetaTileEntity) getBaseMetaTileEntity();
+                if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) {
+                    MetaTileEntity mMetaTileEntity = (MetaTileEntity) mBaseMetaTileEntity.getMetaTileEntity();
+                    //for (int t = 0; t < 6; t++) {
+                    if (mMetaTileEntity.dechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
+                        for (int i = mMetaTileEntity.dechargerSlotStartIndex(), k = mMetaTileEntity.dechargerSlotCount() + i; i < k; i++) {
+                            if (mMetaTileEntity.mInventory[i] != null && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
+                                mBaseMetaTileEntity.increaseStoredEnergyUnits(GT_ModHandler.dischargeElectricItem(mMetaTileEntity.mInventory[i], (int) Math.min(V[mTier] * 15, mBaseMetaTileEntity.getEUCapacity() - mBaseMetaTileEntity.getStoredEU()), (int) Math.min(Integer.MAX_VALUE, mMetaTileEntity.getInputTier()), true, false, false), true);
+                                if (mMetaTileEntity.mInventory[i].stackSize <= 0)
+                                    mMetaTileEntity.mInventory[i] = null;
+                            }
+                        }
+                    }
+                    if (mMetaTileEntity.rechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() > 0) {
+                        for (int i = mMetaTileEntity.rechargerSlotStartIndex(), k = mMetaTileEntity.rechargerSlotCount() + i; i < k; i++) {
+                            if (mBaseMetaTileEntity.getStoredEU() > 0 && mMetaTileEntity.mInventory[i] != null) {
+                                mBaseMetaTileEntity.decreaseStoredEU(GT_ModHandler.chargeElectricItem(mMetaTileEntity.mInventory[i], (int) Math.min(V[this.mTier] * 15, mBaseMetaTileEntity.getStoredEU()), (int) Math.min(Integer.MAX_VALUE, mMetaTileEntity.getOutputTier()), true, false), true);
+                                if (mMetaTileEntity.mInventory[i].stackSize <= 0)
+                                    mMetaTileEntity.mInventory[i] = null;
+                            }
+                        }
+                        //}
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
index 8be43c1b94..a9c4299edd 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
@@ -1,7 +1,6 @@
 package gregtech.common.tileentities.machines.basic;

 

 import gregtech.api.enums.Textures;

-import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.interfaces.ITexture;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.api.metatileentity.MetaTileEntity;

@@ -12,54 +11,44 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

 

 public class GT_MetaTileEntity_Disassembler

-  extends GT_MetaTileEntity_BasicMachine

-{

-  public GT_MetaTileEntity_Disassembler(int aID, String aName, String aNameRegional, int aTier)

-  {

-    super(aID, aName, aNameRegional, aTier, 1, "Disassembles Machines at " + (50 + 10 * aTier) + "% Efficiency", 1, 9, "Disassembler.png", "", new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER) });

-  }

-  

-  public GT_MetaTileEntity_Disassembler(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName)

-  {

-    super(aName, aTier, 1, aDescription, aTextures, 1, 9, aGUIName, aNEIName);

-  }

-  

-  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

-  {

-    return new GT_MetaTileEntity_Disassembler(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

-  }

-  

-  public int checkRecipe()

-  {

-    if ((getInputAt(0) != null) && (isOutputEmpty()))

-    {

-      NBTTagCompound tNBT = getInputAt(0).getTagCompound();

-      if (tNBT != null)

-      {

-        tNBT = tNBT.getCompoundTag("GT.CraftingComponents");

-        if (tNBT != null)

-        {

-          getInputAt(0).stackSize -= 1;

-          this.mEUt = (16 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

-          this.mMaxProgresstime = 80;

-          for (int i = 0; i < this.mOutputItems.length; i++) {

-            if (getBaseMetaTileEntity().getRandomNumber(100) < 50 + 10 * this.mTier)

-            {

-              this.mOutputItems[i] = GT_Utility.loadItem(tNBT, "Ingredient." + i);

-              if (this.mOutputItems[i] != null) {

-                this.mMaxProgresstime *= 1.7;

-              }

+        extends GT_MetaTileEntity_BasicMachine {

+    public GT_MetaTileEntity_Disassembler(int aID, String aName, String aNameRegional, int aTier) {

+        super(aID, aName, aNameRegional, aTier, 1, "Disassembles Machines at " + (50 + 10 * aTier) + "% Efficiency", 1, 9, "Disassembler.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER)});

+    }

+

+    public GT_MetaTileEntity_Disassembler(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {

+        super(aName, aTier, 1, aDescription, aTextures, 1, 9, aGUIName, aNEIName);

+    }

+

+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

+        return new GT_MetaTileEntity_Disassembler(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

+    }

+

+    public int checkRecipe() {

+        if ((getInputAt(0) != null) && (isOutputEmpty())) {

+            NBTTagCompound tNBT = getInputAt(0).getTagCompound();

+            if (tNBT != null) {

+                tNBT = tNBT.getCompoundTag("GT.CraftingComponents");

+                if (tNBT != null) {

+                    getInputAt(0).stackSize -= 1;

+                    this.mEUt = (16 * (1 << this.mTier - 1) * (1 << this.mTier - 1));

+                    this.mMaxProgresstime = 80;

+                    for (int i = 0; i < this.mOutputItems.length; i++) {

+                        if (getBaseMetaTileEntity().getRandomNumber(100) < 50 + 10 * this.mTier) {

+                            this.mOutputItems[i] = GT_Utility.loadItem(tNBT, "Ingredient." + i);

+                            if (this.mOutputItems[i] != null) {

+                                this.mMaxProgresstime *= 1.7;

+                            }

+                        }

+                    }

+                    return 2;

+                }

             }

-          }

-          return 2;

         }

-      }

+        return 0;

+    }

+

+    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

+        return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (aStack.getTagCompound() != null) && (aStack.getTagCompound().getCompoundTag("GT.CraftingComponents") != null);

     }

-    return 0;

-  }

-  

-  public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)

-  {

-    return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (aStack.getTagCompound() != null) && (aStack.getTagCompound().getCompoundTag("GT.CraftingComponents") != null);

-  }

 }

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
index 292014245b..030eca8984 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
@@ -1,11 +1,9 @@
 package gregtech.common.tileentities.machines.basic;

 

-import static gregtech.api.enums.GT_Values.V;

 import gregtech.api.enums.ConfigCategories;

 import gregtech.api.enums.ItemList;

 import gregtech.api.enums.Materials;

 import gregtech.api.enums.Textures;

-import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.interfaces.ITexture;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.api.metatileentity.MetaTileEntity;

@@ -14,68 +12,67 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Config;

 import net.minecraftforge.fluids.FluidStack;

 

+import static gregtech.api.enums.GT_Values.V;

+

 public class GT_MetaTileEntity_Massfabricator

-  extends GT_MetaTileEntity_BasicMachine

-{

-  public static int sUUAperUUM = 1;

-  public static int sUUASpeedBonus = 4;

-  public static int sDurationMultiplier = 3215;

-  public static boolean sRequiresUUA = false;

-  

-  public GT_MetaTileEntity_Massfabricator(int aID, String aName, String aNameRegional, int aTier)

-  {

-    super(aID, aName, aNameRegional, aTier, 1, "UUM = Matter * Fabrication Squared", 1, 1, "Massfabricator.png", "", new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB) });

-  }

-  

-  public GT_MetaTileEntity_Massfabricator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName)

-  {

-    super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);

-  }

-  

-  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

-  {

-    return new GT_MetaTileEntity_Massfabricator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

-  }

-  

-  public void onConfigLoad(GT_Config aConfig)

-  {

-    super.onConfigLoad(aConfig);

-    sDurationMultiplier = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUM_Duration_Multiplier", sDurationMultiplier);

-    sUUAperUUM = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_per_UUM", sUUAperUUM);

-    sUUASpeedBonus = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Speed_Bonus", sUUASpeedBonus);

-    sRequiresUUA = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Requirement", sRequiresUUA);

-    Materials.UUAmplifier.mChemicalFormula = ("Mass Fabricator Eff/Speed Bonus: x" + sUUASpeedBonus);

-  }

-  

-@Override public long maxAmperesIn(){return 10;}

-@Override public long maxEUStore()  {return V[mTier]*512;}

-  

-  public int checkRecipe()

-  {

-    FluidStack tFluid = getDrainableStack();

-    if ((tFluid == null) || (tFluid.amount < getCapacity()))

-    {

-      this.mOutputFluid = Materials.UUMatter.getFluid(1L);

-      this.mEUt = ((int)gregtech.api.enums.GT_Values.V[this.mTier])*8;

-      this.mMaxProgresstime = (sDurationMultiplier / (1 << (this.mTier*2) - 2));

-      if (((tFluid = getFillableStack()) != null) && (tFluid.amount >= sUUAperUUM) && (tFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L))))

-      {

-        tFluid.amount -= sUUAperUUM;

-        this.mMaxProgresstime /= sUUASpeedBonus;

-        return 2;

-      }

-      return (sRequiresUUA) || (ItemList.Circuit_Integrated.isStackEqual(getInputAt(0), true, true)) ? 1 : 2;

+        extends GT_MetaTileEntity_BasicMachine {

+    public static int sUUAperUUM = 1;

+    public static int sUUASpeedBonus = 4;

+    public static int sDurationMultiplier = 3215;

+    public static boolean sRequiresUUA = false;

+

+    public GT_MetaTileEntity_Massfabricator(int aID, String aName, String aNameRegional, int aTier) {

+        super(aID, aName, aNameRegional, aTier, 1, "UUM = Matter * Fabrication Squared", 1, 1, "Massfabricator.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_MASSFAB), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB)});

+    }

+

+    public GT_MetaTileEntity_Massfabricator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {

+        super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);

+    }

+

+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

+        return new GT_MetaTileEntity_Massfabricator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);

+    }

+

+    public void onConfigLoad(GT_Config aConfig) {

+        super.onConfigLoad(aConfig);

+        sDurationMultiplier = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUM_Duration_Multiplier", sDurationMultiplier);

+        sUUAperUUM = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_per_UUM", sUUAperUUM);

+        sUUASpeedBonus = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Speed_Bonus", sUUASpeedBonus);

+        sRequiresUUA = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Requirement", sRequiresUUA);

+        Materials.UUAmplifier.mChemicalFormula = ("Mass Fabricator Eff/Speed Bonus: x" + sUUASpeedBonus);

+    }

+

+    @Override

+    public long maxAmperesIn() {

+        return 10;

+    }

+

+    @Override

+    public long maxEUStore() {

+        return V[mTier] * 512;

+    }

+

+    public int checkRecipe() {

+        FluidStack tFluid = getDrainableStack();

+        if ((tFluid == null) || (tFluid.amount < getCapacity())) {

+            this.mOutputFluid = Materials.UUMatter.getFluid(1L);

+            this.mEUt = ((int) gregtech.api.enums.GT_Values.V[this.mTier]) * 8;

+            this.mMaxProgresstime = (sDurationMultiplier / (1 << (this.mTier * 2) - 2));

+            if (((tFluid = getFillableStack()) != null) && (tFluid.amount >= sUUAperUUM) && (tFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L)))) {

+                tFluid.amount -= sUUAperUUM;

+                this.mMaxProgresstime /= sUUASpeedBonus;

+                return 2;

+            }

+            return (sRequiresUUA) || (ItemList.Circuit_Integrated.isStackEqual(getInputAt(0), true, true)) ? 1 : 2;

+        }

+        return 0;

+    }

+

+    public boolean isFluidInputAllowed(FluidStack aFluid) {

+        return aFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L));

+    }

+

+    public int getCapacity() {

+        return Math.max(sUUAperUUM, 1000);

     }

-    return 0;

-  }

-  

-  public boolean isFluidInputAllowed(FluidStack aFluid)

-  {

-    return aFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L));

-  }

-  

-  public int getCapacity()

-  {

-    return Math.max(sUUAperUUM, 1000);

-  }

 }

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
index 11489dfa56..de0a468582 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
+++ b/src/main/java/gregtech/common/tileentities/m