Replace ear-piercing beep sound with a separate on off beep (Soaryn) sound

Author: pupnewfster

src/datagen/generated/mekanism/.cache/70ecf5bbefc27eadffc9d4d9ba3cdf3f3bb4064c

@@ -80,7 +80,8 @@ private void addHolidaySoundEvents() {
 
     private void addGuiSoundEvents() {
         String basePath = "gui/";
-        //Manually call this to skip applying a subtitle
-        addSoundEvent(MekanismSounds.BEEP, basePath + "beep", UnaryOperator.identity(), sound -> sound.pitch(0.8F));
+        //Manually call this to skip applying subtitles
+        addSoundEvent(MekanismSounds.BEEP_ON, basePath + "beep_on", UnaryOperator.identity(), sound -> sound.pitch(0.8F));
+        addSoundEvent(MekanismSounds.BEEP_OFF, basePath + "beep_off", UnaryOperator.identity(), sound -> sound.pitch(0.8F));
     }
 }

src/datagen/generated/mekanism/assets/mekanism/sounds.json

@@ -86,7 +86,7 @@ protected void addGuiElements() {
                 select(index);
             }
             addRenderableWidget(new GuiSlot(SlotType.NORMAL, this, slot.x - 1, slot.y - 1)
-                  .click((e, x, y) -> select(index), MekanismSounds.BEEP)
+                  .click((e, x, y) -> select(index), 1.0F, MekanismSounds.BEEP_ON)
                   .overlayColor(isValidItem(index) ? null : () -> 0xCC333333)
                   .with(() -> index == selected ? SlotOverlay.SELECT : null));
         }

src/datagen/main/java/mekanism/client/sound/MekanismSoundProvider.java

@@ -21,7 +21,8 @@ public GuiDigitalIconToggle(IGuiWrapper gui, int x, int y, int width, int height
         this.typeSupplier = typeSupplier;
         this.typeSetter = typeSetter;
         this.options = enumClass.getEnumConstants();
-        this.clickSound = MekanismSounds.BEEP;
+        this.clickSound = MekanismSounds.BEEP_ON;
+        this.clickVolume = 1.0F;
         tooltip(() -> Collections.singletonList(this.typeSupplier.get().getTooltip()));
     }
 

src/main/java/mekanism/client/gui/GuiModuleTweaker.java

@@ -26,7 +26,8 @@ public GuiDigitalSwitch(IGuiWrapper gui, int x, int y, ResourceLocation icon, Bo
         this.icon = icon;
         this.stateSupplier = stateSupplier;
         this.onToggle = onToggle;
-        this.clickSound = MekanismSounds.BEEP;
+        this.clickSound = () -> this.stateSupplier.getAsBoolean() ? MekanismSounds.BEEP_OFF.get() : MekanismSounds.BEEP_ON.get();
+        this.clickVolume = 1.0F;
     }
 
     @Override

src/main/java/mekanism/client/gui/element/GuiDigitalIconToggle.java

@@ -35,7 +35,8 @@ public GuiDropdown(IGuiWrapper gui, int x, int y, int width, Class<TYPE> enumCla
         this.options = enumClass.getEnumConstants();
         this.typeTooltips = new EnumMap<>(enumClass);
         this.active = true;
-        this.clickSound = MekanismSounds.BEEP;
+        this.clickSound = MekanismSounds.BEEP_ON;
+        this.clickVolume = 1.0F;
     }
 
     @Override

src/main/java/mekanism/client/gui/element/GuiDigitalSwitch.java

@@ -8,7 +8,6 @@
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import org.jetbrains.annotations.NotNull;
 
@@ -20,7 +19,7 @@ public class GuiDumpButton<TILE extends BlockEntity & IHasDumpButton> extends Gu
     public GuiDumpButton(IGuiWrapper gui, TILE tile, int x, int y) {
         super(MekanismUtils.getResource(ResourceType.GUI, "dump.png"), gui, x, y, 21, 10);
         this.tile = tile;
-        this.clickSound = SoundEvents.UI_BUTTON_CLICK;
+        this.clickSound = BUTTON_CLICK_SOUND;
     }
 
     @Override

