aboutsummaryrefslogtreecommitdiff
path: root/api/src/main/java/me/shedaniel
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 /api/src/main/java/me/shedaniel
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 'api/src/main/java/me/shedaniel')
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java4
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java8
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryDefinition.java2
-rw-r--r--api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java4
4 files changed, 9 insertions, 9 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java b/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java
index 9ca3b960e..662338b0c 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java
@@ -76,7 +76,7 @@ public abstract class FavoriteEntry {
return Optional.empty();
}
- public abstract int hashIgnoreAmount();
+ public abstract long hashIgnoreAmount();
public abstract FavoriteEntry copy();
@@ -96,7 +96,7 @@ public abstract class FavoriteEntry {
public int hashCode() {
int result = 1;
result = 31 * result + getType().hashCode();
- result = 31 * result + hashIgnoreAmount();
+ result = 31 * result + Long.hashCode(hashIgnoreAmount());
return result;
}
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java
index 9765edb99..c4b2205ae 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/SimpleDisplayRenderer.java
@@ -24,8 +24,8 @@
package me.shedaniel.rei.api.client.gui;
import com.mojang.blaze3d.vertex.PoseStack;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
+import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
+import it.unimi.dsi.fastutil.longs.LongSet;
import me.shedaniel.math.Point;
import me.shedaniel.math.Rectangle;
import me.shedaniel.rei.api.client.gui.widgets.Slot;
@@ -84,12 +84,12 @@ public class SimpleDisplayRenderer extends DisplayRenderer implements WidgetHold
}
public static boolean equalsList(EntryIngredient left, EntryIngredient right) {
- IntSet leftBytes = new IntOpenHashSet(left.size());
+ LongSet leftBytes = new LongOpenHashSet(left.size());
for (EntryStack<?> entryStack : left) {
leftBytes.add(EntryStacks.hashExact(entryStack));
}
if (leftBytes.size() > right.size()) return false;
- IntSet rightBytes = new IntOpenHashSet(right.size());
+ LongSet rightBytes = new LongOpenHashSet(right.size());
for (EntryStack<?> entryStack : right) {
rightBytes.add(EntryStacks.hashExact(entryStack));
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryDefinition.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryDefinition.java
index 04ea05d7f..2b41f0cd7 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryDefinition.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryDefinition.java
@@ -59,7 +59,7 @@ public interface EntryDefinition<T> {
T normalize(EntryStack<T> entry, T value);
- int hash(EntryStack<T> entry, T value, ComparisonContext context);
+ long hash(EntryStack<T> entry, T value, ComparisonContext context);
boolean equals(T o1, T o2, ComparisonContext context);
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java
index 58cf1ada5..c8b1b86e9 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java
@@ -157,7 +157,7 @@ public final class EntryStacks {
* @param <T> the type of the stack
* @return the hash code of the {@link ComparisonContext#EXACT} context
*/
- public static <T> int hashExact(EntryStack<T> stack) {
+ public static <T> long hashExact(EntryStack<T> stack) {
return stack.getDefinition().hash(stack, stack.getValue(), ComparisonContext.EXACT);
}
@@ -171,7 +171,7 @@ public final class EntryStacks {
* @param <T> the type of the stack
* @return the hash code of the {@link ComparisonContext#FUZZY} context
*/
- public static <T> int hashFuzzy(EntryStack<T> stack) {
+ public static <T> long hashFuzzy(EntryStack<T> stack) {
return stack.getDefinition().hash(stack, stack.getValue(), ComparisonContext.FUZZY);
}