aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/goodgenerator
diff options
context:
space:
mode:
authorSampsa <69092953+S4mpsa@users.noreply.github.com>2024-09-11 22:48:21 +0300
committerGitHub <noreply@github.com>2024-09-11 19:48:21 +0000
commitc0606a4f058a886f25cdadfcdc5fd8f039bbe811 (patch)
tree965a81a7de2a07e48a0da8dde7784cfe32db1a6e /src/main/java/goodgenerator
parent47c78185d4fc675ff86dca0a818943f43e118db1 (diff)
downloadGT5-Unofficial-c0606a4f058a886f25cdadfcdc5fd8f039bbe811.tar.gz
GT5-Unofficial-c0606a4f058a886f25cdadfcdc5fd8f039bbe811.tar.bz2
GT5-Unofficial-c0606a4f058a886f25cdadfcdc5fd8f039bbe811.zip
Various turbine fixes (#3147)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/goodgenerator')
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java3
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java21
-rw-r--r--src/main/java/goodgenerator/loader/Loaders.java2
3 files changed, 15 insertions, 11 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java
index e7ea94f3c8..3c44da9ca3 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java
@@ -142,11 +142,10 @@ public class MTESupercriticalFluidTurbine extends MTELargeTurbineBase {
protected MultiblockTooltipBuilder createTooltip() {
final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType("Supercritical Steam Turbine")
- .addInfo("Controller block for Supercritical Fluid Turbine")
+ .addInfo("Controller block for Large Supercritical Fluid Turbine")
.addInfo("Needs a Turbine, place inside controller")
.addInfo("Use Supercritical Steam to generate power.")
.addInfo("Outputs 1L of Steam per 1L of SC Steam as well as producing power")
- .addInfo("Extreme Heated Steam will cause more damage to the turbine.")
.addInfo("Power output depends on turbine and fitting")
.addInfo("Use screwdriver to adjust fitting of turbine")
.addSeparator()
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java
index 086aa28528..ea36b53651 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java
@@ -12,11 +12,13 @@ import static gregtech.api.util.GTUtility.filterValidMTEs;
import java.util.ArrayList;
import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
+import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import org.jetbrains.annotations.NotNull;
@@ -313,14 +315,6 @@ public abstract class MTELargeTurbineBase extends MTEEnhancedMultiBlockBase<MTEL
+ EnumChatFormatting.RESET
+ " %" /* 8 */
};
- if (!this.getClass()
- .getName()
- .contains("Steam"))
- ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": "
- + EnumChatFormatting.YELLOW
- + GTUtility.safeInt((long) realOptFlow)
- + EnumChatFormatting.RESET
- + " L/t";
return ret;
}
@@ -329,6 +323,17 @@ public abstract class MTELargeTurbineBase extends MTEEnhancedMultiBlockBase<MTEL
}
@Override
+ public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+ if (side == getBaseMetaTileEntity().getFrontFacing()) {
+ looseFit ^= true;
+ GTUtility.sendChatToPlayer(
+ aPlayer,
+ looseFit ? GTUtility.trans("500", "Fitting: Loose - More Flow")
+ : GTUtility.trans("501", "Fitting: Tight - More Efficiency"));
+ }
+ }
+
+ @Override
public boolean isGivingInformation() {
return true;
}
diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java
index ac58e86d3b..3603537427 100644
--- a/src/main/java/goodgenerator/loader/Loaders.java
+++ b/src/main/java/goodgenerator/loader/Loaders.java
@@ -300,7 +300,7 @@ public class Loaders {
Loaders.SCTurbine = new MTESupercriticalFluidTurbine(
MetaTileEntityIDs.SupercriticalFluidTurbine.ID,
"SupercriticalSteamTurbine",
- "SC Steam Turbine").getStackForm(1L);
+ "Large Supercritical Steam Turbine").getStackForm(1L);
Loaders.XHE = new MTEExtremeHeatExchanger(
MetaTileEntityIDs.ExtremeHeatExchanger.ID,
"ExtremeHeatExchanger",