Refactoring: down't use VersionUtil for sounds

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

@@ -53,18 +53,9 @@ import de.butzlabben.missilewars.util.geometry.GameArea;
 import de.butzlabben.missilewars.util.geometry.Geometry;
 import de.butzlabben.missilewars.util.serialization.Serializer;
 import de.butzlabben.missilewars.util.version.VersionUtil;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.function.Consumer;
 import lombok.Getter;
 import lombok.ToString;
-import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.Player;
@@ -76,6 +67,12 @@ import org.bukkit.scheduler.BukkitTask;
 import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.util.Vector;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Consumer;
+
 /**
  * @author Butzlabben
  * @since 01.01.2018
@@ -666,7 +663,8 @@ public class Game {
         
         Fireball fb = player.launchProjectile(Fireball.class);
         fb.setVelocity(player.getLocation().getDirection().multiply(2.5D));
-        VersionUtil.playFireball(player, fb.getLocation());
+        player.playSound(fb.getLocation(), Sound.BLOCK_ANVIL_LAND, 100.0F, 2.0F);
+        player.playSound(fb.getLocation(), Sound.ITEM_FLINTANDSTEEL_USE, 100.0F, 1.0F);
         fb.setYield(3F);
         fb.setIsIncendiary(true);
         fb.setBounce(false);

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Team.java

@@ -32,6 +32,7 @@ import lombok.ToString;
 import org.bukkit.Color;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.LeatherArmorMeta;
@@ -211,14 +212,16 @@ public class Team {
      * game result.
      */
     public void sendGameResultSound(MWPlayer mwPlayer) {
+        
+        Player player = mwPlayer.getPlayer();
 
         switch (gameResult) {
             case WIN:
-                VersionUtil.playPling(mwPlayer.getPlayer());
+                player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 100, 3);
                 break;
             case LOSE:
             case DRAW:
-                VersionUtil.playDraw(mwPlayer.getPlayer());
+                player.playSound(player.getLocation(), Sound.ENTITY_WITHER_DEATH, 100, 0);
                 break;
             default:
                 break;

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/misc/Shield.java

@@ -21,10 +21,10 @@ package de.butzlabben.missilewars.game.misc;
 import de.butzlabben.missilewars.MissileWars;
 import de.butzlabben.missilewars.configuration.arena.ShieldConfiguration;
 import de.butzlabben.missilewars.game.missile.paste.PasteProvider;
-import de.butzlabben.missilewars.util.version.VersionUtil;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
@@ -71,6 +71,6 @@ public class Shield implements Listener {
         File schem = new File(pluginDir, "shields/" + shieldConfiguration.getSchematic());
 
         PasteProvider.getPaster().pasteSchematic(schem, pastePos, loc.getWorld());
-        VersionUtil.playSnowball(player, player.getLocation());
+        player.playSound(player.getLocation(), Sound.ENTITY_ENDER_DRAGON_FLAP, 1, 1);
     }
 }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/timer/LobbyTimer.java

@@ -24,7 +24,7 @@ import de.butzlabben.missilewars.game.Arenas;
 import de.butzlabben.missilewars.game.Game;
 import de.butzlabben.missilewars.game.enums.MapChooseProcedure;
 import de.butzlabben.missilewars.player.MWPlayer;
-import de.butzlabben.missilewars.util.version.VersionUtil;
+import org.bukkit.Sound;
 
 import java.util.Map;
 import java.util.Optional;
@@ -109,7 +109,7 @@ public class LobbyTimer extends Timer implements Runnable {
 
     private void playPling() {
         for (MWPlayer mwPlayer : getGame().getPlayers().values()) {
-            VersionUtil.playPling(mwPlayer.getPlayer());
+            mwPlayer.getPlayer().playSound(mwPlayer.getPlayer().getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 100, 3);
         }
     }
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/version/VersionUtil.java

@@ -21,11 +21,8 @@ package de.butzlabben.missilewars.util.version;
 import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.game.Team;
 import org.bukkit.Bukkit;
-import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.Sound;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
@@ -73,33 +70,6 @@ public class VersionUtil {
         return version;
     }
     
-    public static void playFireball(Player p, Location loc) {
-        p.playSound(loc, sound("BLOCK_ANVIL_LAND"), 100.0F, 2.0F);
-        p.playSound(loc, sound("ITEM_FLINTANDSTEEL_USE"), 100.0F, 1.0F);
-    }
-
-    public static void playSnowball(Player p, Location loc) {
-        p.playSound(loc, sound("ENTITY_ENDER_DRAGON_FLAP"), 1, 1);
-    }
-
-    public static void playPling(Player p) {
-        p.playSound(p.getLocation(), sound("BLOCK_NOTE_BLOCK_PLING"), 100, 3);
-    }
-
-    public static void playDraw(Player p) {
-        p.playSound(p.getLocation(), sound("ENTITY_WITHER_DEATH"), 100, 0);
-    }
-
-    private static Sound sound(String s) {
-        Sound sound = null;
-        try {
-            sound = Sound.valueOf(s);
-        } catch (Exception e) {
-            Logger.ERROR.log("Couldn't find sound " + s);
-        }
-        return sound;
-    }
-
     public static Material getFireball() {
         return Material.valueOf("FIRE_CHARGE");
     }