From 2d052750c8ec7dfb209bef144f043ebef484fe43 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 29 Dec 2016 21:53:34 +0100 Subject: [PATCH] Firework box doc and recipe change --- .../de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java | 2 +- .../ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java | 4 +++- .../actuallyadditions/mod/tile/TileEntityFireworkBox.java | 4 ++-- src/main/resources/assets/actuallyadditions/lang/en_US.lang | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java index 27807db67..14e04e07e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -211,9 +211,9 @@ public final class InitBooklet{ new BookletChapter("rangedCollector", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockRangedCollector), new PageTextOnly(1).addTextReplacement("", TileEntityRangedCollector.RANGE), new PageCrafting(2, BlockCrafting.recipeRangedCollector).setNoText()); //RF Using Blocks + new BookletChapter("fireworkBox", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockFireworkBox), new PageTextOnly(1).addTextReplacement("", TileEntityFireworkBox.USE_PER_SHOT), new PageCrafting(2, BlockCrafting.recipeFireworkBox)).setSpecial(); new BookletChapter("batteryBox", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockBatteryBox), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeBatteryBox).setNoText()).setSpecial(); new BookletChapter("farmer", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockFarmer), new PageTextOnly(1), new PagePicture(2, "page_farmer_crops", 95).addItemToPage(new ItemStack(Items.WHEAT_SEEDS)).addItemToPage(new ItemStack(InitItems.itemCanolaSeed)), new PagePicture(3, "page_farmer_cactus", 105).addItemToPage(new ItemStack(Blocks.CACTUS)), new PagePicture(4, "page_farmer_wart", 95).addItemToPage(new ItemStack(Items.NETHER_WART)), new PageCrafting(4, BlockCrafting.recipeFarmer).setWildcard().setNoText()).setImportant(); - new BookletChapter("fireworkBox", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockFireworkBox), new PageTextOnly(1).addTextReplacement("", TileEntityFireworkBox.USE_PER_SHOT), new PageCrafting(2, BlockCrafting.recipeFireworkBox)).setSpecial(); new BookletChapter("miner", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockMiner), new PageTextOnly(1).addTextReplacement("", TileEntityMiner.ENERGY_USE_PER_BLOCK).addTextReplacement("", TileEntityMiner.DEFAULT_RANGE), new PageCrafting(2, BlockCrafting.recipeMiner)).setSpecial(); new BookletChapterCoffee("coffeeMachine", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockCoffeeMachine), new PageTextOnly(1).addItemToPage(new ItemStack(InitItems.itemCoffeeBean)).addTextReplacement("", TileEntityCoffeeMachine.ENERGY_USED).addTextReplacement("", TileEntityCoffeeMachine.CACHE_USE).addTextReplacement("", TileEntityCoffeeMachine.WATER_USE), new PageTextOnly(2).addItemToPage(new ItemStack(InitItems.itemCoffee)), new PagePicture(3, "page_coffee_machine", 115), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine).setWildcard().setNoText(), new PageCrafting(5, ItemCrafting.recipeCup).setNoText()).setImportant(); new BookletChapterCrusher("crusher", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockGrinderDouble), new PageTextOnly(1).addTextReplacement("", TileEntityGrinder.ENERGY_USE), new PageCrafting(2, BlockCrafting.recipeCrusher).setWildcard().setNoText(), new PageCrafting(3, BlockCrafting.recipeDoubleCrusher).setWildcard().setNoText(), new PageCrusherRecipe(4, CrusherCrafting.recipeIronHorseArmor).setNoText(), new PageCrusherRecipe(5, CrusherCrafting.recipeGoldHorseArmor).setNoText(), new PageCrusherRecipe(6, CrusherCrafting.recipeDiamondHorseArmor).setNoText()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java index 6471af454..9d321cfa9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java @@ -140,9 +140,11 @@ public final class BlockCrafting{ //Firework Box GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFireworkBox), - "GGG", "SSS", "CCC", + "GFG", "SAS", "CCC", 'G', new ItemStack(Items.GUNPOWDER), 'S', new ItemStack(Items.STICK), + 'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), + 'F', new ItemStack(Items.FIREWORKS, 1, Util.WILDCARD), 'C', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()))); recipeFireworkBox = RecipeUtil.lastIRecipe(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java index 24aa3ea6a..29b715e82 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java @@ -184,8 +184,8 @@ public class TileEntityFireworkBox extends TileEntityBase implements IEnergyDisp private NBTTagCompound makeFireworkCharge(){ NBTTagCompound compound = new NBTTagCompound(); - if(this.world.rand.nextFloat() >= this.trailOrFlickerChance){ - if(this.world.rand.nextFloat() >= this.flickerChance){ + if(this.world.rand.nextFloat() <= this.trailOrFlickerChance){ + if(this.world.rand.nextFloat() <= this.flickerChance){ compound.setBoolean("Flicker", true); } else{ diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index b0f740dbd..6819b4caa 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -1001,8 +1001,8 @@ booklet.actuallyadditions.chapter.miner.text.1=The Vertical Digger can 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 CF, it will shoot out some randomly generated Fireworks around it. For each shot, it uses CF. 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=When right-clicking it with a Redstone Torch in hand, it will change between a mode where it gets deactivated by Redstone and a mode where it responds to pulses. +booklet.actuallyadditions.chapter.fireworkBox.text.1=The Firework Box is a perfect thing for New Year's! When placed down and supplied with some CF, it will shoot out some randomly generated Fireworks around it. For each shot, it uses CF. You can right-click the block to be able to precisely configure the types of Fireworks you want to get and how often you get them, along with a bunch of other options. Just play around in the GUI to find out what every setting does. This is a great way to set up cool looking Firework displays. +booklet.actuallyadditions.chapter.fireworkBox.text.2=This is a rarely known fact, but to craft a Firework Rocket, just put together a Gunpowder and a piece of Paper. booklet.actuallyadditions.chapter.rf.name=CF - Crystal Flux booklet.actuallyadditions.chapter.rf.text.1=Since the recent diminishment of what was known as Redstone Flux, a new way of storing power has arisen: Crystal Flux. This stuff is generated by all Actually Additions machines, however, it is compatible with Tesla and Forge Units, meaning machines that use Crystal Flux and machines that use any of the other systems mentioned can be interconnected without needing any sort of conversion.