Changing WallSign check

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/signs/MWSign.java

@@ -23,7 +23,6 @@ import de.butzlabben.missilewars.MissileWars;
 import de.butzlabben.missilewars.configuration.Messages;
 import de.butzlabben.missilewars.game.Game;
 import de.butzlabben.missilewars.game.GameManager;
-import de.butzlabben.missilewars.util.version.VersionUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -31,6 +30,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
+import org.bukkit.block.data.type.WallSign;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,7 +46,8 @@ public class MWSign {
     public boolean isValid() {
         boolean worldExists = location.getWorld() != null;
         boolean lobbyValid = GameManager.getInstance().getGames().containsKey(lobby);
-        boolean blockIsSign = VersionUtil.isWallSignMaterial(location.getBlock().getType());
+        boolean blockIsSign = (location.getBlock().getBlockData() instanceof WallSign);
+        
         return worldExists && lobbyValid && blockIsSign;
     }
 
@@ -73,7 +74,7 @@ public class MWSign {
 
     public void editSign(Location location, List<String> lines) {
         Block block = location.getBlock();
-        if (!VersionUtil.isWallSignMaterial(block.getType())) {
+        if (!(block.getBlockData() instanceof WallSign)) {
             Logger.WARN.log("Configured sign at: " + location + " is not a wall sign");
             return;
         }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/SignListener.java

@@ -24,8 +24,8 @@ import de.butzlabben.missilewars.game.Game;
 import de.butzlabben.missilewars.game.GameManager;
 import de.butzlabben.missilewars.game.signs.MWSign;
 import de.butzlabben.missilewars.game.signs.SignRepository;
-import de.butzlabben.missilewars.util.version.VersionUtil;
 import org.bukkit.block.Block;
+import org.bukkit.block.data.type.WallSign;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -45,7 +45,7 @@ public class SignListener implements Listener {
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
 
         Block block = event.getClickedBlock();
-        if (!VersionUtil.isWallSignMaterial(block.getType())) return;
+        if (!(block.getBlockData() instanceof WallSign)) return;
 
         SignRepository repository = MissileWars.getInstance().getSignRepository();
         Optional<MWSign> optional = repository.getSign(block.getLocation());
@@ -61,7 +61,7 @@ public class SignListener implements Listener {
     @EventHandler
     public void onSignChange(SignChangeEvent event) {
         Block block = event.getBlock();
-        if (!VersionUtil.isWallSignMaterial(block.getType())) return;
+        if (!(block.getBlockData() instanceof WallSign)) return;
 
         Player player = event.getPlayer();
         if (!hasManageSignPermission(player)) return;
@@ -90,7 +90,7 @@ public class SignListener implements Listener {
     @EventHandler
     public void onSignBreak(BlockBreakEvent event) {
         Block block = event.getBlock();
-        if (!VersionUtil.isWallSignMaterial(block.getType())) return;
+        if (!(block.getBlockData() instanceof WallSign)) return;
 
         Player player = event.getPlayer();
         if (!hasManageSignPermission(player)) return;

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

@@ -107,9 +107,5 @@ public class VersionUtil {
     public static ItemStack getGlassPlane(String colorCode) {
         return new ItemStack(ColorConverter.getGlassPaneFromColorCode(colorCode));
     }
-
-    public static boolean isWallSignMaterial(Material material) {
-        return material.name().contains("_SIGN");
-    }
     
 }