Refactoring: change glass getter

missilewars-plugin/src/main/java/de/butzlabben/missilewars/inventory/OrcItem.java

@@ -18,24 +18,25 @@
 
 package de.butzlabben.missilewars.inventory;
 
-import de.butzlabben.missilewars.util.version.VersionUtil;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import de.butzlabben.missilewars.util.version.ColorConverter;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
 public class OrcItem {
 
     public static OrcItem enabled, disabled, coming_soon, back, fill, error = new OrcItem(Material.BARRIER, null,
             "§cERROR: Item is wrong configured!", "§cPath in properties: see Displayname");
 
     static {
-        fill = new OrcItem(VersionUtil.getGlassPlane("§8"));
+        fill = new OrcItem(new ItemStack(ColorConverter.getGlassPaneFromColorCode("§8")));
     }
 
     private ItemStack is;

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

@@ -24,7 +24,6 @@ import de.butzlabben.missilewars.event.PlayerArenaLeaveEvent;
 import de.butzlabben.missilewars.game.Game;
 import de.butzlabben.missilewars.inventory.VoteInventory;
 import de.butzlabben.missilewars.player.MWPlayer;
-import de.butzlabben.missilewars.util.version.VersionUtil;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -60,7 +59,7 @@ public class LobbyListener extends GameBoundListener {
 
         if (event.getItem() == null) return;
 
-        if (VersionUtil.isStainedGlassPane(event.getItem().getType())) {
+        if (event.getItem().getType().name().contains("STAINED_GLASS_PANE")) {
             // team change:
             if (!player.hasPermission("mw.change")) return;
 

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

@@ -21,7 +21,6 @@ package de.butzlabben.missilewars.util.version;
 import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.game.Team;
 import org.bukkit.Bukkit;
-import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
@@ -78,14 +77,5 @@ public class VersionUtil {
         is.setItemMeta(im);
         return is;
     }
-
-    public static boolean isStainedGlassPane(Material material) {
-        if (material == null) return false;
-        return material.name().contains("STAINED_GLASS_PANE");
-    }
-    
-    public static ItemStack getGlassPlane(String colorCode) {
-        return new ItemStack(ColorConverter.getGlassPaneFromColorCode(colorCode));
-    }
     
 }