Update to use newer Registry methods

changelog.html

@@ -1,3 +1,11 @@
+<h2>3.2.2</h2>
+<h4>Fixes:</h4>
+<ul>
+    <li>Update to use newer Registry methods.</li>
+</ul>
+<br/>
+<hr/>
+
 <h2>3.2.1</h2>
 <h4>Fixes:</h4>
 <ul>

gradle.properties

@@ -5,4 +5,4 @@ curse_project_id=238222
 
 version_major=3
 version_minor=2
-version_patch=1
+version_patch=2

src/main/java/mezz/jei/JustEnoughItems.java

@@ -56,7 +56,8 @@ public void preInit(@Nonnull FMLPreInitializationEvent event) {
 			String name = "jeiDebug";
 			Item debugItem = new DebugItem(name);
 			debugItem.setUnlocalizedName(name);
-			GameRegistry.registerItem(debugItem, name);
+			debugItem.setRegistryName(name);
+			GameRegistry.register(debugItem);
 		}
 	}
 

src/main/java/mezz/jei/util/ItemStackElement.java

@@ -58,7 +58,7 @@ private ItemStackElement(@Nonnull ItemStack itemStack) {
 		Item item = itemStack.getItem();
 
 		EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-		ResourceLocation itemResourceLocation = GameData.getItemRegistry().getNameForObject(item);
+		ResourceLocation itemResourceLocation = Item.itemRegistry.getNameForObject(item);
 		String modId = itemResourceLocation.getResourceDomain().toLowerCase(Locale.ENGLISH);
 		String modName = Internal.getItemRegistry().getModNameForItem(item).toLowerCase(Locale.ENGLISH);
 

src/main/java/mezz/jei/util/ModList.java

@@ -29,7 +29,7 @@ public ModList() {
 
 	@Nonnull
 	public String getModNameForItem(@Nonnull Item item) {
-		ResourceLocation itemResourceLocation = GameData.getItemRegistry().getNameForObject(item);
+		ResourceLocation itemResourceLocation = Item.itemRegistry.getNameForObject(item);
 		String modId = itemResourceLocation.getResourceDomain();
 		String lowercaseModId = modId.toLowerCase(Locale.ENGLISH);
 		String modName = modNamesForIds.get(lowercaseModId);

src/main/java/mezz/jei/util/StackHelper.java

@@ -10,8 +10,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry;
-import net.minecraftforge.fml.common.registry.GameData;
 import net.minecraftforge.oredict.OreDictionary;
 
 import javax.annotation.Nonnull;
@@ -322,10 +320,9 @@ public String getModId(@Nonnull ItemStack stack) {
 
 	@Nonnull
 	public String getModId(@Nonnull Item item) {
-		FMLControlledNamespacedRegistry<Item> itemRegistry = GameData.getItemRegistry();
-		ResourceLocation itemName = itemRegistry.getNameForObject(item);
+		ResourceLocation itemName = Item.itemRegistry.getNameForObject(item);
 		if (itemName == null) {
-			throw new NullPointerException("GameData.getItemRegistry().getNameForObject returned null for: " + item.getClass());
+			throw new NullPointerException("Item.itemRegistry.getNameForObject returned null for: " + item.getClass());
 		}
 
 		return itemName.getResourceDomain();
@@ -350,10 +347,9 @@ public String getUniqueIdentifierForStack(@Nonnull ItemStack stack, @Nonnull Uid
 			throw new NullPointerException("Found an itemStack with a null item. This is an error from another mod.");
 		}
 
-		FMLControlledNamespacedRegistry<Item> itemRegistry = GameData.getItemRegistry();
-		ResourceLocation itemName = itemRegistry.getNameForObject(item);
+		ResourceLocation itemName = Item.itemRegistry.getNameForObject(item);
 		if (itemName == null) {
-			throw new NullPointerException("GameData.getItemRegistry().getNameForObject returned null for: " + item.getClass());
+			throw new NullPointerException("Item.itemRegistry.getNameForObject returned null for: " + item.getClass());
 		}
 
 		String itemNameString = itemName.toString();