From 6b59736ffeb33460f0bddeaef79c9e6eb54a45f0 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 3 Aug 2016 02:36:28 -0700 Subject: [PATCH] Fix #1369 Add button click noise to various buttons --- .../forestry/core/gui/widgets/GameTokenWidget.java | 1 + .../java/forestry/core/gui/widgets/ProbeButton.java | 1 + src/main/java/forestry/core/proxy/ProxyClient.java | 10 ++++++++++ src/main/java/forestry/core/proxy/ProxyCommon.java | 4 ++++ src/main/java/forestry/factory/gui/GuiWorktable.java | 6 +++--- .../forestry/factory/gui/widgets/ClearWorktable.java | 2 ++ .../factory/gui/widgets/MemorizedRecipeSlot.java | 1 + .../java/forestry/mail/gui/widgets/AddresseeSlot.java | 1 + 8 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/core/gui/widgets/GameTokenWidget.java b/src/main/java/forestry/core/gui/widgets/GameTokenWidget.java index 657ea035c..deb8421c8 100644 --- a/src/main/java/forestry/core/gui/widgets/GameTokenWidget.java +++ b/src/main/java/forestry/core/gui/widgets/GameTokenWidget.java @@ -93,5 +93,6 @@ public class GameTokenWidget extends Widget { public void handleMouseClick(int mouseX, int mouseY, int mouseButton) { game.choose(index); Proxies.net.sendToServer(new PacketGuiSelectRequest(index, 0)); + Proxies.common.playButtonClick(); } } diff --git a/src/main/java/forestry/core/gui/widgets/ProbeButton.java b/src/main/java/forestry/core/gui/widgets/ProbeButton.java index 97d82950e..7e1e0d699 100644 --- a/src/main/java/forestry/core/gui/widgets/ProbeButton.java +++ b/src/main/java/forestry/core/gui/widgets/ProbeButton.java @@ -48,6 +48,7 @@ public class ProbeButton extends Widget { public void handleMouseClick(int mouseX, int mouseY, int mouseButton) { pressed = true; Proxies.net.sendToServer(new PacketGuiSelectRequest(-1, 0)); + Proxies.common.playButtonClick(); } @Override diff --git a/src/main/java/forestry/core/proxy/ProxyClient.java b/src/main/java/forestry/core/proxy/ProxyClient.java index 6d3e77069..35c081a2f 100644 --- a/src/main/java/forestry/core/proxy/ProxyClient.java +++ b/src/main/java/forestry/core/proxy/ProxyClient.java @@ -15,8 +15,11 @@ import java.io.File; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.audio.PositionedSoundRecord; +import net.minecraft.client.audio.SoundHandler; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -92,4 +95,11 @@ public class ProxyClient extends ProxyCommon { public EntityPlayer getPlayer() { return Minecraft.getMinecraft().thePlayer; } + + @Override + public void playButtonClick() { + Minecraft minecraft = getClientInstance(); + SoundHandler soundHandler = minecraft.getSoundHandler(); + soundHandler.playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F)); + } } diff --git a/src/main/java/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java index 67071e4a3..d2061339a 100755 --- a/src/main/java/forestry/core/proxy/ProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommon.java @@ -86,4 +86,8 @@ public class ProxyCommon { return null; } + public void playButtonClick() { + + } + } diff --git a/src/main/java/forestry/factory/gui/GuiWorktable.java b/src/main/java/forestry/factory/gui/GuiWorktable.java index 2f8c1f2f3..96672bfa3 100755 --- a/src/main/java/forestry/factory/gui/GuiWorktable.java +++ b/src/main/java/forestry/factory/gui/GuiWorktable.java @@ -10,9 +10,6 @@ ******************************************************************************/ package forestry.factory.gui; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.EntityPlayer; - import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.buttons.GuiBetterButton; @@ -23,6 +20,8 @@ import forestry.factory.gui.widgets.ClearWorktable; import forestry.factory.gui.widgets.MemorizedRecipeSlot; import forestry.factory.recipes.RecipeMemory; import forestry.factory.tiles.TileWorktable; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.EntityPlayer; public class GuiWorktable extends GuiForestryTitled { private static final int SPACING = 18; @@ -71,5 +70,6 @@ public class GuiWorktable extends GuiForestryTitled