Fix crafting bug

zelytra · Aug 27, 2021 · 49b588f · 49b588f
1 parent cd5c181
commit 49b588f
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 20 deletions.
diff --git a/src/main/java/fr/zelytra/daedalus/builders/customCraft/ShapedRecipeBuilder.java b/src/main/java/fr/zelytra/daedalus/builders/customCraft/ShapedRecipeBuilder.java
@@ -3,6 +3,7 @@
 import fr.zelytra.daedalus.Daedalus;
 import fr.zelytra.daedalus.managers.items.CustomItemStack;
 import fr.zelytra.daedalus.managers.items.CustomMaterial;
+import fr.zelytra.daedalus.managers.languages.Lang;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
@@ -66,29 +67,31 @@ public void register() {
         CraftPattern[] craftPatterns = new CraftPattern(this.shapedRecipe.getShape()).getAllPossibilities();
         int count = 0;
         for (CraftPattern pattern : craftPatterns) {
-            NamespacedKey key;
-            ShapedRecipe recipe;
-            if (material != null) {
-                key = new NamespacedKey(Daedalus.getInstance(), material.getName() + count);
-                recipe = new ShapedRecipe(key, new CustomItemStack(material, this.amount).getItem());
-            }else {
-                key = new NamespacedKey(Daedalus.getInstance(), vanillaMaterial.name() + count);
-                recipe = new ShapedRecipe(key, new ItemStack(vanillaMaterial, this.amount));
-            }
-            recipe.shape(pattern.getShapeArray());
+            for (Lang lang : Lang.values()) {
+                NamespacedKey key;
+                ShapedRecipe recipe;
+                if (material != null) {
+                    key = new NamespacedKey(Daedalus.getInstance(), material.getName() + count);
+                    recipe = new ShapedRecipe(key, new CustomItemStack(material, lang).getItem());
+                } else {
+                    key = new NamespacedKey(Daedalus.getInstance(), vanillaMaterial.name() + count);
+                    recipe = new ShapedRecipe(key, new ItemStack(vanillaMaterial, this.amount));
+                }
+                recipe.shape(pattern.getShapeArray());
 
-            for (Map.Entry<Character, ItemStack> map : this.shapedRecipe.getIngredientMap().entrySet()) {
-                if (map.getValue() != null) {
-                    if (CustomItemStack.hasTag(map.getValue())) {
-                        RecipeChoice.ExactChoice item = new RecipeChoice.ExactChoice(new CustomItemStack(CustomItemStack.getCustomMaterial(map.getValue()), amount).getItem());
-                        recipe.setIngredient(map.getKey(), item);
-                    } else {
-                        recipe.setIngredient(map.getKey(), map.getValue().getType());
+                for (Map.Entry<Character, ItemStack> map : this.shapedRecipe.getIngredientMap().entrySet()) {
+                    if (map.getValue() != null) {
+                        if (CustomItemStack.hasTag(map.getValue())) {
+                            RecipeChoice.ExactChoice item = new RecipeChoice.ExactChoice(new CustomItemStack(CustomItemStack.getCustomMaterial(map.getValue()), lang).getItem());
+                            recipe.setIngredient(map.getKey(), item);
+                        } else {
+                            recipe.setIngredient(map.getKey(), map.getValue().getType());
+                        }
                     }
                 }
+                Daedalus.getInstance().getServer().addRecipe(recipe);
+                count++;
             }
-            Daedalus.getInstance().getServer().addRecipe(recipe);
-            count++;
         }
     }
 }
diff --git a/...ain/java/fr/zelytra/daedalus/events/running/environnement/items/listener/DionysosCup.java b/...ain/java/fr/zelytra/daedalus/events/running/environnement/items/listener/DionysosCup.java
@@ -118,6 +118,10 @@ public void onCraft(PrepareItemCraftEvent e) {
             meta.setLore(lore);
 
             result.setItemMeta(meta);
+
+            if (result == null)
+                return;
+
             e.getInventory().setResult(result);
         }
 

diff --git a/src/main/java/fr/zelytra/daedalus/events/running/environnement/respawnable/BlockEnum.java b/src/main/java/fr/zelytra/daedalus/events/running/environnement/respawnable/BlockEnum.java
@@ -1,6 +1,7 @@
 package fr.zelytra.daedalus.events.running.environnement.respawnable;
 
 import fr.zelytra.daedalus.managers.game.settings.BlockCooldownEnum;
+import fr.zelytra.daedalus.managers.game.settings.GameSettings;
 import fr.zelytra.daedalus.managers.items.CustomItemStack;
 import fr.zelytra.daedalus.managers.items.CustomMaterial;
 import org.bukkit.Material;
@@ -65,7 +66,10 @@ public Material getMaterial() {
     }
 
     public ItemStack getItemStack() {
-        return itemStack;
+        if (CustomItemStack.hasTag(itemStack))
+            return new CustomItemStack(CustomItemStack.getCustomMaterial(itemStack), GameSettings.LANG).getItem();
+        else
+            return itemStack;
     }
 
     public boolean hasItemStack() {

diff --git a/src/main/java/fr/zelytra/daedalus/managers/items/CustomItemStack.java b/src/main/java/fr/zelytra/daedalus/managers/items/CustomItemStack.java
@@ -2,6 +2,7 @@
 
 import fr.zelytra.daedalus.Daedalus;
 import fr.zelytra.daedalus.managers.game.settings.GameSettings;
+import fr.zelytra.daedalus.managers.languages.Lang;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.attribute.Attribute;
@@ -118,6 +119,48 @@ public CustomItemStack(CustomMaterial material) {
 
     }
 
+    public CustomItemStack(CustomMaterial material, Lang lang) {
+
+        this.customMaterial = material;
+        switch (material.getItemType()) {
+            case ARMOR:
+                this.item = new ItemStack(this.customMaterial.getVanillaMaterial());
+                ItemMeta meta = this.item.getItemMeta();
+                assert meta != null;
+                meta.setCustomModelData(this.customMaterial.getCustomModelData());
+                meta.setDisplayName(this.customMaterial.getDisplayName(lang));
+
+                meta.addAttributeModifier(Attribute.GENERIC_ARMOR, AttributeGenerator.armor(material.getArmor(), material.getSlot()));
+                meta.addAttributeModifier(Attribute.GENERIC_MAX_HEALTH, AttributeGenerator.extraHeart(material.getExtraHeart(), material.getSlot()));
+
+                PersistentDataContainer itemData = meta.getPersistentDataContainer();
+                itemData.set(itemKey, PersistentDataType.STRING, this.customMaterial.getName());
+                //itemData.set(descriptionKey, PersistentDataType.STRING, );
+                //meta.setLore(lore);
+                this.item.setItemMeta(meta);
+                break;
+
+            default:
+                this.item = new ItemStack(this.customMaterial.getVanillaMaterial());
+                meta = this.item.getItemMeta();
+                assert meta != null;
+                meta.setCustomModelData(this.customMaterial.getCustomModelData());
+                meta.setDisplayName(this.customMaterial.getDisplayName(lang));
+                itemData = meta.getPersistentDataContainer();
+                itemData.set(itemKey, PersistentDataType.STRING, this.customMaterial.getName());
+                //itemData.set(descriptionKey, PersistentDataType.STRING, );
+                //meta.setLore(lore);
+                this.item.setItemMeta(meta);
+
+                if (material == CustomMaterial.DIONYSUS_CUP)
+                    dionysosMugInit();
+
+                break;
+
+        }
+
+    }
+
     private void dionysosMugInit() {
         ItemMeta meta = this.item.getItemMeta();
         PersistentDataContainer itemData = meta.getPersistentDataContainer();

diff --git a/src/main/java/fr/zelytra/daedalus/managers/items/CustomMaterial.java b/src/main/java/fr/zelytra/daedalus/managers/items/CustomMaterial.java
@@ -1,6 +1,7 @@
 package fr.zelytra.daedalus.managers.items;
 
 import fr.zelytra.daedalus.managers.game.settings.GameSettings;
+import fr.zelytra.daedalus.managers.languages.Lang;
 import org.bukkit.Material;
 import org.bukkit.inventory.EquipmentSlot;
 
@@ -89,6 +90,10 @@ public String getDisplayName() {
         return GameSettings.LANG.textOf(displayName);
     }
 
+    public String getDisplayName(Lang lang) {
+        return lang.textOf(displayName);
+    }
+
     public String getName() {
         return name;
     }