Revert "Revert "merge master (#1800)""

This reverts commit 4159f36223a936528f43eaa4439281478a4314c2.

1 files changed, 13 insertions, 10 deletions

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 7bbfd46b35..92d90c63a9 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
@@ -1625,16 +1625,19 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
             } else {
                 getBaseMetaTileEntity().enableWorking();
             }
-        }).setPlayClickSound(true).setBackground(() -> {
-            List<UITexture> ret = new ArrayList<>();
-            ret.add(GT_UITextures.BUTTON_STANDARD);
-            if (getBaseMetaTileEntity().isAllowedToWork()) {
-                ret.add(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON);
-            } else {
-                ret.add(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_OFF);
-            }
-            return ret.toArray(new IDrawable[0]);
-        }).setPos(174, 148).setSize(16, 16);
+        }).setPlayClickSoundResource(
+                () -> getBaseMetaTileEntity().isAllowedToWork() ? SoundResource.GUI_BUTTON_UP.resourceLocation
+                        : SoundResource.GUI_BUTTON_DOWN.resourceLocation)
+                .setBackground(() -> {
+                    List<UITexture> ret = new ArrayList<>();
+                    ret.add(GT_UITextures.BUTTON_STANDARD);
+                    if (getBaseMetaTileEntity().isAllowedToWork()) {
+                        ret.add(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON);
+                    } else {
+                        ret.add(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_OFF);
+                    }
+                    return ret.toArray(new IDrawable[0]);
+                }).setPos(174, 148).setSize(16, 16);
         button.addTooltip(StatCollector.translateToLocal("GT5U.gui.button.power_switch"))
                 .setTooltipShowUpDelay(TOOLTIP_DELAY);
         return (ButtonWidget) button;