aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2016-06-30 14:49:25 +0200
committerGitHub <noreply@github.com>2016-06-30 14:49:25 +0200
commit173e5a11d78951b7a2cfe57e55e6eaf0fc760d59 (patch)
treeb98313126ef581bd451f7f52484af55ed12cb876 /src/main/java/gregtech/common/tileentities
parent90d776893e1d48fbdaf4ee781c78357ec5f9cc35 (diff)
parentad8ad425420c73c5778a8ac309edc976f62aa5c8 (diff)
downloadGT5-Unofficial-173e5a11d78951b7a2cfe57e55e6eaf0fc760d59.tar.gz
GT5-Unofficial-173e5a11d78951b7a2cfe57e55e6eaf0fc760d59.tar.bz2
GT5-Unofficial-173e5a11d78951b7a2cfe57e55e6eaf0fc760d59.zip
Merge pull request #547 from perkinslr/experimental
Make plasma turbine output cooled versions of plasma
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java16
1 files changed, 15 insertions, 1 deletions
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 2880c609a9..e8a5ac95d9 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
@@ -12,6 +12,8 @@ import gregtech.api.util.GT_Utility;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidRegistry;
+
import java.util.ArrayList;
import java.util.Collection;
@@ -107,6 +109,18 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
totalFlow += flow; // track total input used
}
}
+ String fn = FluidRegistry.getFluidName(firstFuelType);
+ String[] nameSegments = fn.split("\\.",2);
+ if (nameSegments.length==2){
+ String outputName=nameSegments[1];
+ FluidStack output = FluidRegistry.getFluidStack(outputName, totalFlow);
+ if (output==null){
+ output = FluidRegistry.getFluidStack("molten."+outputName, totalFlow);
+ }
+ if (output!=null) {
+ addOutput(output);
+ }
+ }
tEU = (int) (Math.min((float) actualOptimalFlow, totalFlow) * fuelValue);
@@ -128,4 +142,4 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
}
-} \ No newline at end of file
+}