From 063cd53712f7cfc2704714e0f4abbb3d067e0e9c Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 2 Jan 2021 17:09:40 +0000 Subject: [PATCH] Started fixing recipe itemstacks --- .../com/willfp/talismans/talismans/Talisman.java | 2 +- .../talismans/util/TalismanCraftListener.java | 6 ++++++ .../resources/talismans/ring/experiencering.yml | 16 ++++++++-------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java index 97034c0..675b1f5 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java @@ -206,6 +206,7 @@ public abstract class Talisman implements Listener, Watcher { recipe.shape("012", "345", "678"); for (int i = 0; i < 9; i++) { + recipeTalismanOverlay[i] = null; char ingredientChar = String.valueOf(i).toCharArray()[0]; Material material; if (recipeStrings.get(i).startsWith("talisman:")) { @@ -219,7 +220,6 @@ public abstract class Talisman implements Listener, Watcher { recipe.setIngredient(ingredientChar, material); } - this.recipe = recipe; Bukkit.getServer().addRecipe(recipe); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java index e71b03e..8fcd71a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.util; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -12,6 +13,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ShapedRecipe; import org.jetbrains.annotations.NotNull; +import java.util.Arrays; import java.util.Objects; public class TalismanCraftListener implements Listener { @@ -87,6 +89,10 @@ public class TalismanCraftListener implements Listener { for (int i = 0; i < 9; i++) { ItemStack itemStack = event.getInventory().getMatrix()[i]; + Bukkit.getLogger().info("==============="); + Bukkit.getLogger().info(Arrays.toString(event.getInventory().getMatrix())); + Bukkit.getLogger().info(Arrays.toString(talisman.getRecipeTalismanOverlay())); + if (itemStack == null) { continue; } diff --git a/eco-core/core-plugin/src/main/resources/talismans/ring/experiencering.yml b/eco-core/core-plugin/src/main/resources/talismans/ring/experiencering.yml index b833bf5..a851166 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/ring/experiencering.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/ring/experiencering.yml @@ -6,17 +6,17 @@ obtaining: # Recipes are left-right, top-bottom # The first item is the top left, the second is top middle, and so on. The last is bottom right. recipe: - - talisman:experience_ring - - talisman:experience_ring - - talisman:experience_ring + - talisman:experience_talisman + - talisman:experience_talisman + - talisman:experience_talisman - - talisman:experience_ring + - talisman:experience_talisman - heart_of_the_sea - - talisman:experience_ring + - talisman:experience_talisman - - talisman:experience_ring - - talisman:experience_ring - - talisman:experience_ring + - talisman:experience_talisman + - talisman:experience_talisman + - talisman:experience_talisman general-config: disabled-in-worlds: []