Fix Ignore NBT in Not Working Properly in Robot Arms/Fluid Regulators (#3699)

Author: Bumperdo09

src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleFluidFilter.java

@@ -162,7 +162,8 @@ public int getTotalConfiguredFluidAmount(FluidStack fluidStack) {
         for (var candidate : matches) {
             if (ignoreNbt && candidate.getFluid() == fluidStack.getFluid()) {
                 totalAmount += candidate.getAmount();
-            } else if (candidate.isFluidEqual(fluidStack)) {
+            }
+            if (!ignoreNbt && candidate.isFluidEqual(fluidStack)) {
                 totalAmount += candidate.getAmount();
             }
         }

src/main/java/com/gregtechceu/gtceu/api/cover/filter/SimpleItemFilter.java

@@ -156,7 +156,8 @@ public int getTotalConfiguredItemCount(ItemStack itemStack) {
         for (var candidate : matches) {
             if (ignoreNbt && ItemStack.isSameItem(candidate, itemStack)) {
                 totalCount += candidate.getCount();
-            } else if (ItemStack.isSameItemSameTags(candidate, itemStack)) {
+            }
+            if (!ignoreNbt && ItemStack.isSameItemSameTags(candidate, itemStack)) {
                 totalCount += candidate.getCount();
             }
         }

src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemNetHandler.java

@@ -406,7 +406,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;
-            else if (!ItemStack.isSameItemSameTags(stack, slot)) continue;
+            if (!ignoreNBT && !ItemStack.isSameItemSameTags(stack, slot)) continue;
             if (arm.getFilterHandler().getFilter().test(slot)) {
                 count += slot.getCount();
             }