Merge pull request 'Configure Renovate' (#1) from renovate/configure into master

Reviewed-on: #1

.gitignore

@@ -1,2 +1,4 @@
-# Project exclude paths
+.idea
-/target/
+*.iml
+target/
+.flattened-pom.xml

menuapi.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
+</module>

pom.xml

@@ -5,19 +5,26 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <groupId>nl.iobyte</groupId>
     <artifactId>menuapi</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
+
+    <distributionManagement>
+        <repository>
+            <id>sbdevelopment-repo</id>
+            <url>https://repo.sbdevelopment.tech/releases</url>
+        </repository>
+    </distributionManagement>
 
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.12.2-R0.1-SNAPSHOT</version>
+            <version>1.20.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

renovate.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+}

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.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.bukkit.Bukkit;
 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) {
+    public ItemBuilder(Material material, int amount, int data) {
-        item = new ItemStack(material, amount, 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();
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
-        meta.setUnbreakable(b);
+            meta.setUnbreakable(b);
-        item.setItemMeta(meta);
+            item.setItemMeta(meta);
+        });
         return this;
     }
 
@@ -55,9 +59,10 @@ public class ItemBuilder {
         if(name == null)
             return this;
 
-        ItemMeta meta = item.getItemMeta();
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
-        meta.setDisplayName(Color.parse(name));
+            meta.setDisplayName(Color.parse(name));
-        this.item.setItemMeta(meta);
+            this.item.setItemMeta(meta);
+        });
         return this;
     }
 
@@ -65,12 +70,13 @@ public class ItemBuilder {
         if(lore == null)
             return this;
 
-        ItemMeta meta = item.getItemMeta();
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
-        for(String string : lore)
+            for (String string : lore)
-            lore.set(lore.indexOf(string), Color.parse(string));
+                lore.set(lore.indexOf(string), Color.parse(string));
 
-        meta.setLore(lore);
+            meta.setLore(lore);
-        item.setItemMeta(meta);
+            item.setItemMeta(meta);
+        });
         return this;
     }
 
@@ -82,52 +88,59 @@ public class ItemBuilder {
     }
 
     public ItemBuilder addLore(String lore) {
-        List<String> list = item.getItemMeta().getLore();
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
-        list.add(lore);
+            List<String> list = meta.hasLore() ? meta.getLore() : new ArrayList<>();
-        setLore(list);
+            list.add(lore);
+            setLore(list);
+        });
         return this;
     }
 
     public ItemBuilder setEnchantment(HashMap<Enchantment, Integer> enchantments) {
-        ItemMeta meta = item.getItemMeta();
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
-        if(!meta.getEnchants().isEmpty())
+            if (!meta.getEnchants().isEmpty())
-            meta.getEnchants().clear();
+                meta.getEnchants().clear();
 
-        for(Map.Entry<Enchantment, Integer> entry : enchantments.entrySet())
+            for (Map.Entry<Enchantment, Integer> entry : enchantments.entrySet())
-            meta.addEnchant(entry.getKey(), entry.getValue(), true);
+                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();
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
-        if (!meta.getEnchants().isEmpty())
+            if (!meta.getEnchants().isEmpty())
-            meta.getEnchants().clear();
+                meta.getEnchants().clear();
 
-        meta.addEnchant(enchantment, i, true);
+            meta.addEnchant(enchantment, i, true);
-        item.setItemMeta(meta);
+            item.setItemMeta(meta);
+        });
         return this;
     }
 
     public ItemBuilder addEnchantment(Enchantment enchantment, int i) {
-        ItemMeta meta = item.getItemMeta();
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
-        meta.addEnchant(enchantment, i, true);
+            meta.addEnchant(enchantment, i, true);
-        item.setItemMeta(meta);
+            item.setItemMeta(meta);
+        });
         return this;
     }
 
     public ItemBuilder addFlag(ItemFlag flag) {
-        ItemMeta meta = item.getItemMeta();
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
-        meta.addItemFlags(flag);
+            meta.addItemFlags(flag);
-        item.setItemMeta(meta);
+            item.setItemMeta(meta);
+        });
         return this;
     }
 
     public ItemBuilder addFlags(ItemFlag... flags) {
-        ItemMeta meta = item.getItemMeta();
+        Optional.ofNullable(item.getItemMeta()).ifPresent(meta -> {
-        meta.addItemFlags(flags);
+            meta.addItemFlags(flags);
-        item.setItemMeta(meta);
+            item.setItemMeta(meta);
+        });
         return this;
     }