2
0
Эх сурвалжийг харах

Remove version check < 1.13

RedstoneFuture 2 жил өмнө
parent
commit
2b01c449f5

+ 2 - 2
missilewars-plugin/src/main/java/de/butzlabben/missilewars/MissileWars.java

@@ -216,9 +216,9 @@ public class MissileWars extends JavaPlugin {
 
         Logger.BOOT.log("This server is running MissileWars v" + version + " by Butzlabben");
 
-        if (VersionUtil.getVersion() < 8) {
+        if (VersionUtil.getVersion() < 13) {
             Logger.WARN.log("====================================================");
-            Logger.WARN.log("It seems that you are using version older than 1.8");
+            Logger.WARN.log("It seems that you are using version older than 1.13");
             Logger.WARN.log("There is no guarantee for this to work");
             Logger.WARN.log("Proceed with extreme caution");
             Logger.WARN.log("====================================================");

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

@@ -664,11 +664,7 @@ public class Game {
     public void spawnFireball(Player player, ItemStack itemStack) {
         int amount = itemStack.getAmount();
         itemStack.setAmount(amount - 1);
-
-        if (amount == 1 && VersionUtil.getVersion() == 8) {
-            player.getInventory().remove(VersionUtil.getFireball());
-        }
-
+        
         Fireball fb = player.launchProjectile(Fireball.class);
         fb.setVelocity(player.getLocation().getDirection().multiply(2.5D));
         VersionUtil.playFireball(player, fb.getLocation());
@@ -811,8 +807,8 @@ public class Game {
             subTitle = Messages.getNativeMessage("game_result.subtitle_draw");
 
         }
-
-        VersionUtil.sendTitle(player, title, subTitle);
+        
+        player.sendTitle(title, subTitle);
     }
 
     /**

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

@@ -202,8 +202,8 @@ public class Team {
                 subTitle = null;
                 break;
         }
-
-        VersionUtil.sendTitle(mwPlayer.getPlayer(), title, subTitle);
+        
+        mwPlayer.getPlayer().sendTitle(title, subTitle);
     }
 
     /**

+ 1 - 4
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/misc/RespawnGoldBlock.java

@@ -23,7 +23,6 @@ import de.butzlabben.missilewars.configuration.Messages;
 import de.butzlabben.missilewars.game.Game;
 import de.butzlabben.missilewars.game.enums.GameState;
 import de.butzlabben.missilewars.util.version.BlockSetterProvider;
-import de.butzlabben.missilewars.util.version.VersionUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -113,9 +112,7 @@ public class RespawnGoldBlock implements Listener {
 
     private void setBlock(Block b) {
         if ((b.getType() != Material.GOLD_BLOCK) && (b.getType() == Material.AIR)) {
-            Object data = b.getData();
-            if (VersionUtil.getVersion() >= 13)
-                data = b.getBlockData();
+            Object data = b.getBlockData();
             map.put(b.getLocation(), new AbstractMap.SimpleEntry<>(b.getType(), data));
             b.setType(Material.GOLD_BLOCK);
         }

+ 3 - 12
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/missile/Missile.java

@@ -32,7 +32,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SpawnEggMeta;
-import org.bukkit.material.SpawnEgg;
 import org.bukkit.util.Vector;
 
 import java.io.File;
@@ -112,17 +111,9 @@ public class Missile {
      */
     public ItemStack getItem() {
         ItemStack is = new ItemStack(VersionUtil.getMonsterEgg(egg));
-        if (VersionUtil.getVersion() > 10) {
-            SpawnEggMeta sm = (SpawnEggMeta) is.getItemMeta();
-            if (VersionUtil.getVersion() < 13)
-                sm.setSpawnedType(egg);
-            is.setItemMeta(sm);
-        } else {
-            SpawnEgg se = new SpawnEgg(egg);
-            se.setSpawnedType(egg);
-            is = se.toItemStack();
-            is.setAmount(1);
-        }
+        SpawnEggMeta sm = (SpawnEggMeta) is.getItemMeta();
+        is.setItemMeta(sm);
+        
         ItemMeta im = is.getItemMeta();
         im.setDisplayName(getDisplayName());
         is.setItemMeta(im);

+ 9 - 14
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/missile/paste/PasteProvider.java

@@ -32,22 +32,17 @@ public class PasteProvider {
     private static final Paster paster;
 
     static {
-        if (VersionUtil.getVersion() < 13) {
-            paster = new R1_12PasteProvider();
-            Logger.DEBUG.log("Chose 1.12 normal paster");
-        } else {
-            if (MissileWars.getInstance().foundFAWE()) {
-                if (VersionUtil.getVersion() < 16) {
-                    paster = new R1_13FawePasteProvider();
-                    Logger.DEBUG.log("Chose 1.13 FAWE paster");
-                } else {
-                    paster = new R1_16FawePasteProvider();
-                    Logger.DEBUG.log("Chose 1.16 FAWE paster");
-                }
+        if (MissileWars.getInstance().foundFAWE()) {
+            if (VersionUtil.getVersion() < 16) {
+                paster = new R1_13FawePasteProvider();
+                Logger.DEBUG.log("Chose 1.13 FAWE paster");
             } else {
-                paster = new R1_13WEPasteProvider();
-                Logger.DEBUG.log("Chose 1.13 WE paster");
+                paster = new R1_16FawePasteProvider();
+                Logger.DEBUG.log("Chose 1.16 FAWE paster");
             }
+        } else {
+            paster = new R1_13WEPasteProvider();
+            Logger.DEBUG.log("Chose 1.13 WE paster");
         }
     }
 

+ 1 - 6
missilewars-plugin/src/main/java/de/butzlabben/missilewars/player/PlayerData.java

@@ -19,7 +19,6 @@
 package de.butzlabben.missilewars.player;
 
 import com.google.common.base.Preconditions;
-import de.butzlabben.missilewars.util.version.VersionUtil;
 import lombok.AllArgsConstructor;
 import lombok.ToString;
 import org.bukkit.GameMode;
@@ -78,11 +77,7 @@ public class PlayerData implements ConfigurationSerializable {
         YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(file);
         PlayerData data;
 
-        if (VersionUtil.getVersion() > 12) {
-            data = yamlConfiguration.getSerializable("data", PlayerData.class);
-        } else {
-            data = (PlayerData) yamlConfiguration.get("data");
-        }
+        data = yamlConfiguration.getSerializable("data", PlayerData.class);
 
         return data;
     }

+ 4 - 29
missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/version/BlockSetterProvider.java

@@ -18,9 +18,10 @@
 
 package de.butzlabben.missilewars.util.version;
 
+import org.bukkit.block.Block;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import org.bukkit.block.Block;
 
 /**
  * @author Butzlabben
@@ -31,10 +32,7 @@ public class BlockSetterProvider {
     private static final BlockDataSetter blockSetter;
 
     static {
-        if (VersionUtil.getVersion() < 13)
-            blockSetter = new LegacyBlockSetter();
-        else
-            blockSetter = new NewBlockSetter();
+        blockSetter = new NewBlockSetter();
     }
 
     private BlockSetterProvider() {
@@ -64,30 +62,7 @@ public class BlockSetterProvider {
             e.printStackTrace();
         }
     }
-
-    private static class LegacyBlockSetter implements BlockDataSetter {
-
-        @Override
-        public void setData(Block block, Object data) {
-            try {
-                Method m = block.getClass().getMethod("setData", byte.class);
-                m.invoke(block, data);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        @Override
-        public void setData(Block block, Object data, boolean update) {
-            try {
-                Method m = block.getClass().getMethod("setData", byte.class, boolean.class);
-                m.invoke(block, data, update);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
+    
     private static class NewBlockSetter implements BlockDataSetter {
 
         @Override

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

@@ -19,7 +19,6 @@
 package de.butzlabben.missilewars.util.version;
 
 import de.butzlabben.missilewars.Logger;
-import de.butzlabben.missilewars.configuration.Messages;
 import de.butzlabben.missilewars.game.Team;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -30,8 +29,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-import java.lang.reflect.Method;
-
 /**
  * @author Butzlabben
  * @since 14.08.2018
@@ -70,59 +67,27 @@ public class VersionUtil {
 
         if (version == 0) {
             Logger.WARN.log("Unknown version: " + Bukkit.getVersion());
-            Logger.WARN.log("Choosing version 1.12.2");
-            version = 12;
+            Logger.WARN.log("Choosing version 1.13");
+            version = 13;
         }
         return version;
     }
-
-    public static void sendTitle(Player p, String title, String subtitle) {
-        if (getVersion() > 8) {
-            try {
-                Method m = p.getClass().getMethod("sendTitle", String.class, String.class);
-                m.invoke(p, title, subtitle);
-            } catch (Exception e) {
-                Logger.ERROR.log("Couldn't send title to player");
-                e.printStackTrace();
-            }
-        } else {
-            p.sendMessage(Messages.getPrefix() + title + " " + subtitle);
-        }
-    }
-
+    
     public static void playFireball(Player p, Location loc) {
-        if (getVersion() <= 8) {
-            p.playSound(loc, sound("ANVIL_LAND"), 100.0F, 2.0F);
-            p.playSound(loc, sound("FIRE_IGNITE"), 100.0F, 1.0F);
-        } else {
-            p.playSound(loc, sound("BLOCK_ANVIL_LAND"), 100.0F, 2.0F);
-            p.playSound(loc, sound("ITEM_FLINTANDSTEEL_USE"), 100.0F, 1.0F);
-        }
+        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) {
-        if (getVersion() <= 8)
-            p.playSound(loc, sound("ENDERDRAGON_WINGS"), 1.0F, 1.0F);
-        else if (getVersion() <= 12)
-            p.playSound(loc, sound("ENTITY_ENDERDRAGON_FLAP"), 1, 1);
-        else
-            p.playSound(loc, sound("ENTITY_ENDER_DRAGON_FLAP"), 1, 1);
+        p.playSound(loc, sound("ENTITY_ENDER_DRAGON_FLAP"), 1, 1);
     }
 
     public static void playPling(Player p) {
-        if (getVersion() <= 8)
-            p.playSound(p.getLocation(), sound("NOTE_PLING"), 100, 3);
-        else if (getVersion() >= 13)
-            p.playSound(p.getLocation(), sound("BLOCK_NOTE_BLOCK_PLING"), 100, 3);
-        else
-            p.playSound(p.getLocation(), sound("BLOCK_NOTE_PLING"), 100, 3);
+        p.playSound(p.getLocation(), sound("BLOCK_NOTE_BLOCK_PLING"), 100, 3);
     }
 
     public static void playDraw(Player p) {
-        if (getVersion() <= 8)
-            p.playSound(p.getLocation(), sound("WITHER_DEATH"), 100, 0);
-        else
-            p.playSound(p.getLocation(), sound("ENTITY_WITHER_DEATH"), 100, 0);
+        p.playSound(p.getLocation(), sound("ENTITY_WITHER_DEATH"), 100, 0);
     }
 
     private static Sound sound(String s) {
@@ -136,67 +101,44 @@ public class VersionUtil {
     }
 
     public static Material getFireball() {
-        if (getVersion() < 13)
-            return Material.valueOf("FIREBALL");
-        else
-            return Material.valueOf("FIRE_CHARGE");
+        return Material.valueOf("FIRE_CHARGE");
     }
 
     public static Material getSnowball() {
-        if (getVersion() < 13)
-            return Material.valueOf("SNOW_BALL");
-        else
-            return Material.valueOf("SNOWBALL");
+        return Material.valueOf("SNOWBALL");
     }
 
     public static Material getMonsterEgg(EntityType type) {
-        if (getVersion() < 13)
-            return Material.valueOf("MONSTER_EGG");
-        else {
-            if (type == EntityType.MUSHROOM_COW) {
-                //noinspection SpellCheckingInspection
-                return Material.valueOf("MOOSHROOM_SPAWN_EGG");
-
-            }
-            return Material.valueOf(type.name() + "_SPAWN_EGG");
+        if (type == EntityType.MUSHROOM_COW) {
+            //noinspection SpellCheckingInspection
+            return Material.valueOf("MOOSHROOM_SPAWN_EGG");
+
         }
+        return Material.valueOf(type.name() + "_SPAWN_EGG");
     }
 
     public static boolean isMonsterEgg(Material material) {
-        if (material == null)
-            return false;
+        if (material == null) return false;
+        
         String name = material.name();
-        if (name.equals("EGG"))
-            return false;
-        if (name.contains("SPAWN_EGG"))
-            return true;
+        
+        if (name.equals("EGG")) return false;
+        if (name.contains("SPAWN_EGG")) return true;
         return name.equals("MONSTER_EGG");
     }
 
     public static Material getPortal() {
-        if (getVersion() < 13)
-            return Material.valueOf("PORTAL");
-        else
-            return Material.valueOf("NETHER_PORTAL");
+        return Material.valueOf("NETHER_PORTAL");
     }
 
     public static Material getSunFlower() {
-        if (getVersion() > 12)
-            return Material.valueOf("SUNFLOWER");
-        else
-            return Material.valueOf("DOUBLE_PLANT");
+        return Material.valueOf("SUNFLOWER");
     }
-
-    @SuppressWarnings("deprecation")
+    
     public static ItemStack getGlassPlane(Team team) {
         String colorCode = team.getColorCode();
-        ItemStack is;
-        if (getVersion() < 13) {
-            is = new ItemStack(Material.valueOf("STAINED_GLASS_PANE"), 1, ColorConverter.getColorIDforBlockFromColorCode(colorCode));
-        } else {
-            is = new ItemStack(ColorConverter.getGlassPaneFromColorCode(colorCode));
-        }
-
+        ItemStack is = new ItemStack(ColorConverter.getGlassPaneFromColorCode(colorCode));
+        
         ItemMeta im = is.getItemMeta();
         im.setDisplayName(team.getFullname());
         is.setItemMeta(im);
@@ -204,28 +146,17 @@ public class VersionUtil {
     }
 
     public static boolean isStainedGlassPane(Material material) {
-        if (material == null)
-            return false;
+        if (material == null) return false;
         return material.name().contains("STAINED_GLASS_PANE");
     }
-
-    @SuppressWarnings("deprecation")
+    
     public static ItemStack getGlassPlane(String colorCode) {
-        ItemStack is;
-        if (getVersion() < 13) {
-            is = new ItemStack(Material.valueOf("STAINED_GLASS_PANE"), 1, ColorConverter.getColorIDforBlockFromColorCode(colorCode));
-        } else {
-            is = new ItemStack(ColorConverter.getGlassPaneFromColorCode(colorCode));
-        }
+        ItemStack is = new ItemStack(ColorConverter.getGlassPaneFromColorCode(colorCode));
         return is;
     }
 
     public static Material getPlayerSkullMaterial() {
-        if (getVersion() > 12) {
-            return Material.valueOf("PLAYER_HEAD");
-        } else {
-            return Material.valueOf("SKULL_ITEM");
-        }
+        return Material.valueOf("PLAYER_HEAD");
     }
 
     public static boolean isWallSignMaterial(Material material) {
@@ -234,15 +165,8 @@ public class VersionUtil {
 
     public static void setUnbreakable(ItemStack is) {
         ItemMeta im = is.getItemMeta();
-        if (getVersion() >= 11) {
-            im.setUnbreakable(true);
-        } else {
-//            im.spigot().setUnbreakable(true);
-        }
+        im.setUnbreakable(true);
         is.setItemMeta(im);
     }
-
-    public static void restart() {
-        Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "restart");
-    }
+    
 }