mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-22 23:28:35 +01:00
Changed Ball Of Hair Name to "Ball of Fur", added Booklet Page
This commit is contained in:
parent
dc4fab5902
commit
dcf9766243
5 changed files with 15 additions and 11 deletions
|
@ -58,7 +58,7 @@ public class BookletChapter{
|
||||||
}
|
}
|
||||||
|
|
||||||
public BookletChapter setSpecial(){
|
public BookletChapter setSpecial(){
|
||||||
this.color = EnumChatFormatting.GOLD;
|
this.color = EnumChatFormatting.DARK_PURPLE;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,7 +51,7 @@ public class BookletIndexEntry{
|
||||||
}
|
}
|
||||||
|
|
||||||
public BookletIndexEntry setSpecial(){
|
public BookletIndexEntry setSpecial(){
|
||||||
this.color = EnumChatFormatting.GOLD;
|
this.color = EnumChatFormatting.DARK_PURPLE;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -34,12 +34,12 @@ public class InitBooklet{
|
||||||
public static BookletChapter chapterIntro;
|
public static BookletChapter chapterIntro;
|
||||||
|
|
||||||
public static BookletIndexEntry entryFunctionalNonRF = new BookletIndexEntry("functionalNoRF");
|
public static BookletIndexEntry entryFunctionalNonRF = new BookletIndexEntry("functionalNoRF");
|
||||||
public static BookletIndexEntry entryFunctionalRF = new BookletIndexEntry("functionalRF");
|
public static BookletIndexEntry entryFunctionalRF = new BookletIndexEntry("functionalRF").setSpecial();
|
||||||
public static BookletIndexEntry entryGeneratingRF = new BookletIndexEntry("generatingRF");
|
public static BookletIndexEntry entryGeneratingRF = new BookletIndexEntry("generatingRF").setSpecial();
|
||||||
public static BookletIndexEntry entryItemsNonRF = new BookletIndexEntry("itemsNoRF");
|
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 entryMisc = new BookletIndexEntry("misc");
|
||||||
public static BookletIndexEntry allAndSearch = new BookletEntryAllSearch("allAndSearch").setSpecial();
|
public static BookletIndexEntry allAndSearch = new BookletEntryAllSearch("allAndSearch").setImportant();
|
||||||
|
|
||||||
static{
|
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();
|
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("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("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
|
//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));
|
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));
|
||||||
|
|
|
@ -15,6 +15,7 @@ import codechicken.nei.NEIServerUtils;
|
||||||
import codechicken.nei.PositionedStack;
|
import codechicken.nei.PositionedStack;
|
||||||
import codechicken.nei.recipe.RecipeInfo;
|
import codechicken.nei.recipe.RecipeInfo;
|
||||||
import codechicken.nei.recipe.TemplateRecipeHandler;
|
import codechicken.nei.recipe.TemplateRecipeHandler;
|
||||||
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.actuallyadditions.recipe.HairyBallHandler;
|
import ellpeck.actuallyadditions.recipe.HairyBallHandler;
|
||||||
import ellpeck.actuallyadditions.util.ModUtil;
|
import ellpeck.actuallyadditions.util.ModUtil;
|
||||||
import ellpeck.actuallyadditions.util.StringUtil;
|
import ellpeck.actuallyadditions.util.StringUtil;
|
||||||
|
@ -37,8 +38,7 @@ public class HairyBallRecipeHandler extends TemplateRecipeHandler implements INe
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getStackForInfo(int page){
|
public ItemStack getStackForInfo(int page){
|
||||||
//TODO Add Hairy Ball Page
|
return new ItemStack(InitItems.itemHairyBall);
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -9,7 +9,7 @@ fluid.canolaoil=Canola Oil
|
||||||
#NEI Integration
|
#NEI Integration
|
||||||
container.nei.actuallyadditions.crushing.name=Crusher
|
container.nei.actuallyadditions.crushing.name=Crusher
|
||||||
container.nei.actuallyadditions.crushingDouble.name=Double 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.compost.name=Compost
|
||||||
container.nei.actuallyadditions.furnaceDouble.name=Double Furnace
|
container.nei.actuallyadditions.furnaceDouble.name=Double Furnace
|
||||||
container.nei.actuallyadditions.treasureChest.name=Treasure Chest
|
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.itemJamChApCi.name=ChApCi-Jam
|
||||||
item.actuallyadditions.itemJamHoMeKi.name=HoMeKi-Jam
|
item.actuallyadditions.itemJamHoMeKi.name=HoMeKi-Jam
|
||||||
item.actuallyadditions.itemJamPiCo.name=PiCo-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.itemLeafBlower.name=Leaf Blower
|
||||||
item.actuallyadditions.itemLeafBlowerAdvanced.name=Advanced Leaf Blower
|
item.actuallyadditions.itemLeafBlowerAdvanced.name=Advanced Leaf Blower
|
||||||
item.actuallyadditions.itemKnife.name=Knife
|
item.actuallyadditions.itemKnife.name=Knife
|
||||||
|
@ -562,3 +562,6 @@ booklet.actuallyadditions.chapter.dropper.text.1=The <item>Automatic Precision D
|
||||||
|
|
||||||
booklet.actuallyadditions.chapter.rangedCollector.name=Ranged Collector
|
booklet.actuallyadditions.chapter.rangedCollector.name=Ranged Collector
|
||||||
booklet.actuallyadditions.chapter.rangedCollector.text.1=The <item>Ranged Collector<r> works much like a hopper, in that it <imp>collects items around it<r>, having the power, however, to pick up items that are in an area of <imp><range> blocks<r> around it. <n>It has a <imp>filter<r> that can be set to <imp>white- or blacklist<r>. <n>This comes with a disadvantage, however: It doesn't auto-output its items.
|
booklet.actuallyadditions.chapter.rangedCollector.text.1=The <item>Ranged Collector<r> works much like a hopper, in that it <imp>collects items around it<r>, having the power, however, to pick up items that are in an area of <imp><range> blocks<r> around it. <n>It has a <imp>filter<r> that can be set to <imp>white- or blacklist<r>. <n>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=<item>Balls of Fur<r> are an item rarely dropped by <imp>cats<r> which have been <imp>tamed<r> by the player. <n>Cats are very mysterious creatures as they <imp>appear to get everything stuck in their fur<r>. <item>Balls of Fur<r> may seem disgusting at first, but when removing all of the hair by <imp>right-clicking<r>, they will reveal some <imp>valuable items<r>. <n>Or just some String. <n><n><n><i>FUURRRRRR!!
|
Loading…
Reference in a new issue