src/main/java/mekanism/client/gui/element/GuiDropdown.java

@@ -7,6 +7,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 import mekanism.api.text.ILangEntry;
 import mekanism.client.gui.GuiMekanism;
 import mekanism.client.gui.GuiUtils;
@@ -35,10 +36,10 @@
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.client.sounds.SoundManager;
-import net.minecraft.core.Holder;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
+import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.Mth;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -49,6 +50,7 @@ public abstract class GuiElement extends AbstractWidget implements IFancyFontRen
     private static final int BUTTON_TEX_X = 200, BUTTON_TEX_Y = 60, BUTTON_INDIVIDUAL_TEX_Y = BUTTON_TEX_Y / 3;
     public static final ResourceLocation WARNING_BACKGROUND_TEXTURE = MekanismUtils.getResource(ResourceType.GUI, "warning_background.png");
     public static final ResourceLocation WARNING_TEXTURE = MekanismUtils.getResource(ResourceType.GUI, "warning.png");
+    protected static Supplier<SoundEvent> BUTTON_CLICK_SOUND = SoundEvents.UI_BUTTON_CLICK::value;
 
     public static final Minecraft minecraft = Minecraft.getInstance();
 
@@ -63,7 +65,9 @@ public abstract class GuiElement extends AbstractWidget implements IFancyFontRen
 
     private IGuiWrapper guiObj;
     @Nullable
-    protected Holder<SoundEvent> clickSound;
+    protected Supplier<SoundEvent> clickSound;
+    //Default to the value from SimpleSoundInstance.forUI
+    protected float clickVolume = 0.25F;
     protected int relativeX;
     protected int relativeY;
     public boolean isOverlay;
@@ -653,16 +657,18 @@ protected void renderBackgroundTexture(GuiGraphics guiGraphics, ResourceLocation
     @Override
     public void playDownSound(@NotNull SoundManager soundHandler) {
         if (clickSound != null) {
-            playClickSound(soundHandler, clickSound);
+            playClickSound(soundHandler, clickSound, clickVolume);
         }
     }
 
-    protected static void playClickSound(Holder<SoundEvent> sound) {
-        playClickSound(minecraft.getSoundManager(), sound);
+    protected static void playClickSound(Supplier<SoundEvent> sound) {
+        //Default to the value from SimpleSoundInstance.forUI
+        playClickSound(minecraft.getSoundManager(), sound, 0.25F);
     }
 
-    private static void playClickSound(@NotNull SoundManager soundHandler, @NotNull Holder<SoundEvent> sound) {
-        soundHandler.play(SimpleSoundInstance.forUI(sound, 1.0F));
+    private static void playClickSound(@NotNull SoundManager soundHandler, @NotNull Supplier<SoundEvent> sound, float clickVolume) {
+
+        soundHandler.play(SimpleSoundInstance.forUI(sound.get(), 1.0F, clickVolume));
     }
 
     protected void drawTiledSprite(GuiGraphics guiGraphics, int xPosition, int yPosition, int yOffset, int desiredWidth, int desiredHeight, TextureAtlasSprite sprite,

src/main/java/mekanism/client/gui/element/GuiDumpButton.java

@@ -3,7 +3,6 @@
 import mekanism.client.gui.IGuiWrapper;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundEvents;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class GuiInsetElement<DATA_SOURCE> extends GuiSideHolder {
@@ -22,7 +21,7 @@ public GuiInsetElement(ResourceLocation overlay, IGuiWrapper gui, DATA_SOURCE da
         this.innerHeight = innerSize;
         //TODO: decide what to do if this doesn't divide nicely
         this.border = (width - innerWidth) / 2;
-        this.clickSound = SoundEvents.UI_BUTTON_CLICK;
+        this.clickSound = BUTTON_CLICK_SOUND;
         active = true;
     }