diff options
| author | Maxim <maxim235@gmx.de> | 2023-03-16 18:03:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-16 18:03:37 +0100 |
| commit | e2a796c7e6b1a3f1fb1963c7463785992f3fb9a2 (patch) | |
| tree | 45a348ee6e2d0c3735d22200f9307b07d4a7b30b /src/main/java/gregtech | |
| parent | 48cd6c2b85c2c11d0394b2c38b02e85c97f38f1d (diff) | |
| download | GT5-Unofficial-e2a796c7e6b1a3f1fb1963c7463785992f3fb9a2.tar.gz GT5-Unofficial-e2a796c7e6b1a3f1fb1963c7463785992f3fb9a2.tar.bz2 GT5-Unofficial-e2a796c7e6b1a3f1fb1963c7463785992f3fb9a2.zip | |
Added custom click sound for the power switch (#1798)
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/api/enums/SoundResource.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java | 23 |
2 files changed, 17 insertions, 10 deletions
diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/src/main/java/gregtech/api/enums/SoundResource.java index fe15c21deb..45cb6e3bc8 100644 --- a/src/main/java/gregtech/api/enums/SoundResource.java +++ b/src/main/java/gregtech/api/enums/SoundResource.java @@ -1,5 +1,6 @@ package gregtech.api.enums; +import static gregtech.api.enums.GT_Values.MOD_ID; import static gregtech.api.enums.GT_Values.MOD_ID_IC2; import java.util.EnumSet; @@ -55,6 +56,9 @@ public enum SoundResource { IC2_MACHINES_KA_CHING(211, MOD_ID_IC2, "machines.KaChing"), IC2_MACHINES_MAGNETIZER_LOOP(212, MOD_ID_IC2, "machines.MagnetizerLoop"), + GUI_BUTTON_DOWN(-1, MOD_ID, "gui.buttonDown"), + GUI_BUTTON_UP(-1, MOD_ID, "gui.buttonUp"), + /* * Other Minecraft Sounds that were missing */ 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; |