diff options
author | Maxim <maxim235@gmx.de> | 2023-04-12 19:19:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-12 19:19:16 +0200 |
commit | d4213b9258f63506059fc42469b4f1be3ac541dc (patch) | |
tree | 74c8cd212fdc88462608750895ddbedf0e5b47bf /src/main/java/gregtech/api/multitileentity/multiblock/base | |
parent | 5949eb9816e4fd329eef87eeed8ee95af93b8130 (diff) | |
download | GT5-Unofficial-d4213b9258f63506059fc42469b4f1be3ac541dc.tar.gz GT5-Unofficial-d4213b9258f63506059fc42469b4f1be3ac541dc.tar.bz2 GT5-Unofficial-d4213b9258f63506059fc42469b4f1be3ac541dc.zip |
Fix MuTE sound (#1878)
* Only play interrupt sound, when machine stop was due to power
* Change power switch button sound to proper one
Diffstat (limited to 'src/main/java/gregtech/api/multitileentity/multiblock/base')
-rw-r--r-- | src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockController.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockController.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockController.java index 088b640dbd..1355ac13a6 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockController.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockController.java @@ -71,6 +71,7 @@ import gnu.trove.list.array.TIntArrayList; import gregtech.api.enums.GT_Values; import gregtech.api.enums.GT_Values.NBT; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TextureSet; import gregtech.api.fluid.FluidTankGT; import gregtech.api.gui.modularui.GT_UITextures; @@ -402,7 +403,7 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex public void setExtendedFacing(ExtendedFacing newExtendedFacing) { if (extendedFacing != newExtendedFacing) { onStructureChange(); - if (structureOkay) stopMachine(); + if (structureOkay) stopMachine(false); extendedFacing = newExtendedFacing; structureOkay = false; if (isServerSide()) { @@ -503,7 +504,7 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex if (structureOkay) { runMachine(tick); } else { - stopMachine(); + stopMachine(false); } } else { doActivitySound(getActivitySoundLoop()); @@ -1526,7 +1527,9 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex enableWorking(); } }) - .setPlayClickSound(true); + .setPlayClickSoundResource( + () -> isAllowedToWork() ? SoundResource.GUI_BUTTON_UP.resourceLocation + : SoundResource.GUI_BUTTON_DOWN.resourceLocation); button.setBackground(() -> { List<UITexture> ret = new ArrayList<>(); ret.add(GT_UITextures.BUTTON_STANDARD); |