From 95fa9868178253e3a0c5765ad85166607aea81a7 Mon Sep 17 00:00:00 2001 From: XxFran10xX <318299142+XxFran10xX@users.noreply.github.com> Date: Sun, 27 Sep 2026 13:55:50 +0200 Subject: [PATCH 1/2] feat: tag alloy scrap with the base metal it consumed A failed alloy forge now records the base ingredient id on the scrap it drops (PDC key ac_scrap_base). ScrapProvenance reads it back so Recycler can turn scrap into part of that base metal. Co-Authored-By: Claude Opus 5.5 (1M context) --- .../objects/alloys/AlloyForger.java | 2 ++ .../objects/data/ScrapProvenance.java | 35 +++++++++++++++++++ .../advancedcrafting/utils/PDCKeys.java | 4 +++ 3 files changed, 41 insertions(+) create mode 100644 src/main/java/net/tfminecraft/advancedcrafting/objects/data/ScrapProvenance.java diff --git a/src/main/java/net/tfminecraft/advancedcrafting/objects/alloys/AlloyForger.java b/src/main/java/net/tfminecraft/advancedcrafting/objects/alloys/AlloyForger.java index ac6e710..cad22c0 100644 --- a/src/main/java/net/tfminecraft/advancedcrafting/objects/alloys/AlloyForger.java +++ b/src/main/java/net/tfminecraft/advancedcrafting/objects/alloys/AlloyForger.java @@ -17,6 +17,7 @@ import net.tfminecraft.advancedcrafting.managers.AlloyManager; import net.tfminecraft.advancedcrafting.objects.crafting.hits.CraftingHit; import net.tfminecraft.advancedcrafting.objects.data.AlloyRecipe; +import net.tfminecraft.advancedcrafting.objects.data.ScrapProvenance; import net.tfminecraft.advancedcrafting.objects.data.StatData; import net.tfminecraft.advancedcrafting.objects.ingredients.Ingredient; import net.tfminecraft.advancedcrafting.objects.stats.StatModifier; @@ -86,6 +87,7 @@ public NamableAlloy forge(Player p, int i) { String scrapId = Cache.scrap.split("\\.")[1].toUpperCase(); ItemManager itemManager = MMOItems.plugin.getItems(); ItemStack template = itemManager.getMMOItem(MMOItems.plugin.getTypes().get(scrapType),scrapId).newBuilder().build(); + if(station.getBaseItem() != null) ScrapProvenance.applyTo(template, station.getBaseItem().getId()); loc.getWorld().dropItem(loc, template); return null; } diff --git a/src/main/java/net/tfminecraft/advancedcrafting/objects/data/ScrapProvenance.java b/src/main/java/net/tfminecraft/advancedcrafting/objects/data/ScrapProvenance.java new file mode 100644 index 0000000..de84559 --- /dev/null +++ b/src/main/java/net/tfminecraft/advancedcrafting/objects/data/ScrapProvenance.java @@ -0,0 +1,35 @@ +package net.tfminecraft.advancedcrafting.objects.data; + +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; +import org.bukkit.persistence.PersistentDataType; + +import net.tfminecraft.advancedcrafting.utils.PDCKeys; + +/** + * Records which base ingredient a failed alloy forge consumed, so scrap can be recycled into it. + */ +public final class ScrapProvenance { + private ScrapProvenance() { + } + + public static void applyTo(ItemStack item, String baseId) { + if (item == null || baseId == null || baseId.isBlank()) { + return; + } + ItemMeta meta = item.getItemMeta(); + if (meta == null) { + return; + } + meta.getPersistentDataContainer().set(PDCKeys.scrapBase(), PersistentDataType.STRING, baseId.toLowerCase()); + item.setItemMeta(meta); + } + + /** Base ingredient id the scrap came from, or null for untagged items (including scrap forged before tagging). */ + public static String readBaseId(ItemStack item) { + if (item == null || !item.hasItemMeta()) { + return null; + } + return item.getItemMeta().getPersistentDataContainer().get(PDCKeys.scrapBase(), PersistentDataType.STRING); + } +} diff --git a/src/main/java/net/tfminecraft/advancedcrafting/utils/PDCKeys.java b/src/main/java/net/tfminecraft/advancedcrafting/utils/PDCKeys.java index 112d933..5ce75ff 100644 --- a/src/main/java/net/tfminecraft/advancedcrafting/utils/PDCKeys.java +++ b/src/main/java/net/tfminecraft/advancedcrafting/utils/PDCKeys.java @@ -24,6 +24,10 @@ public static NamespacedKey craftStatTemplateRevision() { return new NamespacedKey(AdvancedCrafting.plugin, "ac_craft_stat_template_revision"); } + public static NamespacedKey scrapBase() { + return new NamespacedKey(AdvancedCrafting.plugin, "ac_scrap_base"); + } + public static NamespacedKey ingredientId() { return new NamespacedKey(AdvancedCrafting.plugin, "ac_ingredient_id"); } From ddd192c8690a5a081d7c61c63e4ce0fa18b33cd8 Mon Sep 17 00:00:00 2001 From: XxFran10xX <318299142+XxFran10xX@users.noreply.github.com> Date: Sun, 27 Sep 2026 14:09:52 +0200 Subject: [PATCH 2/2] fix: lowercase scrap base ids with Locale.ROOT Co-Authored-By: Claude Opus 5.5 (1M context) --- .../advancedcrafting/objects/data/ScrapProvenance.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/tfminecraft/advancedcrafting/objects/data/ScrapProvenance.java b/src/main/java/net/tfminecraft/advancedcrafting/objects/data/ScrapProvenance.java index de84559..21f9426 100644 --- a/src/main/java/net/tfminecraft/advancedcrafting/objects/data/ScrapProvenance.java +++ b/src/main/java/net/tfminecraft/advancedcrafting/objects/data/ScrapProvenance.java @@ -1,5 +1,7 @@ package net.tfminecraft.advancedcrafting.objects.data; +import java.util.Locale; + import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataType; @@ -21,7 +23,7 @@ public static void applyTo(ItemStack item, String baseId) { if (meta == null) { return; } - meta.getPersistentDataContainer().set(PDCKeys.scrapBase(), PersistentDataType.STRING, baseId.toLowerCase()); + meta.getPersistentDataContainer().set(PDCKeys.scrapBase(), PersistentDataType.STRING, baseId.toLowerCase(Locale.ROOT)); item.setItemMeta(meta); }