aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/multitileentity/machine
diff options
context:
space:
mode:
authorMaxim <maxim235@gmx.de>2023-04-12 19:19:16 +0200
committerGitHub <noreply@github.com>2023-04-12 19:19:16 +0200
commitd4213b9258f63506059fc42469b4f1be3ac541dc (patch)
tree74c8cd212fdc88462608750895ddbedf0e5b47bf /src/main/java/gregtech/api/multitileentity/machine
parent5949eb9816e4fd329eef87eeed8ee95af93b8130 (diff)
downloadGT5-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/machine')
-rw-r--r--src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
index 680116e95a..e50236c93b 100644
--- a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
+++ b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
@@ -455,7 +455,7 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl
protected void runMachine(long tick) {
if (acceptsFuel() && isActive()) {
if (!consumeFuel()) {
- stopMachine();
+ stopMachine(true);
return;
}
}
@@ -561,7 +561,7 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl
}
if (logic.removeEnergyUnsafe(eut)) {
- stopMachine();
+ stopMachine(true);
}
}
@@ -766,11 +766,13 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl
}
}
- protected void stopMachine() {
+ protected void stopMachine(boolean powerShutDown) {
progressTime = 0;
setActive(false);
disableWorking();
- setSound(GregTechTileClientEvents.STOP_SOUND_LOOP, INTERRUPT_SOUND_INDEX);
+ if (powerShutDown) {
+ setSound(GregTechTileClientEvents.STOP_SOUND_LOOP, INTERRUPT_SOUND_INDEX);
+ }
issueClientUpdate();
}