diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockContainerBase.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockContainerBase.java index 5c99b6ec1..594d6dbbe 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockContainerBase.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockContainerBase.java @@ -51,6 +51,7 @@ public abstract class BlockContainerBase extends BlockContainer{ world.spawnEntityInWorld(entityItem); itemStack.stackSize = 0; } + tileEntity.setInventorySlotContents(i, null); } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java index d45a92451..929bae429 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java @@ -98,6 +98,7 @@ public class BlockInputter extends BlockContainerBase implements INameableItem{ world.spawnEntityInWorld(entityItem); itemStack.stackSize = 0; } + tileEntity.setInventorySlotContents(0, null); } } super.breakBlock(world, x, y, z, block, par6); diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java index 8cae2710f..5ae512e55 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java @@ -56,7 +56,9 @@ public class GuiBooklet extends GuiScreen{ private static final int BUTTON_BACK_ID = 1; private static final int BUTTON_RETURN_ID = 2; private static final int CHAPTER_BUTTONS_START = 3; + public static final int BUTTONS_PER_PAGE = 13; + private static final int TOOLTIP_SPLIT_LENGTH = 160; private static final int BUTTON_UPDATE_ID = CHAPTER_BUTTONS_START+BUTTONS_PER_PAGE; private static final int BUTTON_TWITTER_ID = BUTTON_UPDATE_ID+1; @@ -183,6 +185,11 @@ public class GuiBooklet extends GuiScreen{ } } + @Override + public boolean doesGuiPauseGame(){ + return false; + } + private GuiButton getButton(int id){ return (GuiButton)this.buttonList.get(id); } @@ -256,9 +263,7 @@ public class GuiBooklet extends GuiScreen{ if(x >= this.guiLeft+138 && x <= this.guiLeft+138+7 && y >= this.guiTop+10 && y <= this.guiTop+10+7){ ArrayList list = new ArrayList(); list.add(EnumChatFormatting.GOLD+"Show Configuration GUI"); - list.add(EnumChatFormatting.ITALIC+"It is highly recommended that you restart"); - list.add(EnumChatFormatting.ITALIC+"your game after changing anything as"); - list.add(EnumChatFormatting.ITALIC+"that prevents possible bugs occuring!"); + list.addAll(this.fontRendererObj.listFormattedStringToWidth("It is highly recommended that you restart your game after changing anything as that prevents possible bugs occuring!", TOOLTIP_SPLIT_LENGTH)); this.func_146283_a(list, x, y); } @@ -276,7 +281,8 @@ public class GuiBooklet extends GuiScreen{ ArrayList list = new ArrayList(); list.add(EnumChatFormatting.GOLD+"There is an Update available!"); list.add(EnumChatFormatting.ITALIC+"You have: "+ModUtil.VERSION+", Newest: "+UpdateChecker.updateVersionS); - list.add("Click this button to visit the download page!"); + list.addAll(this.fontRendererObj.listFormattedStringToWidth(EnumChatFormatting.ITALIC+"Updates include: "+UpdateChecker.changelog, TOOLTIP_SPLIT_LENGTH)); + list.add(EnumChatFormatting.GRAY+"Click this button to visit the download page!"); this.func_146283_a(list, x, y); } } diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java index b3bc1bdd3..c1dffdb76 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -58,6 +58,7 @@ public class InitBooklet{ new BookletChapter("fishingNet", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeFisher)); new BookletChapter("feeder", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeFeeder)); new BookletChapter("compost", entryFunctionalNonRF, new PageText(1).setStack(new ItemStack(InitItems.itemFertilizer)), new PageCrafting(2, BlockCrafting.recipeCompost), new PageCrafting(3, ItemCrafting.recipeMashedFood)); + new BookletChapter("crate", entryFunctionalNonRF, new PageCrafting(1, BlockCrafting.recipeCrate)); new BookletChapter("coffeeMachine", entryFunctionalRF, new PageText(1), new PageText(2), new PageText(3), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine)); new BookletChapterCrusher("crusher", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeCrusher), new PageCrafting(3, BlockCrafting.recipeDoubleCrusher)); @@ -68,8 +69,8 @@ public class InitBooklet{ new BookletChapter("repairer", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeRepairer)); new BookletChapter("coalGen", entryGeneratingRF, new PageCrafting(1, BlockCrafting.recipeCoalGen)); - new BookletChapter("oilGen", entryGeneratingRF, new PageCrafting(1, BlockCrafting.recipeOilGen)); new BookletChapter("solarPanel", entryGeneratingRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeSolar)); new BookletChapter("heatCollector", entryGeneratingRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeHeatCollector)); + new BookletChapter("canola", entryGeneratingRF, new PageText(1), new PageText(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())), new PageCrafting(3, BlockCrafting.recipeCanolaPress), new PageCrafting(4, BlockCrafting.recipeFermentingBarrel), new PageCrafting(5, BlockCrafting.recipeOilGen)); } } diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index e821b73cc..1a9c70e41 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -68,6 +68,9 @@ public class BlockCrafting{ public static IRecipe recipeBlockChar; public static IRecipe recipeFeeder; public static IRecipe recipeCompost; + public static IRecipe recipeCrate; + public static IRecipe recipeFermentingBarrel; + public static IRecipe recipeCanolaPress; public static void init(){ @@ -195,6 +198,7 @@ public class BlockCrafting{ 'H', Blocks.hopper, 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal()))); + recipeCanolaPress = Util.lastIRecipe(); } //Ore Magnet @@ -216,6 +220,7 @@ public class BlockCrafting{ 'H', Blocks.hopper, 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()), 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal()))); + recipeFermentingBarrel = Util.lastIRecipe(); } //Phantomface @@ -453,6 +458,7 @@ public class BlockCrafting{ 'C', new ItemStack(Blocks.chest), 'D', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()), 'W', "plankWood")); + recipeCrate = Util.lastIRecipe(); } //Greenhouse Glass diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 36c430d7f..efba68909 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -466,9 +466,6 @@ booklet.actuallyadditions.chapter.repairer.text.1=The Item Repairer is booklet.actuallyadditions.chapter.coalGen.name=Coal Generator booklet.actuallyadditions.chapter.coalGen.text.1=This is pretty self-explanatory: You fill the Coal Generator up with Coal, and it will generate RF. -booklet.actuallyadditions.chapter.oilGen.name=Oil Generator -booklet.actuallyadditions.chapter.oilGen.text.1=The Oil Generator uses buckets of Oil to generate much bigger amounts of RF than the Coal Generator does. - booklet.actuallyadditions.chapter.solarPanel.name=Solar Panel booklet.actuallyadditions.chapter.solarPanel.text.1=The Solar Panel is a block that is used to generate RF through the power of the sun! Just plop it down under a free sky and watch it generate RF slowly just by sitting there. It will obviously not work at night. Obviously. diff --git a/src/main/resources/assets/actuallyadditions/textures/gui/guiBooklet.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiBooklet.png index 95762e222..86603c637 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