aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-08-18 03:03:49 +0900
committerGitHub <noreply@github.com>2023-08-17 20:03:49 +0200
commit17c9c3844ce32f65ff2858162c524cda3fa8eba7 (patch)
treefc51cad7f5cce10ce83b697d2d87e45c4d726841
parent3ff231ddd5caa4089aeb00369dc9f2c1b6d684dc (diff)
downloadGT5-Unofficial-17c9c3844ce32f65ff2858162c524cda3fa8eba7.tar.gz
GT5-Unofficial-17c9c3844ce32f65ff2858162c524cda3fa8eba7.tar.bz2
GT5-Unofficial-17c9c3844ce32f65ff2858162c524cda3fa8eba7.zip
Remove fire display from singleblock generator (#2240)
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
index 0285ca932a..93bbdd2d18 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
@@ -3,7 +3,6 @@ package gregtech.api.metatileentity.implementations;
import static gregtech.api.enums.GT_Values.V;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
@@ -208,19 +207,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
@Override
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && aTick % 10 == 0) {
- if (mFluid == null) {
- if (aBaseMetaTileEntity.getUniversalEnergyStored() < maxEUOutput() + getMinimumStoredEU()) {
- mInventory[getStackDisplaySlot()] = null;
- } else {
- if (mInventory[getStackDisplaySlot()] == null)
- mInventory[getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1);
- mInventory[getStackDisplaySlot()].setStackDisplayName(
- "Draining internal buffer: "
- + GT_Utility.formatNumbers(
- aBaseMetaTileEntity.getUniversalEnergyStored() - getMinimumStoredEU())
- + " EU");
- }
- } else {
+ if (mFluid != null) {
long tFuelValue = getFuelValue(mFluid), tConsumed = consumedFluidPerOperation(mFluid);
if (tFuelValue > 0 && tConsumed > 0 && mFluid.amount >= tConsumed) {
long tFluidAmountToUse = Math.min(