From 228c606237e37d8d0572ee6c3be237d39323f6c1 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 29 Sep 2015 15:20:12 +0100 Subject: [PATCH] Added two new Portuguese Pavement Colors, yellow and green. --- .../vazkii/botania/common/block/ModFluffBlocks.java | 10 +++++----- .../botania/common/block/decor/BlockPavement.java | 2 +- .../vazkii/botania/common/core/BotaniaCreativeTab.java | 4 ++-- .../botania/common/crafting/ModCraftingRecipes.java | 6 ++++-- src/main/resources/assets/botania/lang/en_US.lang | 10 +++++++++- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 1e4ee9a9f..c6eb49bcd 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -173,9 +173,9 @@ public final class ModFluffBlocks { public static Block[] stoneFullSlabs = new Block[8]; public static Block stoneWall; - public static Block[] pavementStairs = new Block[4]; - public static Block[] pavementSlabs = new Block[4]; - public static Block[] pavementFullSlabs = new Block[4]; + public static Block[] pavementStairs = new Block[BlockPavement.TYPES]; + public static Block[] pavementSlabs = new Block[BlockPavement.TYPES]; + public static Block[] pavementFullSlabs = new Block[BlockPavement.TYPES]; public static Block endStoneSlab; public static Block endStoneSlabFull; @@ -296,7 +296,7 @@ public final class ModFluffBlocks { } stoneWall = new Block18StoneWall(); - for(int i = 0; i < 4; i++) { + for(int i = 0; i < pavementStairs.length; i++) { pavementStairs[i] = new BlockPavementStairs(i); pavementSlabs[i] = new BlockPavementSlab(false, i, i); pavementFullSlabs[i] = new BlockPavementSlab(true, i, i); @@ -378,7 +378,7 @@ public final class ModFluffBlocks { ((BlockModSlab) stoneFullSlabs[i]).register(); } - for(int i = 0; i < 4; i++) { + for(int i = 0; i < pavementSlabs.length; i++) { ((BlockModSlab) pavementSlabs[i]).register(); ((BlockModSlab) pavementFullSlabs[i]).register(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index 1ae2a7d6b..9c3511687 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -40,7 +40,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockPavement extends BlockMod { - private static final int TYPES = 4; + public static final int TYPES = 6; IIcon[] icons; public BlockPavement() { diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index abff34630..8ba9422bb 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -383,9 +383,9 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.biomeStoneWall); addBlock(ModFluffBlocks.pavement); - for(int i = 0; i < 4; i++) + for(int i = 0; i < ModFluffBlocks.pavementStairs.length; i++) addBlock(ModFluffBlocks.pavementStairs[i]); - for(int i = 0; i < 4; i++) + for(int i = 0; i < ModFluffBlocks.pavementSlabs.length; i++) addBlock(ModFluffBlocks.pavementSlabs[i]); if(ConfigHandler.enderStuff19Enabled) { diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index db7d920c7..243e46c84 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1996,7 +1996,9 @@ public final class ModCraftingRecipes { addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 1), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.coal)); addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 2), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.dye, 1, 4)); addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 3), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.redstone)); - recipesPavement = BotaniaAPI.getLatestAddedRecipes(4); + addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 4), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.wheat)); + addShapelessOreDictRecipe(new ItemStack(ModFluffBlocks.pavement, 3, 5), LibOreDict.LIVING_ROCK, "cobblestone", "gravel", new ItemStack(Items.slime_ball)); + recipesPavement = BotaniaAPI.getLatestAddedRecipes(6); // Cellular Block Recipe GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.cellBlock, 3), new ItemStack(Blocks.cactus), new ItemStack(Blocks.cactus), new ItemStack(Blocks.cactus), new ItemStack(Blocks.cactus), new ItemStack(Items.carrot), new ItemStack(Items.potato)); @@ -2098,7 +2100,7 @@ public final class ModCraftingRecipes { } // Pavement Stairsm & Stairs - for(int i = 0; i < 4; i++) + for(int i = 0; i < ModFluffBlocks.pavementStairs.length; i++) addStairsAndSlabs(ModFluffBlocks.pavement, i, ModFluffBlocks.pavementStairs[i], ModFluffBlocks.pavementSlabs[i]); // Misc Recipes diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 89d3f240b..010c117f4 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1113,10 +1113,14 @@ tile.botania:pavement0.name=White Portuguese Pavement tile.botania:pavement1.name=Black Portuguese Pavement tile.botania:pavement2.name=Blue Portuguese Pavement tile.botania:pavement3.name=Red Portuguese Pavement +tile.botania:pavement4.name=Yellow Portuguese Pavement +tile.botania:pavement5.name=Green Portuguese Pavement tile.botania:pavement0Stairs.name=White Portuguese Pavement Stairs tile.botania:pavement1Stairs.name=Black Portuguese Pavement Stairs tile.botania:pavement2Stairs.name=Blue Portuguese Pavement Stairs tile.botania:pavement3Stairs.name=Red Portuguese Pavement Stairs +tile.botania:pavement4Stairs.name=Yellow Portuguese Pavement Stairs +tile.botania:pavement5Stairs.name=Green Portuguese Pavement Stairs tile.botania:pavement0Slab.name=White Portuguese Pavement Slab tile.botania:pavement0SlabFull.name=White Portuguese Pavement Slab tile.botania:pavement1Slab.name=Black Portuguese Pavement Slab @@ -1125,6 +1129,10 @@ tile.botania:pavement2Slab.name=Blue Portuguese Pavement Slab tile.botania:pavement2SlabFull.name=Blue Portuguese Pavement Slab tile.botania:pavement3Slab.name=Red Portuguese Pavement Slab tile.botania:pavement3SlabFull.name=Red Portuguese Pavement Slab +tile.botania:pavement4Slab.name=Yellow Portuguese Pavement Slab +tile.botania:pavement4SlabFull.name=Yellow Portuguese Pavement Slab +tile.botania:pavement5Slab.name=Green Portuguese Pavement Slab +tile.botania:pavement5SlabFull.name=Green Portuguese Pavement Slab tile.botania:cellBlock.name=Cellular Block tile.botania:gaiaHeadBlock.name=Gaia Guardian's Head tile.botania:corporeaRetainer.name=Corporea Retainer @@ -3462,7 +3470,7 @@ botania.page.cacophonium2=For maximum cacophony, the &1Cacophonium&0 can be shif # -- 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.pavement0=&1Portuguese Pavement&0 is a type of building block designed to be used to create detailed roads. It comes in various colors, all of which 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