Add sound effect volume control & bump version to 1.2.1

Author: mini-bomba

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.daemon=false
 
 modId = streamchatmod
 modName = StreamChat
-version = 1.2
+version = 1.2.1
 minecraftVersion = 1.8.9
 forgeVersion = 11.15.1.2318-1.8.9
 mappings = stable_22

src/main/java/me/mini_bomba/streamchatmod/StreamChatMod.java

@@ -117,7 +117,7 @@ private void onTwitchMessage(ChannelMessageEvent event) {
         ChatStyle style = new ChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/twitch delete " + event.getChannel().getName() + " " + event.getMessageEvent().getMessageId().orElse("")));
         component.setChatStyle(style);
         StreamUtils.addMessage(component);
-        if (this.config.playSoundOnMessage.getBoolean()) StreamUtils.playSound("note.pling", 0.1f, 1.25f);
+        if (this.config.playSoundOnMessage.getBoolean()) StreamUtils.playSound("note.pling", (float) config.messageSoundVolume.getDouble(), 1.25f);
     }
 
     private void onTwitchFollow(FollowEvent event) {

src/main/java/me/mini_bomba/streamchatmod/StreamConfig.java

@@ -15,6 +15,8 @@ public class StreamConfig {
     public final Property playSoundOnMessage;
     public final Property playSoundOnFollow;
     public final Property followEventEnabled;
+    public final Property messageSoundVolume;
+    public final Property eventSoundVolume;
 
     public StreamConfig(File configFile) {
         config = new Configuration(configFile);
@@ -25,6 +27,8 @@ public StreamConfig(File configFile) {
         twitchSelectedChannel = config.get("twitch", "selectedChannel", "");
         playSoundOnMessage = config.get("sounds", "onMessage", true);
         playSoundOnFollow = config.get("sounds", "onFollow", true);
+        messageSoundVolume = config.get("sounds", "messageVolume", 1.0d);
+        eventSoundVolume = config.get("sounds", "eventVolume", 1.0d);
         followEventEnabled = config.get("twitchEvents", "followers", true);
         saveIfChanged();
     }

src/main/java/me/mini_bomba/streamchatmod/StreamEvents.java

@@ -30,11 +30,11 @@ public void onTick(TickEvent.ClientTickEvent event){
         if (mod.eventSoundTimer > -1) {
             int timer = mod.eventSoundTimer;
             if (timer == 0) {
-                StreamUtils.playSound("note.harp", 0.25f, 1.0f);
+                StreamUtils.playSound("note.harp", (float) mod.config.eventSoundVolume.getDouble(), 1.0f);
             } else if (timer == 5) {
-                StreamUtils.playSound("note.harp", 0.25f, 1.25f);
+                StreamUtils.playSound("note.harp", (float) mod.config.eventSoundVolume.getDouble(), 1.25f);
             } else if (timer == 10) {
-                StreamUtils.playSound("note.harp", 0.25f, 1.5f);
+                StreamUtils.playSound("note.harp", (float) mod.config.eventSoundVolume.getDouble(), 1.5f);
             }
             mod.eventSoundTimer++;
             if (mod.eventSoundTimer >= 11) mod.eventSoundTimer = -1;

src/main/java/me/mini_bomba/streamchatmod/commands/TwitchCommand.java

@@ -128,11 +128,55 @@ public void processCommand(ICommandSender sender, String[] args) throws CommandE
                             }
                         }
                         break;
+                    case "messagevolume":
+                    case "msgvolume":
+                    case "mvolume":
+                    case "messagev":
+                    case "msgv":
+                    case "mv":
+                        if (args.length == 2)
+                            StreamUtils.addMessage(EnumChatFormatting.AQUA + "Volume for message sound effects: " + EnumChatFormatting.GREEN + mod.config.messageSoundVolume.getDouble() * 100 + "%");
+                        else {
+                            double newState;
+                            try {
+                                newState = Double.parseDouble(args[2]);
+                            } catch (NumberFormatException e) {
+                                throw new CommandException("Invalid double value: " + args[2]);
+                            }
+                            if (newState > 1) newState /= 100;
+                            mod.config.messageSoundVolume.set(newState);
+                            mod.config.saveIfChanged();
+                            StreamUtils.addMessage(EnumChatFormatting.GREEN + "Volume for message sound effects has been set to " + EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + newState * 100 + "%");
+                        }
+                        break;
+                    case "eventvolume":
+                    case "eventsvolume":
+                    case "evolume":
+                    case "eventv":
+                    case "eventsv":
+                    case "ev":
+                        if (args.length == 2)
+                            StreamUtils.addMessage(EnumChatFormatting.AQUA + "Volume for event sound effects: " + EnumChatFormatting.GREEN + mod.config.eventSoundVolume.getDouble() * 100 + "%");
+                        else {
+                            double newState;
+                            try {
+                                newState = Double.parseDouble(args[2]);
+                            } catch (NumberFormatException e) {
+                                throw new CommandException("Invalid double value: " + args[2]);
+                            }
+                            if (newState > 1) newState /= 100;
+                            mod.config.eventSoundVolume.set(newState);
+                            mod.config.saveIfChanged();
+                            StreamUtils.addMessage(EnumChatFormatting.GREEN + "Volume for event sound effects has been set to " + EnumChatFormatting.AQUA + EnumChatFormatting.BOLD + newState * 100 + "%");
+                        }
+                        break;
                     default:
                         StreamUtils.addMessages(sender, new String[]{
                                 EnumChatFormatting.GREEN + "Usage of /twitch sounds:",
                                 EnumChatFormatting.GRAY + "/twitch sounds message [enable/disable]"+EnumChatFormatting.WHITE+" - "+EnumChatFormatting.AQUA+"Enables/disables sound effect on new twitch chat message.",
-                                EnumChatFormatting.GRAY + "/twitch sounds follow [enable/disable]"+EnumChatFormatting.WHITE+" - "+EnumChatFormatting.AQUA+"Enables/disables sound effect on new twitch follower."
+                                EnumChatFormatting.GRAY + "/twitch sounds follow [enable/disable]"+EnumChatFormatting.WHITE+" - "+EnumChatFormatting.AQUA+"Enables/disables sound effect on new twitch follower.",
+                                EnumChatFormatting.GRAY + "/twitch sounds messagevolume [new volume]"+EnumChatFormatting.WHITE+" - "+EnumChatFormatting.AQUA+"Controls the volume of sounds effects for new messages.",
+                                EnumChatFormatting.GRAY + "/twitch sounds eventvolume [new volume]"+EnumChatFormatting.WHITE+" - "+EnumChatFormatting.AQUA+"Controls the volume of sounds effects for events like new followers."
                         });
                 }
                 break;