Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable

7 files changed, 22 insertions, 45 deletions

diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
index 92a9b6d7dc..208c4d4e91 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
@@ -25,7 +25,7 @@ public class GT_MetaTileEntity_Boiler_Steel
         super(aID, aName, aNameRegional, new String[]{

                 "Faster than the Bronze Boiler",

                 "Produces 300L of Steam per second",

-                "Causes 20 Pollution per second"});

+                "Causes 30 Pollution per second"});

     }

 

     public GT_MetaTileEntity_Boiler_Steel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
index 04922c0a03..467030cf21 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
@@ -41,9 +41,9 @@ public abstract class GT_MetaTileEntity_LargeBoiler
                 "Produces " + (getEUt() * 40) * (runtimeBoost(20) / 20f) + "L of Steam with 1 Coal at " + getEUt() * 40 + "L/s",

                 "A programmed circuit in the main block throttles the boiler (-1000L/s per config)",

                 "Size(WxHxD): 3x5x3, Controller (Front middle in Fireboxes)",

-                "3x1x3 of Fire Boxes (Bottom layer, Min 3)",

-                "3x4x3 of Casings (Above Fireboxes, hollow, Min 24!)",

-                "3 Pipe Casing Blocks (Inside the Hollow Casing)",

+                "3x1x3 of "+getCasingMaterial()+" Fire Boxes (Bottom layer, Min 3)",

+                "3x4x3 of "+getCasingMaterial()+" Casings (Above Fireboxes, hollow, Min 24!)",

+                "3 "+getCasingMaterial()+" Pipe Casing Blocks (Inside the Hollow Casing)",

                 "1x Input Fuel Hatch/Bus (Any Firebox)",

                 "1x Input Water Hatch (Any Firebox)",

                 "1x Output Hatch (Any Casing)",

@@ -53,6 +53,8 @@ public abstract class GT_MetaTileEntity_LargeBoiler
                 String.format("Takes %.2f seconds to heat up", 500.0 / getEfficiencyIncrease()),

                 "Causes up to " + 20 * getPollutionPerTick(null) + " Pollution per second"};

     }

+    

+    public abstract String getCasingMaterial();

 

     public abstract Block getCasingBlock();

 

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
index 7c5dad3c96..cc494498da 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
@@ -18,6 +18,10 @@ public class GT_MetaTileEntity_LargeBoiler_Bronze
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

         return new GT_MetaTileEntity_LargeBoiler_Bronze(this.mName);

     }

+    

+    public String getCasingMaterial(){

+    	return "Bronze";

+    }

 

     public Block getCasingBlock() {

         return GregTech_API.sBlockCasings1;

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
index a68c0e6212..984290a3c6 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
@@ -18,6 +18,10 @@ public class GT_MetaTileEntity_LargeBoiler_Steel
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

         return new GT_MetaTileEntity_LargeBoiler_Steel(this.mName);

     }

+    

+    public String getCasingMaterial(){

+    	return "Steel";

+    }

 

     public Block getCasingBlock() {

         return GregTech_API.sBlockCasings2;

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java
index 6fc32f8c34..144c44aeed 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Titanium.java
@@ -18,6 +18,10 @@ public class GT_MetaTileEntity_LargeBoiler_Titanium
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
         return new GT_MetaTileEntity_LargeBoiler_Titanium(this.mName);
     }
+    
+    public String getCasingMaterial(){
+    	return "Titanium";
+    }
 
     public Block getCasingBlock() {
         return GregTech_API.sBlockCasings4;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
index 997a176e34..b69bac2f94 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
@@ -18,6 +18,10 @@ public class GT_MetaTileEntity_LargeBoiler_TungstenSteel
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

         return new GT_MetaTileEntity_LargeBoiler_TungstenSteel(this.mName);

     }

+    

+    public String getCasingMaterial(){

+    	return "TungstenSteel";

+    }

 

     public Block getCasingBlock() {

         return GregTech_API.sBlockCasings4;

diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
index 2bfc81caf4..a17f11d495 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java
@@ -61,44 +61,6 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach
         return true;
     }
 
-//	  public void onRightclick(EntityPlayer aPlayer)
-//	  {
-//	    ItemStack tPlayerItem = aPlayer.inventory.getCurrentItem();
-//	    if (tPlayerItem == null)
-//	    {
-//	      if (this.mItemID > 0)
-//	      {
-//	        for (int i = 0; (this.mItemCount < getMaxItemCount()) && (i < aPlayer.field_71071_by.func_70302_i_()); i++)
-//	        {
-//	          if ((aPlayer.field_71071_by.func_70301_a(i) != null) && (aPlayer.field_71071_by.func_70301_a(i).field_77993_c == this.mItemID) && (aPlayer.field_71071_by.func_70301_a(i).func_77960_j() == this.mItemMeta) && (!aPlayer.field_71071_by.func_70301_a(i).func_77942_o()))
-//	          {
-//	            this.mItemCount += aPlayer.field_71071_by.func_70301_a(i).field_77994_a;
-//	            if (aPlayer.field_71071_by.func_70301_a(i).field_77994_a == 111)
-//	            {
-//	              this.mItemCount = (getMaxItemCount() + 192 - (this.mItemCount + (this.mInventory[0] == null ? 0 : this.mInventory[0].field_77994_a) + (this.mInventory[1] == null ? 0 : this.mInventory[1].field_77994_a) + (this.mInventory[2] == null ? 0 : this.mInventory[2].field_77994_a)));
-//	            }
-//	            else if (this.mItemCount > getMaxItemCount())
-//	            {
-//	              aPlayer.field_71071_by.func_70301_a(i).field_77994_a = (this.mItemCount - getMaxItemCount());
-//	              this.mItemCount = getMaxItemCount();
-//	            }
-//	            else
-//	            {
-//	              aPlayer.field_71071_by.func_70301_a(i).field_77994_a = 0;
-//	            }
-//	          }
-//	          if ((aPlayer.field_71071_by.func_70301_a(i) != null) && (aPlayer.field_71071_by.func_70301_a(i).field_77994_a <= 0)) {
-//	            aPlayer.field_71071_by.func_70299_a(i, null);
-//	          }
-//	        }
-//	        GT_Utility.sendChatToPlayer(aPlayer, this.mItemCount + (this.mInventory[0] == null ? 0 : this.mInventory[0].field_77994_a) + (this.mInventory[1] == null ? 0 : this.mInventory[1].field_77994_a) + (this.mInventory[2] == null ? 0 : this.mInventory[2].field_77994_a) + " of " + new ItemStack(this.mItemID, 1, this.mItemMeta).func_82833_r());
-//	      }
-//	    }
-//	    if (aPlayer.field_71069_bz != null) {
-//	      aPlayer.field_71069_bz.func_75142_b();
-//	    }
-//	  }
-
     @Override
     public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
         return new GT_Container_QuantumChest(aPlayerInventory, aBaseMetaTileEntity);
@@ -113,9 +75,6 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
 
         if (getBaseMetaTileEntity().isServerSide() && getBaseMetaTileEntity().isAllowedToWork()) {
-//            	if(mInventory[0]!=null)System.out.println("input: "+mInventory[0].stackSize);
-//            	System.out.println("store: "+mItemCount);
-//            	if(mInventory[0]!=null)System.out.println("output: "+mInventory[2].stackSize);
             if ((getItemCount() <= 0)) {
                 this.mItemStack = null;
                 this.mItemCount = 0;