From 6122d28bb9187f7fd71a2c13b2743fe16ae3c8aa Mon Sep 17 00:00:00 2001
From: thomas <thomas.weert@icloud.com>
Date: Fri, 6 Aug 2021 14:23:43 +0200
Subject: [PATCH] Added custom model support and dropped support for versions
 bellow 1.14.4

---
 menuapi.iml                                   | 19 ++++
 pom.xml                                       |  8 +-
 .../nl/iobyte/menuapi/item/ItemBuilder.java   | 99 +++++++++++--------
 3 files changed, 79 insertions(+), 47 deletions(-)
 create mode 100644 menuapi.iml

diff --git a/menuapi.iml b/menuapi.iml
new file mode 100644
index 0000000..09e477e
--- /dev/null
+++ b/menuapi.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 28ea0c1..6603ba7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,19 +5,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <groupId>nl.iobyte</groupId>
     <artifactId>menuapi</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
 
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.12.2-R0.1-SNAPSHOT</version>
+            <version>1.14.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/nl/iobyte/menuapi/item/ItemBuilder.java b/src/main/java/nl/iobyte/menuapi/item/ItemBuilder.java
index 5803df9..f2b41d8 100644
--- a/src/main/java/nl/iobyte/menuapi/item/ItemBuilder.java
+++ b/src/main/java/nl/iobyte/menuapi/item/ItemBuilder.java
@@ -1,16 +1,10 @@
 package nl.iobyte.menuapi.item;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.bukkit.Bukkit;
+import java.util.*;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 
 public class ItemBuilder {
 
@@ -28,8 +22,9 @@ public class ItemBuilder {
         item = new ItemStack(material, amount);
     }
 
-    public ItemBuilder(Material material, int amount, short data) {
-        item = new ItemStack(material, amount, data);
+    public ItemBuilder(Material material, int amount, int data) {
+        this(material, amount);
+        setCustomModelData(data);
     }
 
     public ItemStack getItem() {
@@ -44,10 +39,19 @@ public class ItemBuilder {
         return this;
     }
 
+    public ItemBuilder setCustomModelData(int i) {
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
+            meta.setCustomModelData(i);
+            item.setItemMeta(meta);
+        });
+        return this;
+    }
+
     public ItemBuilder setUnbreakable(boolean b) {
-        ItemMeta meta = item.getItemMeta();
-        meta.setUnbreakable(b);
-        item.setItemMeta(meta);
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
+            meta.setUnbreakable(b);
+            item.setItemMeta(meta);
+        });
         return this;
     }
 
@@ -55,9 +59,10 @@ public class ItemBuilder {
         if(name == null)
             return this;
 
-        ItemMeta meta = item.getItemMeta();
-        meta.setDisplayName(Color.parse(name));
-        this.item.setItemMeta(meta);
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
+            meta.setDisplayName(Color.parse(name));
+            this.item.setItemMeta(meta);
+        });
         return this;
     }
 
@@ -65,12 +70,13 @@ public class ItemBuilder {
         if(lore == null)
             return this;
 
-        ItemMeta meta = item.getItemMeta();
-        for(String string : lore)
-            lore.set(lore.indexOf(string), Color.parse(string));
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
+            for (String string : lore)
+                lore.set(lore.indexOf(string), Color.parse(string));
 
-        meta.setLore(lore);
-        item.setItemMeta(meta);
+            meta.setLore(lore);
+            item.setItemMeta(meta);
+        });
         return this;
     }
 
@@ -82,52 +88,59 @@ public class ItemBuilder {
     }
 
     public ItemBuilder addLore(String lore) {
-        List<String> list = item.getItemMeta().getLore();
-        list.add(lore);
-        setLore(list);
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
+            List<String> list = meta.hasLore() ? meta.getLore() : new ArrayList<>();
+            list.add(lore);
+            setLore(list);
+        });
         return this;
     }
 
     public ItemBuilder setEnchantment(HashMap<Enchantment, Integer> enchantments) {
-        ItemMeta meta = item.getItemMeta();
-        if(!meta.getEnchants().isEmpty())
-            meta.getEnchants().clear();
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
+            if (!meta.getEnchants().isEmpty())
+                meta.getEnchants().clear();
 
-        for(Map.Entry<Enchantment, Integer> entry : enchantments.entrySet())
-            meta.addEnchant(entry.getKey(), entry.getValue(), true);
+            for (Map.Entry<Enchantment, Integer> entry : enchantments.entrySet())
+                meta.addEnchant(entry.getKey(), entry.getValue(), true);
 
-        item.setItemMeta(meta);
+            item.setItemMeta(meta);
+        });
         return this;
     }
 
     public ItemBuilder setEnchantment(Enchantment enchantment, int i) {
-        ItemMeta meta = item.getItemMeta();
-        if (!meta.getEnchants().isEmpty())
-            meta.getEnchants().clear();
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
+            if (!meta.getEnchants().isEmpty())
+                meta.getEnchants().clear();
 
-        meta.addEnchant(enchantment, i, true);
-        item.setItemMeta(meta);
+            meta.addEnchant(enchantment, i, true);
+            item.setItemMeta(meta);
+        });
         return this;
     }
 
     public ItemBuilder addEnchantment(Enchantment enchantment, int i) {
-        ItemMeta meta = item.getItemMeta();
-        meta.addEnchant(enchantment, i, true);
-        item.setItemMeta(meta);
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
+            meta.addEnchant(enchantment, i, true);
+            item.setItemMeta(meta);
+        });
         return this;
     }
 
     public ItemBuilder addFlag(ItemFlag flag) {
-        ItemMeta meta = item.getItemMeta();
-        meta.addItemFlags(flag);
-        item.setItemMeta(meta);
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
+            meta.addItemFlags(flag);
+            item.setItemMeta(meta);
+        });
         return this;
     }
 
     public ItemBuilder addFlags(ItemFlag... flags) {
-        ItemMeta meta = item.getItemMeta();
-        meta.addItemFlags(flags);
-        item.setItemMeta(meta);
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
+            meta.addItemFlags(flags);
+            item.setItemMeta(meta);
+        });
         return this;
     }