Use manual tag checking instead of IsSameItemSameTags (#4210)

YoungOnionMC · web-flow · commit c1ffc1f126d2 · 2025-11-25T12:30:39.000-07:00
diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java
@@ -119,7 +119,7 @@ public List<Object> compressIngredients(Collection<Object> ingredients) {
                             break;
                         }
                     } else if (obj instanceof ItemStack stack1) {
-                        if (ItemStack.isSameItemSameTags(stack, stack1)) {
+                        if (GTUtil.isSameItemSameTags(stack, stack1)) {
                             isEqual = true;
                             break;
                         }
diff --git a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleItemFilter.java b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleItemFilter.java
@@ -4,6 +4,7 @@
 import com.gregtechceu.gtceu.api.gui.widget.PhantomSlotWidget;
 import com.gregtechceu.gtceu.api.gui.widget.ToggleButtonWidget;
 import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler;
+import com.gregtechceu.gtceu.utils.GTUtil;
 
 import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup;
 
@@ -157,7 +158,7 @@ public int getTotalConfiguredItemCount(ItemStack itemStack) {
             if (ignoreNbt && ItemStack.isSameItem(candidate, itemStack)) {
                 totalCount += candidate.getCount();
             }
-            if (!ignoreNbt && ItemStack.isSameItemSameTags(candidate, itemStack)) {
+            if (!ignoreNbt && GTUtil.isSameItemSameTags(candidate, itemStack)) {
                 totalCount += candidate.getCount();
             }
         }
diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/TankWidget.java b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/TankWidget.java
@@ -10,6 +10,7 @@
 import com.gregtechceu.gtceu.integration.xei.handlers.fluid.CycleFluidEntryHandler;
 import com.gregtechceu.gtceu.integration.xei.handlers.fluid.CycleFluidStackHandler;
 import com.gregtechceu.gtceu.utils.FormattingUtil;
+import com.gregtechceu.gtceu.utils.GTUtil;
 
 import com.lowdragmc.lowdraglib.gui.editor.annotation.Configurable;
 import com.lowdragmc.lowdraglib.gui.editor.annotation.LDLRegister;
@@ -532,7 +533,7 @@ private int tryClickContainer(boolean isShiftKeyDown) {
 
                 if (filledResult.isEmpty()) {
                     filledResult = remainingStack.copy();
-                } else if (ItemStack.isSameItemSameTags(filledResult, remainingStack)) {
+                } else if (GTUtil.isSameItemSameTags(filledResult, remainingStack)) {
                     if (filledResult.getCount() < filledResult.getMaxStackSize())
                         filledResult.grow(1);
                     else
@@ -578,7 +579,7 @@ private int tryClickContainer(boolean isShiftKeyDown) {
 
                 if (drainedResult.isEmpty()) {
                     drainedResult = remainingStack.copy();
-                } else if (ItemStack.isSameItemSameTags(drainedResult, remainingStack)) {
+                } else if (GTUtil.isSameItemSameTags(drainedResult, remainingStack)) {
                     if (drainedResult.getCount() < drainedResult.getMaxStackSize())
                         drainedResult.grow(1);
                     else
diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableItemStackHandler.java b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableItemStackHandler.java
@@ -11,6 +11,7 @@
 import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredient;
 import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler;
 import com.gregtechceu.gtceu.utils.GTTransferUtils;
+import com.gregtechceu.gtceu.utils.GTUtil;
 
 import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced;
 import com.lowdragmc.lowdraglib.syncdata.annotation.Persisted;
@@ -134,7 +135,7 @@ public static List<Ingredient> handleRecipe(IO io, GTRecipe recipe, List<Ingredi
                     int outputStorageLimit = 0;
                     for (int slot = 0; slot < storage.getSlots(); ++slot) {
                         ItemStack stack = storage.getStackInSlot(slot);
-                        if (stack.isEmpty() || ItemStack.isSameItemSameTags(stack, output)) {
+                        if (stack.isEmpty() || GTUtil.isSameItemSameTags(stack, output)) {
                             outputStorageLimit += storage.getSlotLimit(slot) - stack.getCount();
                         }
                     }
@@ -175,7 +176,7 @@ public static List<Ingredient> handleRecipe(IO io, GTRecipe recipe, List<Ingredi
                 } else { // IO.OUT
                     ItemStack output = items[0].copyWithCount(amount);
                     // Only try this slot if not visited or if visited with the same type of item
-                    if (visited[slot] == null || ItemStack.isSameItemSameTags(visited[slot], output)) {
+                    if (visited[slot] == null || GTUtil.isSameItemSameTags(visited[slot], output)) {
                         if (count < output.getMaxStackSize() && count < storage.getSlotLimit(slot)) {
                             var remainder = getActioned(storage, slot, recipe.ingredientActions);
                             if (remainder == null) remainder = storage.insertItem(slot, output, simulate);
diff --git a/src/main/java/com/gregtechceu/gtceu/api/pattern/BlockPattern.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/BlockPattern.java
@@ -12,6 +12,7 @@
 import com.gregtechceu.gtceu.api.pattern.predicates.SimplePredicate;
 import com.gregtechceu.gtceu.api.pattern.util.PatternMatchContext;
 import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection;
+import com.gregtechceu.gtceu.utils.GTUtil;
 
 import com.lowdragmc.lowdraglib.utils.BlockInfo;
 
@@ -649,7 +650,7 @@ private static IntObjectPair<IItemHandler> getMatchStackWithHandler(
                 if (rt != null) {
                     return rt;
                 }
-            } else if (candidates.stream().anyMatch(candidate -> ItemStack.isSameItemSameTags(candidate, stack)) &&
+            } else if (candidates.stream().anyMatch(candidate -> GTUtil.isSameItemSameTags(candidate, stack)) &&
                     !stack.isEmpty() && stack.getItem() instanceof BlockItem) {
                         return IntObjectPair.of(i, handler);
                     }
diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/GTRecipeLookup.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/GTRecipeLookup.java
@@ -13,6 +13,7 @@
 import com.gregtechceu.gtceu.common.data.GTRecipeTypes;
 import com.gregtechceu.gtceu.common.item.armor.PowerlessJetpack;
 import com.gregtechceu.gtceu.config.ConfigHolder;
+import com.gregtechceu.gtceu.utils.GTUtil;
 
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.item.ItemStack;
@@ -145,7 +146,7 @@ public static ItemStack[] uniqueItems(@NotNull Collection<ItemStack> inputs) {
             if (index > 0) {
                 for (ItemStack unique : uniqueItems) {
                     if (unique == null) break;
-                    else if (ItemStack.isSameItemSameTags(input, unique)) {
+                    else if (GTUtil.isSameItemSameTags(input, unique)) {
                         continue main;
                     }
                 }
diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/item/StrictNBTItemStackMapIngredient.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/lookup/ingredient/item/StrictNBTItemStackMapIngredient.java
@@ -2,6 +2,7 @@
 
 import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.AbstractMapIngredient;
 import com.gregtechceu.gtceu.core.mixins.forge.StrictNBTIngredientAccessor;
+import com.gregtechceu.gtceu.utils.GTUtil;
 import com.gregtechceu.gtceu.utils.ItemStackHashStrategy;
 
 import net.minecraft.world.item.ItemStack;
@@ -55,7 +56,7 @@ public boolean equals(Object obj) {
             }
             if (this.nbtIngredient != null) {
                 if (other.nbtIngredient != null) {
-                    return ItemStack.isSameItemSameTags(((StrictNBTIngredientAccessor) nbtIngredient).getStack(),
+                    return GTUtil.isSameItemSameTags(((StrictNBTIngredientAccessor) nbtIngredient).getStack(),
                             ((StrictNBTIngredientAccessor) other.nbtIngredient).getStack());
                 } else {
                     this.nbtIngredient.test(other.stack);
diff --git a/src/main/java/com/gregtechceu/gtceu/client/util/RenderUtil.java b/src/main/java/com/gregtechceu/gtceu/client/util/RenderUtil.java
@@ -6,6 +6,7 @@
 import com.gregtechceu.gtceu.api.recipe.content.Content;
 import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient;
 import com.gregtechceu.gtceu.utils.GTMatrixUtils;
+import com.gregtechceu.gtceu.utils.GTUtil;
 import com.gregtechceu.gtceu.utils.ResearchManager;
 
 import com.lowdragmc.lowdraglib.gui.util.DrawerHelper;
@@ -298,7 +299,7 @@ public static boolean renderResearchItemContent(GuiGraphics graphics, Operation<
                 ItemStack[] items = ItemRecipeCapability.CAP.of(outputs.get(0).content).getItems();
                 if (items.length > 0) {
                     ItemStack output = items[0];
-                    if (!output.isEmpty() && !ItemStack.isSameItemSameTags(output, stack)) {
+                    if (!output.isEmpty() && !GTUtil.isSameItemSameTags(output, stack)) {
                         originalMethod.call(entity, level, output, x, y, seed, z);
                         return true;
                     }
diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/ConveyorCover.java b/src/main/java/com/gregtechceu/gtceu/common/cover/ConveyorCover.java
@@ -20,6 +20,7 @@
 import com.gregtechceu.gtceu.common.cover.data.DistributionMode;
 import com.gregtechceu.gtceu.common.cover.data.ManualIOMode;
 import com.gregtechceu.gtceu.utils.GTTransferUtils;
+import com.gregtechceu.gtceu.utils.GTUtil;
 import com.gregtechceu.gtceu.utils.ItemStackHashStrategy;
 
 import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup;
@@ -280,7 +281,7 @@ protected static boolean moveInventoryItemsExact(IItemHandler sourceInventory, I
             int slotIndex = itemInfo.slots.getInt(i);
             ItemStack extractedStack = sourceInventory.extractItem(slotIndex, itemsLeftToExtract, true);
             if (!extractedStack.isEmpty() &&
-                    ItemStack.isSameItemSameTags(resultStack, extractedStack)) {
+                    GTUtil.isSameItemSameTags(resultStack, extractedStack)) {
                 totalExtractedCount += extractedStack.getCount();
                 itemsLeftToExtract -= extractedStack.getCount();
             }
@@ -312,7 +313,7 @@ protected static boolean moveInventoryItemsExact(IItemHandler sourceInventory, I
             int slotIndex = itemInfo.slots.getInt(i);
             ItemStack extractedStack = sourceInventory.extractItem(slotIndex, itemsLeftToExtract, false);
             if (!extractedStack.isEmpty() &&
-                    ItemStack.isSameItemSameTags(resultStack, extractedStack)) {
+                    GTUtil.isSameItemSameTags(resultStack, extractedStack)) {
                 itemsLeftToExtract -= extractedStack.getCount();
             }
             if (itemsLeftToExtract == 0) {
diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/AdvancedItemVoidingCover.java b/src/main/java/com/gregtechceu/gtceu/common/cover/voiding/AdvancedItemVoidingCover.java
@@ -7,6 +7,7 @@
 import com.gregtechceu.gtceu.api.gui.widget.EnumSelectorWidget;
 import com.gregtechceu.gtceu.api.gui.widget.IntInputWidget;
 import com.gregtechceu.gtceu.common.cover.data.VoidingMode;
+import com.gregtechceu.gtceu.utils.GTUtil;
 
 import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup;
 import com.lowdragmc.lowdraglib.syncdata.annotation.DescSynced;
@@ -73,7 +74,7 @@ private void voidOverflow(IItemHandler handler) {
 
             for (int slot = 0; slot < handler.getSlots(); slot++) {
                 ItemStack is = handler.getStackInSlot(slot);
-                if (!is.isEmpty() && ItemStack.isSameItemSameTags(is, itemInfo.itemStack)) {
+                if (!is.isEmpty() && GTUtil.isSameItemSameTags(is, itemInfo.itemStack)) {
                     ItemStack extracted = handler.extractItem(slot, itemToVoidAmount, false);
 
                     if (!extracted.isEmpty()) {
diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HarvestCropsBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/HarvestCropsBehavior.java
@@ -4,6 +4,7 @@
 import com.gregtechceu.gtceu.api.item.tool.aoe.AoESymmetrical;
 import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior;
 import com.gregtechceu.gtceu.common.data.item.GTToolActions;
+import com.gregtechceu.gtceu.utils.GTUtil;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
@@ -92,7 +93,7 @@ private static boolean harvestBlockRoutine(BlockPos pos, UseOnContext context) {
                 var drops = Block.getDrops(blockState, (ServerLevel) level, pos, null);
                 boolean removedSeed = false;
                 for (ItemStack drop : drops) {
-                    if (!removedSeed && ItemStack.isSameItemSameTags(drop, seed)) {
+                    if (!removedSeed && GTUtil.isSameItemSameTags(drop, seed)) {
                         drop.shrink(1);
                         removedSeed = true;
                         if (drop.isEmpty()) continue;
diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CreativeChestMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/CreativeChestMachine.java
@@ -5,6 +5,7 @@
 import com.gregtechceu.gtceu.api.gui.widget.PhantomSlotWidget;
 import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
 import com.gregtechceu.gtceu.api.machine.MetaMachine;
+import com.gregtechceu.gtceu.utils.GTUtil;
 
 import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup;
 import com.lowdragmc.lowdraglib.gui.texture.ResourceBorderTexture;
@@ -156,7 +157,7 @@ public void setStackInSlot(int index, ItemStack stack) {
 
         @Override
         public @NotNull ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate) {
-            if (!stored.isEmpty() && ItemStack.isSameItemSameTags(stored, stack)) return ItemStack.EMPTY;
+            if (!stored.isEmpty() && GTUtil.isSameItemSameTags(stored, stack)) return ItemStack.EMPTY;
             return stack;
         }
 
diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/QuantumChestMachine.java
@@ -21,6 +21,7 @@
 import com.gregtechceu.gtceu.utils.FormattingUtil;
 import com.gregtechceu.gtceu.utils.GTMath;
 import com.gregtechceu.gtceu.utils.GTTransferUtils;
+import com.gregtechceu.gtceu.utils.GTUtil;
 
 import com.lowdragmc.lowdraglib.gui.editor.Icons;
 import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup;
@@ -389,7 +390,7 @@ public Widget createUIWidget() {
                             }
                         }))
                 .addWidget(new PhantomSlotWidget(lockedItem, 0, 58, 41,
-                        stack -> stored.isEmpty() || ItemStack.isSameItemSameTags(stack, stored))
+                        stack -> stored.isEmpty() || GTUtil.isSameItemSameTags(stack, stored))
                         .setMaxStackSize(1))
                 .addWidget(new ToggleButtonWidget(4, 41, 18, 18,
                         GuiTextures.BUTTON_ITEM_OUTPUT, this::isAutoOutputItems, this::setAutoOutputItems)
@@ -446,7 +447,7 @@ public Widget createUIWidget() {
     protected class ItemCache extends MachineTrait implements IItemHandlerModifiable {
 
         private final Predicate<ItemStack> filter = i -> !isLocked() ||
-                ItemStack.isSameItemSameTags(i, getLockedItem());
+                GTUtil.isSameItemSameTags(i, getLockedItem());
 
         public ItemCache(MetaMachine holder) {
             super(holder);
diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemNetHandler.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemNetHandler.java
@@ -12,6 +12,7 @@
 import com.gregtechceu.gtceu.common.cover.RobotArmCover;
 import com.gregtechceu.gtceu.common.cover.data.FilterMode;
 import com.gregtechceu.gtceu.utils.FacingPos;
+import com.gregtechceu.gtceu.utils.GTUtil;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -353,7 +354,7 @@ public static int countStack(IItemHandler handler, ItemStack stack, RobotArmCove
             ItemStack slot = handler.getStackInSlot(i);
             if (slot.isEmpty()) continue;
             if (ignoreNBT && !ItemStack.isSameItem(stack, slot)) continue;
-            if (!ignoreNBT && !ItemStack.isSameItemSameTags(stack, slot)) continue;
+            if (!ignoreNBT && !GTUtil.isSameItemSameTags(stack, slot)) continue;
             if (arm.getFilterHandler().getFilter().test(slot)) {
                 count += slot.getCount();
             }
diff --git a/src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java b/src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java
@@ -604,6 +604,10 @@ public static void addPotionTooltip(List<Pair<MobEffectInstance, Float>> effects
         });
     }
 
+    public static boolean isSameItemSameTags(ItemStack s1, ItemStack s2) {
+        return (ItemStack.isSameItem(s1, s2) && Objects.equals(s1.getTag(), s2.getTag()));
+    }
+
     public static <T> T getLast(List<T> list) {
         return list.get(list.size() - 1);
     }
diff --git a/src/main/java/com/gregtechceu/gtceu/utils/OverlayedItemHandler.java b/src/main/java/com/gregtechceu/gtceu/utils/OverlayedItemHandler.java
@@ -56,7 +56,7 @@ public int insertStackedItemStack(@NotNull ItemStack stack, int amountToInsert)
             initSlot(i);
             // if it's the same item or there is no item in the slot
             ItemStack slotKey = this.slots[i].getItemStack();
-            if (slotKey.isEmpty() || ItemStack.isSameItemSameTags(slotKey, stack)) {
+            if (slotKey.isEmpty() || GTUtil.isSameItemSameTags(slotKey, stack)) {
                 // if the slot is not full
                 int canInsertUpTo = Math.min(this.slots[i].getSlotLimit() - this.slots[i].getCount(),
                         stack.getMaxStackSize());
@@ -140,7 +140,7 @@ public ItemStack getItemStack() {
         }
 
         public void setItemStack(@NotNull ItemStack itemStack) {
-            if (!ItemStack.isSameItemSameTags(this.itemStack, itemStack)) {
+            if (!GTUtil.isSameItemSameTags(this.itemStack, itemStack)) {
                 this.itemStack = itemStack;
                 this.slotLimit = Math.min(itemStack.getMaxStackSize(), slotLimit);
             }

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public List<Object> compressIngredients(Collection<Object> ingredients) {`
`119`	`119`	`break;`
`120`	`120`	`}`
`121`	`121`	`} else if (obj instanceof ItemStack stack1) {`
`122`		`- if (ItemStack.isSameItemSameTags(stack, stack1)) {`
	`122`	`+ if (GTUtil.isSameItemSameTags(stack, stack1)) {`
`123`	`123`	`isEqual = true;`
`124`	`124`	`break;`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import com.gregtechceu.gtceu.api.gui.widget.PhantomSlotWidget;`
`5`	`5`	`import com.gregtechceu.gtceu.api.gui.widget.ToggleButtonWidget;`
`6`	`6`	`import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler;`
	`7`	`+import com.gregtechceu.gtceu.utils.GTUtil;`
`7`	`8`
`8`	`9`	`import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup;`
`9`	`10`
`@@ -157,7 +158,7 @@ public int getTotalConfiguredItemCount(ItemStack itemStack) {`
`157`	`158`	`if (ignoreNbt && ItemStack.isSameItem(candidate, itemStack)) {`
`158`	`159`	`totalCount += candidate.getCount();`
`159`	`160`	`}`
`160`		`- if (!ignoreNbt && ItemStack.isSameItemSameTags(candidate, itemStack)) {`
	`161`	`+ if (!ignoreNbt && GTUtil.isSameItemSameTags(candidate, itemStack)) {`
`161`	`162`	`totalCount += candidate.getCount();`
`162`	`163`	`}`
`163`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`import com.gregtechceu.gtceu.api.pattern.predicates.SimplePredicate;`
`13`	`13`	`import com.gregtechceu.gtceu.api.pattern.util.PatternMatchContext;`
`14`	`14`	`import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection;`
	`15`	`+import com.gregtechceu.gtceu.utils.GTUtil;`
`15`	`16`
`16`	`17`	`import com.lowdragmc.lowdraglib.utils.BlockInfo;`
`17`	`18`
`@@ -649,7 +650,7 @@ private static IntObjectPair<IItemHandler> getMatchStackWithHandler(`
`649`	`650`	`if (rt != null) {`
`650`	`651`	`return rt;`
`651`	`652`	`}`
`652`		`- } else if (candidates.stream().anyMatch(candidate -> ItemStack.isSameItemSameTags(candidate, stack)) &&`
	`653`	`+ } else if (candidates.stream().anyMatch(candidate -> GTUtil.isSameItemSameTags(candidate, stack)) &&`
`653`	`654`	`!stack.isEmpty() && stack.getItem() instanceof BlockItem) {`
`654`	`655`	`return IntObjectPair.of(i, handler);`
`655`	`656`	`}`