diff options
| author | Maxim <maxim235@gmx.de> | 2023-04-21 10:01:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 10:01:43 +0200 |
| commit | 9b95285147123015e60613c62e8ab53597625d93 (patch) | |
| tree | 43d7edf52b66e7ed8503db2246222aff073f9588 /src/main | |
| parent | a51537f9d259cbf0b6c8fc5cd4ecae45511cd59e (diff) | |
| download | GT5-Unofficial-9b95285147123015e60613c62e8ab53597625d93.tar.gz GT5-Unofficial-9b95285147123015e60613c62e8ab53597625d93.tar.bz2 GT5-Unofficial-9b95285147123015e60613c62e8ab53597625d93.zip | |
Allow sound loop to be muffled :pensib: (#1902)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 6c18d00c8c..55be6c6d92 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -539,7 +539,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec byte tData = (byte) ((mFacing & 7) | (mActive ? 8 : 0) | (mRedstone ? 16 : 0) | (mLockUpgrade ? 32 : 0) - | (mWorks ? 64 : 0)); + | (mWorks ? 64 : 0) + | (mMuffler ? 128 : 0)); if (tData != oTextureData) sendBlockEvent(GregTechTileClientEvents.CHANGE_COMMON_DATA, oTextureData = tData); @@ -729,6 +730,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec mRedstone = ((aValue & 16) != 0); // mLockUpgrade = ((aValue&32) != 0); mWorks = ((aValue & 64) != 0); + mMuffler = ((aValue & 128) != 0); } case GregTechTileClientEvents.CHANGE_CUSTOM_DATA -> { if (hasValidMetaTileEntity()) { diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 0f5f5dcc85..7d37b6747f 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -375,7 +375,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity boolean active = aBaseMetaTileEntity.isActive() && mPollution > 0; setMufflers(active); } else { - doActivitySound(getActivitySoundLoop()); + if (!aBaseMetaTileEntity.hasMufflerUpgrade()) { + doActivitySound(getActivitySoundLoop()); + } } } |