Update to 1.11

build.gradle

@@ -90,7 +90,7 @@ curseforge {
 		id = curse_project_id
 		changelog = file('changelog.html')
 		changelogType = 'html'
-		releaseType = 'beta'
+		releaseType = 'alpha'
 	}
 }
 

gradle.properties

@@ -1,6 +1,6 @@
-mcversion=1.10.2
-forgeversion=12.18.2.2125
-mcp_mappings=snapshot_20161111
+mcversion=1.11
+forgeversion=13.19.0.2127-1.11.x
+mcp_mappings=snapshot_20161115
 curse_project_id=238222
 
 version_major=4

src/main/java/mezz/jei/ItemBlacklist.java

@@ -27,8 +27,8 @@ public void addItemToBlacklist(@Nullable ItemStack itemStack) {
 			Log.error("Null itemStack", new NullPointerException());
 			return;
 		}
-		if (itemStack.getItem() == null) {
-			Log.error("Null item in itemStack", new NullPointerException());
+		if (itemStack.func_190926_b()) {
+			Log.error("Invalid itemStack", new IllegalArgumentException());
 			return;
 		}
 
@@ -42,8 +42,8 @@ public void removeItemFromBlacklist(@Nullable ItemStack itemStack) {
 			Log.error("Null itemStack", new NullPointerException());
 			return;
 		}
-		if (itemStack.getItem() == null) {
-			Log.error("Null item in itemStack", new NullPointerException());
+		if (itemStack.func_190926_b()) {
+			Log.error("Invalid itemStack", new IllegalArgumentException());
 			return;
 		}
 
@@ -57,8 +57,8 @@ public boolean isItemBlacklisted(@Nullable ItemStack itemStack) {
 			Log.error("Null itemStack", new NullPointerException());
 			return false;
 		}
-		if (itemStack.getItem() == null) {
-			Log.error("Null item in itemStack", new NullPointerException());
+		if (itemStack.func_190926_b()) {
+			Log.error("Invalid itemStack", new IllegalArgumentException());
 			return false;
 		}
 

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

@@ -16,8 +16,8 @@
 		name = Constants.NAME,
 		version = Constants.VERSION,
 		guiFactory = "mezz.jei.config.JEIModGuiFactory",
-		acceptedMinecraftVersions = "[1.10]",
-		dependencies = "required-after:Forge@[12.18.1.2053,);")
+		acceptedMinecraftVersions = "[1.11]",
+		dependencies = "required-after:forge@13.19.0.2127,);")
 public class JustEnoughItems {
 
 	@SuppressWarnings("NullableProblems")

src/main/java/mezz/jei/ProxyCommonClient.java

@@ -116,7 +116,7 @@ public void onResourceManagerReload(IResourceManager resourceManager) {
 
 	@SubscribeEvent
 	public void onEntityJoinedWorld(EntityJoinWorldEvent event) {
-		if (event.getWorld().isRemote && !SessionData.hasJoinedWorld() && Minecraft.getMinecraft().thePlayer != null) {
+		if (event.getWorld().isRemote && !SessionData.hasJoinedWorld() && Minecraft.getMinecraft().player != null) {
 			SessionData.setJoinedWorld();
 			Config.syncWorldConfig();
 		}

src/main/java/mezz/jei/RecipeRegistry.java

@@ -38,7 +38,6 @@
 import mezz.jei.util.Log;
 import mezz.jei.util.RecipeCategoryComparator;
 import mezz.jei.util.RecipeMap;
-import mezz.jei.util.StackHelper;
 import net.minecraft.block.Block;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Container;
@@ -212,24 +211,10 @@ private <T> void addRecipe(T recipe, Class<? extends T> recipeClass) {
 			addRecipeUnchecked(recipe, recipeCategory, recipeHandler);
 		} catch (RuntimeException e) {
 			String recipeInfo = ErrorUtil.getInfoFromBrokenRecipe(recipe, recipeHandler);
-
-			// suppress the null item in stack exception, that information is redundant here.
-			String errorMessage = e.getMessage();
-			if (StackHelper.nullItemInStack.equals(errorMessage)) {
-				Log.error("Found a broken recipe: {}\n", recipeInfo);
-			} else {
-				Log.error("Found a broken recipe: {}\n", recipeInfo, e);
-			}
+			Log.error("Found a broken recipe: {}\n", recipeInfo, e);
 		} catch (LinkageError e) {
 			String recipeInfo = ErrorUtil.getInfoFromBrokenRecipe(recipe, recipeHandler);
-
-			// suppress the null item in stack exception, that information is redundant here.
-			String errorMessage = e.getMessage();
-			if (StackHelper.nullItemInStack.equals(errorMessage)) {
-				Log.error("Found a broken recipe: {}\n", recipeInfo);
-			} else {
-				Log.error("Found a broken recipe: {}\n", recipeInfo, e);
-			}
+			Log.error("Found a broken recipe: {}\n", recipeInfo, e);
 		}
 	}
 

src/main/java/mezz/jei/SubtypeRegistry.java

@@ -52,12 +52,12 @@ public String getSubtypeInfo(@Nullable ItemStack itemStack) {
 			return null;
 		}
 
-		Item item = itemStack.getItem();
-		if (item == null) {
-			Log.error("Null item", new NullPointerException());
+		if (itemStack.func_190926_b()) {
+			Log.error("Invalid ItemStack", new IllegalArgumentException());
 			return null;
 		}
 
+		Item item = itemStack.getItem();
 		ISubtypeInterpreter nbtInterpreter = interpreters.get(item);
 		if (nbtInterpreter != null) {
 			return nbtInterpreter.getSubtypeInfo(itemStack);

src/main/java/mezz/jei/config/JEIModConfigGui.java

@@ -33,7 +33,7 @@ private static GuiScreen getParent(GuiScreen parent) {
 			if (parentScreen != null) {
 				return parentScreen;
 			} else {
-				return new GuiInventory(parent.mc.thePlayer);
+				return new GuiInventory(parent.mc.player);
 			}
 		}
 		return parent;
@@ -42,7 +42,7 @@ private static GuiScreen getParent(GuiScreen parent) {
 	private static List<IConfigElement> getConfigElements() {
 		List<IConfigElement> configElements = new ArrayList<IConfigElement>();
 
-		if (Minecraft.getMinecraft().theWorld != null) {
+		if (Minecraft.getMinecraft().world != null) {
 			Configuration worldConfig = Config.getWorldConfig();
 			if (worldConfig != null) {
 				ConfigCategory categoryWorldConfig = worldConfig.getCategory(SessionData.getWorldUid());

src/main/java/mezz/jei/gui/ItemListOverlayInternal.java

@@ -326,8 +326,8 @@ public void drawScreen(Minecraft minecraft, int mouseX, int mouseY) {
 
 	private boolean shouldShowDeleteItemTooltip(Minecraft minecraft) {
 		if (Config.isDeleteItemsInCheatModeActive()) {
-			EntityPlayer player = minecraft.thePlayer;
-			if (player.inventory.getItemStack() != null) {
+			EntityPlayer player = minecraft.player;
+			if (!player.inventory.getItemStack().func_190926_b()) {
 				return true;
 			}
 		}
@@ -408,10 +408,10 @@ public boolean handleMouseClicked(int mouseX, int mouseY, int mouseButton) {
 
 		if (Config.isDeleteItemsInCheatModeActive()) {
 			Minecraft minecraft = Minecraft.getMinecraft();
-			EntityPlayerSP player = minecraft.thePlayer;
+			EntityPlayerSP player = minecraft.player;
 			ItemStack itemStack = player.inventory.getItemStack();
-			if (itemStack != null) {
-				player.inventory.setItemStack(null);
+			if (!itemStack.func_190926_b()) {
+				player.inventory.setItemStack(ItemStack.field_190927_a);
 				PacketJei packet = new PacketDeletePlayerItem(itemStack);
 				JustEnoughItems.getProxy().sendPacketToServer(packet);
 				return true;

src/main/java/mezz/jei/gui/recipes/RecipeGuiLogic.java

@@ -105,7 +105,7 @@ private void setState(State state) {
 	}
 
 	private int getRecipeCategoryIndex(List<IRecipeCategory> recipeCategories) {
-		final Container container = Minecraft.getMinecraft().thePlayer.openContainer;
+		final Container container = Minecraft.getMinecraft().player.openContainer;
 		if (container == null) {
 			return 0;
 		}

src/main/java/mezz/jei/gui/recipes/RecipesGui.java

@@ -319,7 +319,7 @@ public void close() {
 				mc.displayGuiScreen(parentScreen);
 				parentScreen = null;
 			} else {
-				mc.thePlayer.closeScreen();
+				mc.player.closeScreen();
 			}
 			logic.clearHistory();
 		}
@@ -371,7 +371,7 @@ protected void actionPerformed(GuiButton guibutton) {
 			RecipeLayout recipeLayout = recipeLayouts.get(recipeIndex);
 			boolean maxTransfer = GuiScreen.isShiftKeyDown();
 			Container container = getParentContainer();
-			if (container != null && RecipeTransferUtil.transferRecipe(container, recipeLayout, mc.thePlayer, maxTransfer)) {
+			if (container != null && RecipeTransferUtil.transferRecipe(container, recipeLayout, mc.player, maxTransfer)) {
 				close();
 			}
 		}
@@ -417,7 +417,7 @@ private void addRecipeTransferButtons(List<RecipeLayout> recipeLayouts) {
 		buttonList.clear();
 		addButtons();
 
-		EntityPlayer player = mc.thePlayer;
+		EntityPlayer player = mc.player;
 		Container container = getParentContainer();
 
 		for (RecipeLayout recipeLayout : recipeLayouts) {

src/main/java/mezz/jei/input/GuiContainerWrapper.java

@@ -24,7 +24,7 @@ public IClickedIngredient<?> getIngredientUnderMouse(int mouseX, int mouseY) {
 		Slot slotUnderMouse = guiContainer.getSlotUnderMouse();
 		if (slotUnderMouse != null) {
 			ItemStack stack = slotUnderMouse.getStack();
-			if (stack != null) {
+			if (!stack.func_190926_b()) {
 				return new ClickedIngredient<ItemStack>(stack);
 			}
 		}

src/main/java/mezz/jei/network/PacketHandler.java

@@ -68,7 +68,7 @@ public void onPacket(FMLNetworkEvent.ServerCustomPacketEvent event) {
 	public void onPacket(FMLNetworkEvent.ClientCustomPacketEvent event) {
 		PacketBuffer packetBuffer = new PacketBuffer(event.getPacket().payload());
 		Minecraft minecraft = Minecraft.getMinecraft();
-		EntityPlayer player = minecraft.thePlayer;
+		EntityPlayer player = minecraft.player;
 		IPacketJeiHandler packetHandler;
 
 		try {

src/main/java/mezz/jei/network/packets/PacketDeletePlayerItem.java

@@ -31,7 +31,7 @@ public void readPacketData(PacketBuffer buf, EntityPlayer player) throws IOExcep
 			ItemStack itemStack = buf.readItemStackFromBuffer();
 			ItemStack playerItem = player.inventory.getItemStack();
 			if (ItemStack.areItemStacksEqual(itemStack, playerItem)) {
-				player.inventory.setItemStack(null);
+				player.inventory.setItemStack(ItemStack.field_190927_a);
 			}
 		}
 	}

src/main/java/mezz/jei/network/packets/PacketGiveItemStack.java

@@ -38,8 +38,8 @@ public void readPacketData(PacketBuffer buf, EntityPlayer player) throws IOExcep
 
 				NBTTagCompound itemStackSerialized = buf.readNBTTagCompoundFromBuffer();
 				if (itemStackSerialized != null) {
-					ItemStack itemStack = ItemStack.loadItemStackFromNBT(itemStackSerialized);
-					if (itemStack != null) {
+					ItemStack itemStack = new ItemStack(itemStackSerialized);
+					if (!itemStack.func_190926_b()) {
 						if (CommandUtil.hasPermission(sender, itemStack)) {
 							CommandUtil.executeGive(sender, itemStack);
 						} else {

src/main/java/mezz/jei/plugins/jei/debug/DebugRecipe.java

@@ -80,7 +80,7 @@ public List<String> getTooltipStrings(int mouseX, int mouseY) {
 	@Override
 	public boolean handleClick(Minecraft minecraft, int mouseX, int mouseY, int mouseButton) {
 		if (mouseButton == 0 && button.mousePressed(minecraft, mouseX, mouseY)) {
-			GuiScreen screen = new GuiInventory(minecraft.thePlayer);
+			GuiScreen screen = new GuiInventory(minecraft.player);
 			minecraft.displayGuiScreen(screen);
 
 			IJeiRuntime runtime = JEIInternalPlugin.jeiRuntime;

src/main/java/mezz/jei/plugins/vanilla/VanillaPlugin.java

@@ -53,6 +53,7 @@
 import net.minecraft.item.ItemMonsterPlacer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.FluidStack;
 
 @JEIPlugin
@@ -79,7 +80,8 @@ public String getSubtypeInfo(ItemStack itemStack) {
 			@Nullable
 			@Override
 			public String getSubtypeInfo(ItemStack itemStack) {
-				return ItemMonsterPlacer.getEntityIdFromItem(itemStack);
+				ResourceLocation resourceLocation = ItemMonsterPlacer.func_190908_h(itemStack);
+				return resourceLocation == null ? null : resourceLocation.toString();
 			}
 		});
 	}

src/main/java/mezz/jei/plugins/vanilla/brewing/BrewingRecipeMaker.java

@@ -23,10 +23,12 @@
 import net.minecraft.potion.PotionHelper;
 import net.minecraft.potion.PotionType;
 import net.minecraft.potion.PotionUtils;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.brewing.AbstractBrewingRecipe;
 import net.minecraftforge.common.brewing.BrewingRecipeRegistry;
 import net.minecraftforge.common.brewing.IBrewingRecipe;
 import net.minecraftforge.common.brewing.VanillaBrewingRecipe;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
 
 public class BrewingRecipeMaker {
 	private final Set<Class> unhandledRecipeClasses = new HashSet<Class>();
@@ -90,7 +92,7 @@ private List<ItemStack> getNewPotions(final int brewingStep, List<ItemStack> kno
 		for (ItemStack potionInput : knownPotions) {
 			for (ItemStack potionIngredient : potionIngredients) {
 				ItemStack potionOutput = PotionHelper.doReaction(potionIngredient, potionInput.copy());
-				if (potionOutput == null) {
+				if (potionOutput.equals(potionInput)) {
 					continue;
 				}
 
@@ -101,9 +103,9 @@ private List<ItemStack> getNewPotions(final int brewingStep, List<ItemStack> kno
 					}
 
 					PotionType potionInputType = PotionUtils.getPotionFromItem(potionInput);
-					int inputId = PotionType.getID(potionInputType);
-					int outputId = PotionType.getID(potionOutputType);
-					if (inputId == outputId) {
+					ResourceLocation inputId = ForgeRegistries.POTION_TYPES.getKey(potionInputType);
+					ResourceLocation outputId = ForgeRegistries.POTION_TYPES.getKey(potionOutputType);
+					if (inputId.equals(outputId)) {
 						continue;
 					}
 				}

src/main/java/mezz/jei/plugins/vanilla/brewing/BrewingRecipeWrapper.java

@@ -13,6 +13,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.PotionType;
 import net.minecraft.potion.PotionUtils;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
 
 public class BrewingRecipeWrapper extends BlankRecipeWrapper {
 	private final List<ItemStack> ingredients;
@@ -42,8 +43,8 @@ public BrewingRecipeWrapper(List<ItemStack> ingredients, ItemStack potionInput,
 
 		PotionType typeIn = PotionUtils.getPotionFromItem(potionInput);
 		PotionType typeOut = PotionUtils.getPotionFromItem(potionOutput);
-		this.hashCode = Objects.hashCode(potionInput.getItem(), PotionType.getID(typeIn),
-				potionOutput.getItem(), PotionType.getID(typeOut),
+		this.hashCode = Objects.hashCode(potionInput.getItem(), ForgeRegistries.POTION_TYPES.getKey(typeIn),
+				potionOutput.getItem(), ForgeRegistries.POTION_TYPES.getKey(typeOut),
 				firstIngredient.getItem(), firstIngredient.getMetadata());
 	}
 
@@ -99,7 +100,7 @@ private static boolean arePotionsEqual(ItemStack potion1, ItemStack potion2) {
 		}
 		PotionType type1 = PotionUtils.getPotionFromItem(potion1);
 		PotionType type2 = PotionUtils.getPotionFromItem(potion2);
-		return PotionType.getID(type1) == PotionType.getID(type2);
+		return ForgeRegistries.POTION_TYPES.getKey(type1).equals(ForgeRegistries.POTION_TYPES.getKey(type2));
 	}
 
 	public int getBrewingSteps() {

src/main/java/mezz/jei/plugins/vanilla/crafting/ShapedOreRecipeWrapper.java

@@ -24,8 +24,8 @@ public ShapedOreRecipeWrapper(IJeiHelpers jeiHelpers, ShapedOreRecipe recipe) {
 		for (Object input : this.recipe.getInput()) {
 			if (input instanceof ItemStack) {
 				ItemStack itemStack = (ItemStack) input;
-				if (itemStack.stackSize != 1) {
-					itemStack.stackSize = 1;
+				if (itemStack.func_190916_E() != 1) {
+					itemStack.func_190920_e(1);
 				}
 			}
 		}

src/main/java/mezz/jei/plugins/vanilla/crafting/ShapedRecipesWrapper.java

@@ -16,8 +16,8 @@ public class ShapedRecipesWrapper extends BlankRecipeWrapper implements IShapedC
 	public ShapedRecipesWrapper(ShapedRecipes recipe) {
 		this.recipe = recipe;
 		for (ItemStack itemStack : this.recipe.recipeItems) {
-			if (itemStack != null && itemStack.stackSize != 1) {
-				itemStack.stackSize = 1;
+			if (itemStack != null && itemStack.func_190916_E() != 1) {
+				itemStack.func_190920_e(1);
 			}
 		}
 	}

src/main/java/mezz/jei/plugins/vanilla/crafting/ShapelessOreRecipeWrapper.java

@@ -19,8 +19,8 @@ public ShapelessOreRecipeWrapper(IJeiHelpers jeiHelpers, ShapelessOreRecipe reci
 		for (Object input : this.recipe.getInput()) {
 			if (input instanceof ItemStack) {
 				ItemStack itemStack = (ItemStack) input;
-				if (itemStack.stackSize != 1) {
-					itemStack.stackSize = 1;
+				if (itemStack.func_190916_E() != 1) {
+					itemStack.func_190920_e(1);
 				}
 			}
 		}

src/main/java/mezz/jei/plugins/vanilla/crafting/ShapelessRecipesWrapper.java

@@ -15,8 +15,8 @@ public ShapelessRecipesWrapper(IGuiHelper guiHelper, ShapelessRecipes recipe) {
 		for (Object input : this.recipe.recipeItems) {
 			if (input instanceof ItemStack) {
 				ItemStack itemStack = (ItemStack) input;
-				if (itemStack.stackSize != 1) {
-					itemStack.stackSize = 1;
+				if (itemStack.func_190916_E() != 1) {
+					itemStack.func_190920_e(1);
 				}
 			}
 		}

src/main/java/mezz/jei/plugins/vanilla/furnace/SmeltingRecipeMaker.java

@@ -18,9 +18,9 @@ public static List<SmeltingRecipe> getFurnaceRecipes(IJeiHelpers helpers) {
 
 		List<SmeltingRecipe> recipes = new ArrayList<SmeltingRecipe>();
 
-		for (Map.Entry<ItemStack, ItemStack> itemStackItemStackEntry : smeltingMap.entrySet()) {
-			ItemStack input = itemStackItemStackEntry.getKey();
-			ItemStack output = itemStackItemStackEntry.getValue();
+		for (Map.Entry<ItemStack, ItemStack> entry : smeltingMap.entrySet()) {
+			ItemStack input = entry.getKey();
+			ItemStack output = entry.getValue();
 
 			List<ItemStack> inputs = stackHelper.getSubtypes(input);
 			SmeltingRecipe recipe = new SmeltingRecipe(inputs, output);