Merge remote-tracking branch 'origin/1.8' into 1.8.8

# Conflicts: # src/main/java/mezz/jei/plugins/vanilla/crafting/CraftingRecipeMaker.java # src/main/java/mezz/jei/util/ItemStackElement.java # src/main/java/mezz/jei/util/ModList.java
mezz · Dec 11, 2015 · af896d1 · af896d1
2 parents f0df1ef + 9cff918
commit af896d1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/mezz/jei/plugins/vanilla/crafting/CraftingRecipeMaker.java b/src/main/java/mezz/jei/plugins/vanilla/crafting/CraftingRecipeMaker.java
@@ -7,6 +7,7 @@
 
 public class CraftingRecipeMaker {
 
+	@SuppressWarnings("unchecked")
 	public static List<IRecipe> getCraftingRecipes() {
 		return CraftingManager.getInstance().getRecipeList();
 	}

diff --git a/src/main/java/mezz/jei/util/ItemStackElement.java b/src/main/java/mezz/jei/util/ItemStackElement.java
@@ -5,6 +5,7 @@
 import java.util.Locale;
 
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 
 import net.minecraftforge.fml.common.registry.GameData;
 
@@ -35,8 +36,9 @@ public static ItemStackElement create(@Nonnull ItemStack itemStack) {
 	private ItemStackElement(@Nonnull ItemStack itemStack) {
 		this.itemStack = itemStack;
 		this.localizedName = itemStack.getDisplayName().toLowerCase();
-
-		String modId = GameData.getItemRegistry().getNameForObject(itemStack.getItem()).getResourceDomain();
+
+		ResourceLocation itemResourceLocation = (ResourceLocation) GameData.getItemRegistry().getNameForObject(itemStack.getItem());
+		String modId = itemResourceLocation.getResourceDomain();
 		String modName = JEIManager.itemRegistry.getModNameForItem(itemStack.getItem());
 
 		this.modName = modId.toLowerCase(Locale.ENGLISH) + ' ' + modName.toLowerCase(Locale.ENGLISH);

diff --git a/src/main/java/mezz/jei/util/ModList.java b/src/main/java/mezz/jei/util/ModList.java
@@ -8,6 +8,7 @@
 import org.apache.commons.lang3.text.WordUtils;
 
 import net.minecraft.item.Item;
+import net.minecraft.util.ResourceLocation;
 
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.ModContainer;
@@ -28,10 +29,13 @@ public ModList() {
 
 	@Nonnull
 	public String getModNameForItem(@Nonnull Item item) {
-		String modId = GameData.getItemRegistry().getNameForObject(item).getResourceDomain();
-		String modName = modNamesForIds.get(modId.toLowerCase(Locale.ENGLISH));
+		ResourceLocation itemResourceLocation = (ResourceLocation) GameData.getItemRegistry().getNameForObject(item);
+		String modId = itemResourceLocation.getResourceDomain();
+		String lowercaseModId = modId.toLowerCase(Locale.ENGLISH);
+		String modName = modNamesForIds.get(lowercaseModId);
 		if (modName == null) {
 			modName = WordUtils.capitalize(modId);
+			modNamesForIds.put(lowercaseModId, modName);
 		}
 		return modName;
 	}