From c7dbac53f3287dd62c104f0561b64dcf4fbbf6ae Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 1 Sep 2015 20:01:20 +0100 Subject: [PATCH] Pavement recipe/docs --- .../botania/common/crafting/ModCraftingRecipes.java | 13 +++++++++++++ .../vazkii/botania/common/lexicon/LexiconData.java | 3 +++ .../java/vazkii/botania/common/lib/LibLexicon.java | 2 ++ src/main/resources/assets/botania/lang/en_US.lang | 5 +++++ 4 files changed, 23 insertions(+) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index cc4faf3e1..7dc6b8d8e 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -25,6 +25,7 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; @@ -289,6 +290,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeManaweaveBoots; public static IRecipe recipeBifrost; public static IRecipe recipeAutocraftingHalo; + public static List recipesPavement; // Garden of Glass public static IRecipe recipeRootToSapling; @@ -1973,6 +1975,13 @@ public final class ModCraftingRecipes { addShapelessOreDictRecipe(new ItemStack(ModItems.autocraftingHalo), new ItemStack(ModItems.craftingHalo), LibOreDict.MANA_DIAMOND); recipeAutocraftingHalo = BotaniaAPI.getLatestAddedRecipe(); + // Pavement Recipes + addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 0), LibOreDict.LIVING_ROCK, "stone", "gravel"); + addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 1), LibOreDict.LIVING_ROCK, "stone", "gravel", new ItemStack(Items.coal)); + addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 2), LibOreDict.LIVING_ROCK, "stone", "gravel", new ItemStack(Items.dye, 1, 4)); + addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 3), LibOreDict.LIVING_ROCK, "stone", "gravel", new ItemStack(Items.redstone)); + recipesPavement = BotaniaAPI.getLatestAddedRecipes(4); + /////////////////////////////////////////////////////////////////////////////////////////////////////////// // Storage Block/Nugget Recipes @@ -2064,6 +2073,10 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModFluffBlocks.stone, i + 8, ModFluffBlocks.stoneStairs[i + 4], ModFluffBlocks.stoneSlabs[i + 4]); } + // Pavement Stairsm & Stairs + for(int i = 0; i < 4; i++) + addStairsAndSlabs(ModFluffBlocks.pavement, i, ModFluffBlocks.pavementStairs[i], ModFluffBlocks.pavementSlabs[i]); + // Misc Recipes GameRegistry.addShapelessRecipe(new ItemStack(Items.reeds, 9, 0), new ItemStack(ModBlocks.reedBlock)); GameRegistry.addShapelessRecipe(new ItemStack(Items.wheat, 4, 0), new ItemStack(ModBlocks.thatch)); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index c7dd10f31..30ad39366 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -1032,6 +1032,9 @@ public final class LexiconData { cacophonium = new BLexiconEntry(LibLexicon.MISC_CACOPHONIUM, categoryMisc); cacophonium.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCacophonium), new PageText("2")); + pavement = new BLexiconEntry(LibLexicon.MISC_PAVEMENT, categoryMisc); + pavement.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesPavement)); + if(Botania.bcTriggersLoaded) { bcIntegration = new CLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc, "BuildCraft"); bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.redstone)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index fe0c8c267..858bcba3a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -247,6 +247,8 @@ public final class LibLexicon { public static final String MISC_BLAZE_BLOCK = "blazeBlock"; public static final String MISC_CHALLENGES = "challenges"; public static final String MISC_CACOPHONIUM = "cacophonium"; + public static final String MISC_PAVEMENT = "pavement"; + public static final String MISC_TC_INTEGRATION = "tcIntegration"; public static final String MISC_BC_INTEGRATION = "bcIntegration"; public static final String MISC_BANNERS = "banners"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index a8e4606a7..2df5ef55f 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3331,6 +3331,11 @@ botania.page.cacophonium0=This interesting instrument, the &1Cacophonium&0, has botania.page.cacophonium1=Hibike! Cacophonium botania.page.cacophonium2=For maximum cacophony, the &1Cacophonium&0 can be shift-right clicked onto a &1Note Block&0, creating the ability to sound off animal or monster sounds on demand.
You monster. +# -- PORTUGUESE PAVEMENT +botania.entry.pavement=Portuguese Pavement +botania.page.pavement0=&1Portuguese Pavement&0 is a type of building block designed to be used to create detailed roads. It comes in four colors, white, black, blue and red, all four of these can be turned into slabs and stairs.
For those with experience in the arts of multiparts and microblocks, these blocks provide a great looking method to create patterns. +botania.page.pavement1=These aren't slippery + # -- THAUMCRAFT INTEGRATION botania.entry.tcIntegration=Thaumcraft Integration botania.page.tcIntegration0=Often enough, the paths of &4Botany&0 and &4Thaumaturgy&0 cross together. Mixing some of the artifacts mentioned in this book as well as any from the school of &5Thaumcraft&0 can allow for combinations of these to form.