diff options
| author | NexusNull <p.wellershaus@googlemail.com> | 2023-04-29 20:12:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-29 20:12:10 +0200 |
| commit | ed070c0362db7aaed43a6df52ec5fa87571da079 (patch) | |
| tree | b0b076e32eddf3f295c6bc9a27a6b807e7ff3173 /src/main/java/gregtech/api | |
| parent | 42f4db938bbcc653c72c2bae9a29c982fb3b8ec9 (diff) | |
| download | GT5-Unofficial-ed070c0362db7aaed43a6df52ec5fa87571da079.tar.gz GT5-Unofficial-ed070c0362db7aaed43a6df52ec5fa87571da079.tar.bz2 GT5-Unofficial-ed070c0362db7aaed43a6df52ec5fa87571da079.zip | |
Revert #1816 and #1825 (#1931)
* revert redstone fix
* remove strong redstone checkbox from Liquid Meter
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java index 0370965f61..10fa7ed216 100644 --- a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java @@ -413,10 +413,6 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov final int ordinalSide = side.ordinal(); if (mSidedRedstone[ordinalSide] != cappedStrength || (mStrongRedstone & (1 << ordinalSide)) > 0) { - if ((mStrongRedstone & (1 << ordinalSide)) > 0) { - mStrongRedstone ^= (1 << ordinalSide); - issueBlockUpdate(); - } mSidedRedstone[ordinalSide] = cappedStrength; issueBlockUpdate(); } @@ -424,15 +420,8 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov @Override public void setStrongOutputRedstoneSignal(ForgeDirection side, byte strength) { - final byte cappedStrength = (byte) Math.min(Math.max(0, strength), 15); - if (side == ForgeDirection.UNKNOWN) return; - - final int ordinalSide = side.ordinal(); - if (mSidedRedstone[ordinalSide] != cappedStrength || (mStrongRedstone & (1 << ordinalSide)) == 0) { - mStrongRedstone |= (1 << ordinalSide); - mSidedRedstone[ordinalSide] = cappedStrength; - issueBlockUpdate(); - } + mStrongRedstone |= (1 << side.ordinal()); + setOutputRedstoneSignal(side, strength); } @Override |