v1.8.3.6

- Allow ItemBuilder loading from ConfigurationSection to skip importing a material if one isn't set. This requires that implementations set the material manually after, since default is set to AIR.
Jake-Moore · Nov 7, 2023 · 2c8fa8a · 2c8fa8a
1 parent 61475a6
commit 2c8fa8a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.kamikazejamplugins</groupId>
     <artifactId>kamicommon</artifactId>
-    <version>1.8.3.5</version>
+    <version>1.8.3.6</version>
     <packaging>jar</packaging>
 
     <name>KamiCommon</name>

diff --git a/src/main/java/com/kamikazejamplugins/kamicommon/item/IAItemBuilder.java b/src/main/java/com/kamikazejamplugins/kamicommon/item/IAItemBuilder.java
@@ -67,14 +67,15 @@ public void loadBasicItem(ConfigurationSection config) {
         this.name = config.getString("name");
         this.lore = config.getStringList("lore");
 
-        String mat = config.getString("material", config.getString("type"));
+        String mat = config.getString("material", config.getString("type", null));
+        if (mat == null) { return; }
+
         CustomStack customStack = CustomStack.getInstance(mat);
-
         ItemStack item;
         if (customStack != null) {
             this.base = customStack.getItemStack();
         }else {
-            this.material = XMaterial.matchXMaterial(config.getString("material", config.getString("type"))).orElseThrow(() -> new IllegalArgumentException("Invalid material: " + config.getString("material", config.getString("type"))));
+            this.material = XMaterial.matchXMaterial(mat).orElseThrow(() -> new IllegalArgumentException("Invalid material: " + config.getString("material", config.getString("type"))));
         }
     }
 

diff --git a/src/main/java/com/kamikazejamplugins/kamicommon/item/ItemBuilder.java b/src/main/java/com/kamikazejamplugins/kamicommon/item/ItemBuilder.java
@@ -52,7 +52,10 @@ public void loadBasicItem(ConfigurationSection config) {
         short damage = (short) config.getInt("damage", 0);
         int amount = config.getInt("amount", 1);
 
-        this.material = XMaterial.matchXMaterial(config.getString("material")).orElseThrow(() -> new IllegalArgumentException("Invalid material: " + config.getString("material")));
+        String mat = config.getString("material", config.getString("type", null));
+        if (mat != null) {
+            this.material = XMaterial.matchXMaterial(mat).orElseThrow(() -> new IllegalArgumentException("Invalid material: " + config.getString("material")));
+        }
         this.amount = amount;
         this.damage = damage;
         this.name = config.getString("name");