diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java index c1d7cc7b8..cfba09e73 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java @@ -97,8 +97,8 @@ public class PageCrafting extends BookletPage{ } } - int xShowOutput = gui.guiLeft+28+82; - int yShowOutput = gui.guiTop+23+20; + int xShowOutput = gui.guiLeft+27+82; + int yShowOutput = gui.guiTop+20+22; this.renderItem(gui, recipe.getRecipeOutput(), xShowOutput, yShowOutput); for(int i = 0; i < 2; i++){ boolean tooltip = i == 1; @@ -107,8 +107,8 @@ public class PageCrafting extends BookletPage{ ItemStack stack = stacks[y*width+x]; if(stack != null){ if(stack.getItemDamage() == Util.WILDCARD) stack.setItemDamage(0); - int xShow = gui.guiLeft+28+x*21; - int yShow = gui.guiTop+23+y*21; + int xShow = gui.guiLeft+27+4+x*18; + int yShow = gui.guiTop+20+4+y*18; if(!tooltip){ this.renderItem(gui, stack, xShow, yShow); } diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java index 4c8df7fc4..289e7df38 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java @@ -54,7 +54,7 @@ public class PageCrusherRecipe extends BookletPage{ } if(recipe.secondChance > 0){ - gui.unicodeRenderer.drawString(recipe.secondChance+"%", gui.guiLeft+37+62, gui.guiTop+20+35, 0); + gui.unicodeRenderer.drawString(recipe.secondChance+"%", gui.guiLeft+37+62, gui.guiTop+20+33, 0); } if(recipe.firstOutput != null){ @@ -67,8 +67,8 @@ public class PageCrusherRecipe extends BookletPage{ boolean tooltip = i == 1; - int xShow = gui.guiLeft+37+(j == 0 ? 0 : (j == 1 ? 42 : (j == 2 ? 43 : 0))); - int yShow = gui.guiTop+20+(j == 0 ? 18 : (j == 1 ? 12 : (j == 2 ? 30 : 0))); + int xShow = gui.guiLeft+37+(j == 0 ? 1 : (j == 1 ? 43 : (j == 2 ? 43 : 0))); + int yShow = gui.guiTop+20+(j == 0 ? 21 : (j == 1 ? 11 : (j == 2 ? 29 : 0))); if(!tooltip){ this.renderItem(gui, stack, xShow, yShow); } diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageFurnace.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageFurnace.java index 9dc968832..f068e8eca 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageFurnace.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageFurnace.java @@ -68,8 +68,8 @@ public class PageFurnace extends BookletPage{ if(stack.getItemDamage() == Util.WILDCARD) stack.setItemDamage(0); boolean tooltip = i == 1; - int xShow = gui.guiLeft+37+1+x*40; - int yShow = gui.guiTop+20+20; + int xShow = gui.guiLeft+37+1+x*42; + int yShow = gui.guiTop+20+21; if(!tooltip){ this.renderItem(gui, stack, xShow, yShow); } diff --git a/src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java b/src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java index fe6cdf26d..d8b424e3b 100644 --- a/src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java +++ b/src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java @@ -235,6 +235,18 @@ public class SmileyCloudEasterEggs{ renderHeadBlock(Blocks.quartz_block, 0, 17F); } }); + //FreakyNinja + register(new ISmileyCloudEasterEgg(){ + @Override + public String[] getTriggerNames(){ + return new String[]{"freakyninja", "ninja", "tl"}; + } + @Override + public void renderExtra(float f){ + renderHoldingItem(false, new ItemStack(Items.diamond_sword)); + renderHeadBlock(Blocks.diamond_block, 0, 26F); + } + }); } private static void register(ISmileyCloudEasterEgg egg){ diff --git a/src/main/resources/assets/actuallyadditions/textures/gui/guiBooklet.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiBooklet.png index 843edc944..0de8cff24 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/gui/guiBooklet.png and b/src/main/resources/assets/actuallyadditions/textures/gui/guiBooklet.png differ