From b18d221641352a50de7f566e25d7fb8264d700a6 Mon Sep 17 00:00:00 2001 From: okx-code Date: Sat, 6 Jun 2026 00:49:21 +0100 Subject: [PATCH] fix bundles --- .../igotyou/FactoryMod/recipes/CompactingRecipe.java | 9 +++++++-- .../igotyou/FactoryMod/recipes/DecompactingRecipe.java | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/CompactingRecipe.java b/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/CompactingRecipe.java index fa241ac83..474c7933f 100644 --- a/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/CompactingRecipe.java +++ b/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/CompactingRecipe.java @@ -3,15 +3,17 @@ 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 java.util.*; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; import org.bukkit.Material; +import org.bukkit.Tag; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import vg.civcraft.mc.civmodcore.inventory.ClonedInventory; import vg.civcraft.mc.civmodcore.inventory.InventoryUtils; import vg.civcraft.mc.civmodcore.inventory.items.ItemMap; import vg.civcraft.mc.civmodcore.inventory.items.ItemUtils; -import vg.civcraft.mc.civmodcore.inventory.items.MetaUtils; /** * Used to compact items, which means whole or multiple stacks of an item are reduced to a single lored item, which is stackable to the same stacksize @@ -187,6 +189,9 @@ public class CompactingRecipe extends InputRecipe { is.getItemMeta().getLore().contains(compactedLore))) { return false; } + if (Tag.ITEMS_BUNDLES.isTagged(is.getType())) { + return false; + } return im.getAmount(is) >= getCompactStackSize(is.getType()); } diff --git a/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/DecompactingRecipe.java b/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/DecompactingRecipe.java index a4a6eb82c..0c8e081f5 100644 --- a/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/DecompactingRecipe.java +++ b/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/DecompactingRecipe.java @@ -6,6 +6,7 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; import org.bukkit.Material; +import org.bukkit.Tag; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @@ -154,6 +155,9 @@ public class DecompactingRecipe extends InputRecipe { } private boolean isDecompactable(ItemStack is) { + if (Tag.ITEMS_BUNDLES.isTagged(is.getType())) { + return false; + } List lore = is.getItemMeta().getLore(); if (lore != null) { for (String content : lore) {