diff options
| author | Martin Robertz <dream-master@gmx.net> | 2023-03-18 20:51:52 +0100 |
|---|---|---|
| committer | Martin Robertz <dream-master@gmx.net> | 2023-03-18 20:51:52 +0100 |
| commit | 4159f36223a936528f43eaa4439281478a4314c2 (patch) | |
| tree | a5b849e8c020fb4107953a5e10757bfd6828d82d /src/main/java/gregtech/api | |
| parent | 76adb65991f741ab39b418b130cb98c93c8cfb70 (diff) | |
| download | GT5-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')
3 files changed, 10 insertions, 21 deletions
diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/src/main/java/gregtech/api/enums/SoundResource.java index 45cb6e3bc8..fe15c21deb 100644 --- a/src/main/java/gregtech/api/enums/SoundResource.java +++ b/src/main/java/gregtech/api/enums/SoundResource.java @@ -1,6 +1,5 @@ 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; @@ -56,9 +55,6 @@ 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/gui/modularui/GT_UITextures.java b/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java index 4b6030fa19..49a999b3fe 100644 --- a/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java +++ b/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java @@ -260,10 +260,6 @@ public class GT_UITextures { .fullImage(MODID, "gui/overlay_button/autooutput_fluid"); public static final UITexture OVERLAY_BUTTON_ALLOW_INPUT = UITexture .fullImage(MODID, "gui/overlay_button/allow_input"); - public static final UITexture OVERLAY_BUTTON_AUTOPULL_ME = UITexture - .fullImage(MODID, "gui/overlay_button/auto_pull_me"); - public static final UITexture OVERLAY_BUTTON_AUTOPULL_ME_DISABLED = UITexture - .fullImage(MODID, "gui/overlay_button/auto_pull_me_disabled"); public static final UITexture OVERLAY_BUTTON_BLOCK_INPUT = UITexture .fullImage(MODID, "gui/overlay_button/block_input"); public static final UITexture OVERLAY_BUTTON_ARROW_GREEN_UP = UITexture 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; |