From 055aa7baa71be12c460063b7c19d25d1170917b8 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 3 Mar 2014 16:23:19 +0000 Subject: [PATCH] Decorative blocks... --- .../botania/common/block/BlockLivingrock.java | 3 +- .../botania/common/block/BlockLivingwood.java | 3 +- .../common/crafting/ModCrafingRecipes.java | 36 +++++++++++++++++++ .../botania/common/lexicon/LexiconData.java | 6 +++- .../vazkii/botania/common/lib/LibLexicon.java | 1 + resources/assets/botania/lang/en_US.lang | 14 +++++++- 6 files changed, 59 insertions(+), 4 deletions(-) diff --git a/MODSRC/vazkii/botania/common/block/BlockLivingrock.java b/MODSRC/vazkii/botania/common/block/BlockLivingrock.java index 7941f232b..384bfdebb 100644 --- a/MODSRC/vazkii/botania/common/block/BlockLivingrock.java +++ b/MODSRC/vazkii/botania/common/block/BlockLivingrock.java @@ -74,7 +74,8 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { - return LexiconData.pureDaisy; + int meta = world.getBlockMetadata(x, y, z); + return meta == 0 ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } } diff --git a/MODSRC/vazkii/botania/common/block/BlockLivingwood.java b/MODSRC/vazkii/botania/common/block/BlockLivingwood.java index 3171b4a60..6c02f1c4f 100644 --- a/MODSRC/vazkii/botania/common/block/BlockLivingwood.java +++ b/MODSRC/vazkii/botania/common/block/BlockLivingwood.java @@ -73,7 +73,8 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { - return LexiconData.pureDaisy; + int meta = world.getBlockMetadata(x, y, z); + return meta == 0 ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } } diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 00de5bef9..6556aa11b 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -52,6 +52,14 @@ public final class ModCrafingRecipes { public static List recipesUnstableBlocks; public static IRecipe recipePylon; public static IRecipe recipeDistributor; + public static IRecipe livingrockDecorRecipe1; + public static IRecipe livingrockDecorRecipe2; + public static IRecipe livingrockDecorRecipe3; + public static IRecipe livingrockDecorRecipe4; + public static IRecipe livingwoodDecorRecipe1; + public static IRecipe livingwoodDecorRecipe2; + public static IRecipe livingwoodDecorRecipe3; + public static IRecipe livingwoodDecorRecipe4; public static void init() { // Lexicon Recipe @@ -191,6 +199,34 @@ public final class ModCrafingRecipes { 'R', LibOreDict.LIVING_ROCK, 'S', LibOreDict.MANA_STEEL); recipeDistributor = BotaniaAPI.getLatestAddedRecipe(); + + // Livingrock Decorative Blocks + addOreDictRecipe(new ItemStack(ModBlocks.livingrock, 4, 1), + "RR", "RR", + 'R', LibOreDict.LIVING_ROCK); + livingrockDecorRecipe1 = BotaniaAPI.getLatestAddedRecipe(); + addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingrock, 1, 2), new ItemStack(ModBlocks.livingrock, 1, 1), new ItemStack(Item.seeds)); + livingrockDecorRecipe2 = BotaniaAPI.getLatestAddedRecipe(); + addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingrock, 2, 3), new ItemStack(ModBlocks.livingrock, 1, 1), "cobblestone"); + livingrockDecorRecipe3 = BotaniaAPI.getLatestAddedRecipe(); + addOreDictRecipe(new ItemStack(ModBlocks.livingrock, 4, 4), + "RR", "RR", + 'R', new ItemStack(ModBlocks.livingrock, 1, 1)); + livingrockDecorRecipe4 = BotaniaAPI.getLatestAddedRecipe(); + + // Livingwood Decorative Blocks + addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingwood, 4, 1), LibOreDict.LIVING_WOOD); + livingwoodDecorRecipe1 = BotaniaAPI.getLatestAddedRecipe(); + addShapelessOreDictRecipe(new ItemStack(ModBlocks.livingwood, 1, 2), new ItemStack(ModBlocks.livingwood, 1, 1), new ItemStack(Item.seeds)); + livingwoodDecorRecipe2 = BotaniaAPI.getLatestAddedRecipe(); + addOreDictRecipe(new ItemStack(ModBlocks.livingwood, 4, 3), + "WW", "WW", + 'W', new ItemStack(ModBlocks.livingwood, 1, 1)); + livingwoodDecorRecipe3 = BotaniaAPI.getLatestAddedRecipe(); + addOreDictRecipe(new ItemStack(ModBlocks.livingwood, 4, 4), + " W ", "W W", " W ", + 'W', new ItemStack(ModBlocks.livingwood, 1, 1)); + livingwoodDecorRecipe4 = BotaniaAPI.getLatestAddedRecipe(); } private static void addOreDictRecipe(ItemStack output, Object... recipe) { diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 716fd3a17..b8da08f3a 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -70,6 +70,7 @@ public final class LexiconData { public static LexiconEntry pylon; public static LexiconEntry unstableBlocks; + public static LexiconEntry decorativeBlocks; public static void init() { BotaniaAPI.addCategory(categoryBasics = new LexiconCategory(LibLexicon.CATEGORY_BASICS)); @@ -171,6 +172,9 @@ 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)); - } + 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), + new PageCraftingRecipe("5", ModCrafingRecipes.livingwoodDecorRecipe1), new PageCraftingRecipe("6", ModCrafingRecipes.livingwoodDecorRecipe2), new PageCraftingRecipe("7", ModCrafingRecipes.livingwoodDecorRecipe3), new PageCraftingRecipe("8", ModCrafingRecipes.livingwoodDecorRecipe4)); + } } diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 941ae5302..01f12397d 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -56,5 +56,6 @@ public final class LibLexicon { public static final String DEVICE_PYLON = "pylon"; public static final String MISC_UNSTABLE_BLOCKS = "unstableBlocks"; + public static final String MISC_DECORATIVE_BLOCKS = "decorativeBlocks"; } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 42e084c73..37d69c215 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -379,4 +379,16 @@ botania.page.pylon1=&oYou must construct additional pylons!&r botania.entry.unstableBlocks=Unstable Cubes botania.page.unstableBlocks0=Fiddling with highly powerful &4Mana&0 infused objects has lead to the creation of these strange cubes. They seem to emit some visual radiation in the form of colorful lightning, but it doesn't seem like it has any effects other than visual appeal. botania.page.unstableBlocks1=They look fancy -botania.page.unstableBlocks2=And they come in all 16 colors \ No newline at end of file +botania.page.unstableBlocks2=And they come in all 16 colors + +# -- DECORATIVE BLOCKS +botania.entry.decorativeBlocks=Decorative Blocks +botania.page.decorativeBlocks0=It's possible to turn blocks of &1Livingrock&0 and &1Livingwood&0 into decorative blocks. Each of them features 4 different decorative variations.
If &4ForgeMultipart&0 is enabled, these will work as &4Microblocks&0. +botania.page.decorativeBlocks1=Livingrock bricks. +botania.page.decorativeBlocks2=Mossing the bricks +botania.page.decorativeBlocks3=Cracking the bricks +botania.page.decorativeBlocks4=Framing the bricks +botania.page.decorativeBlocks5=Turning wood into planks +botania.page.decorativeBlocks6=Mossing the planks +botania.page.decorativeBlocks7=Framing the planks +botania.page.decorativeBlocks8=Pattern planks \ No newline at end of file