Refactoring: down't use VersionUtil for materials

missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/StatsCommands.java

@@ -31,7 +31,6 @@ import de.butzlabben.missilewars.inventory.pages.PageGUICreator;
 import de.butzlabben.missilewars.util.stats.PlayerGuiFactory;
 import de.butzlabben.missilewars.util.stats.PreFetcher;
 import de.butzlabben.missilewars.util.stats.StatsUtil;
-import de.butzlabben.missilewars.util.version.VersionUtil;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -83,7 +82,7 @@ public class StatsCommands extends BaseCommand {
         inv.addItem(9, new OrcItem(Material.SLIME_BLOCK, "§aGeneral statistics", generalLore));
 
         List<String> playerLore = Arrays.asList("§7Unique players: §e" + fetcher.getUniquePlayers(), "", "§7Click to list players");
-        OrcItem players = new OrcItem(VersionUtil.getPlayerSkullMaterial(), "§aPlayers", playerLore);
+        OrcItem players = new OrcItem(Material.PLAYER_HEAD, "§aPlayers", playerLore);
         players.setOnClick((p, inventory, item) -> {
             p.closeInventory();
             preFetchRunnable.stop();

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/equipment/SpecialGameEquipment.java

@@ -19,7 +19,6 @@
 package de.butzlabben.missilewars.game.equipment;
 
 import de.butzlabben.missilewars.game.Game;
-import de.butzlabben.missilewars.util.version.VersionUtil;
 import lombok.Getter;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
@@ -85,7 +84,7 @@ public class SpecialGameEquipment {
      * This method creates the shield item stack.
      */
     private void createShield() {
-        shield = new ItemStack(VersionUtil.getSnowball());
+        shield = new ItemStack(Material.SNOWBALL);
         ItemMeta shieldMeta = shield.getItemMeta();
         shieldMeta.setDisplayName(game.getArena().getShieldConfiguration().getName());
         shield.setItemMeta(shieldMeta);
@@ -102,7 +101,7 @@ public class SpecialGameEquipment {
      * This method creates the fireball item stack.
      */
     private void createFireball() {
-        fireball = new ItemStack(VersionUtil.getFireball());
+        fireball = new ItemStack(Material.FIRE_CHARGE);
         ItemMeta fireballMeta = fireball.getItemMeta();
         fireballMeta.setDisplayName(game.getArena().getFireballConfiguration().getName());
         fireball.setItemMeta(fireballMeta);

missilewars-plugin/src/main/java/de/butzlabben/missilewars/inventory/pages/InventoryPage.java

@@ -21,7 +21,6 @@ package de.butzlabben.missilewars.inventory.pages;
 import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.inventory.OrcInventory;
 import de.butzlabben.missilewars.inventory.OrcItem;
-import de.butzlabben.missilewars.util.version.VersionUtil;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
@@ -38,7 +37,7 @@ public class InventoryPage extends OrcInventory {
     public InventoryPage(String title, int page, int pages) {
         super(title, 6);
 
-        OrcItem oi = new OrcItem(VersionUtil.getSunFlower(), "§aPage §e" + page + " §aof§e " + pages);
+        OrcItem oi = new OrcItem(Material.SUNFLOWER, "§aPage §e" + page + " §aof§e " + pages);
         addItem(5, 4, oi);
 
         oi = new OrcItem(Material.PAPER, "§ePrevious page");

missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/game/GameListener.java

@@ -32,6 +32,7 @@ import de.butzlabben.missilewars.util.geometry.Geometry;
 import de.butzlabben.missilewars.util.version.VersionUtil;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
@@ -66,14 +67,14 @@ public class GameListener extends GameBoundListener {
         if (event.getEntity().getType() != EntityType.FIREBALL) return;
         if (getGame().getArena().getFireballConfiguration().isDestroysPortal()) return;
 
-        event.blockList().removeIf(b -> b.getType() == VersionUtil.getPortal());
+        event.blockList().removeIf(b -> b.getType() == Material.NETHER_PORTAL);
     }
 
     @EventHandler
     public void onBlockPhysics(BlockPhysicsEvent event) {
         if (!isInGameWorld(event.getBlock().getLocation())) return;
 
-        if (event.getChangedType() != VersionUtil.getPortal()) return;
+        if (event.getChangedType() != Material.NETHER_PORTAL) return;
 
         Location location = event.getBlock().getLocation();
         
@@ -117,7 +118,7 @@ public class GameListener extends GameBoundListener {
         }
 
         // shield spawn with using of a shield spawn egg
-        if (itemStack.getType() == VersionUtil.getFireball()) {
+        if (itemStack.getType() == Material.FIRE_CHARGE) {
 
             getGame().spawnFireball(player, itemStack);
         }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/stats/PlayerGuiFactory.java

@@ -27,9 +27,9 @@ import de.butzlabben.missilewars.game.stats.PlayerStats;
 import de.butzlabben.missilewars.game.stats.PlayerStatsComparator;
 import de.butzlabben.missilewars.inventory.OrcItem;
 import de.butzlabben.missilewars.inventory.pages.PageGUICreator;
-import de.butzlabben.missilewars.util.version.VersionUtil;
 import lombok.Getter;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -113,7 +113,7 @@ public class PlayerGuiFactory {
 
         PageGUICreator<PlayerStats> creator = new PageGUICreator<>("§ePlayer statistics", stats, (item) -> {
             String name = item.getName();
-            ItemStack itemStack = new ItemStack(VersionUtil.getPlayerSkullMaterial());
+            ItemStack itemStack = new ItemStack(Material.PLAYER_HEAD);
             SkullMeta sm = (SkullMeta) itemStack.getItemMeta();
             if (Config.isShowRealSkins()) {
                 //noinspection deprecation

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/stats/PreFetcher.java

@@ -25,18 +25,14 @@ import de.butzlabben.missilewars.game.stats.StatsFetcher;
 import de.butzlabben.missilewars.inventory.OrcItem;
 import de.butzlabben.missilewars.inventory.pages.InventoryPage;
 import de.butzlabben.missilewars.inventory.pages.PageGUICreator;
-import de.butzlabben.missilewars.util.version.VersionUtil;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.SkullMeta;
 
+import java.util.*;
+
 public class PreFetcher {
 
     @Getter
@@ -117,7 +113,7 @@ public class PreFetcher {
 
         private PageGUICreator<String> getPreFetchCreator(Collection<String> names) {
             return new PageGUICreator<>("§ePlayer statistics", names, (item) -> {
-                ItemStack itemStack = new ItemStack(VersionUtil.getPlayerSkullMaterial());
+                ItemStack itemStack = new ItemStack(Material.PLAYER_HEAD);
                 SkullMeta sm = (SkullMeta) itemStack.getItemMeta();
                 //noinspection deprecation
                 sm.setOwner(item);

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

@@ -70,14 +70,6 @@ public class VersionUtil {
         return version;
     }
     
-    public static Material getFireball() {
-        return Material.valueOf("FIRE_CHARGE");
-    }
-
-    public static Material getSnowball() {
-        return Material.valueOf("SNOWBALL");
-    }
-
     public static Material getMonsterEgg(EntityType type) {
         if (type == EntityType.MUSHROOM_COW) {
             //noinspection SpellCheckingInspection
@@ -96,14 +88,6 @@ public class VersionUtil {
         if (name.contains("SPAWN_EGG")) return true;
         return name.equals("MONSTER_EGG");
     }
-
-    public static Material getPortal() {
-        return Material.valueOf("NETHER_PORTAL");
-    }
-
-    public static Material getSunFlower() {
-        return Material.valueOf("SUNFLOWER");
-    }
     
     public static ItemStack getGlassPlane(Team team) {
         String colorCode = team.getColorCode();
@@ -124,10 +108,6 @@ public class VersionUtil {
         return new ItemStack(ColorConverter.getGlassPaneFromColorCode(colorCode));
     }
 
-    public static Material getPlayerSkullMaterial() {
-        return Material.valueOf("PLAYER_HEAD");
-    }
-
     public static boolean isWallSignMaterial(Material material) {
         return material.name().contains("_SIGN");
     }