From 76d00af8a38c88d59df6ef2ec797d29a557b1d11 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 4 Oct 2015 19:28:30 +0200 Subject: [PATCH] Added FrauBaerchen Smiley Cloud and fixed empty NEI Info Pages --- .../gadget/cloud/SmileyCloudEasterEggs.java | 13 +++++++++++++ .../nei/BookletInfoRecipeHandler.java | 8 +++----- .../actuallyadditions/nei/NeiScreenEvents.java | 2 +- .../assets/actuallyadditions/lang/en_US.lang | 1 + 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java b/src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java index e85be93da..2d38d17cb 100644 --- a/src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java +++ b/src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java @@ -279,6 +279,19 @@ public class SmileyCloudEasterEggs{ renderHeadBlock(Blocks.gravel, 0, 47F); } }); + register(new ISmileyCloudEasterEgg(){ + @Override + public String[] getTriggerNames(){ + return new String[]{"FrauBaerchen", "Baerchen", "Nina"}; + } + + @Override + public void renderExtra(float f){ + renderHoldingItem(false, new ItemStack(Items.cookie)); + renderHoldingItem(true, new ItemStack(Items.paper)); + renderHeadBlock(Blocks.coal_block, 0, 60F); + } + }); } private static void register(ISmileyCloudEasterEgg egg){ diff --git a/src/main/java/ellpeck/actuallyadditions/nei/BookletInfoRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/nei/BookletInfoRecipeHandler.java index 4d2284c55..4b57dae81 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/BookletInfoRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/BookletInfoRecipeHandler.java @@ -103,11 +103,9 @@ public class BookletInfoRecipeHandler extends TemplateRecipeHandler implements I int maxLines = 6; String aText = page.getChapter().pages[0].getText(); - if(aText != null){ - List text = Minecraft.getMinecraft().fontRenderer.listFormattedStringToWidth(aText, 165); - for(int i = 0; i < Math.min(maxLines, text.size()); i++){ - GuiDraw.drawString(text.get(i)+(i == maxLines-1 && text.size() > maxLines ? EnumChatFormatting.RESET+""+EnumChatFormatting.BLACK+"..." : ""), 0, 18+25+i*(Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT+1), 0, false); - } + List text = Minecraft.getMinecraft().fontRenderer.listFormattedStringToWidth(aText != null ? aText : EnumChatFormatting.DARK_RED+StringUtil.localize("container.nei."+ModUtil.MOD_ID_LOWER+".booklet.noText"), 165); + for(int i = 0; i < Math.min(maxLines, text.size()); i++){ + GuiDraw.drawString(text.get(i)+(i == maxLines-1 && text.size() > maxLines ? EnumChatFormatting.RESET+""+EnumChatFormatting.BLACK+"..." : ""), 0, 18+25+i*(Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT+1), 0, false); } } } diff --git a/src/main/java/ellpeck/actuallyadditions/nei/NeiScreenEvents.java b/src/main/java/ellpeck/actuallyadditions/nei/NeiScreenEvents.java index a4c7f9a2f..ee7e01034 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/NeiScreenEvents.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/NeiScreenEvents.java @@ -70,7 +70,7 @@ public class NeiScreenEvents{ GuiBooklet book = new GuiBooklet(Minecraft.getMinecraft().currentScreen); Minecraft.getMinecraft().displayGuiScreen(book); book.openIndexEntry(page.getChapter().entry, InitBooklet.entries.indexOf(page.getChapter().entry)/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true); - book.openChapter(page.getChapter(), page.getChapter().pages[0]); + book.openChapter(page.getChapter(), page); } } } diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index f770b4498..3688773f0 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -22,6 +22,7 @@ container.nei.actuallyadditions.coffee.extra.milk=+01:00, -1 Level container.nei.actuallyadditions.booklet.name=ActAdd Manual container.nei.actuallyadditions.booklet.header=The Actually Additions Manual reads: +container.nei.actuallyadditions.booklet.noText=Nothing, apparently! But that doesn't matter. Just click the button on the bottom to see the item inside the booklet and look through its pages to find some fancy stuff! #Blocks tile.actuallyadditions.blockCompost.name=Compost