diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-03-19 19:16:12 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-03-19 19:16:12 +0800 |
| commit | d21a84ac2e07fe30685f1d703481425b0f01c93d (patch) | |
| tree | 4089e62da73a4346de41b486603c3316f0201cc8 /runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java | |
| parent | 43ae584e12c7ed0755301eb34223f644a717183e (diff) | |
| download | RoughlyEnoughItems-d21a84ac2e07fe30685f1d703481425b0f01c93d.tar.gz RoughlyEnoughItems-d21a84ac2e07fe30685f1d703481425b0f01c93d.tar.bz2 RoughlyEnoughItems-d21a84ac2e07fe30685f1d703481425b0f01c93d.zip | |
Implement ItemComparatorRegistry as a replacement for previous check tags and check amount flags
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java index 450248dbe..e2e2460a6 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java @@ -34,7 +34,7 @@ import me.shedaniel.rei.api.config.ConfigObject; import me.shedaniel.rei.api.REIHelper; import me.shedaniel.rei.api.gui.config.RecipeScreenType; import me.shedaniel.rei.api.ingredient.EntryStack; -import me.shedaniel.rei.api.ingredient.entry.VanillaEntryTypes; +import me.shedaniel.rei.api.ingredient.entry.type.VanillaEntryTypes; import me.shedaniel.rei.api.ingredient.util.EntryStacks; import me.shedaniel.rei.api.registry.display.Display; import me.shedaniel.rei.api.registry.display.DisplayCategory; @@ -152,7 +152,7 @@ public class ClientHelperImpl implements ClientHelper { if (ConfigObject.getInstance().isGrabbingItems() && Minecraft.getInstance().screen instanceof CreativeModeInventoryScreen) { Inventory inventory = Minecraft.getInstance().player.inventory; EntryStack<ItemStack> stack = entry.copy(); - if (!inventory.getCarried().isEmpty() && EntryStacks.equalsIgnoreCount(EntryStacks.of(inventory.getCarried()), stack)) { + if (!inventory.getCarried().isEmpty() && EntryStacks.equalsExact(EntryStacks.of(inventory.getCarried()), stack)) { stack.getValue().setCount(Mth.clamp(stack.getValue().getCount() + inventory.getCarried().getCount(), 1, stack.getValue().getMaxStackSize())); } else if (!inventory.getCarried().isEmpty()) { return false; @@ -162,7 +162,7 @@ public class ClientHelperImpl implements ClientHelper { } else if (RoughlyEnoughItemsCore.canUsePackets()) { Inventory inventory = Minecraft.getInstance().player.inventory; EntryStack<ItemStack> stack = entry.copy(); - if (!inventory.getCarried().isEmpty() && !EntryStacks.equalsIgnoreCount(EntryStacks.of(inventory.getCarried()), stack)) { + if (!inventory.getCarried().isEmpty() && !EntryStacks.equalsExact(EntryStacks.of(inventory.getCarried()), stack)) { return false; } try { |
