diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index bec7e671c..25e3cff9e 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -64,6 +64,7 @@ public final class LibResources { public static final String ENTRY_HYDROANGEAS = PREFIX_ENTRIES + "hydroangeas.png"; public static final String ENTRY_CRAFT_CRATE = PREFIX_ENTRIES + "craftCrate.png"; public static final String ENTRY_AZULEJOS = PREFIX_ENTRIES + "azulejos.png"; + public static final String ENTRY_METAMORPHIC_STONES = PREFIX_ENTRIES + "metamorphicStones.png"; public static final String MODEL_ALTAR = PREFIX_MODEL + "altar.png"; public static final String MODEL_ALTAR_MOSSY = PREFIX_MODEL + "altarMossy.png"; diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 4814ab0c4..4eeb77ee8 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -34,6 +34,7 @@ import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab; import vazkii.botania.common.block.decor.slabs.prismarine.BlockDarkPrismarineSlab; import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineBrickSlab; import vazkii.botania.common.block.decor.slabs.prismarine.BlockPrismarineSlab; +import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs; import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; import vazkii.botania.common.block.decor.stairs.BlockReedStairs; import vazkii.botania.common.block.decor.stairs.BlockThatchStairs; @@ -226,7 +227,7 @@ public final class ModFluffBlocks { for(int i = 0; i < 24; i++) { int meta = i % 16; Block block = i < 16 ? biomeStoneA : biomeStoneB; - biomeStoneStairs[i] = new BlockLivingStairs(block, meta); + biomeStoneStairs[i] = new BlockBiomeStoneStairs(block, meta); biomeStoneSlabs[i] = new BlockBiomeStoneSlab(false, block, meta, i); biomeStoneFullSlabs[i] = new BlockBiomeStoneSlab(true, block, meta, i); } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index 2f00f87d9..027b096ee 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -17,16 +17,20 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.lexicon.LexiconData; -public class BlockBiomeStone extends BlockMod { +public class BlockBiomeStone extends BlockMod implements ILexiconable { private static IIcon[] icons = new IIcon[32]; int iconOffset; @@ -80,4 +84,9 @@ public class BlockBiomeStone extends BlockMod { int meta = world.getBlockMetadata(x, y, z); return new ItemStack(this, 1, meta); } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.marimorphosis; + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java index eaf59015b..14968fee4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java @@ -10,9 +10,14 @@ */ package vazkii.botania.common.block.decor.slabs; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.lexicon.LexiconData; import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class BlockBiomeStoneSlab extends BlockLivingSlab { @@ -32,5 +37,10 @@ public class BlockBiomeStoneSlab extends BlockLivingSlab { public BlockSlab getSingleBlock() { return (BlockSlab) ModFluffBlocks.biomeStoneSlabs[index]; } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.marimorphosis; + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java new file mode 100644 index 000000000..ccdd689db --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java @@ -0,0 +1,31 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jan 29, 2015, 10:39:38 PM (GMT)] + */ +package vazkii.botania.common.block.decor.stairs; + +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.lexicon.LexiconData; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class BlockBiomeStoneStairs extends BlockLivingStairs { + + public BlockBiomeStoneStairs(Block source, int meta) { + super(source, meta); + } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.marimorphosis; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java index 8847c9157..15849fb7e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -21,10 +21,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeDictionary.Type; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lexicon.LexiconData; public class SubTileMarimorphosis extends SubTileFunctional { @@ -116,4 +118,9 @@ public class SubTileMarimorphosis extends SubTileFunctional { return 1000; } + @Override + public LexiconEntry getEntry() { + return LexiconData.marimorphosis; + } + } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 945b7c26b..c7d0bd4b7 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1535,6 +1535,16 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModBlocks.customBrick, 2, ModFluffBlocks.snowBrickStairs, ModFluffBlocks.snowBrickSlab); addStairsAndSlabs(ModBlocks.customBrick, 3, ModFluffBlocks.tileStairs, ModFluffBlocks.tileSlab); + // Biome Stone Recipes + for(int i = 0; i < 8; i++) { + GameRegistry.addSmelting(new ItemStack(ModFluffBlocks.biomeStoneA, 1, i + 8), new ItemStack(ModFluffBlocks.biomeStoneA, 1, i), 0.1F); + GameRegistry.addRecipe(new ItemStack(ModFluffBlocks.biomeStoneB, 1, i), "SS", "SS", 'S', new ItemStack(ModFluffBlocks.biomeStoneA, 1, i)); + GameRegistry.addRecipe(new ItemStack(ModFluffBlocks.biomeStoneB, 1, i + 8), "S", "S", 'S', new ItemStack(ModFluffBlocks.biomeStoneSlabs[i + 16])); + addStairsAndSlabs(ModFluffBlocks.biomeStoneA, i, ModFluffBlocks.biomeStoneStairs[i], ModFluffBlocks.biomeStoneSlabs[i]); + addStairsAndSlabs(ModFluffBlocks.biomeStoneA, i + 8, ModFluffBlocks.biomeStoneStairs[i + 8], ModFluffBlocks.biomeStoneSlabs[i + 8]); + addStairsAndSlabs(ModFluffBlocks.biomeStoneB, i, ModFluffBlocks.biomeStoneStairs[i + 16], ModFluffBlocks.biomeStoneSlabs[i + 16]); + } + // 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/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java index 52e72247d..509071e21 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -65,6 +65,7 @@ public final class ModPetalRecipes { public static RecipePetals vinculotusRecipe; public static RecipePetals spectranthemumRecipe; public static RecipePetals medumoneRecipe; + public static RecipePetals marimorphosisRecipe; public static void init() { pureDaisyRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), white, white, white, white); @@ -103,6 +104,7 @@ public final class ModPetalRecipes { vinculotusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_VINCULOTUS), purpleMana, purpleMana, lime, black, blackMana, black, runeWater, runeSloth, runeLust, redstoneRoot); spectranthemumRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTRANTHEMUM), whiteMana, whiteMana, white, white, cyan, runeEnvy, runeWater, redstoneRoot, pixieDust); medumoneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MEDUMONE), brown, brown, brownMana, gray, grayMana, runeEarth, redstoneRoot); + marimorphosisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MARIMORPHOSIS), grayMana, yellow, green, lime, lightBlue, red, runeEarth, runeFire, redstoneRoot); ItemStack stack = new ItemStack(Items.skull, 1, 3); ItemNBTHelper.setString(stack, "SkullOwner", "Vazkii"); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 0ac6413c2..f154f33c3 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -93,6 +93,7 @@ public final class LexiconData { public static LexiconEntry vinculotus; public static LexiconEntry spectranthemum; public static LexiconEntry medumone; + public static LexiconEntry marimorphosis; public static LexiconEntry generatingIntro; public static LexiconEntry daybloom; @@ -397,6 +398,9 @@ public final class LexiconData { medumone = new BLexiconEntry(LibLexicon.FFLOWER_MEDUMONE, categoryFunctionalFlowers); medumone.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.medumoneRecipe)); + marimorphosis = new BLexiconEntry(LibLexicon.FFLOWER_MARIMORPHOSIS, categoryFunctionalFlowers); + marimorphosis.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_METAMORPHIC_STONES), new PagePetalRecipe("2", ModPetalRecipes.marimorphosisRecipe)); + // GENERATING FLOWERS ENTRIES generatingIntro = new BLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers); generatingIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index ff402e10b..d14cafadf 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -74,6 +74,7 @@ public final class LibLexicon { public static final String FFLOWER_VINCULOTUS = "vinculotus"; public static final String FFLOWER_SPECTRANTHEMUN = "spectranthemum"; public static final String FFLOWER_MEDUMONE = "medumone"; + public static final String FFLOWER_MARIMORPHOSIS = "marimorphosis"; public static final String GFLOWER_INTRO = "gIntro"; public static final String GFLOWER_DAYBLOOM = "daybloom"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 2027ef10b..3722185d9 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1371,6 +1371,12 @@ botania.entry.medumone=Medumone botania.page.medumone0=The &1Medumone&0 is a flower with the ability to completely halt a creature's movement.
While it receives &4Mana&0, it'll halt any nearby entities in their tracks with a powerful slowness effect, provided they are not players. botania.page.medumone1=&oThose credits look fake&r... +# -- MARIMORPHOSIS +botania.entry.marimorphosis=Marimorphosis +botania.page.marimorphosis0=The &1Marimorphosis&0 is a flower that executes metamorphic transformations on nearby &1Stone&0 blocks. These blocks get metamorphised into one of 8 different types of &1Metamorphic Stone&0. All 8 types will generate, but the type(s) that generate more often depend on the biome. All of these can be used to make bricks, chiseled bricks, slabs and stairs. +botania.page.marimorphosis1=The various flavours of &1Metamorphic Stone&0 +botania.page.marimorphosis2=&oThis flower is pretty gneiss&r. + # - GENERATING FLOWERS # -- AN INTRODUCTION TO GENERATION botania.entry.gIntro=An Introduction to Generation diff --git a/src/main/resources/assets/botania/textures/gui/entries/metamorphicStones.png b/src/main/resources/assets/botania/textures/gui/entries/metamorphicStones.png new file mode 100644 index 000000000..1d7958c7b Binary files /dev/null and b/src/main/resources/assets/botania/textures/gui/entries/metamorphicStones.png differ