From 3ca6bd040d08ee5af0dbca629aeedccb3cc84f52 Mon Sep 17 00:00:00 2001 From: Cola Date: Mon, 29 May 2023 00:18:46 +0100 Subject: [PATCH] Add lore to hash if its present on an item --- .../FactoryMod/recipes/WordBankRecipe.java | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/plugins/factorymod-paper/paper/src/main/java/com/github/igotyou/FactoryMod/recipes/WordBankRecipe.java b/plugins/factorymod-paper/paper/src/main/java/com/github/igotyou/FactoryMod/recipes/WordBankRecipe.java index 3819c89f1..701c3c5da 100644 --- a/plugins/factorymod-paper/paper/src/main/java/com/github/igotyou/FactoryMod/recipes/WordBankRecipe.java +++ b/plugins/factorymod-paper/paper/src/main/java/com/github/igotyou/FactoryMod/recipes/WordBankRecipe.java @@ -2,6 +2,16 @@ package com.github.igotyou.FactoryMod.recipes; import com.github.igotyou.FactoryMod.FactoryMod; import com.github.igotyou.FactoryMod.factories.FurnCraftChestFactory; +import com.github.igotyou.FactoryMod.utility.MultiInventoryWrapper; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; +import vg.civcraft.mc.civmodcore.inventory.items.ItemMap; +import vg.civcraft.mc.civmodcore.inventory.items.ItemUtils; + import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -13,16 +23,6 @@ import java.util.List; import java.util.Map.Entry; import java.util.Random; -import com.github.igotyou.FactoryMod.utility.MultiInventoryWrapper; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; -import vg.civcraft.mc.civmodcore.inventory.items.ItemMap; -import vg.civcraft.mc.civmodcore.inventory.items.ItemUtils; - public class WordBankRecipe extends InputRecipe { private String key; @@ -151,6 +151,12 @@ public class WordBankRecipe extends InputRecipe { for (Entry entry : entries) { digest.update(entry.getKey().getType().getKey().getKey().getBytes()); digest.update(toBuffer(entry.getValue())); + if (entry.getKey().getItemMeta().hasLore()) { + ItemStack item = entry.getKey(); + for (String s : item.getItemMeta().getLore()) { + digest.update(s.getBytes()); + } + } } byte[] result = digest.digest(); ByteBuffer buffer = ByteBuffer.allocate(result.length);