Get ModName from items more efficiently

mezz · Sep 16, 2016 · 4c448fe · 4c448fe
1 parent 0fbd364
commit 4c448fe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/mezz/jei/ItemRegistry.java b/src/main/java/mezz/jei/ItemRegistry.java
@@ -66,6 +66,11 @@ public String getModNameForItem(@Nullable Item item) {
 		return modList.getModNameForItem(item);
 	}
 
+	@Nonnull
+	public String getModNameForModId(@Nonnull String modId) {
+		return modList.getModNameForModId(modId);
+	}
+
 	@Nonnull
 	@Override
 	public ImmutableList<ItemStack> getItemListForModId(@Nullable String modId) {

diff --git a/src/main/java/mezz/jei/util/ItemStackElement.java b/src/main/java/mezz/jei/util/ItemStackElement.java
@@ -8,6 +8,7 @@
 
 import com.google.common.base.Joiner;
 import mezz.jei.Internal;
+import mezz.jei.ItemRegistry;
 import mezz.jei.config.Config;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.I18n;
@@ -65,7 +66,8 @@ private ItemStackElement(@Nonnull ItemStack itemStack) {
 		}
 
 		String modId = itemResourceLocation.getResourceDomain().toLowerCase(Locale.ENGLISH);
-		String modName = Internal.getItemRegistry().getModNameForItem(item).toLowerCase(Locale.ENGLISH);
+		ItemRegistry itemRegistry = Internal.getItemRegistry();
+		String modName = itemRegistry.getModNameForModId(modId).toLowerCase(Locale.ENGLISH);
 
 		String displayName = itemStack.getDisplayName();
 		if (displayName == null) {

diff --git a/src/main/java/mezz/jei/util/ModList.java b/src/main/java/mezz/jei/util/ModList.java
@@ -33,6 +33,11 @@ public String getModNameForItem(@Nonnull Item item) {
 			throw new NullPointerException("item.getRegistryName() returned null for: " + stackInfo);
 		}
 		String modId = itemResourceLocation.getResourceDomain();
+		return getModNameForModId(modId);
+	}
+
+	@Nonnull
+	public String getModNameForModId(@Nonnull String modId) {
 		String lowercaseModId = modId.toLowerCase(Locale.ENGLISH);
 		String modName = modNamesForIds.get(lowercaseModId);
 		if (modName == null) {