From ed070c0362db7aaed43a6df52ec5fa87571da079 Mon Sep 17 00:00:00 2001 From: NexusNull Date: Sat, 29 Apr 2023 20:12:10 +0200 Subject: Revert #1816 and #1825 (#1931) * revert redstone fix * remove strong redstone checkbox from Liquid Meter --- .../gregtech/api/metatileentity/CoverableTileEntity.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/main/java/gregtech/api/metatileentity') 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 -- cgit