From c0e5df4280d441d0f9da610aaf007d945883be68 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 3 Mar 2014 22:27:59 +0000 Subject: [PATCH] Signal Flare recipe + doc = done. --- .../botania/common/crafting/ModCrafingRecipes.java | 13 ++++++++++++- .../botania/common/entity/EntitySignalFlare.java | 4 ++-- .../vazkii/botania/common/lexicon/LexiconData.java | 2 +- resources/assets/botania/lang/en_US.lang | 2 ++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index b150d1518..c52ae3928 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -23,6 +23,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ItemLens; +import vazkii.botania.common.item.ItemSignalFlare; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibOreDict; @@ -61,6 +62,7 @@ public final class ModCrafingRecipes { public static IRecipe livingwoodDecorRecipe3; public static IRecipe livingwoodDecorRecipe4; public static List recipesManaBeacons; + public static List recipesSignalFlares; public static void init() { // Lexicon Recipe @@ -231,11 +233,20 @@ public final class ModCrafingRecipes { // MANA BEACON RECIPES for(int i = 0; i < 16; i++) - addOreDictRecipe(new ItemStack(ModBlocks.manaBeacon, 2, i), + addOreDictRecipe(new ItemStack(ModBlocks.manaBeacon, 1, i), " B ", "BPB", " B ", 'B', new ItemStack(ModBlocks.unstableBlock, 1, i), 'P', LibOreDict.MANA_PEARL); recipesManaBeacons = BotaniaAPI.getLatestAddedRecipes(16); + + // SIGNAL FLARE RECIPES + for(int i = 0; i < 16; i++) + addOreDictRecipe(ItemSignalFlare.forColor(i), + "I ", " B", "W ", + 'B', new ItemStack(ModBlocks.manaBeacon, 1, i), + 'I', "ingotIron", + 'W', LibOreDict.LIVING_WOOD); + recipesSignalFlares = BotaniaAPI.getLatestAddedRecipes(16); } private static void addOreDictRecipe(ItemStack output, Object... recipe) { diff --git a/MODSRC/vazkii/botania/common/entity/EntitySignalFlare.java b/MODSRC/vazkii/botania/common/entity/EntitySignalFlare.java index 5df9fb68a..b58de79cd 100644 --- a/MODSRC/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/MODSRC/vazkii/botania/common/entity/EntitySignalFlare.java @@ -57,12 +57,12 @@ public class EntitySignalFlare extends Entity { @Override protected void readEntityFromNBT(NBTTagCompound nbttagcompound) { - nbttagcompound.setInteger(COLOR_TAG, getColor()); + setColor(nbttagcompound.getInteger(COLOR_TAG)); } @Override protected void writeEntityToNBT(NBTTagCompound nbttagcompound) { - setColor(nbttagcompound.getInteger(COLOR_TAG)); + nbttagcompound.setInteger(COLOR_TAG, getColor()); } public void setColor(int color) { diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index d816e4fd6..fbe6e27cb 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -171,7 +171,7 @@ public final class LexiconData { // MISCLENAEOUS ENTRIES unstableBlocks = new BLexiconEntry(LibLexicon.MISC_UNSTABLE_BLOCKS, categoryMisc); - unstableBlocks.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_UNSTABLE_BLOCK), new PageCraftingRecipe("2", ModCrafingRecipes.recipesUnstableBlocks), new PageText("3"), new PageImage("4", LibResources.ENTRY_UNSTABLE_BEACON), new PageCraftingRecipe("5", ModCrafingRecipes.recipesManaBeacons)); + unstableBlocks.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_UNSTABLE_BLOCK), new PageCraftingRecipe("2", ModCrafingRecipes.recipesUnstableBlocks), new PageText("3"), new PageImage("4", LibResources.ENTRY_UNSTABLE_BEACON), new PageCraftingRecipe("5", ModCrafingRecipes.recipesManaBeacons), new PageText("6"), new PageCraftingRecipe("7", ModCrafingRecipes.recipesSignalFlares)); decorativeBlocks = new BLexiconEntry(LibLexicon.MISC_DECORATIVE_BLOCKS, categoryMisc); decorativeBlocks.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.livingrockDecorRecipe1), new PageCraftingRecipe("2", ModCrafingRecipes.livingrockDecorRecipe2), new PageCraftingRecipe("3", ModCrafingRecipes.livingrockDecorRecipe3), new PageCraftingRecipe("4", ModCrafingRecipes.livingrockDecorRecipe4), diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 7ed7ff5e2..9c43d6aa6 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -401,6 +401,8 @@ botania.page.unstableBlocks2=And they come in all 16 colors botania.page.unstableBlocks3=You also found a way of creating a different version of these that releases an extremely larger amount of energy, this time in the form of a beam towards the sky that extends into a cloud of sorts. This one also seems to be disableable via a &4Redstone Signal&0, you call it &1Unstable Beacon&0, as it looks like one somehow. botania.page.unstableBlocks4=Fireworks? botania.page.unstableBlocks5=Combined entropy +botania.page.unstableBlocks6=It's also possible, by using the &1Unstable Beacons&0, to turn them into a manageable and portable utility, in the form of the &1Signal Flare&0.
This gun of sorts shoots a colored round into the sky that lasts a few seconds, it also stuns any nearby enemies for just as long. +botania.page.unstableBlocks7=&oShoot in case of titan.&r # -- DECORATIVE BLOCKS botania.entry.decorativeBlocks=Decorative Blocks