Update Part 1

13 files changed, 52 insertions, 37 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
index 260d5f100a..bff1c616fd 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
@@ -115,7 +115,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
             this.mPumpCountBelow = 0;
             IGregTechTileEntity tTileEntity;
             for (int i = 1; (i < 21) && ((tTileEntity = getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance((byte) 0, i)) != null)
-                    && (tTileEntity.getMetaTileEntity() != null) && ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Pump)); i++) {
+                    && ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Pump)); i++) {
                 getBaseMetaTileEntity().setActive(tTileEntity.isActive());
                 this.mPumpCountBelow += 1;
                 ((GT_MetaTileEntity_Pump) tTileEntity.getMetaTileEntity()).mPumpTimer -= 1;
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
index 88eabd2322..9187d1fcb5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
@@ -11,6 +11,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

 import gregtech.api.objects.GT_RenderedTexture;

 import gregtech.api.objects.ItemData;

+import gregtech.api.util.GT_LanguageManager;

 import gregtech.api.util.GT_Log;

 import gregtech.api.util.GT_OreDictUnificator;

 import gregtech.api.util.GT_Recipe;

@@ -155,7 +156,7 @@ public class GT_MetaTileEntity_Scanner
             	

             	this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()});

             	getSpecialSlot().stackSize -= 1;

-                GT_Utility.ItemNBT.setBookTitle(this.mOutputItems[0], tRecipe.mOutput.getDisplayName()+" Construction Data");

+                GT_Utility.ItemNBT.setBookTitle(this.mOutputItems[0], GT_LanguageManager.getTranslation(tRecipe.mOutput.getDisplayName())+" Construction Data");

 

                 NBTTagCompound tNBT = this.mOutputItems[0].getTagCompound();

                 if (tNBT == null) {

@@ -175,15 +176,15 @@ public class GT_MetaTileEntity_Scanner
                 

                 tNBT.setString("author", "Assembly Line Recipe Generator");

                 NBTTagList tNBTList = new NBTTagList();

-                tNBTList.appendTag(new NBTTagString("Constructionplan for "+tRecipe.mOutput.stackSize+" "+tRecipe.mOutput.getDisplayName()+". Needed EU/t: "+tRecipe.mEUt+" Productiontime: "+(tRecipe.mDuration/20)));

+                tNBTList.appendTag(new NBTTagString("Constructionplan for "+tRecipe.mOutput.stackSize+" "+GT_LanguageManager.getTranslation(tRecipe.mOutput.getDisplayName())+". Needed EU/t: "+tRecipe.mEUt+" Productiontime: "+(tRecipe.mDuration/20)));

                 for(int i=0;i<tRecipe.mInputs.length;i++){

                 	if(tRecipe.mInputs[i]!=null){

-                		tNBTList.appendTag(new NBTTagString("Input Bus "+(i+1)+": "+tRecipe.mInputs[i].stackSize+" "+tRecipe.mInputs[i].getDisplayName()));

+                		tNBTList.appendTag(new NBTTagString("Input Bus "+(i+1)+": "+tRecipe.mInputs[i].stackSize+" "+GT_LanguageManager.getTranslation(tRecipe.mInputs[i].getDisplayName())));

                 	}

                 }

                 for(int i=0;i<tRecipe.mFluidInputs.length;i++){

                 	if(tRecipe.mFluidInputs[i]!=null){

-                		tNBTList.appendTag(new NBTTagString("Input Hatch "+(i+1)+": "+tRecipe.mFluidInputs[i].amount+"L "+tRecipe.mFluidInputs[i].getLocalizedName()));

+                		tNBTList.appendTag(new NBTTagString("Input Hatch "+(i+1)+": "+tRecipe.mFluidInputs[i].amount+"L "+GT_LanguageManager.getTranslation(tRecipe.mFluidInputs[i].getLocalizedName())));

                 	}

                 }

                 tNBT.setTag("pages", tNBTList);

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
index af8247d4b8..5ba4d04dfd 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
@@ -176,7 +176,7 @@ public class GT_MetaTileEntity_AssemblyLine
                 }
                 tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, -2, i);
                 if (!addInputToMachineList(tTileEntity, 16)){
-                    if (!addOutputToMachineList(tTileEntity, 16)){;return false;
+                    if (!addOutputToMachineList(tTileEntity, 16)){
                     }else{if(r>0){return true;}else{return false;}}
                 }
             }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
