Merge pull request #2 from freeserverproject/dev

Dev
freeserverproject · Nov 23, 2022 · 7fbccec · 7fbccec
2 parents 53206bd + dcff40f
commit 7fbccec
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>pro.freeserver.plugin.alphakun</groupId>
     <artifactId>CraftSupporter</artifactId>
-    <version>2.0.0-release</version>
+    <version>2.0.1-release</version>
     <packaging>jar</packaging>
 
     <name>CraftSupporter</name>

diff --git a/src/main/java/pro/freeserver/plugin/alphakun/craftsupporter/classes/Ingredient.kt b/src/main/java/pro/freeserver/plugin/alphakun/craftsupporter/classes/Ingredient.kt
@@ -6,13 +6,17 @@ class Ingredient(ingredientKey: Char, material: String, amount: Int, customModel
     private var ingredientmKey: Char
     private var material: String
     private var amount: Int
-    private var customModelData: Int
+    private var customModelData: Int?
 
     init {
         this.ingredientmKey = ingredientKey
         this.material = material
         this.amount = amount
-        this.customModelData = customModelData
+        if (customModelData == 0) {
+            this.customModelData = null
+        } else {
+            this.customModelData = customModelData
+        }
     }
 
     fun getIngredientKey(): Char {
@@ -27,7 +31,7 @@ class Ingredient(ingredientKey: Char, material: String, amount: Int, customModel
         return amount
     }
 
-    fun getCustomModelData(): Int {
+    fun getCustomModelData(): Int? {
         return customModelData
     }
 }
diff --git a/src/main/java/pro/freeserver/plugin/alphakun/craftsupporter/classes/ItemStackAPI.kt b/src/main/java/pro/freeserver/plugin/alphakun/craftsupporter/classes/ItemStackAPI.kt
@@ -20,9 +20,10 @@ class ItemStackAPI(material: Material, amount: Int? = null, itemName: String? =
         this.itemName = itemName?:""
         this.lore = lore
         this.enchant = enchant?: mapOf()
-        this.customModelData = customModelData
         if (customModelData == 0) {
             this.customModelData = null
+        } else {
+            this.customModelData = customModelData
         }
     }
 

diff --git a/src/main/java/pro/freeserver/plugin/alphakun/craftsupporter/classes/Racipe.kt b/src/main/java/pro/freeserver/plugin/alphakun/craftsupporter/classes/Racipe.kt
@@ -70,6 +70,7 @@ class Racipe(recipeName: String, itemName: String?, material: String?, amount: I
             for (i in ingredients) {
                 item = ItemStackAPI(material =  i.getMaterial()?:Material.STONE ,amount= i.getAmount(), customModelData = i.getCustomModelData())
                 recipe.addIngredient(item.getItemStack())
+                println(i.getMaterial().toString() + "'s customModelData is" + i.getCustomModelData())
             }
         }
         if (Bukkit.addRecipe(recipe)) {