diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-04-03 17:12:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-03 17:12:12 +0200 |
| commit | cb41ac5155bee91779fc3dbf38966be4a082a1d4 (patch) | |
| tree | e16f03a97c2799dcdc88fa417fc50eb0639ec100 /src/main/java/gregtech/api/util | |
| parent | e04ad467cd52d2a0cba6f3d298f80ea25113741f (diff) | |
| parent | 486dacc5d03c2d2c89297ab673479d2c17085d0e (diff) | |
| download | GT5-Unofficial-cb41ac5155bee91779fc3dbf38966be4a082a1d4.tar.gz GT5-Unofficial-cb41ac5155bee91779fc3dbf38966be4a082a1d4.tar.bz2 GT5-Unofficial-cb41ac5155bee91779fc3dbf38966be4a082a1d4.zip | |
Merge pull request #486 from johnch18/mccoverfix
Made machine control covers disable themselves upon power loss
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_CoverBehavior.java | 3 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/util/GT_CoverBehavior.java b/src/main/java/gregtech/api/util/GT_CoverBehavior.java index c0ad751add..ef332ddb01 100644 --- a/src/main/java/gregtech/api/util/GT_CoverBehavior.java +++ b/src/main/java/gregtech/api/util/GT_CoverBehavior.java @@ -15,6 +15,9 @@ import static gregtech.api.enums.GT_Values.E; * For Covers with a special behavior. */ public abstract class GT_CoverBehavior { + + public EntityPlayer lastPlayer = null; + /** * Called by updateEntity inside the covered TileEntity. aCoverVariable is the Value you returned last time. */ diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index a9ba9b9bbc..9558df4608 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -1981,6 +1981,12 @@ public class GT_Utility { } try { if (tTileEntity instanceof IMachineProgress) { + if (((IMachineProgress) tTileEntity).isAllowedToWork()) { + tList.add("Disabled." + EnumChatFormatting.RED + EnumChatFormatting.RESET); + } + if (((IMachineProgress) tTileEntity).wasShutdown()) { + tList.add("Shut down due to power loss." + EnumChatFormatting.RED + EnumChatFormatting.RESET); + } rEUAmount += 400; int tValue = 0; if (0 < (tValue = ((IMachineProgress) tTileEntity).getMaxProgress())) |