diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index eb7421302..914088c50 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -81,7 +81,6 @@ public class RenderSpark extends RenderEntity { float f5 = 0.5F; float f6 = 0.25F; - p_77026_1_.startDrawingQuads(); p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); p_77026_1_.setBrightness(240); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 738b7a303..72fb19d5f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -76,7 +76,8 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid LibBlockNames.SUBTILE_BELLETHORN, LibBlockNames.SUBTILE_DREADTHORN, LibBlockNames.SUBTILE_HEISEI_DREAM, - LibBlockNames.SUBTILE_TIGERSEYE, + LibBlockNames.SUBTILE_TIGERSEYE, + LibBlockNames.SUBTILE_MARIMORPHOSIS, LibBlockNames.SUBTILE_ORECHID, LibBlockNames.SUBTILE_FALLEN_KANADE, LibBlockNames.SUBTILE_EXOFLAME, diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 4488f3d8d..778fa9a01 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -73,6 +73,7 @@ import vazkii.botania.common.block.subtile.functional.SubTileHyacidus; import vazkii.botania.common.block.subtile.functional.SubTileJadedAmaranthus; import vazkii.botania.common.block.subtile.functional.SubTileJiyuulia; import vazkii.botania.common.block.subtile.functional.SubTileLoonuim; +import vazkii.botania.common.block.subtile.functional.SubTileMarimorphosis; import vazkii.botania.common.block.subtile.functional.SubTileMedumone; import vazkii.botania.common.block.subtile.functional.SubTilePollidisiac; import vazkii.botania.common.block.subtile.functional.SubTileRannuncarpus; @@ -349,6 +350,7 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_VINCULOTUS, SubTileVinculotus.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_SPECTRANTHEMUM, SubTileSpectranthemum.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MEDUMONE, SubTileMedumone.class); + BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MARIMORPHOSIS, SubTileMarimorphosis.class); } private static void registerTile(Class clazz, String key) { diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index ec2833df5..4814ab0c4 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -11,9 +11,12 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; +import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneA; +import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneB; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzSlab; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartzStairs; +import vazkii.botania.common.block.decor.slabs.BlockBiomeStoneSlab; import vazkii.botania.common.block.decor.slabs.BlockDirtPathSlab; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.block.decor.slabs.BlockReedSlab; @@ -31,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.BlockLivingStairs; import vazkii.botania.common.block.decor.stairs.BlockReedStairs; import vazkii.botania.common.block.decor.stairs.BlockThatchStairs; import vazkii.botania.common.block.decor.stairs.bricks.BlockCustomBrickStairs; @@ -128,6 +132,13 @@ public final class ModFluffBlocks { public static Block dirtPathSlab; public static Block dirtPathSlabFull; + public static Block biomeStoneA; + public static Block biomeStoneB; + + public static Block[] biomeStoneStairs = new Block[24]; + public static Block[] biomeStoneSlabs = new Block[24]; + public static Block[] biomeStoneFullSlabs = new Block[24]; + public static void init() { livingwoodStairs = new BlockLivingwoodStairs(); livingwoodSlab = new BlockLivingwoodSlab(false); @@ -177,6 +188,9 @@ public final class ModFluffBlocks { tileStairs = new BlockTileStairs(); tileSlab = new BlockTileSlab(false); tileSlabFull = new BlockTileSlab(true); + + biomeStoneA = new BlockBiomeStoneA(); + biomeStoneB = new BlockBiomeStoneB(); if(ConfigHandler.darkQuartzEnabled) { darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK); @@ -209,6 +223,14 @@ public final class ModFluffBlocks { dirtPathSlab = new BlockDirtPathSlab(false); dirtPathSlabFull = new BlockDirtPathSlab(true); + for(int i = 0; i < 24; i++) { + int meta = i % 16; + Block block = i < 16 ? biomeStoneA : biomeStoneB; + biomeStoneStairs[i] = new BlockLivingStairs(block, meta); + biomeStoneSlabs[i] = new BlockBiomeStoneSlab(false, block, meta, i); + biomeStoneFullSlabs[i] = new BlockBiomeStoneSlab(true, block, meta, i); + } + if(ConfigHandler.darkQuartzEnabled) { ((BlockModSlab) darkQuartzSlab).register(); ((BlockModSlab) darkQuartzSlabFull).register(); @@ -260,6 +282,11 @@ public final class ModFluffBlocks { ((BlockModSlab) dirtPathSlab).register(); ((BlockModSlab) dirtPathSlabFull).register(); + + for(int i = 0; i < 24; i++) { + ((BlockModSlab) biomeStoneSlabs[i]).register(); + ((BlockModSlab) biomeStoneFullSlabs[i]).register(); + } } } 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 new file mode 100644 index 000000000..2f00f87d9 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -0,0 +1,83 @@ +/** + * 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, 6:54:20 PM (GMT)] + */ +package vazkii.botania.common.block.decor.biomestone; + +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; +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.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.client.core.helper.IconHelper; +import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; + +public class BlockBiomeStone extends BlockMod { + + private static IIcon[] icons = new IIcon[32]; + int iconOffset; + + public BlockBiomeStone(int iconOffset, String name) { + super(Material.rock); + setHardness(1.5F); + setResistance(10F); + setStepSound(soundTypeStone); + setBlockName(name); + this.iconOffset = iconOffset; + } + + @Override + public void registerBlockIcons(IIconRegister register) { + for(int i = 0; i < 16; i++) { + int index = i + iconOffset; + icons[index] = IconHelper.forName(register, "biomeStone" + index); + } + } + + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + for(int i = 0; i < 16; i++) + list.add(new ItemStack(item, 1, i)); + } + + @Override + public IIcon getIcon(int side, int meta) { + return icons[meta + iconOffset]; + } + + @Override + protected boolean shouldRegisterInNameSet() { + return false; + } + + @Override + public int damageDropped(int par1) { + return par1; + } + + @Override + public Block setBlockName(String par1Str) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); + return super.setBlockName(par1Str); + } + + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + int meta = world.getBlockMetadata(x, y, z); + return new ItemStack(this, 1, meta); + } +} diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java new file mode 100644 index 000000000..4e50d040e --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java @@ -0,0 +1,26 @@ +/** + * 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, 7:17:35 PM (GMT)] + */ +package vazkii.botania.common.block.decor.biomestone; + +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockBiomeStoneA extends BlockBiomeStone { + + public BlockBiomeStoneA() { + super(0, LibBlockNames.BIOME_STONE_A); + } + + @Override + public int damageDropped(int par1) { + return par1 % 8 + 8; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java new file mode 100644 index 000000000..405432fc5 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -0,0 +1,21 @@ +/** + * 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, 7:17:41 PM (GMT)] + */ +package vazkii.botania.common.block.decor.biomestone; + +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockBiomeStoneB extends BlockBiomeStone { + + public BlockBiomeStoneB() { + super(16, LibBlockNames.BIOME_STONE_B); + } + +} 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 new file mode 100644 index 000000000..eaf59015b --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java @@ -0,0 +1,36 @@ +/** + * 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, 7:34:16 PM (GMT)] + */ +package vazkii.botania.common.block.decor.slabs; + +import vazkii.botania.common.block.ModFluffBlocks; +import net.minecraft.block.Block; +import net.minecraft.block.BlockSlab; + +public class BlockBiomeStoneSlab extends BlockLivingSlab { + + int index; + + public BlockBiomeStoneSlab(boolean full, Block source, int meta, int index) { + super(full, source, meta); + this.index = index; + } + + @Override + public BlockSlab getFullBlock() { + return (BlockSlab) ModFluffBlocks.biomeStoneFullSlabs[index]; + } + + @Override + public BlockSlab getSingleBlock() { + return (BlockSlab) ModFluffBlocks.biomeStoneSlabs[index]; + } + +} 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 new file mode 100644 index 000000000..8847c9157 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -0,0 +1,119 @@ +/** + * 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, 8:17:55 PM (GMT)] + */ +package vazkii.botania.common.block.subtile.functional; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import akka.util.Collections; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +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.subtile.SubTileFunctional; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.core.handler.ConfigHandler; + +public class SubTileMarimorphosis extends SubTileFunctional { + + private static final int COST = 12; + private static final Type[] TYPES = new Type[] { + Type.FOREST, + Type.PLAINS, + Type.MOUNTAIN, + Type.MUSHROOM, + Type.SWAMP, + Type.SANDY, + Type.SNOWY, + Type.MESA + }; + + @Override + public void onUpdate() { + super.onUpdate(); + if(redstoneSignal > 0) + return; + + if(!supertile.getWorldObj().isRemote && mana >= COST && ticksExisted % 2 == 0) { + ChunkCoordinates coords = getCoordsToPut(); + if(coords != null) { + ItemStack stack = getStoneToPut(coords); + if(stack != null) { + Block block = Block.getBlockFromItem(stack.getItem()); + int meta = stack.getItemDamage(); + supertile.getWorldObj().setBlock(coords.posX, coords.posY, coords.posZ, block, meta, 1 | 2); + if(ConfigHandler.blockBreakParticles) + supertile.getWorldObj().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(block) + (meta << 12)); + + mana -= COST; + sync(); + } + } + } + } + + public ItemStack getStoneToPut(ChunkCoordinates coords) { + List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorldObj().getBiomeGenForCoords(coords.posX, coords.posZ))); + + List values = new ArrayList(); + for(int i = 0; i < 8; i++) { + int times = 1; + if(types.contains(TYPES[i])) + times = 12; + + for(int j = 0; j < times; j++) + values.add(i); + } + + return new ItemStack(ModFluffBlocks.biomeStoneA, 1, values.get(supertile.getWorldObj().rand.nextInt(values.size()))); + } + + public ChunkCoordinates getCoordsToPut() { + List possibleCoords = new ArrayList(); + int range = 8; + int rangeY = 5; + + for(int i = -range; i < range + 1; i++) + for(int j = -rangeY; j < rangeY; j++) + for(int k = -range; k < range + 1; k++) { + int x = supertile.xCoord + i; + int y = supertile.yCoord + j; + int z = supertile.zCoord + k; + Block block = supertile.getWorldObj().getBlock(x, y, z); + if(block != null && block.isReplaceableOreGen(supertile.getWorldObj(), x, y, z, Blocks.stone)) + possibleCoords.add(new ChunkCoordinates(x, y, z)); + } + + if(possibleCoords.isEmpty()) + return null; + return possibleCoords.get(supertile.getWorldObj().rand.nextInt(possibleCoords.size())); + } + + @Override + public int getColor() { + return 0x769897; + } + + @Override + public boolean acceptsRedstone() { + return true; + } + + @Override + public int getMaxMana() { + return 1000; + } + +} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 84f8d517a..a2c2f4821 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -203,6 +203,13 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.elfQuartz); addBlock(ModFluffBlocks.elfQuartzSlab); addBlock(ModFluffBlocks.elfQuartzStairs); + + addBlock(ModFluffBlocks.biomeStoneA); + addBlock(ModFluffBlocks.biomeStoneB); + for(int i = 0; i < 24; i++) + addBlock(ModFluffBlocks.biomeStoneStairs[i]); + for(int i = 0; i < 24; i++) + addBlock(ModFluffBlocks.biomeStoneSlabs[i]); addItem(ModItems.glassPick); addItem(ModItems.manasteelPick); @@ -292,3 +299,4 @@ public final class BotaniaCreativeTab extends CreativeTabs { } } + diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 8ea1c491c..66a394dce 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -69,6 +69,8 @@ public final class LibBlockNames { public static final String PRISM = "prism"; public static final String DIRT_PATH = "dirtPath"; public static final String ENCHANTED_SOIL = "enchantedSoil"; + public static final String BIOME_STONE_A = "biomeStoneA"; + public static final String BIOME_STONE_B = "biomeStoneB"; public static final String SUBTILE_PUREDAISY = "puredaisy"; public static final String SUBTILE_MANASTAR = "manastar"; @@ -105,6 +107,7 @@ public final class LibBlockNames { public static final String SUBTILE_VINCULOTUS = "vinculotus"; public static final String SUBTILE_SPECTRANTHEMUM = "spectranthemum"; public static final String SUBTILE_MEDUMONE = "medumone"; + public static final String SUBTILE_MARIMORPHOSIS = "marimorphosis"; public static final String QUARTZ_DARK = "Dark"; public static final String QUARTZ_MANA = "Mana"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 768d28980..2027ef10b 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -571,6 +571,86 @@ tile.botania:prism.name=Mana Prism tile.botania:dirtPath.name=Trodden Dirt tile.botania:enchantedSoil.name=Enchanted Soil tile.botania:dirtPath0Slab.name=Trodden Dirt Slab +tile.botania:biomeStoneA0.name=Metamorphic Forest Stone +tile.botania:biomeStoneA1.name=Metamorphic Plains Stone +tile.botania:biomeStoneA2.name=Metamorphic Mountain Stone +tile.botania:biomeStoneA3.name=Metamorphic Fungal Stone +tile.botania:biomeStoneA4.name=Metamorphic Swamp Stone +tile.botania:biomeStoneA5.name=Metamorphic Desert Stone +tile.botania:biomeStoneA6.name=Metamorphic Taiga Stone +tile.botania:biomeStoneA7.name=Metamorphic Mesa Stone +tile.botania:biomeStoneA8.name=Metamorphic Forest Cobblestone +tile.botania:biomeStoneA9.name=Metamorphic Plains Cobblestone +tile.botania:biomeStoneA10.name=Metamorphic Mountain Cobblestone +tile.botania:biomeStoneA11.name=Metamorphic Fungal Cobblestone +tile.botania:biomeStoneA12.name=Metamorphic Swamp Cobblestone +tile.botania:biomeStoneA13.name=Metamorphic Desert Cobblestone +tile.botania:biomeStoneA14.name=Metamorphic Taiga Cobblestone +tile.botania:biomeStoneA15.name=Metamorphic Mesa Cobblestone +tile.botania:biomeStoneB0.name=Metamorphic Forest Stone Bricks +tile.botania:biomeStoneB1.name=Metamorphic Plains Stone Bricks +tile.botania:biomeStoneB2.name=Metamorphic Mountain Stone Bricks +tile.botania:biomeStoneB3.name=Metamorphic Fungal Stone Bricks +tile.botania:biomeStoneB4.name=Metamorphic Swamp Stone Bricks +tile.botania:biomeStoneB5.name=Metamorphic Desert Stone Bricks +tile.botania:biomeStoneB6.name=Metamorphic Taiga Stone Bricks +tile.botania:biomeStoneB7.name=Metamorphic Mesa Stone Bricks +tile.botania:biomeStoneB8.name=Chiseled Metamorphic Forest Stone Brick +tile.botania:biomeStoneB9.name=Chiseled Metamorphic Plains Stone Brick +tile.botania:biomeStoneB10.name=Chiseled Metamorphic Mountain Stone Brick +tile.botania:biomeStoneB11.name=Chiseled Metamorphic Fungal Stone Brick +tile.botania:biomeStoneB12.name=Chiseled Metamorphic Swamp Stone Brick +tile.botania:biomeStoneB13.name=Chiseled Metamorphic Desert Stone Brick +tile.botania:biomeStoneB14.name=Chiseled Metamorphic Taiga Stone Brick +tile.botania:biomeStoneB15.name=Chiseled Metamorphic Mesa Stone Brick +tile.botania:biomeStoneA0Stairs.name=Metamorphic Forest Stone Stairs +tile.botania:biomeStoneA1Stairs.name=Metamorphic Plains Stone Stairs +tile.botania:biomeStoneA2Stairs.name=Metamorphic Mountain Stone Stairs +tile.botania:biomeStoneA3Stairs.name=Metamorphic Fungal Stone Stairs +tile.botania:biomeStoneA4Stairs.name=Metamorphic Swamp Stone Stairs +tile.botania:biomeStoneA5Stairs.name=Metamorphic Desert Stone Stairs +tile.botania:biomeStoneA6Stairs.name=Metamorphic Taiga Stone Stairs +tile.botania:biomeStoneA7Stairs.name=Metamorphic Mesa Stone Stairs +tile.botania:biomeStoneA8Stairs.name=Metamorphic Forest Cobblestone Stairs +tile.botania:biomeStoneA9Stairs.name=Metamorphic Plains Cobblestone Stairs +tile.botania:biomeStoneA10Stairs.name=Metamorphic Mountain Cobblestone Stairs +tile.botania:biomeStoneA11Stairs.name=Metamorphic Fungal Cobblestone Stairs +tile.botania:biomeStoneA12Stairs.name=Metamorphic Swamp Cobblestone Stairs +tile.botania:biomeStoneA13Stairs.name=Metamorphic Desert Cobblestone Stairs +tile.botania:biomeStoneA14Stairs.name=Metamorphic Taiga Cobblestone Stairs +tile.botania:biomeStoneA15Stairs.name=Metamorphic Mesa Cobblestone Stairs +tile.botania:biomeStoneB0Stairs.name=Metamorphic Forest Stone Brick Stairs +tile.botania:biomeStoneB1Stairs.name=Metamorphic Plains Stone Brick Stairs +tile.botania:biomeStoneB2Stairs.name=Metamorphic Mountain Stone Brick Stairs +tile.botania:biomeStoneB3Stairs.name=Metamorphic Fungal Stone Brick Stairs +tile.botania:biomeStoneB4Stairs.name=Metamorphic Swamp Stone Brick Stairs +tile.botania:biomeStoneB5Stairs.name=Metamorphic Desert Stone Brick Stairs +tile.botania:biomeStoneB6Stairs.name=Metamorphic Taiga Stone Brick Stairs +tile.botania:biomeStoneB7Stairs.name=Metamorphic Mesa Stone Bricks Stairs +tile.botania:biomeStoneA0Slab.name=Metamorphic Forest Stone Slab +tile.botania:biomeStoneA1Slab.name=Metamorphic Plains Stone Slab +tile.botania:biomeStoneA2Slab.name=Metamorphic Mountain Stone Slab +tile.botania:biomeStoneA3Slab.name=Metamorphic Fungal Stone Slab +tile.botania:biomeStoneA4Slab.name=Metamorphic Swamp Stone Slab +tile.botania:biomeStoneA5Slab.name=Metamorphic Desert Stone Slab +tile.botania:biomeStoneA6Slab.name=Metamorphic Taiga Stone Slab +tile.botania:biomeStoneA7Slab.name=Metamorphic Mesa Stone Slab +tile.botania:biomeStoneA8Slab.name=Metamorphic Forest Cobblestone Slab +tile.botania:biomeStoneA9Slab.name=Metamorphic Plains Cobblestone Slab +tile.botania:biomeStoneA10Slab.name=Metamorphic Mountain Cobblestone Slab +tile.botania:biomeStoneA11Slab.name=Metamorphic Fungal Cobblestone Slab +tile.botania:biomeStoneA12Slab.name=Metamorphic Swamp Cobblestone Slab +tile.botania:biomeStoneA13Slab.name=Metamorphic Desert Cobblestone Slab +tile.botania:biomeStoneA14Slab.name=Metamorphic Taiga Cobblestone Slab +tile.botania:biomeStoneA15Slab.name=Metamorphic Mesa Cobblestone Slab +tile.botania:biomeStoneB0Slab.name=Metamorphic Forest Stone Brick Slab +tile.botania:biomeStoneB1Slab.name=Metamorphic Plains Stone Brick Slab +tile.botania:biomeStoneB2Slab.name=Metamorphic Mountain Stone Brick Slab +tile.botania:biomeStoneB3Slab.name=Metamorphic Fungal Stone Brick Slab +tile.botania:biomeStoneB4Slab.name=Metamorphic Swamp Stone Brick Slab +tile.botania:biomeStoneB5Slab.name=Metamorphic Desert Stone Brick Slab +tile.botania:biomeStoneB6Slab.name=Metamorphic Taiga Stone Brick Slab +tile.botania:biomeStoneB7Slab.name=Metamorphic Mesa Stone Bricks Slab # FLOWER NAMES tile.botania:flower..name=Botania Flower @@ -648,6 +728,8 @@ tile.botania:flower.spectranthemum.name=Spectranthemum tile.botania:flower.spectranthemum.reference=In the shell tile.botania:flower.medumone.name=Medumone tile.botania:flower.medumone.reference='Twas Hades all along +tile.botania:flower.marimorphosis.name=Marimorphosis +tile.botania:flower.marimorphosis.reference=Solid as a rock # ITEM NAMES item.botania:lexicon.name=Lexica Botania diff --git a/src/main/resources/assets/botania/textures/blocks/unused/flowerStone.png b/src/main/resources/assets/botania/textures/blocks/alt/marimorphosis.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/flowerStone.png rename to src/main/resources/assets/botania/textures/blocks/alt/marimorphosis.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone0.png b/src/main/resources/assets/botania/textures/blocks/biomeStone0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone0.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone0.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone1.png b/src/main/resources/assets/botania/textures/blocks/biomeStone1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone1.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone1.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone10.png b/src/main/resources/assets/botania/textures/blocks/biomeStone10.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone10.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone10.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone11.png b/src/main/resources/assets/botania/textures/blocks/biomeStone11.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone11.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone11.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone12.png b/src/main/resources/assets/botania/textures/blocks/biomeStone12.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone12.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone12.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone13.png b/src/main/resources/assets/botania/textures/blocks/biomeStone13.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone13.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone13.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone14.png b/src/main/resources/assets/botania/textures/blocks/biomeStone14.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone14.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone14.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone15.png b/src/main/resources/assets/botania/textures/blocks/biomeStone15.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone15.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone15.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone16.png b/src/main/resources/assets/botania/textures/blocks/biomeStone16.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone16.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone16.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone17.png b/src/main/resources/assets/botania/textures/blocks/biomeStone17.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone17.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone17.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone18.png b/src/main/resources/assets/botania/textures/blocks/biomeStone18.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone18.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone18.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone19.png b/src/main/resources/assets/botania/textures/blocks/biomeStone19.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone19.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone19.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone2.png b/src/main/resources/assets/botania/textures/blocks/biomeStone2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone2.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone2.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone20.png b/src/main/resources/assets/botania/textures/blocks/biomeStone20.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone20.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone20.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone21.png b/src/main/resources/assets/botania/textures/blocks/biomeStone21.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone21.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone21.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone22.png b/src/main/resources/assets/botania/textures/blocks/biomeStone22.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone22.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone22.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone23.png b/src/main/resources/assets/botania/textures/blocks/biomeStone23.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone23.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone23.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone24.png b/src/main/resources/assets/botania/textures/blocks/biomeStone24.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone24.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone24.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone25.png b/src/main/resources/assets/botania/textures/blocks/biomeStone25.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone25.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone25.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone26.png b/src/main/resources/assets/botania/textures/blocks/biomeStone26.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone26.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone26.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone27.png b/src/main/resources/assets/botania/textures/blocks/biomeStone27.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone27.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone27.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone28.png b/src/main/resources/assets/botania/textures/blocks/biomeStone28.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone28.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone28.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone29.png b/src/main/resources/assets/botania/textures/blocks/biomeStone29.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone29.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone29.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone3.png b/src/main/resources/assets/botania/textures/blocks/biomeStone3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone3.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone3.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone30.png b/src/main/resources/assets/botania/textures/blocks/biomeStone30.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone30.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone30.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone31.png b/src/main/resources/assets/botania/textures/blocks/biomeStone31.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone31.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone31.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone4.png b/src/main/resources/assets/botania/textures/blocks/biomeStone4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone4.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone4.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone5.png b/src/main/resources/assets/botania/textures/blocks/biomeStone5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone5.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone5.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone6.png b/src/main/resources/assets/botania/textures/blocks/biomeStone6.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone6.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone6.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone7.png b/src/main/resources/assets/botania/textures/blocks/biomeStone7.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone7.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone7.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone8.png b/src/main/resources/assets/botania/textures/blocks/biomeStone8.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone8.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone8.png diff --git a/src/main/resources/assets/botania/textures/blocks/unused/biomeStone9.png b/src/main/resources/assets/botania/textures/blocks/biomeStone9.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unused/biomeStone9.png rename to src/main/resources/assets/botania/textures/blocks/biomeStone9.png diff --git a/src/main/resources/assets/botania/textures/blocks/marimorphosis.png b/src/main/resources/assets/botania/textures/blocks/marimorphosis.png new file mode 100644 index 000000000..b939307a4 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/marimorphosis.png differ