diff --git a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java index 36bc2cb42..36693a492 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java @@ -58,6 +58,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid // Functional LibBlockNames.SUBTILE_BELLETHORN, + LibBlockNames.SUBTILE_HEISEI_DREAM, }; protected BlockSpecialFlower() { diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index ffe864ebc..a2a0ae9a7 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -17,6 +17,7 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.SubTileBellethorn; +import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; import vazkii.botania.common.block.tile.TileAltar; @@ -73,5 +74,6 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ENDOFLAME, SubTileEndoflame.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_BELLETHORN, SubTileBellethorn.class); + BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_HEISEI_DREAM, SubTileHeiseiDream.class); } } diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java new file mode 100644 index 000000000..e235a2d39 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -0,0 +1,28 @@ +/** + * 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Feb 16, 2014, 12:37:40 AM (GMT)] + */ +package vazkii.botania.common.block.subtile.functional; + +import vazkii.botania.common.block.subtile.SubTileFunctional; + +public class SubTileHeiseiDream extends SubTileFunctional { + + @Override + public int getColor() { + return 0xFF219D; + } + + @Override + public int getMaxMana() { + return 1000; + } + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index fa1cedf74..bf6eff27f 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -33,5 +33,6 @@ public final class LibBlockNames { public static final String SUBTILE_ENDOFLAME = "endoflame"; public static final String SUBTILE_BELLETHORN = "bellethorn"; + public static final String SUBTILE_HEISEI_DREAM = "heiseiDream"; } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 858c15aa2..092da03e0 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -79,6 +79,7 @@ tile.botania:flower.endoflame.name=Endoflame # - FUNCTIONAL tile.botania:flower.bellethorn.name=Bellethorne +tile.botania:flower.heiseiDream.name=Heisei Dream # ITEM NAMES item.botania:lexicon.name=Lexica Botania diff --git a/resources/assets/botania/textures/blocks/heiseidream.png b/resources/assets/botania/textures/blocks/heiseidream.png deleted file mode 100644 index ae69cf9c3..000000000 Binary files a/resources/assets/botania/textures/blocks/heiseidream.png and /dev/null differ