From aa0ec6a575c1bddd06905196db6f6426d6e9fd2b Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Sun, 3 Jan 2016 19:16:43 +0100
Subject: [PATCH] Fixed booklet achievement info not showing the item if it has
 a wildcard value

---
 .../booklet/BookletUtils.java                 | 30 ++++++++++---------
 .../actuallyadditions/booklet/GuiBooklet.java |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/BookletUtils.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/BookletUtils.java
index 2562d88b1..7bb5a84fd 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/booklet/BookletUtils.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/BookletUtils.java
@@ -117,21 +117,23 @@ public class BookletUtils{
         for(BookletPage page : booklet.currentEntrySet.chapter.pages){
             if(page != null && page.getItemStacksForPage() != null){
                 for(ItemStack stack : page.getItemStacksForPage()){
-                    for(Achievement achievement : InitAchievements.achievementList){
-                        if(stack != null && achievement.theItemStack != null && achievement.theItemStack.isItemEqual(stack)){
-                            if(pre){
-                                booklet.mc.getTextureManager().bindTexture(GuiBooklet.resLoc);
-                                booklet.drawTexturedModalRect(booklet.guiLeft+booklet.xSize+1, booklet.guiTop-18, 166, 154, 22, 21);
-                                return;
-                            }
-                            else{
-                                if(mouseX >= booklet.guiLeft+booklet.xSize+1 && mouseX < booklet.guiLeft+booklet.xSize+1+22 && mouseY >= booklet.guiTop-18 && mouseY < booklet.guiTop-18+21){
-                                    if(infoList == null){
-                                        infoList = new ArrayList<String>();
-                                        infoList.add(EnumChatFormatting.GOLD+"Achievements related to this chapter:");
+                    if(stack != null){
+                        for(Achievement achievement : InitAchievements.achievementList){
+                            if(achievement.theItemStack != null && ItemUtil.areItemsEqual(stack, achievement.theItemStack, true)){
+                                if(pre){
+                                    booklet.mc.getTextureManager().bindTexture(GuiBooklet.resLoc);
+                                    booklet.drawTexturedModalRect(booklet.guiLeft+booklet.xSize+1, booklet.guiTop-18, 166, 154, 22, 21);
+                                    return;
+                                }
+                                else{
+                                    if(mouseX >= booklet.guiLeft+booklet.xSize+1 && mouseX < booklet.guiLeft+booklet.xSize+1+22 && mouseY >= booklet.guiTop-18 && mouseY < booklet.guiTop-18+21){
+                                        if(infoList == null){
+                                            infoList = new ArrayList<String>();
+                                            infoList.add(EnumChatFormatting.GOLD+"Achievements related to this chapter:");
+                                        }
+                                        infoList.add("-"+StringUtil.localize(achievement.statId));
+                                        infoList.add(EnumChatFormatting.GRAY+"("+achievement.getDescription()+")");
                                     }
-                                    infoList.add("-"+StringUtil.localize(achievement.statId));
-                                    infoList.add(EnumChatFormatting.GRAY+"("+achievement.getDescription()+")");
                                 }
                             }
                         }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/GuiBooklet.java
index f8600b13f..bb78afc1d 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/booklet/GuiBooklet.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/booklet/GuiBooklet.java
@@ -261,7 +261,7 @@ public class GuiBooklet extends GuiScreen{
         }
     }
 
-    @SuppressWarnings({"unchecked", "MismatchedQueryAndUpdateOfCollection"})
+    @SuppressWarnings("unchecked")
     @Override
     public void initGui(){
         this.guiLeft = (this.width-this.xSize)/2;