diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 8cb4e2472..d8e040dcb 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -72,6 +72,7 @@ import vazkii.botania.common.block.string.BlockRedStringDispenser; import vazkii.botania.common.block.string.BlockRedStringFertilizer; import vazkii.botania.common.block.string.BlockRedStringInterceptor; import vazkii.botania.common.block.string.BlockRedStringRelay; +import vazkii.botania.common.block.subtile.SubTileDecor; import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation; @@ -448,11 +449,11 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DAYBLOOM, SubTileDaybloom.class); + registerSubTileWithDecor(LibBlockNames.SUBTILE_DAYBLOOM, SubTileDaybloom.class, SubTileDecor.Daybloom.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ENDOFLAME, SubTileEndoflame.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_HYDROANGEAS, SubTileHydroangeas.class); + registerSubTileWithDecor(LibBlockNames.SUBTILE_HYDROANGEAS, SubTileHydroangeas.class, SubTileDecor.Hydroangeas.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_THERMALILY, SubTileThermalily.class); - BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_NIGHTSHADE, SubTileNightshade.class); + registerSubTileWithDecor(LibBlockNames.SUBTILE_NIGHTSHADE, SubTileNightshade.class, SubTileDecor.Nightshade.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ARCANE_ROSE, SubTileArcaneRose.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MUNCHDEW, SubTileMunchdew.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_ENTROPINNYUM, SubTileEntropinnyum.class); @@ -505,7 +506,12 @@ public final class ModBlocks { if(innerClazz.getSimpleName().equals("Mini")) BotaniaAPI.registerMiniSubTile(key + "Chibi", innerClazz, key); } - + + private static void registerSubTileWithDecor(String key, Class clazz, Class decor) { + BotaniaAPI.registerSubTile(key, clazz); + BotaniaAPI.registerMiniSubTile(key + "Decor", decor, key); + } + private static void registerTile(Class clazz, String key) { GameRegistry.registerTileEntity(clazz, LibResources.PREFIX_MOD + key); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileDecor.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileDecor.java new file mode 100644 index 000000000..b9058c7dd --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileDecor.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 @ [Sep 28, 2015, 10:17:01 PM (GMT)] + */ +package vazkii.botania.common.block.subtile; + +import vazkii.botania.api.subtile.SubTileEntity; + +public class SubTileDecor extends SubTileEntity { + + @Override + public boolean canUpdate() { + return false; + } + + public static class Daybloom extends SubTileDecor { } + public static class Nightshade extends SubTileDecor { } + public static class Hydroangeas extends SubTileDecor { } + +} diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 5ce8e6ecc..30ceab6a2 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -446,7 +446,7 @@ public final class LexiconData { functionalIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRedstoneRoot)).setIcon(null);; flowerShrinking = new BLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers); - flowerShrinking.setPriority().setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", BotaniaAPI.miniFlowerRecipes)); + flowerShrinking.setPriority().setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", BotaniaAPI.miniFlowerRecipes)).setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN + "Chibi")); jadedAmaranthus = new BLexiconEntry(LibLexicon.FFLOWER_JADED_AMARANTHUS, categoryFunctionalFlowers); jadedAmaranthus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.jadedAmaranthusRecipe), new PageText("2")); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index c140331ff..495299c4f 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1143,14 +1143,20 @@ tile.botania:flower.manastar.reference=Wish upon a star # - GENERATING tile.botania:flower.daybloom.name=Daybloom tile.botania:flower.daybloom.reference=A Sting of light +tile.botania:flower.daybloomDecor.name=Daybloom Motif +tile.botania:flower.daybloomDecor.reference=A Sting of light tile.botania:flower.endoflame.name=Endoflame tile.botania:flower.endoflame.reference=Squirting Lag tile.botania:flower.hydroangeas.name=Hydroangeas tile.botania:flower.hydroangeas.reference=Just friendly crustaceans +tile.botania:flower.hydroangeasDecor.name=Hydroangeas Motif +tile.botania:flower.hydroangeasDecor.reference=Just friendly crustaceans tile.botania:flower.thermalily.name=Thermalily tile.botania:flower.thermalily.reference=A Scarlet Rose indeed tile.botania:flower.nightshade.name=Nightshade tile.botania:flower.nightshade.reference=Ghastly signature +tile.botania:flower.nightshadeDecor.name=Nightshade Motif +tile.botania:flower.nightshadeDecor.reference=Ghastly signature tile.botania:flower.arcanerose.name=Rosa Arcana tile.botania:flower.arcanerose.reference=Ten blue orbs in the corner tile.botania:flower.munchdew.name=Munchdew @@ -2191,7 +2197,7 @@ botania.page.fIntro4=&1Redstone Root&0 for Redstone Control # -- FLOWER SHRINKING botania.entry.flowerShrinking=Flower Shrinking -botania.page.flowerShrinking0=Some functional flowers have a bit too much reach. Sometimes one might not want that to be the case. Tossing one of those few flowers into a &1Mana Pool&0 with an &1Alchemy Catalyst&0 will, at the cost of some &4Mana&0, shrink it, making its radius smaller. Every other function remains the same. +botania.page.flowerShrinking0=Some functional flowers have a bit too much reach. Sometimes one might not want that to be the case. Tossing one of those few flowers into a &1Mana Pool&0 with an &1Alchemy Catalyst&0 will, at the cost of some &4Mana&0, shrink it, making its radius smaller. Every other function remains the same.
This can also be done for passive generating flowers, turning them into decorative versions that don't decay. botania.page.flowerShrinking1=Like a nendoroid # -- JADED AMARANTHUS diff --git a/src/main/resources/assets/botania/textures/blocks/alt/daybloomDecor.png b/src/main/resources/assets/botania/textures/blocks/alt/daybloomDecor.png new file mode 100644 index 000000000..b8f5d2d11 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/daybloomDecor.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/hydroangeasDecor.png b/src/main/resources/assets/botania/textures/blocks/alt/hydroangeasDecor.png new file mode 100644 index 000000000..5fc439299 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/hydroangeasDecor.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/alt/nightshadeDecor.png b/src/main/resources/assets/botania/textures/blocks/alt/nightshadeDecor.png new file mode 100644 index 000000000..d82999856 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/alt/nightshadeDecor.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/daybloomDecor.png b/src/main/resources/assets/botania/textures/blocks/daybloomDecor.png new file mode 100644 index 000000000..fd58ce13f Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/daybloomDecor.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/hydroangeasDecor.png b/src/main/resources/assets/botania/textures/blocks/hydroangeasDecor.png new file mode 100644 index 000000000..08b18e41f Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/hydroangeasDecor.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/nightshadeDecor.png b/src/main/resources/assets/botania/textures/blocks/nightshadeDecor.png new file mode 100644 index 000000000..ec4ecbcd5 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/nightshadeDecor.png differ