index 6877c4155a..beb4be7373 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
@@ -10,6 +10,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;

 import gregtech.api.objects.GT_ItemStack;

 import gregtech.api.objects.GT_RenderedTexture;

+import gregtech.api.objects.XSTR;

 import gregtech.api.util.GT_OreDictUnificator;

 import gregtech.api.util.GT_Utility;

 import gregtech.common.GT_Pollution;

@@ -187,7 +188,7 @@ public class GT_MetaTileEntity_BronzeBlastFurnace
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {

         if ((aBaseMetaTileEntity.isClientSide()) &&

                 (aBaseMetaTileEntity.isActive())) {

-            aBaseMetaTileEntity.getWorld().spawnParticle("largesmoke", aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1) + Math.random(), aBaseMetaTileEntity.getOffsetY(aBaseMetaTileEntity.getBackFacing(), 1), aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1) + Math.random(), 0.0D, 0.3D, 0.0D);

+            aBaseMetaTileEntity.getWorld().spawnParticle("largesmoke", aBaseMetaTileEntity.getOffsetX(aBaseMetaTileEntity.getBackFacing(), 1) + (new XSTR()).nextFloat(), aBaseMetaTileEntity.getOffsetY(aBaseMetaTileEntity.getBackFacing(), 1), aBaseMetaTileEntity.getOffsetZ(aBaseMetaTileEntity.getBackFacing(), 1) + (new XSTR()).nextFloat(), 0.0D, 0.3D, 0.0D);

         }

         if (aBaseMetaTileEntity.isServerSide()) {

             if (this.mUpdate-- == 0) {

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
index a241817edb..493f4407b4 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
@@ -161,7 +161,8 @@ public class GT_MetaTileEntity_DistillationTower
             return false;
         }
         GT_MetaTileEntity_Hatch_Output[] tmpHatches = new GT_MetaTileEntity_Hatch_Output[5];
-        for (int i = 0; i < this.mOutputHatches.size(); i++) {
+        int mOutputHatches_sS=this.mOutputHatches.size();
+        for (int i = 0; i < mOutputHatches_sS; i++) {
             int hatchNumber = this.mOutputHatches.get(i).getBaseMetaTileEntity().getYCoord() - 1 - height;
             if (tmpHatches[hatchNumber] == null) {
                 tmpHatches[hatchNumber] = this.mOutputHatches.get(i);
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
index 62189600eb..a341a47d80 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
@@ -1,8 +1,5 @@
 package gregtech.common.tileentities.machines.multi;

 

-import java.util.ArrayList;

-import java.util.Arrays;

-

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.Textures;

 import gregtech.api.gui.GT_GUIContainer_MultiMachine;

@@ -18,6 +15,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;

 import net.minecraftforge.fluids.FluidStack;

 

+import java.util.ArrayList;

+import java.util.Arrays;

+

 public class GT_MetaTileEntity_ElectricBlastFurnace

         extends GT_MetaTileEntity_MultiBlockBase {

     private int mHeatingCapacity = 0;

@@ -72,13 +72,14 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
 

     public boolean checkRecipe(ItemStack aStack) {

         ArrayList<ItemStack> tInputList = getStoredInputs();

-        for (int i = 0; i < tInputList.size() - 1; i++) {

-            for (int j = i + 1; j < tInputList.size(); j++) {

+        int tInputList_sS=tInputList.size();

+        for (int i = 0; i < tInputList_sS - 1; i++) {

+            for (int j = i + 1; j < tInputList_sS; j++) {

                 if (GT_Utility.areStacksEqual((ItemStack) tInputList.get(i), (ItemStack) tInputList.get(j))) {

                     if (((ItemStack) tInputList.get(i)).stackSize >= ((ItemStack) tInputList.get(j)).stackSize) {

-                        tInputList.remove(j--);

+                        tInputList.remove(j--); tInputList_sS=tInputList.size();

                     } else {

-                        tInputList.remove(i--);

+                        tInputList.remove(i--); tInputList_sS=tInputList.size();

                         break;

                     }

                 }

@@ -87,13 +88,14 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
         ItemStack[] tInputs = (ItemStack[]) Arrays.copyOfRange(tInputList.toArray(new ItemStack[tInputList.size()]), 0, 2);

 

         ArrayList<FluidStack> tFluidList = getStoredFluids();

-        for (int i = 0; i < tFluidList.size() - 1; i++) {

-            for (int j = i + 1; j < tFluidList.size(); j++) {

+        int tFluidList_sS=tFluidList.size();

+        for (int i = 0; i < tFluidList_sS - 1; i++) {

+            for (int j = i + 1; j < tFluidList_sS; j++) {

                 if (GT_Utility.areFluidsEqual((FluidStack) tFluidList.get(i), (FluidStack) tFluidList.get(j))) {

                     if (((FluidStack) tFluidList.get(i)).amount >= ((FluidStack) tFluidList.get(j)).amount) {

-                        tFluidList.remove(j--);

+                        tFluidList.remove(j--); tFluidList_sS=tFluidList.size();

                     } else {

-                        tFluidList.remove(i--);

+                        tFluidList.remove(i--); tFluidList_sS=tFluidList.size();

                         break;

                     }

                 }

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
index 6d61e2b01f..c5f6f11122 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java
@@ -69,13 +69,14 @@ public class GT_MetaTileEntity_ImplosionCompressor
 

     public boolean checkRecipe(ItemStack aStack) {

         ArrayList<ItemStack> tInputList = getStoredInputs();

-        for (int i = 0; i < tInputList.size() - 1; i++) {

-            for (int j = i + 1; j < tInputList.size(); j++) {

+        int tInputList_sS=tInputList.size();

+        for (int i = 0; i < tInputList_sS - 1; i++) {

+            for (int j = i + 1; j < tInputList_sS; j++) {

                 if (GT_Utility.areStacksEqual((ItemStack) tInputList.get(i), (ItemStack) tInputList.get(j))) {

                     if (((ItemStack) tInputList.get(i)).stackSize >= ((ItemStack) tInputList.get(j)).stackSize) {

-                        tInputList.remove(j--);

+                        tInputList.remove(j--); tInputList_sS=tInputList.size();

                     } else {

-                        tInputList.remove(i--);

+                        tInputList.remove(i--); tInputList_sS=tInputList.size();

                         break;

                     }

                 }

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
index 621eb6498b..b42d14cd6e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
@@ -162,6 +162,10 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M
         } else {
             this.mMaxProgresstime = 1;
             this.mEfficiencyIncrease = (10);
+            if(this.mDynamoHatches.size()>0){
+            	if(this.mDynamoHatches.get(0).getBaseMetaTileEntity().getOutputVoltage() < (int)((long)mEUt * (long)mEfficiency / 10000L)){
+            	explodeMultiblock();}
+            }
             return true;
         }
     }
@@ -219,4 +223,4 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M
         return true;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
index c5507e0bde..69a33ee867 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
@@ -95,7 +95,8 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
             int flow = 0;
             int totalFlow = 0;
 
-            for (int i = 0; i < aFluids.size(); i++) {
+            int aFluids_sS=aFluids.size();
+            for (int i = 0; i < aFluids_sS; i++) {
                 if (aFluids.get(i).isFluidEqual(firstFuelType)) {
                     flow = aFluids.get(i).amount; // Get all (steam) in hatch
                     flow = Math.min(flow, Math.min(remainingFlow, (int) (actualOptimalFlow * 1.25f))); // try to use up to 125% of optimal flow w/o exceeding remainingFlow
@@ -114,9 +115,9 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
                 if (efficiency < 0)
                     efficiency = 0; // Can happen with really ludicrously poor inefficiency.
                 tEU *= efficiency;
-                tEU = Math.max(1, tEU * aBaseEff / 10000);
+                tEU = Math.max(1, (int)((long)tEU * (long)aBaseEff / 10000L));
             } else {
-                tEU = tEU * aBaseEff / 10000;
+                tEU = (int)((long)tEU * (long)aBaseEff / 10000L);
             }
 
             return tEU;
@@ -126,4 +127,4 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
index b9c1251453..e7b9d27285 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
@@ -100,13 +100,13 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
             float efficiency = 1.0f - Math.abs(((totalFlow - (float) aOptFlow) / aOptFlow));
             if(totalFlow>aOptFlow){efficiency = 1.0f;}
             tEU *= efficiency;
-            tEU = Math.max(1, tEU * aBaseEff / 10000);
+            tEU = Math.max(1, (int)((long)tEU * (long)aBaseEff / 10000L));
         } else {
-            tEU = tEU * aBaseEff / 10000;
+            tEU = (int)((long)tEU * (long)aBaseEff / 10000L);
         }
 
         return tEU;
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
index 923eaabcdb..f1894833f3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
@@ -99,7 +99,8 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
             int flow = 0;
             int totalFlow = 0;
 
-            for (int i = 0; i < aFluids.size(); i++) {
+            int aFluids_sS=aFluids.size();
+            for (int i = 0; i < aFluids_sS; i++) {
                 if (aFluids.get(i).isFluidEqual(firstFuelType)) {
                     flow = aFluids.get(i).amount; // Get all (steam) in hatch
                     flow = Math.min(flow, Math.min(remainingFlow, (int) (actualOptimalFlow * 1.25f))); // try to use up to 125% of optimal flow w/o exceeding remainingFlow
@@ -130,9 +131,9 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
                 if (efficiency < 0)
                     efficiency = 0; // Can happen with really ludicrously poor inefficiency.
                 tEU *= efficiency;
-                tEU = Math.max(1, tEU * aBaseEff / 10000);
+                tEU = Math.max(1, (int)((long)tEU * (long)aBaseEff / 10000L));
             } else {
-                tEU = tEU * aBaseEff / 10000;
+                tEU = (int)((long)tEU * (long)aBaseEff / 10000L);
             }
 
             return tEU;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
index 7fba8ac265..d8071e149f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
@@ -108,11 +108,11 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
             float efficiency = 1.0f - Math.abs(((totalFlow - (float) aOptFlow) / aOptFlow));
             if(totalFlow>aOptFlow){efficiency = 1.0f;}
             tEU *= efficiency;
-            tEU = Math.max(1, tEU * aBaseEff / 20000);
+            tEU = Math.max(1, (int)((long)tEU * (long)aBaseEff / 20000L));
         } else {
-            tEU = tEU * aBaseEff / 20000;
+            tEU = (int)((long)tEU * (long)aBaseEff / 20000L);
         }
 
         return tEU;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
index 04fab35f7e..0f8a5de431 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
@@ -141,6 +141,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
         return aFacing > 1;
     }
 
+    public String mMachine = "";
     public boolean checkRecipe(ItemStack aStack) {
         if (!isCorrectMachinePart(mInventory[1])) {
             return false;
@@ -176,6 +177,8 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
             tTier = 8;
         }
         
+        if(!mMachine.equals(mInventory[1].getUnlocalizedName()))mLastRecipe=null;
+        mMachine = mInventory[1].getUnlocalizedName();
         ItemStack[] tInputs = (ItemStack[]) tInputList.toArray(new ItemStack[tInputList.size()]);
 
         ArrayList<FluidStack> tFluidList = getStoredFluids();