From 017f9b291987672ee4c3f926c4a723cd3c92a0d6 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 27 Jan 2018 20:17:35 -0500 Subject: [PATCH] metronome plugin: remove configurable sound ids until a better solution is found --- .../plugins/metronome/MetronomePlugin.java | 8 +++--- .../MetronomePluginConfiguration.java | 25 +------------------ 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java index 1b1b0d81ac..013cf595fa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java @@ -27,14 +27,14 @@ package net.runelite.client.plugins.metronome; import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; +import javax.inject.Inject; import net.runelite.api.Client; +import net.runelite.api.SoundEffectID; import net.runelite.api.events.GameTick; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; -import javax.inject.Inject; - @PluginDescriptor( name = "Metronome plugin" ) @@ -67,11 +67,11 @@ public class MetronomePlugin extends Plugin { if (config.enableTock() && shouldTock) { - client.playSoundEffect(config.tockSound()); + client.playSoundEffect(SoundEffectID.GE_DECREMENT_PLOP); } else { - client.playSoundEffect(config.tickSound()); + client.playSoundEffect(SoundEffectID.GE_INCREMENT_PLOP); } shouldTock = !shouldTock; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePluginConfiguration.java b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePluginConfiguration.java index 564577e4ab..cc47b5990e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePluginConfiguration.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePluginConfiguration.java @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.metronome; -import net.runelite.api.SoundEffectID; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; @@ -59,36 +58,14 @@ public interface MetronomePluginConfiguration extends Config return 1; } - @ConfigItem( - keyName = "tickSound", - name = "Tick sound ID", - description = "Configures which sound to play on the specified tick", - position = 3 - ) - default int tickSound() - { - return SoundEffectID.GE_INCREMENT_PLOP; - } - @ConfigItem( keyName = "enableTock", name = "Enable tock (alternating) sound", description = "Toggles whether to play two alternating sounds", - position = 4 + position = 3 ) default boolean enableTock() { return false; } - - @ConfigItem( - keyName = "tockSound", - name = "Tock sound ID", - description = "Configures which sound to alternate between", - position = 5 - ) - default int tockSound() - { - return SoundEffectID.GE_DECREMENT_PLOP; - } }