tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Crate improvements

Browse source 
- Crate now accepts any IC2- or BC3-compatible wrench to drop keeping
  items
- Crate now renders item name and amount as a floating tag above itself
  when being looked at
- Item icon, name, and amount now glows on the side of the crate so it
  is visible at night
This commit is contained in:
Brian Ricketts 2013-03-12 12:51:10 -05:00
parent aae7782356
commit 9f65322f78
3 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/minecraft/assemblyline/client/render/RenderCrate.java
View file

@ -1,5 +1,7 @@
package assemblyline.client.render;
import java.util.ArrayList;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.OpenGlHelper;
@ -9,8 +11,10 @@ import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.common.ForgeDirection;
@ -18,23 +22,25 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import assemblyline.common.block.TileEntityCrate;
import assemblyline.common.machine.imprinter.ItemImprinter;
import assemblyline.common.machine.imprinter.TileEntityFilterable;
public class RenderCrate extends TileEntitySpecialRenderer
{
private final RenderBlocks renderBlocks = new RenderBlocks();
@Override
public void renderTileEntityAt(TileEntity var1, double x, double y, double z, float var8)
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float var8)
{
if (var1 instanceof TileEntityCrate)
if (tileEntity instanceof TileEntityCrate)
{
TileEntityCrate tileEntity = (TileEntityCrate) var1;
TileEntityCrate tileCrate = (TileEntityCrate) tileEntity;
RenderItem renderItem = ((RenderItem) RenderManager.instance.getEntityClassRenderObject(EntityItem.class));
String itemName = "Empty";
String amount = "";
ItemStack itemStack = tileEntity.getStackInSlot(0);
ItemStack itemStack = tileCrate.getStackInSlot(0);
if (itemStack != null)
{
@ -45,10 +51,11 @@ public class RenderCrate extends TileEntitySpecialRenderer
for (int side = 2; side < 6; side++)
{
ForgeDirection direction = ForgeDirection.getOrientation(side);
boolean solid = tileEntity.worldObj.isBlockSolidOnSide(tileEntity.xCoord + direction.offsetX, tileEntity.yCoord, tileEntity.zCoord + direction.offsetZ, direction.getOpposite());
boolean solid = tileCrate.worldObj.isBlockSolidOnSide(tileCrate.xCoord + direction.offsetX, tileCrate.yCoord, tileCrate.zCoord + direction.offsetZ, direction.getOpposite());
if (solid)
continue;
this.setupLight(tileEntity, direction.offsetX, direction.offsetZ);
this.setupLight(tileCrate, direction.offsetX, direction.offsetZ);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240);
if (itemStack != null)
{
@ -102,6 +109,17 @@ public class RenderCrate extends TileEntitySpecialRenderer
this.renderText(amount, side, 0.02f, x, y - 0.15f, z);
}
}
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
MovingObjectPosition objectPosition = player.rayTrace(8, 1);
if (objectPosition != null)
{
if (objectPosition.blockX == tileCrate.xCoord && objectPosition.blockY == tileCrate.yCoord && objectPosition.blockZ == tileCrate.zCoord)
{
RenderHelper.renderFloatingText(itemName + (amount.isEmpty() ? "" : " (" + amount + ")"), (float) x + 0.5f, (float) y - 1f, (float) z + 0.5f, 0xFFFFFF);
}
}
}
}

2
src/minecraft/assemblyline/client/render/RenderHelper.java
View file

@ -1,6 +1,7 @@
package assemblyline.client.render;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.RenderManager;
@ -34,6 +35,7 @@ public class RenderHelper
GL11.glRotatef(renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
GL11.glScalef(-scale, -scale, scale);
GL11.glDisable(GL11.GL_LIGHTING);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240);
GL11.glDepthMask(false);
GL11.glDisable(GL11.GL_DEPTH_TEST);
GL11.glEnable(GL11.GL_BLEND);

22
src/minecraft/assemblyline/common/block/BlockCrate.java
View file

@ -68,26 +68,8 @@ public class BlockCrate extends BlockALMachine
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ)
{
/**
* Check if the player is holding a wrench or an electric item. If so, do not open the GUI.
*/
if (entityPlayer.inventory.getCurrentItem() != null)
{
if (entityPlayer.inventory.getCurrentItem().getItem() instanceof IToolConfigurator)
{
world.notifyBlocksOfNeighborChange(x, y, z, this.blockID);
((IToolConfigurator) entityPlayer.inventory.getCurrentItem().getItem()).wrenchUsed(entityPlayer, x, y, z);
return this.onUseWrench(world, x, y, z, entityPlayer, side, hitX, hitY, hitZ);
}
else if (entityPlayer.inventory.getCurrentItem().getItem() instanceof IItemElectric)
{
if (this.onUseElectricItem(world, x, y, z, entityPlayer, side, hitX, hitY, hitZ))
{
return true;
}
}
}
if (super.onBlockActivated(world, x, y, z, entityPlayer, side, hitX, hitY, hitZ))
return true;
if (!world.isRemote)
{