aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2023-03-18 20:51:52 +0100
committerMartin Robertz <dream-master@gmx.net>2023-03-18 20:51:52 +0100
commit4159f36223a936528f43eaa4439281478a4314c2 (patch)
treea5b849e8c020fb4107953a5e10757bfd6828d82d /src/main/java/gregtech/api/metatileentity
parent76adb65991f741ab39b418b130cb98c93c8cfb70 (diff)
downloadGT5-Unofficial-4159f36223a936528f43eaa4439281478a4314c2.tar.gz
GT5-Unofficial-4159f36223a936528f43eaa4439281478a4314c2.tar.bz2
GT5-Unofficial-4159f36223a936528f43eaa4439281478a4314c2.zip
Revert "merge master (#1800)"
This reverts commit dafbaf22fd6bef1112143b80d35eae9c60880dfc.
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java23
1 files changed, 10 insertions, 13 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 92d90c63a9..7bbfd46b35 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,19 +1625,16 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity
} else {
getBaseMetaTileEntity().enableWorking();
}
- }).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);
+ }).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);
button.addTooltip(StatCollector.translateToLocal("GT5U.gui.button.power_switch"))
.setTooltipShowUpDelay(TOOLTIP_DELAY);
return (ButtonWidget) button;