aboutsummaryrefslogtreecommitdiff
path: root/main/java/gregtech/common/tileentities/machines
diff options
context:
space:
mode:
authorBlood-Asp <Blood@Asp>2015-06-29 23:03:55 +0200
committerBlood-Asp <Blood@Asp>2015-06-29 23:03:55 +0200
commit002e757d65f20ab809f7a21d0662e36aa84c2fc0 (patch)
treef9af947c08343be8d475ef7aebc3dae7e12050bc /main/java/gregtech/common/tileentities/machines
parent8198a51aeef641fd25d2b77f776c7640dd3f84a9 (diff)
downloadGT5-Unofficial-002e757d65f20ab809f7a21d0662e36aa84c2fc0.tar.gz
GT5-Unofficial-002e757d65f20ab809f7a21d0662e36aa84c2fc0.tar.bz2
GT5-Unofficial-002e757d65f20ab809f7a21d0662e36aa84c2fc0.zip
Version 5.08.22-23
Diffstat (limited to 'main/java/gregtech/common/tileentities/machines')
-rw-r--r--main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java2
-rw-r--r--main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java2
-rw-r--r--main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java11
3 files changed, 12 insertions, 3 deletions
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
index 9e4d31e33b..48bd34bf0c 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
@@ -49,7 +49,7 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
int tEU=0;
int distOut=0;
for(int i=0;i<steams.size();i++){
- if(steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("fluid.ic2superheatedsteam")){
+ if(steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("ic2.fluidSuperheatedSteam")){
int out = Math.min((int)(optFlow*1.5f),steams.get(i).amount);
depleteInput(new FluidStack(steams.get(i),out));
distOut += out;
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
index dc88d453d0..0f20246eed 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
@@ -49,7 +49,7 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
int tEU=0;
int distOut=0;
for(int i=0;i<steams.size();i++){
- if(steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("fluid.steam")||steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("fluid.ic2steam")){
+ if(steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("fluid.steam")||steams.get(i).getFluid().getUnlocalizedName(steams.get(i)).equals("ic2.fluidSteam")){
int out = Math.min((int)(optFlow*1.5f),steams.get(i).amount);
depleteInput(new FluidStack(steams.get(i),out));
distOut += out/160;
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
index 6bc1f36794..fa9ee5e949 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
@@ -38,7 +38,16 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
public String[] getDescription()
{
- return new String[] { "Controller Block for the Processing Array", "Size: 3x3x3 (Hollow)", "Controller (front centered)", "1x Input (anywhere)", "1x Output (anywhere)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "Robust Tungstensteel Casings for the rest (16 at least!)","Put up to 16 Basic Machines into the GUI Inventory","Currently only fluid Centrifuge Recipes work correctly","Make Deuterium/Tritium with it." };
+ return new String[] { "Controller Block for the Processing Array",
+ "Size: 3x3x3 (Hollow)",
+ "Controller (front centered)",
+ "1x Input (anywhere)",
+ "1x Output (anywhere)",
+ "1x Energy Hatch (anywhere)",
+ "1x Maintenance Hatch (anywhere)",
+ "Robust Tungstensteel Casings for the rest (16 at least!)",
+ "Place up to 16 Single Block GT Machines into the GUI Inventory",
+ "They will work the same way as placed directly in world"};
}
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)