Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 08:48:34 +01:00
Code Issues Projects Releases Wiki Activity

Added FrauBaerchen Smiley Cloud and fixed empty NEI Info Pages

Browse source
This commit is contained in:
Ellpeck 2015-10-04 19:28:30 +02:00
parent 8896937cac
commit 76d00af8a3
4 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java
View file

@ -279,6 +279,19 @@ public class SmileyCloudEasterEggs{
renderHeadBlock(Blocks.gravel, 0, 47F); 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){ private static void register(ISmileyCloudEasterEgg egg){

8
src/main/java/ellpeck/actuallyadditions/nei/BookletInfoRecipeHandler.java
View file

@ -103,11 +103,9 @@ public class BookletInfoRecipeHandler extends TemplateRecipeHandler implements I
int maxLines = 6; int maxLines = 6;
String aText = page.getChapter().pages[0].getText(); String aText = page.getChapter().pages[0].getText();
if(aText != null){ List text = Minecraft.getMinecraft().fontRenderer.listFormattedStringToWidth(aText != null ? aText : EnumChatFormatting.DARK_RED+StringUtil.localize("container.nei."+ModUtil.MOD_ID_LOWER+".booklet.noText"), 165);
List text = Minecraft.getMinecraft().fontRenderer.listFormattedStringToWidth(aText, 165); for(int i = 0; i < Math.min(maxLines, text.size()); i++){
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);
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);
}
} }
} }
} }

2
src/main/java/ellpeck/actuallyadditions/nei/NeiScreenEvents.java
View file

@ -70,7 +70,7 @@ public class NeiScreenEvents{
GuiBooklet book = new GuiBooklet(Minecraft.getMinecraft().currentScreen); GuiBooklet book = new GuiBooklet(Minecraft.getMinecraft().currentScreen);
Minecraft.getMinecraft().displayGuiScreen(book); Minecraft.getMinecraft().displayGuiScreen(book);
book.openIndexEntry(page.getChapter().entry, InitBooklet.entries.indexOf(page.getChapter().entry)/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true); 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);
} }
} }
} }

1
src/main/resources/assets/actuallyadditions/lang/en_US.lang
View file

@ -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.name=ActAdd Manual
container.nei.actuallyadditions.booklet.header=The <item>Actually Additions Manual<r> reads: container.nei.actuallyadditions.booklet.header=The <item>Actually Additions Manual<r> 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 #Blocks
tile.actuallyadditions.blockCompost.name=Compost tile.actuallyadditions.blockCompost.name=Compost