Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Improved Items#getCustomItem and Items#isCustomItem performance

Browse Source
This commit is contained in:
Auxilor
2022-01-12 15:59:25 +00:00
parent c3f88bf7b0
commit 08b563d528
1 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
eco-api/src/main/java/com/willfp/eco/core/items/Items.java
View File

@@ -1,5 +1,6 @@
package com.willfp.eco.core.items;
import com.willfp.eco.core.fast.FastItemStack;
import com.willfp.eco.core.items.args.LookupArgParser;
import com.willfp.eco.core.items.provider.ItemProvider;
import com.willfp.eco.core.recipe.parts.EmptyTestableItem;
@@ -34,6 +35,11 @@ public final class Items {
*/
private static final Map<NamespacedKey, TestableItem> REGISTRY = new ConcurrentHashMap<>();
/**
* Cached custom item lookups, using {@link FastItemStack#hashCode()}.
*/
private static final Map<Integer, NamespacedKey> CACHE = new ConcurrentHashMap<>();
/**
* All item providers.
*/
@@ -276,12 +282,7 @@ public final class Items {
* @return If is recipe.
*/
public static boolean isCustomItem(@NotNull final ItemStack itemStack) {
for (TestableItem item : REGISTRY.values()) {
if (item.matches(itemStack)) {
return true;
}
}
return false;
return getCustomItem(itemStack) != null;
}
/**
@@ -292,12 +293,35 @@ public final class Items {
*/
@Nullable
public static CustomItem getCustomItem(@NotNull final ItemStack itemStack) {
for (TestableItem item : REGISTRY.values()) {
if (item.matches(itemStack)) {
return getOrWrap(item);
int hash = FastItemStack.wrap(itemStack).hashCode();
NamespacedKey itemKey = CACHE.get(hash);
if (itemKey != null) {
TestableItem found = REGISTRY.get(itemKey);
if (found != null) {
return getOrWrap(found);
} else {
CACHE.remove(hash);
}
}
return null;
TestableItem match = null;
for (TestableItem item : REGISTRY.values()) {
if (item.matches(itemStack)) {
match = item;
break;
}
}
if (match == null) {
return null;
}
if (match instanceof CustomItem custom) {
CACHE.put(hash, custom.getKey());
}
return getOrWrap(match);
}
/**