aboutsummaryrefslogtreecommitdiff
path: root/runtime/src/main/java/me/shedaniel/rei/plugin/client
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2021-03-29 00:29:50 +0800
committershedaniel <daniel@shedaniel.me>2021-03-29 00:29:50 +0800
commit096a01c606f491f2bb7a07c3df8ac83f6d313086 (patch)
treeb8f788dd6ed087ef76a5c81d3b3378bc3b1cf7b3 /runtime/src/main/java/me/shedaniel/rei/plugin/client
parent7b44adc2bd4e1ef21cd229f5b52d3ddae58a8b20 (diff)
downloadRoughlyEnoughItems-096a01c606f491f2bb7a07c3df8ac83f6d313086.tar.gz
RoughlyEnoughItems-096a01c606f491f2bb7a07c3df8ac83f6d313086.tar.bz2
RoughlyEnoughItems-096a01c606f491f2bb7a07c3df8ac83f6d313086.zip
Use long for hashing the EntryStack
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'runtime/src/main/java/me/shedaniel/rei/plugin/client')
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java2
3 files changed, 4 insertions, 4 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java
index d4049d2e4..3b547fe2f 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientRuntimePlugin.java
@@ -189,7 +189,7 @@ public class DefaultClientRuntimePlugin implements REIClientPlugin {
private static class EntryStackFavoriteEntry extends FavoriteEntry {
private static final Function<EntryStack<?>, String> CANCEL_FLUID_AMOUNT = s -> null;
private final EntryStack<?> stack;
- private final int hashIgnoreAmount;
+ private final long hashIgnoreAmount;
public EntryStackFavoriteEntry(EntryStack<?> stack) {
this.stack = stack.normalize();
@@ -226,7 +226,7 @@ public class DefaultClientRuntimePlugin implements REIClientPlugin {
}
@Override
- public int hashIgnoreAmount() {
+ public long hashIgnoreAmount() {
return hashIgnoreAmount;
}
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
index 750dae613..aebfa33f9 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
@@ -112,7 +112,7 @@ public class FluidEntryDefinition implements EntryDefinition<FluidStack>, EntryS
}
@Override
- public int hash(EntryStack<FluidStack> entry, FluidStack value, ComparisonContext context) {
+ public long hash(EntryStack<FluidStack> entry, FluidStack value, ComparisonContext context) {
int code = 1;
code = 31 * code + value.getFluid().hashCode();
code = 31 * code + (context.isFuzzy() || !value.hasTag() ? 0 : value.getTag().hashCode());
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java
index 8f995af67..292ca0fb8 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java
@@ -108,7 +108,7 @@ public class ItemEntryDefinition implements EntryDefinition<ItemStack>, EntrySer
}
@Override
- public int hash(EntryStack<ItemStack> entry, ItemStack value, ComparisonContext context) {
+ public long hash(EntryStack<ItemStack> entry, ItemStack value, ComparisonContext context) {
int code = 1;
code = 31 * code + System.identityHashCode(value.getItem());
code = 31 * code + (context.isFuzzy() ? 0 : Long.hashCode(ItemComparatorRegistry.getInstance().hashOf(value)));