From 028d8a961249e7eafba0d1f94f24c6bb695c11c5 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 13 Dec 2015 17:43:35 +0100 Subject: [PATCH] Firework Box Crafting & Docs (it rhymes!) --- .../actuallyadditions/booklet/InitBooklet.java | 1 + .../config/values/ConfigCrafting.java | 3 ++- .../actuallyadditions/crafting/BlockCrafting.java | 11 +++++++++++ .../assets/actuallyadditions/lang/en_US.lang | 6 +++++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java index 78ff7eca5..3764b3803 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -100,6 +100,7 @@ public class InitBooklet{ new BookletChapter("rangedCollector", entryFunctionalNonRF, new ItemStack(InitBlocks.blockRangedCollector), new PageTextOnly(1).addTextReplacement("", TileEntityRangedCollector.RANGE), new PageCrafting(2, BlockCrafting.recipeRangedCollector).setNoText()); //RF Using Blocks + new BookletChapter("fireworkBox", entryFunctionalRF, new ItemStack(InitBlocks.blockFireworkBox), new PageTextOnly(1).addTextReplacement("", TileEntityFireworkBox.USE_PER_SHOT), new PageCrafting(2, BlockCrafting.recipeFireworkBox)).setSpecial(); new BookletChapter("laserRelays", entryFunctionalRF, new ItemStack(InitBlocks.blockLaserRelay), new PageTextOnly(1).addTextReplacement("", TileEntityLaserRelay.MAX_DISTANCE).addTextReplacement("", ConfigIntValues.LASER_RELAY_LOSS.getValue()), new PagePicture(2, "pageLaserRelay", 0).setNoText(), new PageCrafting(3, BlockCrafting.recipeLaserRelay).setNoText(), new PageCrafting(4, ItemCrafting.recipeLaserWrench).setNoText()).setImportant(); new BookletChapter("miner", entryFunctionalRF, new ItemStack(InitBlocks.blockMiner), new PageTextOnly(1).addTextReplacement("", TileEntityMiner.ENERGY_USE_PER_BLOCK), new PageCrafting(2, BlockCrafting.recipeMiner)).setSpecial(); new BookletChapterCoffee("coffeeMachine", entryFunctionalRF, new ItemStack(InitBlocks.blockCoffeeMachine), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemCoffeeBean)).addTextReplacement("", TileEntityCoffeeMachine.ENERGY_USED).addTextReplacement("", TileEntityCoffeeMachine.CACHE_USE).addTextReplacement("", TileEntityCoffeeMachine.WATER_USE), new PageTextOnly(2).setStack(new ItemStack(InitItems.itemCoffee)), new PagePicture(3, "pageCoffeeMachine", 115), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine).setNoText(), new PageCrafting(5, ItemCrafting.recipeCup).setNoText()).setImportant(); diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index d22b1d5b3..8a27a50aa 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -150,7 +150,8 @@ public enum ConfigCrafting{ CHEST_TO_CRATE_UPGRADE("Chest To Crate Upgrade", ConfigCategories.ITEMS_CRAFTING), DRILL_CORE("Drill Core", ConfigCategories.ITEMS_CRAFTING), ATOMIC_RECONSTRUCTOR("Atomic Reconstructor", ConfigCategories.BLOCKS_CRAFTING), - MINER("Miner", ConfigCategories.BLOCKS_CRAFTING); + MINER("Miner", ConfigCategories.BLOCKS_CRAFTING), + FIREWORK_BOX("Firework Box", ConfigCategories.BLOCKS_CRAFTING); public final String name; public final String category; diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index f0d04a02b..38e26a0b7 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -82,6 +82,7 @@ public class BlockCrafting{ public static IRecipe recipeAtomicReconstructor; public static IRecipe recipeBookStand; public static IRecipe recipeMiner; + public static IRecipe recipeFireworkBox; public static void init(){ @@ -89,6 +90,16 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockBookletStand), new ItemStack(InitItems.itemBooklet), "plankWood")); recipeBookStand = Util.GetRecipes.lastIRecipe(); + //Firework Box + if(ConfigCrafting.FIREWORK_BOX.isEnabled()){ + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFireworkBox), + "GGG", "SSS", "CCC", + 'G', new ItemStack(Items.gunpowder), + 'S', new ItemStack(Items.stick), + 'C', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()))); + recipeFireworkBox = Util.GetRecipes.lastIRecipe(); + } + //Miner if(ConfigCrafting.MINER.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMiner), diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index ff6e9a5a5..e46734300 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -659,4 +659,8 @@ booklet.actuallyadditions.chapter.miscDecorStuffsAndThings.text.1=Sometimes, whe booklet.actuallyadditions.chapter.miner.name=Vertical Digger booklet.actuallyadditions.chapter.miner.text.1=The Vertical Digger can be used to automatically mine blocks from the world. It has two modes: It can either only mine ores or mine everything. When mining a block, it uses about RF. Mined items get stored in an internal buffer that can be accessed through right-clicking. Right-clicking while sneaking will show the Digger's status. Much like Phantomfaces, the Digger's range can be upgraded by placing 3 or less Phantom Boosters above it. -booklet.actuallyadditions.chapter.miner.text.2=(Works with any colored Drill) I dig it \ No newline at end of file +booklet.actuallyadditions.chapter.miner.text.2=(Works with any colored Drill) I dig it + +booklet.actuallyadditions.chapter.fireworkBox.name=Firework Box +booklet.actuallyadditions.chapter.fireworkBox.text.1=The Firework Box is a perfect thing for New Year's! When placed down and supplied with some RF, it will shoot out some randomly generated Fireworks around it. For each shot, it uses RF. You know, Vanilla Fireworks are just too bloody annoying to craft, but too awesome not to use. So here's the solution. +booklet.actuallyadditions.chapter.fireworkBox.text.2=Keep it safe. It won't explode. \ No newline at end of file