From eb724c9a6bddff676e0a85374f4b9699cd5e2b86 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Tue, 24 Mar 2015 22:32:22 +0000 Subject: [PATCH] Floating Flower variants! --- .../botania/client/lib/LibResources.java | 7 ++-- .../render/tile/RenderTileFloatingFlower.java | 3 +- .../block/BlockFloatingSpecialFlower.java | 2 +- .../block/decor/BlockFloatingFlower.java | 30 +++++++++++++++++ .../common/block/decor/IFloatingFlower.java | 32 +++++++++++++++++++ .../common/block/tile/TileFloatingFlower.java | 25 ++++++++++++++- .../block/tile/TileFloatingSpecialFlower.java | 27 ++++++++++++++++ .../botania/common/item/ItemGrassSeeds.java | 9 ++++++ .../resources/assets/botania/lang/en_US.lang | 2 +- 9 files changed, 129 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 6ab09828a..77057b6b3 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -92,7 +92,6 @@ public final class LibResources { public static final String MODEL_ELEMENTIUM_1 = PREFIX_MODEL + "elementium1.png"; public static final String MODEL_ELEMENTIUM_2 = PREFIX_MODEL + "elementium2.png"; public static final String MODEL_PIXIE = PREFIX_MODEL + "pixie.png"; - public static final String MODEL_MINI_ISLAND = PREFIX_MODEL + "miniIsland.png"; public static final String MODEL_TINY_POTATO = PREFIX_MODEL + "tinyPotato.png"; public static final String MODEL_SPAWNER_CLAW = PREFIX_MODEL + "spawnerClaw.png"; public static final String MODEL_BREWERY = PREFIX_MODEL + "brewery.png"; @@ -104,8 +103,10 @@ public final class LibResources { public static final String MODEL_CORPOREA_INDEX = PREFIX_MODEL + "corporeaIndex.png"; public static final String MODEL_INVISIBLE_ARMOR = PREFIX_MODEL + "invisibleArmor.png"; public static final String MODEL_PUMP = PREFIX_MODEL + "pump.png"; - - public static final String MODEL_CAPE = "/assets/botania/textures/model/cape.png"; + public static final String MODEL_MINI_ISLAND = PREFIX_MODEL + "miniIsland.png"; + public static final String MODEL_MINI_ISLAND_PODZOL = PREFIX_MODEL + "miniIslandPodzol.png"; + public static final String MODEL_MINI_ISLAND_MYCEL = PREFIX_MODEL + "miniIslandMycelium.png"; + public static final String MODEL_MINI_ISLAND_SNOW = PREFIX_MODEL + "miniIslandSnow.png"; public static final String MISC_PARTICLES = PREFIX_MISC + "particles.png"; public static final String MISC_WISP_LARGE = PREFIX_MISC + "wispLarge.png"; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index caa400541..266d0db97 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -31,7 +31,6 @@ import vazkii.botania.common.block.decor.IFloatingFlower; public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_MINI_ISLAND); private static final ModelMiniIsland model = new ModelMiniIsland(); @Override @@ -54,7 +53,7 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { GL11.glRotatef(4F * (float) Math.sin(worldTime * 0.04F), 1F, 0F, 0F); } - Minecraft.getMinecraft().renderEngine.bindTexture(texture); + Minecraft.getMinecraft().renderEngine.bindTexture(flower.getIslandType().getResource()); GL11.glPushMatrix(); GL11.glTranslatef(0.5F, 1.4F, 0.5F); GL11.glScalef(1F, -1F, -1F); diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 0f1e40587..898b0860a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -107,7 +107,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - return ((TileSpecialFlower) world.getTileEntity(x, y, z)).onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ); + return ((TileSpecialFlower) world.getTileEntity(x, y, z)).onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ) || super.onBlockActivated(world, x, y, z, player, side, hitX, hitY, hitZ); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index f53ed0b03..fad3a0f4a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -20,6 +20,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -32,9 +33,13 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModContainer; +import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; import vazkii.botania.common.block.tile.TileFloatingFlower; +import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; +import vazkii.botania.common.item.ItemGrassSeeds; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -120,6 +125,31 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab return Blocks.dirt.getIcon(par1, par2); } + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + ItemStack stack = player.getCurrentEquippedItem(); + if(stack != null) { + TileFloatingFlower flower = (TileFloatingFlower) world.getTileEntity(x, y, z); + IslandType type = null; + if(stack.getItem() == Items.snowball) + type = IslandType.SNOW; + else if(stack.getItem() == ModItems.grassSeeds) + type = ItemGrassSeeds.getIslandType(stack); + + if(type != null && type != flower.getIslandType()) { + if(!world.isRemote) { + flower.setIslandType(type); + world.markBlockForUpdate(x, y, z); + } + + if(!player.capabilities.isCreativeMode) + stack.stackSize--; + return true; + } + } + return false; + } + @Override public int getRenderType() { return LibRenderIDs.idMiniIsland; diff --git a/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java index 70b3f1bf2..e56d463ec 100644 --- a/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java @@ -10,10 +10,42 @@ */ package vazkii.botania.common.block.decor; +import vazkii.botania.client.lib.LibResources; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; public interface IFloatingFlower { public ItemStack getDisplayStack(); + public IslandType getIslandType(); + + public void setIslandType(IslandType type); + + public static enum IslandType { + GRASS(LibResources.MODEL_MINI_ISLAND), + PODZOL(LibResources.MODEL_MINI_ISLAND_PODZOL), + MYCEL(LibResources.MODEL_MINI_ISLAND_MYCEL), + SNOW(LibResources.MODEL_MINI_ISLAND_SNOW); + + private IslandType(String s) { + res = new ResourceLocation(s); + } + + private final ResourceLocation res; + + public static IslandType ofType(String typeStr) { + for(IslandType type : IslandType.class.getEnumConstants()) + if(type.toString().equals(typeStr)) + return type; + + return GRASS; + } + + public ResourceLocation getResource() { + return res; + } + + } + } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index 88b994f17..342a5812b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -11,13 +11,16 @@ package vazkii.botania.common.block.tile; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.IFloatingFlower; -public class TileFloatingFlower extends TileEntity implements IFloatingFlower { +public class TileFloatingFlower extends TileMod implements IFloatingFlower { + public static final String TAG_ISLAND_TYPE = "islandType"; public static ItemStack forcedStack = null; + IslandType type = IslandType.GRASS; @Override public ItemStack getDisplayStack() { @@ -35,4 +38,24 @@ public class TileFloatingFlower extends TileEntity implements IFloatingFlower { return false; } + @Override + public IslandType getIslandType() { + return type; + } + + @Override + public void setIslandType(IslandType type) { + this.type = type; + } + + @Override + public void writeCustomNBT(NBTTagCompound cmp) { + cmp.setString(TAG_ISLAND_TYPE, type.toString()); + } + + @Override + public void readCustomNBT(NBTTagCompound cmp) { + type = IslandType.ofType(cmp.getString(TAG_ISLAND_TYPE)); + } + } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java index 331520c9b..b84d45b44 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java @@ -11,11 +11,16 @@ package vazkii.botania.common.block.tile; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.common.block.decor.IFloatingFlower; +import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; public class TileFloatingSpecialFlower extends TileSpecialFlower implements IFloatingFlower { + public static final String TAG_ISLAND_TYPE = "islandType"; + IslandType type = IslandType.GRASS; + @Override public boolean isOnSpecialSoil() { return false; @@ -26,4 +31,26 @@ public class TileFloatingSpecialFlower extends TileSpecialFlower implements IFlo return ItemBlockSpecialFlower.ofType(subTileName); } + @Override + public IslandType getIslandType() { + return type; + } + + @Override + public void setIslandType(IslandType type) { + this.type = type; + } + + @Override + public void writeCustomNBT(NBTTagCompound cmp) { + super.writeCustomNBT(cmp); + cmp.setString(TAG_ISLAND_TYPE, type.toString()); + } + + @Override + public void readCustomNBT(NBTTagCompound cmp) { + super.readCustomNBT(cmp); + type = IslandType.ofType(cmp.getString(TAG_ISLAND_TYPE)); + } + } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index fbc353c6a..47c422842 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -28,6 +28,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -40,6 +41,10 @@ public class ItemGrassSeeds extends ItemMod { private static Map> blockSwappers = new HashMap(); + private static final IslandType[] ISLAND_TYPES = { + IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL + }; + private static final int types = 3; IIcon[] icons; @@ -202,5 +207,9 @@ public class ItemGrassSeeds extends ItemMod { list.remove(this); } } + + public static IslandType getIslandType(ItemStack stack) { + return ISLAND_TYPES[Math.min(stack.getItemDamage(), ISLAND_TYPES.length - 1)]; + } } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index b1603c00c..a12bad0f1 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2392,7 +2392,7 @@ botania.page.dispenserTweaks0=&1Dispensers&0, among their normal abilities, can # -- GLIMMERING FLOWERS botania.entry.shinyFlowers=Glimmering Flowers botania.page.shinyFlowers0=By combining your typical &1Mystical Flowers&0 with some &1Glowstone Dust&0, you can make them sparkle even brighter, and emit actual physical light, of the same brightness as a &1Glowstone Block&0.
With some &1Dirt&0 and &1Pasture Seeds&0 it's possible to turn them into a miniature floating island that will not only emit light, but also look very fancy indeed. -botania.page.shinyFlowers3=Combining any color of &1Floating Flower&0 with any flower that has an effect (any &4Functional or Generating Flower&0, etc) in a crafting table will join the two, allowing for both the look and properties of a &1Floating Flower&0 and the effects of the flower chosen in one block. +botania.page.shinyFlowers3=Combining any color of &1Floating Flower&0 with any flower that has an effect (any &4Functional or Generating Flower&0, etc) in a crafting table will join the two, allowing for both the look and properties of a &1Floating Flower&0 and the effects of the flower chosen in one block. Lastly, right clicking a floating flower in the world with any type of &1Pasture Seed&0 or a &1Snowball&0 will change its look. botania.page.shinyFlowers1=Pretty Pretty Shiny Shiny botania.page.shinyFlowers2=Like Laputa but (a lot) tinier