From dcf97662434cf38afc49bf8fb517223e0143afad Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 17 Dec 2015 22:18:37 +0100 Subject: [PATCH] Changed Ball Of Hair Name to "Ball of Fur", added Booklet Page --- .../actuallyadditions/booklet/BookletChapter.java | 2 +- .../actuallyadditions/booklet/BookletIndexEntry.java | 2 +- .../ellpeck/actuallyadditions/booklet/InitBooklet.java | 9 +++++---- .../actuallyadditions/nei/HairyBallRecipeHandler.java | 4 ++-- .../resources/assets/actuallyadditions/lang/en_US.lang | 9 ++++++--- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/BookletChapter.java b/src/main/java/ellpeck/actuallyadditions/booklet/BookletChapter.java index b4840646d..c611f05ce 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/BookletChapter.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/BookletChapter.java @@ -58,7 +58,7 @@ public class BookletChapter{ } public BookletChapter setSpecial(){ - this.color = EnumChatFormatting.GOLD; + this.color = EnumChatFormatting.DARK_PURPLE; return this; } } diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/BookletIndexEntry.java b/src/main/java/ellpeck/actuallyadditions/booklet/BookletIndexEntry.java index b970dd3bc..140d7259b 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/BookletIndexEntry.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/BookletIndexEntry.java @@ -51,7 +51,7 @@ public class BookletIndexEntry{ } public BookletIndexEntry setSpecial(){ - this.color = EnumChatFormatting.GOLD; + this.color = EnumChatFormatting.DARK_PURPLE; return this; } diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java index cba6eea87..f7a848bd3 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -34,12 +34,12 @@ public class InitBooklet{ public static BookletChapter chapterIntro; public static BookletIndexEntry entryFunctionalNonRF = new BookletIndexEntry("functionalNoRF"); - public static BookletIndexEntry entryFunctionalRF = new BookletIndexEntry("functionalRF"); - public static BookletIndexEntry entryGeneratingRF = new BookletIndexEntry("generatingRF"); + public static BookletIndexEntry entryFunctionalRF = new BookletIndexEntry("functionalRF").setSpecial(); + public static BookletIndexEntry entryGeneratingRF = new BookletIndexEntry("generatingRF").setSpecial(); public static BookletIndexEntry entryItemsNonRF = new BookletIndexEntry("itemsNoRF"); - public static BookletIndexEntry entryItemsRF = new BookletIndexEntry("itemsRF"); + public static BookletIndexEntry entryItemsRF = new BookletIndexEntry("itemsRF").setSpecial(); public static BookletIndexEntry entryMisc = new BookletIndexEntry("misc"); - public static BookletIndexEntry allAndSearch = new BookletEntryAllSearch("allAndSearch").setSpecial(); + public static BookletIndexEntry allAndSearch = new BookletEntryAllSearch("allAndSearch").setImportant(); static{ chapterIntro = new BookletChapter("intro", entryMisc, new ItemStack(InitItems.itemLexicon), new PageTextOnly(1), new PageTextOnly(2), new PageTextOnly(3), new PageCrafting(4, ItemCrafting.recipeBook)).setImportant(); @@ -58,6 +58,7 @@ public class InitBooklet{ new BookletChapter("lamps", entryMisc, new ItemStack(InitBlocks.blockColoredLampOn, 1, TheColoredLampColors.GREEN.ordinal()), lampPages.toArray(new BookletPage[lampPages.size()])); new BookletChapter("treasureChest", entryMisc, new ItemStack(InitBlocks.blockTreasureChest), new PageTextOnly(1).setStack(new ItemStack(InitBlocks.blockTreasureChest))).setSpecial(); + new BookletChapter("hairBalls", entryMisc, new ItemStack(InitItems.itemHairyBall), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemHairyBall))).setSpecial(); //No RF Using Blocks new BookletChapter("breaker", entryFunctionalNonRF, new ItemStack(InitBlocks.blockBreaker), new PageCrafting(1, BlockCrafting.recipeBreaker), new PageCrafting(2, BlockCrafting.recipePlacer), new PageCrafting(3, BlockCrafting.recipeLiquidPlacer), new PageCrafting(4, BlockCrafting.recipeLiquidCollector)); diff --git a/src/main/java/ellpeck/actuallyadditions/nei/HairyBallRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/nei/HairyBallRecipeHandler.java index 8eed0465a..f44ba0981 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/HairyBallRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/HairyBallRecipeHandler.java @@ -15,6 +15,7 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; +import ellpeck.actuallyadditions.items.InitItems; import ellpeck.actuallyadditions.recipe.HairyBallHandler; import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.StringUtil; @@ -37,8 +38,7 @@ public class HairyBallRecipeHandler extends TemplateRecipeHandler implements INe @Override public ItemStack getStackForInfo(int page){ - //TODO Add Hairy Ball Page - return null; + return new ItemStack(InitItems.itemHairyBall); } @Override diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 92933d1f8..61c1d2c43 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -9,7 +9,7 @@ fluid.canolaoil=Canola Oil #NEI Integration container.nei.actuallyadditions.crushing.name=Crusher container.nei.actuallyadditions.crushingDouble.name=Double Crusher -container.nei.actuallyadditions.ballOfHair.name=Ball Of Hair Usage +container.nei.actuallyadditions.ballOfHair.name=Ball Of Fur Usage container.nei.actuallyadditions.compost.name=Compost container.nei.actuallyadditions.furnaceDouble.name=Double Furnace container.nei.actuallyadditions.treasureChest.name=Treasure Chest @@ -202,7 +202,7 @@ item.actuallyadditions.itemJamPlApLe.name=PlApLe-Jam item.actuallyadditions.itemJamChApCi.name=ChApCi-Jam item.actuallyadditions.itemJamHoMeKi.name=HoMeKi-Jam item.actuallyadditions.itemJamPiCo.name=PiCo-Jam -item.actuallyadditions.itemHairyBall.name=Ball of Hair +item.actuallyadditions.itemHairyBall.name=Ball of Fur item.actuallyadditions.itemLeafBlower.name=Leaf Blower item.actuallyadditions.itemLeafBlowerAdvanced.name=Advanced Leaf Blower item.actuallyadditions.itemKnife.name=Knife @@ -561,4 +561,7 @@ booklet.actuallyadditions.chapter.dropper.name=Automatic Precision Dropper booklet.actuallyadditions.chapter.dropper.text.1=The Automatic Precision Dropper works much like a normal dropper, but it will drop items without needing a Redstone Signal. It also won't spit them out all over the ground, but it will drop them straight into the direction you point it at! It can be turned off with a Redstone Signal. booklet.actuallyadditions.chapter.rangedCollector.name=Ranged Collector -booklet.actuallyadditions.chapter.rangedCollector.text.1=The Ranged Collector works much like a hopper, in that it collects items around it, having the power, however, to pick up items that are in an area of blocks around it. It has a filter that can be set to white- or blacklist. This comes with a disadvantage, however: It doesn't auto-output its items. \ No newline at end of file +booklet.actuallyadditions.chapter.rangedCollector.text.1=The Ranged Collector works much like a hopper, in that it collects items around it, having the power, however, to pick up items that are in an area of blocks around it. It has a filter that can be set to white- or blacklist. This comes with a disadvantage, however: It doesn't auto-output its items. + +booklet.actuallyadditions.chapter.hairBalls.name=Ball of Fur-s +booklet.actuallyadditions.chapter.hairBalls.text.1=Balls of Fur are an item rarely dropped by cats which have been tamed by the player. Cats are very mysterious creatures as they appear to get everything stuck in their fur. Balls of Fur may seem disgusting at first, but when removing all of the hair by right-clicking, they will reveal some valuable items. Or just some String. FUURRRRRR!! \ No newline at end of file