diff --git a/MODSRC/vazkii/botania/client/lib/LibResources.java b/MODSRC/vazkii/botania/client/lib/LibResources.java index f0636cab0..454a09a2c 100644 --- a/MODSRC/vazkii/botania/client/lib/LibResources.java +++ b/MODSRC/vazkii/botania/client/lib/LibResources.java @@ -34,6 +34,7 @@ public final class LibResources { public static final String ENTRY_APOTHECARY = PREFIX_ENTRIES + "apothecary.png"; public static final String ENTRY_PURE_DAISY = PREFIX_ENTRIES + "pureDaisy.png"; public static final String ENTRY_SPREADER = PREFIX_ENTRIES + "spreader.png"; + public static final String ENTRY_UNSTABLE_BLOCK = PREFIX_ENTRIES + "unstableBlock.png"; public static final String MODEL_ALTAR = PREFIX_MODEL + "altar.png"; public static final String MODEL_SPREADER = PREFIX_MODEL + "spreader.png"; diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index a8a01a897..bc0abe099 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -49,6 +49,7 @@ public final class ModCrafingRecipes { public static IRecipe recipeLensGravity; public static IRecipe recipeLensBore; public static IRecipe recipeLensDamaging; + public static List recipesUnstableBlocks; public static void init() { // Lexicon Recipe @@ -160,6 +161,15 @@ public final class ModCrafingRecipes { addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 0, 8), new ItemStack(ModItems.lens), LibOreDict.RUNE[13]); recipeLensDamaging = BotaniaAPI.getLatestAddedRecipe(); + + // Unstable Block Recipes + for(int i = 0; i < 16; i++) + addOreDictRecipe(new ItemStack(ModBlocks.unstableBlock, 2, i), + "OPO", "PMP", "OPO", + 'O', new ItemStack(Block.obsidian), + 'P', LibOreDict.PETAL[i], + 'M', new ItemStack(Item.enderPearl)); + recipesUnstableBlocks = BotaniaAPI.getLatestAddedRecipes(16); } 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 1f2351d8c..a9393a835 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -62,6 +62,8 @@ public final class LexiconData { public static LexiconEntry generatingIntro; public static LexiconEntry daybloom; + public static LexiconEntry unstableBlocks; + public static void init() { BotaniaAPI.addCategory(categoryBasics = new LexiconCategory(LibLexicon.CATEGORY_BASICS)); BotaniaAPI.addCategory(categoryMana = new LexiconCategory(LibLexicon.CATEGORY_MANA)); @@ -139,6 +141,10 @@ public final class LexiconData { daybloom = new BLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers); daybloom.setPriority().setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.daybloomRecipe)); + + // 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)); } } diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index c662801d4..16b8d05c0 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -47,5 +47,7 @@ public final class LibLexicon { public static final String GFLOWER_INTRO = "gIntro"; public static final String GFLOWER_DAYBLOOM = "daybloom"; + + public static final String MISC_UNSTABLE_BLOCKS = "unstableBlocks"; } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 1a1d384b7..444431e63 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -52,22 +52,22 @@ tile.botania:livingwood.name=Livingwood tile.botania:spreader.name=Mana Spreader tile.botania:pool.name=Mana Pool tile.botania:runeAltar.name=Runic Altar -tile.botania:unstableBlock0.name=White Unstable Block -tile.botania:unstableBlock1.name=Orange Unstable Block -tile.botania:unstableBlock2.name=Magenta Unstable Block -tile.botania:unstableBlock3.name=Light Blue Unstable Block -tile.botania:unstableBlock4.name=Yellow Unstable Block -tile.botania:unstableBlock5.name=Lime Unstable Block -tile.botania:unstableBlock6.name=Pink Unstable Block -tile.botania:unstableBlock7.name=Gray Unstable Block -tile.botania:unstableBlock8.name=Light Gray Unstable Block -tile.botania:unstableBlock9.name=Cyan Unstable Block -tile.botania:unstableBlock10.name=Purple Unstable Block -tile.botania:unstableBlock11.name=Blue Unstable Block -tile.botania:unstableBlock12.name=Brown Unstable Block -tile.botania:unstableBlock13.name=Green Unstable Block -tile.botania:unstableBlock14.name=Red Unstable Block -tile.botania:unstableBlock15.name=Black Unstable Block +tile.botania:unstableBlock0.name=White Unstable Cube +tile.botania:unstableBlock1.name=Orange Unstable Cube +tile.botania:unstableBlock2.name=Magenta Unstable Cube +tile.botania:unstableBlock3.name=Light Blue Unstable Cube +tile.botania:unstableBlock4.name=Yellow Unstable Cube +tile.botania:unstableBlock5.name=Lime Unstable Cube +tile.botania:unstableBlock6.name=Pink Unstable Cube +tile.botania:unstableBlock7.name=Gray Unstable Cube +tile.botania:unstableBlock8.name=Light Gray Unstable Cube +tile.botania:unstableBlock9.name=Cyan Unstable Cube +tile.botania:unstableBlock10.name=Purple Unstable Cube +tile.botania:unstableBlock11.name=Blue Unstable Cube +tile.botania:unstableBlock12.name=Brown Unstable Cube +tile.botania:unstableBlock13.name=Green Unstable Cube +tile.botania:unstableBlock14.name=Red Unstable Cube +tile.botania:unstableBlock15.name=Black Unstable Cube # FLOWER NAMES tile.botania:flower..name=Botania Flower @@ -318,4 +318,15 @@ botania.page.gIntro2=It is important to keep in mind that these flowers memorize # -- DAYBLOOM botania.entry.daybloom=Daybloom botania.page.daybloom0=The &1Daybloom&0 is the most basic and rudimentary &4Generating Flower&0. Simply put, it preforms a modified photosythesis process, in order to transform sunlight into &4Mana&0. -botania.page.daybloom1=Starting up a brand new day \ No newline at end of file +botania.page.daybloom1=Starting up a brand new day + +# - MAGICAL APPARATUS + +# - MYSTICAL INSTRUMENTS + +# - MISCLANEOUS +# -- UNSTABLE CUBE +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 diff --git a/resources/assets/botania/textures/gui/entries/unstableBlock.png b/resources/assets/botania/textures/gui/entries/unstableBlock.png new file mode 100644 index 000000000..6547a1ad3 Binary files /dev/null and b/resources/assets/botania/textures/gui/entries/unstableBlock.png differ