Refactoring: change glass getter

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

@@ -52,7 +52,6 @@ import de.butzlabben.missilewars.util.PlayerDataProvider;
 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 lombok.Getter;
 import lombok.ToString;
 import org.bukkit.*;
@@ -347,8 +346,8 @@ public class Game {
 
             // team change menu:
             if (player.hasPermission("mw.change")) {
-                player.getInventory().setItem(0, VersionUtil.getGlassPlane(team1));
-                player.getInventory().setItem(8, VersionUtil.getGlassPlane(team2));
+                player.getInventory().setItem(0, team1.getGlassPlane());
+                player.getInventory().setItem(8, team2.getGlassPlane());
             }
 
             // map choose menu:

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

@@ -34,6 +34,7 @@ import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.LeatherArmorMeta;
 
 import java.util.ArrayList;
@@ -237,4 +238,13 @@ public class Team {
         }
     }
 
+    public ItemStack getGlassPlane() {
+        ItemStack is = new ItemStack(ColorConverter.getGlassPaneFromColorCode(getColorCode()));
+
+        ItemMeta im = is.getItemMeta();
+        im.setDisplayName(getFullname());
+        is.setItemMeta(im);
+        return is;
+    }
+
 }

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

@@ -19,11 +19,7 @@
 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;
 
 /**
  * @author Butzlabben
@@ -69,23 +65,4 @@ public class VersionUtil {
         return version;
     }
     
-    public static ItemStack getGlassPlane(Team team) {
-        String colorCode = team.getColorCode();
-        ItemStack is = new ItemStack(ColorConverter.getGlassPaneFromColorCode(colorCode));
-        
-        ItemMeta im = is.getItemMeta();
-        im.setDisplayName(team.getFullname());
-        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));
-    }
-    
 }