#216 Add 3D leaf item rendering, allow shearing, allow creative access

This commit is contained in:
mezz committed 2014-09-25 02:14:02 -07:00
1 parent aaef67ae8f
commit b2feb8b4c4
7 files changed
+251 -34

No files matched your search

@@ -17,6 +17,7 @@ import net.minecraft.block.BlockNewLeaf;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -65,41 +66,68 @@ public class ForestryBlockLeaves extends BlockNewLeaf implements ITileEntityProv
return (TileLeaves) tile;
}
private static NBTTagCompound getTagCompoundForTree(IBlockAccess world, int x, int y, int z) {
TileLeaves leaves = getLeafTile(world, x, y, z);
ITree tree = leaves.getTree();
NBTTagCompound nbttagcompound = new NBTTagCompound();
if (tree == null)
return nbttagcompound;
tree.writeToNBT(nbttagcompound);
return nbttagcompound;
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(Item item, CreativeTabs tab, List list) {
list.add(new ItemStack(item, 1, 0));
for (ITree tree : PluginArboriculture.treeInterface.getIndividualTemplates()) {
NBTTagCompound treeNBT = new NBTTagCompound();
tree.writeToNBT(treeNBT);
ItemStack itemStack = new ItemStack(item, 1, 0);
itemStack.setTagCompound(treeNBT);
list.add(itemStack);
}
}
/* DROP HANDLING */
// Hack: When harvesting leaves we need to get the drops in onBlockHarvested,
// because Mojang destroys the block and tile before calling getDrops.
protected ThreadLocal<ArrayList<ItemStack>> drops = new ThreadLocal<ArrayList<ItemStack>>();
@Override
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
public void onBlockHarvested(World world, int x, int y, int z, int metadata, EntityPlayer player) {
int fortune = EnchantmentHelper.getFortuneModifier(player);
float saplingModifier = 1.0f;
int count = quantityDropped(metadata, fortune, world.rand);
if (Proxies.common.isSimulating(world)) {
EntityPlayer player = harvesters.get();
if (player != null) {
ItemStack held = player.inventory.getCurrentItem();
if (held != null && held.getItem() instanceof IToolGrafter) {
saplingModifier = ((IToolGrafter) held.getItem()).getSaplingModifier(held, world, player, x, y, z);
count = 1;
held.damageItem(1, player);
if (held.stackSize <= 0)
player.destroyCurrentEquippedItem();
}
}
}
ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
for(int i = 0; i < count; i++) {
ret.addAll(getLeafDrop(world, x, y, z, saplingModifier, fortune));
}
return ret;
drops.set(getLeafDrop(world, x, y, z, saplingModifier, fortune));
}
@Override
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
ArrayList<ItemStack> ret = drops.get();
drops.remove();
// leaves not harvested, get drops normally
if (ret == null)
ret = getLeafDrop(world, x, y, z, 1.0f, fortune);
return ret;
}
private ArrayList<ItemStack> getLeafDrop(World world, int x, int y, int z, float saplingModifier, int fortune) {
ArrayList<ItemStack> prod = new ArrayList<ItemStack>();
@@ -127,19 +155,27 @@ public class ForestryBlockLeaves extends BlockNewLeaf implements ITileEntityProv
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
TileLeaves leaves = getLeafTile(world, x, y, z);
ITree tree = leaves.getTree();
NBTTagCompound nbttagcompound = new NBTTagCompound();
tree.writeToNBT(nbttagcompound);
ItemStack itemStack = super.getPickBlock(target, world, x, y, z);
itemStack.setTagCompound(nbttagcompound);
NBTTagCompound treeNBT = getTagCompoundForTree(world, x, y, z);
itemStack.setTagCompound(treeNBT);
return itemStack;
}
@Override
public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z) {
return false;
return true;
}
@Override
public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune) {
ArrayList<ItemStack> ret = super.onSheared(item, world, x, y, z, fortune);
NBTTagCompound treeNBT = getTagCompoundForTree(world, x, y, z);
for (ItemStack stack : ret)
stack.setTagCompound(treeNBT);
return ret;
}
/* RENDERING */
@@ -151,9 +151,16 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru
@Override
public void setTree(ITree tree) {
super.setTree(tree);
if (tree.canBearFruit())
isFruitLeaf = tree.getGenome().getFruitProvider().markAsFruitLeaf(tree.getGenome(), worldObj, xCoord, yCoord, zCoord);
super.setTree(tree);
textureIndexFancy = determineTextureIndex(true);
textureIndexPlain = determineTextureIndex(false);
textureIndexFruits = determineOverlayIndex();
colourLeaves = determineFoliageColour();
colourFruits = determineFruitColour();
}
/* INFORMATION */
@@ -316,6 +323,8 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru
**/
@Override
public boolean shouldRefresh(Block oldBlock, Block newBlock, int oldMeta, int newMeta, World world, int x, int y, int z) {
if (!Block.isEqualTo(oldBlock, newBlock))
return true;
return false;
}
@@ -208,17 +208,18 @@ public class TreeHelper extends SpeciesRoot implements ITreeRoot {
if (!ForestryBlock.leaves.isBlockEqual(world, x, y, z))
return false;
TileLeaves tileLeaves = new TileLeaves();
tileLeaves.setTree((ITree) tree.copy());
tileLeaves.setOwner(owner);
world.setTileEntity(x, y, z, tileLeaves);
TileEntity tile = world.getTileEntity(x, y, z);
if (!(tile instanceof TileLeaves)) {
world.setBlockToAir(x, y, z);
return false;
}
TileLeaves leaves = (TileLeaves) tile;
leaves.setTree((ITree) tree.copy());
leaves.setOwner(owner);
world.markBlockForUpdate(x, y, z);
return true;
}
@@ -1,13 +1,16 @@
package forestry.arboriculture.items;
import com.mojang.authlib.GameProfile;
import forestry.api.arboriculture.ITree;
import forestry.arboriculture.genetics.Tree;
import forestry.core.items.ItemForestryBlock;
import forestry.core.utils.StringUtil;
import forestry.plugins.PluginArboriculture;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
public class ItemLeavesBlock extends ItemForestryBlock {
@@ -32,7 +35,11 @@ public class ItemLeavesBlock extends ItemForestryBlock {
@Override
public int getColorFromItemStack(ItemStack itemstack, int renderPass) {
if (!itemstack.hasTagCompound())
return PluginArboriculture.proxy.getFoliageColorBasic();
ITree tree = getTree(itemstack);
if (tree == null)
return PluginArboriculture.proxy.getFoliageColorBasic();
return tree.getGenome().getPrimary().getLeafColour(tree);
}
@@ -40,4 +47,15 @@ public class ItemLeavesBlock extends ItemForestryBlock {
return new Tree(itemStack.getTagCompound());
}
@Override
public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) {
if (!stack.hasTagCompound())
return false;
ITree tree = getTree(stack);
if (tree == null)
return false;
GameProfile owner = player.getGameProfile();
return PluginArboriculture.treeInterface.setLeaves(world, tree, owner, x, y, z);
}
}
@@ -39,6 +39,7 @@ public class ClientProxyArboriculture extends ProxyArboriculture {
RenderingRegistry.registerBlockHandler(new FruitPodRenderingHandler());
MinecraftForgeClient.registerItemRenderer(ForestryBlock.stairs.item(), new StairItemRenderer());
MinecraftForgeClient.registerItemRenderer(ForestryBlock.leaves.item(), new LeavesRenderingHandler());
}
@Override
@@ -10,34 +10,46 @@
******************************************************************************/
package forestry.arboriculture.render;
import forestry.api.arboriculture.ITree;
import forestry.arboriculture.gadgets.ForestryBlockLeaves;
import forestry.arboriculture.gadgets.TileLeaves;
import forestry.arboriculture.genetics.Tree;
import forestry.arboriculture.items.ItemLeavesBlock;
import forestry.core.proxy.Proxies;
import forestry.core.render.OverlayRenderingHandler;
import forestry.core.utils.StackUtils;
import forestry.plugins.PluginArboriculture;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.EntityRenderer;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import forestry.arboriculture.gadgets.ForestryBlockLeaves;
import forestry.arboriculture.gadgets.TileLeaves;
import forestry.core.render.OverlayRenderingHandler;
import forestry.plugins.PluginArboriculture;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
/**
* Ugly but serviceable renderer for leaves, taking fruits into account.
*/
public class LeavesRenderingHandler extends OverlayRenderingHandler {
public class LeavesRenderingHandler extends OverlayRenderingHandler implements IItemRenderer {
@Override
public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
// see IItemRenderer section below for inventory rendering
}
@Override
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
TileLeaves tile = ForestryBlockLeaves.getLeafTile(world, x, y, z);
if (tile == null || tile.getTree() == null)
return false;
// Render the plain leaf block.
renderer.renderStandardBlock(block, x, y, z);
// Render overlay for fruit leaves.
TileLeaves tile = ForestryBlockLeaves.getLeafTile(world, x, y, z);
IIcon fruitIcon = null;
int fruitColor = 0xffffff;
if (tile != null) {
@@ -53,7 +65,7 @@ public class LeavesRenderingHandler extends OverlayRenderingHandler {
@Override
public boolean shouldRender3DInInventory(int modelId) {
return false;
return true;
}
@Override
@@ -96,4 +108,142 @@ public class LeavesRenderingHandler extends OverlayRenderingHandler {
return true;
}
/* IItemRenderer */
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
switch (type) {
case ENTITY:
case EQUIPPED_FIRST_PERSON:
case EQUIPPED:
case INVENTORY:
return true;
default:
return false;
}
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
return true;
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
switch (type) {
case ENTITY:
renderLeafBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f);
break;
case EQUIPPED:
case EQUIPPED_FIRST_PERSON:
renderLeafBlock((RenderBlocks) data[0], item, 0f, 0.0f, 0.0f);
break;
case INVENTORY:
renderLeafBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f);
break;
default:
}
}
private ITree getTree(ItemStack itemStack) {
return new Tree(itemStack.getTagCompound());
}
private void renderLeafBlock(RenderBlocks renderer, ItemStack itemStack, float x, float y, float z) {
Tessellator tessellator = Tessellator.instance;
Block block = StackUtils.getBlock(itemStack);
if (!(itemStack.getItem() instanceof ItemLeavesBlock) || !itemStack.hasTagCompound())
return;
ITree tree = getTree(itemStack);
if (tree == null)
return;
TileLeaves leaves = new TileLeaves();
leaves.setTree(tree);
IIcon leavesIcon = leaves.getIcon(Proxies.render.fancyGraphicsEnabled());
int color = leaves.determineFoliageColour();
float r1 = (float)(color >> 16 & 255) / 255.0F;
float g1 = (float)(color >> 8 & 255) / 255.0F;
float b1 = (float)(color & 255) / 255.0F;
GL11.glColor4f(r1, g1, b1, 1.0F);
block.setBlockBoundsForItemRender();
renderer.setRenderBoundsFromBlock(block);
GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1.0F, 0.0F);
renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, leavesIcon);
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, leavesIcon);
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1.0F);
renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, leavesIcon);
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, leavesIcon);
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1.0F, 0.0F, 0.0F);
renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, leavesIcon);
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, leavesIcon);
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
// add fruit
if (!leaves.hasFruit())
return;
leaves.addRipeness(20);
int fruitColor = leaves.determineFruitColour();
IIcon fruitTexture = leaves.getFruitTexture();
if (fruitTexture == null)
return;
float r2 = (float)(fruitColor >> 16 & 255) / 255.0F;
float g2 = (float)(fruitColor >> 8 & 255) / 255.0F;
float b2 = (float)(fruitColor & 255) / 255.0F;
GL11.glColor4f(r2, g2, b2, 1.0F);
block.setBlockBoundsForItemRender();
renderer.setRenderBoundsFromBlock(block);
GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1.0F, 0.0F);
renderer.renderFaceYNeg(block, 0.0D, 0.0D - OVERLAY_SHIFT, 0.0D, fruitTexture);
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderer.renderFaceYPos(block, 0.0D, 0.0D + OVERLAY_SHIFT, 0.0D, fruitTexture);
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1.0F);
renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D - OVERLAY_SHIFT, fruitTexture);
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D + OVERLAY_SHIFT, fruitTexture);
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1.0F, 0.0F, 0.0F);
renderer.renderFaceXNeg(block, 0.0D - OVERLAY_SHIFT, 0.0D, 0.0D, fruitTexture);
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderer.renderFaceXPos(block, 0.0D + OVERLAY_SHIFT, 0.0D, 0.0D, fruitTexture);
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
}
@@ -92,6 +92,8 @@ public class TextureManager implements ITextureManager {
@Override
public IIcon getIcon(short texUID) {
if (texUID < 0)
return null;
if (texUID < textures.length)
return textures[texUID];