Skip to content

use forge tag comparison instead of string comparison #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tofof wants to merge 1 commit into
base: 1.11
Choose a base branch
from
+2 −15
Open

use forge tag comparison instead of string comparison #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/main/java/mcjty/rftoolscontrol/blocks/processor/ProcessorTileEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,18 +846,13 @@ public ItemStack getCraftResult(IProgram program) {
}

private ItemStack findCraftingCard(IItemHandler handler, ItemStack craftResult) {
String resultNBT = "";
if (craftResult.hasTagCompound()) {
resultNBT = craftResult.serializeNBT().toString();
}
for (int j = 0 ; j < handler.getSlots() ; j++) {
ItemStack s = handler.getStackInSlot(j);
if (ItemStackTools.isValid(s) && s.getItem() == ModItems.craftingCardItem) {
ItemStack result = CraftingCardItem.getResult(s);

if (ItemStackTools.isValid(result) && result.isItemEqual(craftResult)) {
if (craftResult.hasTagCompound()) {
if (resultNBT.equalsIgnoreCase(result.serializeNBT().toString())) {
if (ItemStack.areItemStackTagsEqual(craftResult, result)) {
return s;
}
} else {
Expand Down
10 changes: 1 addition & 9 deletions src/main/java/mcjty/rftoolscontrol/logic/InventoryTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,7 @@ public static ItemStack extractItem(@Nullable IItemHandler itemHandler, @Nullabl
public static boolean isEqualAdvanced(ItemStack itemMatcher, ItemStack stack, boolean strictnbt) {
if (ItemStackTools.isValid(stack) && ItemStack.areItemsEqual(stack, itemMatcher)) {
if (strictnbt) {
if (itemMatcher.hasTagCompound() || stack.hasTagCompound()) {
String t1 = itemMatcher.serializeNBT().toString();
String t2 = stack.serializeNBT().toString();
if (t1.equalsIgnoreCase(t2)) {
return true;
}
} else {
return true;
}
return (!itemMatcher.hasTagCompound() || ItemStack.areItemStackTagsEqual(stack, itemMatcher));
} else {
return true;
}
Expand Down