Merge pull request #68 from tylermurphy534/1.5.0

1.5.0 

1 files changed, 26 insertions, 21 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java
index 1c77ec2..dfdb197 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java
@@ -20,16 +20,16 @@
 package net.tylermurphy.hideAndSeek.configuration;
 
 import com.cryptomorin.xseries.XItemStack;
-import net.tylermurphy.hideAndSeek.util.Version;
+import net.tylermurphy.hideAndSeek.Main;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.*;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 public class Items {
 
@@ -38,16 +38,16 @@ public class Items {
 
     public static void loadItems() {
 
-        ConfigManager manager = new ConfigManager("items.yml");
+        ConfigManager manager = ConfigManager.create("items.yml");
 
         SEEKER_ITEMS = new ArrayList<>();
         ConfigurationSection SeekerItems = manager.getConfigurationSection("items.seeker");
         int i = 1;
         while (true) {
             ConfigurationSection section = SeekerItems.getConfigurationSection(String.valueOf(i));
-            if(section == null) break;
+            if (section == null) break;
             ItemStack item = createItem(section);
-            if(item != null) SEEKER_ITEMS.add(item);
+            if (item != null) SEEKER_ITEMS.add(item);
             i++;
         }
 
@@ -56,9 +56,9 @@ public class Items {
         i = 1;
         while (true) {
             ConfigurationSection section = HiderItems.getConfigurationSection(String.valueOf(i));
-            if(section == null) break;
+            if (section == null) break;
             ItemStack item = createItem(section);
-            if(item != null) HIDER_ITEMS.add(item);
+            if (item != null) HIDER_ITEMS.add(item);
             i++;
         }
         SEEKER_EFFECTS = new ArrayList<>();
@@ -66,9 +66,9 @@ public class Items {
         i = 1;
         while (true) {
             ConfigurationSection section = SeekerEffects.getConfigurationSection(String.valueOf(i));
-            if(section == null) break;
+            if (section == null) break;
             PotionEffect effect = getPotionEffect(section);
-            if(effect != null) SEEKER_EFFECTS.add(effect);
+            if (effect != null) SEEKER_EFFECTS.add(effect);
             i++;
         }
 
@@ -77,9 +77,9 @@ public class Items {
         i = 1;
         while (true) {
             ConfigurationSection section = HiderEffects.getConfigurationSection(String.valueOf(i));
-            if(section == null) break;
+            if (section == null) break;
             PotionEffect effect = getPotionEffect(section);
-            if(effect != null) HIDER_EFFECTS.add(effect);
+            if (effect != null) HIDER_EFFECTS.add(effect);
             i++;
         }
 
@@ -89,11 +89,11 @@ public class Items {
         ConfigurationSection config = new YamlConfiguration().createSection("temp");
         String material = item.getString("material").toUpperCase();
         boolean splash = false;
-        if(!Version.atLeast("1.9")){
-            if(material.contains("POTION")){
+        if (!Main.getInstance().supports(9)) {
+            if (material.contains("POTION")) {
                 config.set("level", 1);
             }
-            if(material.equalsIgnoreCase("SPLASH_POTION") || material.equalsIgnoreCase("LINGERING_POTION")){
+            if (material.equalsIgnoreCase("SPLASH_POTION") || material.equalsIgnoreCase("LINGERING_POTION")) {
                 material = "POTION";
                 splash = true;
             }
@@ -102,22 +102,27 @@ public class Items {
         config.set("material", material);
         config.set("enchants", item.getConfigurationSection("enchantments"));
         config.set("unbreakable", item.getBoolean("unbreakable"));
-        if(item.isSet("lore"))
+        if (Main.getInstance().supports(14)) {
+            if (item.contains("model-data")) {
+                config.set("model-data", item.getInt("model-data"));
+            }
+        }
+        if (item.isSet("lore"))
             config.set("lore", item.getStringList("lore"));
         if (material.equalsIgnoreCase("POTION") || material.equalsIgnoreCase("SPLASH_POTION") || material.equalsIgnoreCase("LINGERING_POTION"))
             config.set("base-effect", String.format("%s,%s,%s", item.getString("type"), false, splash));
         ItemStack stack = XItemStack.deserialize(config);
         stack.setAmount(item.getInt("amount"));
-        if(stack.getData().getItemType() == Material.AIR) return null;
+        if (stack.getData().getItemType() == Material.AIR) return null;
         return stack;
     }
 
-    private static PotionEffect getPotionEffect(ConfigurationSection item){
+    private static PotionEffect getPotionEffect(ConfigurationSection item) {
         String type = item.getString("type");
-        if(type == null) return null;
-        if(PotionEffectType.getByName(type.toUpperCase()) == null) return null;
+        if (type == null) return null;
+        if (PotionEffectType.getByName(type.toUpperCase()) == null) return null;
         return new PotionEffect(
-                Objects.requireNonNull(PotionEffectType.getByName(type.toUpperCase())),
+                PotionEffectType.getByName(type.toUpperCase()),
                 item.getInt("duration"),
                 item.getInt("amplifier"),
                 item.getBoolean("ambient"),