Improved crate render
This commit is contained in:
parent
ad0fb070ba
commit
d8f3f065be
5 changed files with 211 additions and 92 deletions
|
@ -1,8 +1,19 @@
|
||||||
package assemblyline.client.render;
|
package assemblyline.client.render;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
|
import net.minecraft.client.renderer.OpenGlHelper;
|
||||||
|
import net.minecraft.client.renderer.RenderBlocks;
|
||||||
|
import net.minecraft.client.renderer.RenderEngine;
|
||||||
|
import net.minecraft.client.renderer.entity.RenderItem;
|
||||||
|
import net.minecraft.client.renderer.entity.RenderManager;
|
||||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||||
|
import net.minecraft.entity.item.EntityItem;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
import net.minecraftforge.client.ForgeHooksClient;
|
||||||
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
@ -11,33 +22,107 @@ import assemblyline.common.block.TileEntityCrate;
|
||||||
public class RenderCrate extends TileEntitySpecialRenderer
|
public class RenderCrate extends TileEntitySpecialRenderer
|
||||||
{
|
{
|
||||||
|
|
||||||
|
private final RenderBlocks renderBlocks = new RenderBlocks();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void renderTileEntityAt(TileEntity var1, double x, double y, double z, float var8)
|
public void renderTileEntityAt(TileEntity var1, double x, double y, double z, float var8)
|
||||||
|
{
|
||||||
|
if (var1 instanceof TileEntityCrate)
|
||||||
{
|
{
|
||||||
TileEntityCrate tileEntity = (TileEntityCrate) var1;
|
TileEntityCrate tileEntity = (TileEntityCrate) var1;
|
||||||
|
|
||||||
|
RenderItem renderItem = ((RenderItem) RenderManager.instance.getEntityClassRenderObject(EntityItem.class));
|
||||||
|
|
||||||
|
String itemName = "Empty";
|
||||||
|
String amount = "";
|
||||||
|
ItemStack itemStack = tileEntity.getStackInSlot(0);
|
||||||
|
|
||||||
|
if (itemStack != null)
|
||||||
|
{
|
||||||
|
itemName = itemStack.getDisplayName();
|
||||||
|
amount = itemStack.stackSize + "";
|
||||||
|
}
|
||||||
|
|
||||||
for (int side = 2; side < 6; side++)
|
for (int side = 2; side < 6; side++)
|
||||||
{
|
{
|
||||||
GL11.glPushMatrix();
|
ForgeDirection direction = ForgeDirection.getOrientation(side);
|
||||||
GL11.glPolygonOffset(-10, -10);
|
this.setupLight(tileEntity, direction.offsetX, direction.offsetZ);
|
||||||
GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL);
|
|
||||||
|
|
||||||
float dx = 1F / 16;
|
if (itemStack != null)
|
||||||
float dz = 1F / 16;
|
{
|
||||||
float displayWidth = 1 - 2F / 16;
|
GL11.glPushMatrix();
|
||||||
float displayHeight = 1 - 2F / 16;
|
|
||||||
GL11.glTranslatef((float) x, (float) y, (float) z);
|
|
||||||
|
|
||||||
switch (side)
|
switch (side)
|
||||||
{
|
{
|
||||||
case 1:
|
case 2:
|
||||||
|
GL11.glTranslated(x + 0.65, y + 0.9, z - 0.01);
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 3:
|
||||||
GL11.glTranslatef(1, 1, 0);
|
GL11.glTranslated(x + 0.35, y + 0.9, z + 1.01);
|
||||||
GL11.glRotatef(180, 1, 0, 0);
|
|
||||||
GL11.glRotatef(180, 0, 1, 0);
|
GL11.glRotatef(180, 0, 1, 0);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
case 4:
|
||||||
|
GL11.glTranslated(x - 0.01, y + 0.9, z + 0.35);
|
||||||
|
GL11.glRotatef(90, 0, 1, 0);
|
||||||
|
break;
|
||||||
|
case 5:
|
||||||
|
GL11.glTranslated(x + 1.01, y + 0.9, z + 0.65);
|
||||||
|
GL11.glRotatef(-90, 0, 1, 0);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
float scale = 0.03125F;
|
||||||
|
GL11.glScalef(0.6f * scale, 0.6f * scale, 0);
|
||||||
|
GL11.glRotatef(180, 0, 0, 1);
|
||||||
|
|
||||||
|
RenderEngine renderEngine = Minecraft.getMinecraft().renderEngine;
|
||||||
|
|
||||||
|
if (!ForgeHooksClient.renderInventoryItem(this.renderBlocks, renderEngine, itemStack, true, 0.0F, 0.0F, 0.0F))
|
||||||
|
{
|
||||||
|
renderItem.renderItemIntoGUI(this.getFontRenderer(), renderEngine, itemStack, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
|
|
||||||
|
this.renderText(itemName, side, 0.02f, x, y - 0.35f, z);
|
||||||
|
|
||||||
|
if (amount != "")
|
||||||
|
{
|
||||||
|
this.renderText(amount, side, 0.02f, x, y - 0.15f, z);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setupLight(TileEntity tileEntity, int xDifference, int zDifference)
|
||||||
|
{
|
||||||
|
World world = tileEntity.worldObj;
|
||||||
|
|
||||||
|
if (world.isBlockOpaqueCube(tileEntity.xCoord + xDifference, tileEntity.yCoord, tileEntity.zCoord + zDifference)) { return; }
|
||||||
|
|
||||||
|
int br = world.getLightBrightnessForSkyBlocks(tileEntity.xCoord + xDifference, tileEntity.yCoord, tileEntity.zCoord + zDifference, 0);
|
||||||
|
int var11 = br % 65536;
|
||||||
|
int var12 = br / 65536;
|
||||||
|
float scale = 0.6F;
|
||||||
|
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, var11 * scale, var12 * scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void renderText(String text, int side, float maxScale, double x, double y, double z)
|
||||||
|
{
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
|
||||||
|
GL11.glPolygonOffset(-10, -10);
|
||||||
|
GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL);
|
||||||
|
|
||||||
|
float displayX = 1 / 16;
|
||||||
|
float displayY = 1 / 16;
|
||||||
|
float displayWidth = 1 - (2 / 16);
|
||||||
|
float displayHeight = 1 - (2 / 16);
|
||||||
|
GL11.glTranslated(x, y, z);
|
||||||
|
|
||||||
|
switch (side)
|
||||||
|
{
|
||||||
case 3:
|
case 3:
|
||||||
GL11.glTranslatef(0, 1, 0);
|
GL11.glTranslatef(0, 1, 0);
|
||||||
GL11.glRotatef(0, 0, 1, 0);
|
GL11.glRotatef(0, 0, 1, 0);
|
||||||
|
@ -60,34 +145,28 @@ public class RenderCrate extends TileEntitySpecialRenderer
|
||||||
GL11.glTranslatef(1, 1, 0);
|
GL11.glTranslatef(1, 1, 0);
|
||||||
GL11.glRotatef(-90, 0, 1, 0);
|
GL11.glRotatef(-90, 0, 1, 0);
|
||||||
GL11.glRotatef(90, 1, 0, 0);
|
GL11.glRotatef(90, 1, 0, 0);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
GL11.glTranslatef(dx + displayWidth / 2, 1F, dz + displayHeight / 2);
|
// Find Center
|
||||||
|
GL11.glTranslatef(displayWidth / 2, 1F, displayHeight / 2);
|
||||||
GL11.glRotatef(-90, 1, 0, 0);
|
GL11.glRotatef(-90, 1, 0, 0);
|
||||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
FontRenderer fontRenderer = this.getFontRenderer();
|
FontRenderer fontRenderer = this.getFontRenderer();
|
||||||
int maxWidth = 1;
|
|
||||||
|
|
||||||
String itemName = "Empty";
|
int requiredWidth = Math.max(fontRenderer.getStringWidth(text), 1);
|
||||||
String amount = "";
|
|
||||||
|
|
||||||
if (tileEntity.getStackInSlot(0) != null)
|
|
||||||
{
|
|
||||||
itemName = tileEntity.getStackInSlot(0).getDisplayName();
|
|
||||||
amount = tileEntity.getStackInSlot(0).stackSize + "";
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
maxWidth = Math.max(fontRenderer.getStringWidth(itemName), maxWidth);
|
|
||||||
maxWidth = Math.max(fontRenderer.getStringWidth(amount), maxWidth);
|
|
||||||
maxWidth += 4;
|
|
||||||
int lineHeight = fontRenderer.FONT_HEIGHT + 2;
|
int lineHeight = fontRenderer.FONT_HEIGHT + 2;
|
||||||
int requiredHeight = lineHeight * 1;
|
int requiredHeight = lineHeight * 1;
|
||||||
float scaleX = displayWidth / maxWidth;
|
float scaler = 0.8f;
|
||||||
float scaleY = displayHeight / requiredHeight;
|
float scaleX = (displayWidth / requiredWidth);
|
||||||
float scale = (float) (Math.min(scaleX, scaleY) * 0.8);
|
float scaleY = (displayHeight / requiredHeight);
|
||||||
|
float scale = (float) scaleX * scaler;
|
||||||
|
|
||||||
|
if (maxScale > 0)
|
||||||
|
{
|
||||||
|
scale = Math.min(scale, maxScale);
|
||||||
|
}
|
||||||
|
|
||||||
GL11.glScalef(scale, -scale, scale);
|
GL11.glScalef(scale, -scale, scale);
|
||||||
GL11.glDepthMask(false);
|
GL11.glDepthMask(false);
|
||||||
|
|
||||||
|
@ -96,27 +175,17 @@ public class RenderCrate extends TileEntitySpecialRenderer
|
||||||
int realHeight = (int) Math.floor(displayHeight / scale);
|
int realHeight = (int) Math.floor(displayHeight / scale);
|
||||||
int realWidth = (int) Math.floor(displayWidth / scale);
|
int realWidth = (int) Math.floor(displayWidth / scale);
|
||||||
|
|
||||||
if (scaleX < scaleY)
|
offsetX = (realWidth - requiredWidth) / 2;
|
||||||
{
|
|
||||||
offsetX = 2 + 5;
|
|
||||||
offsetY = (realHeight - requiredHeight) / 2;
|
offsetY = (realHeight - requiredHeight) / 2;
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
offsetX = (realWidth - maxWidth) / 2 + 2 + 5;
|
|
||||||
offsetY = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
GL11.glDisable(GL11.GL_LIGHTING);
|
GL11.glDisable(GL11.GL_LIGHTING);
|
||||||
fontRenderer.drawString(itemName, offsetX - realWidth / 2, 1 + offsetY - realHeight / 2 + 0 * lineHeight, 1);
|
fontRenderer.drawString(text, offsetX - (realWidth / 2), 1 + offsetY - (realHeight / 2), 1);
|
||||||
fontRenderer.drawString(amount, offsetX - realWidth / 2, 1 + offsetY - realHeight / 2 + 1 * lineHeight, 1);
|
|
||||||
GL11.glEnable(GL11.GL_LIGHTING);
|
GL11.glEnable(GL11.GL_LIGHTING);
|
||||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
GL11.glDepthMask(true);
|
GL11.glDepthMask(true);
|
||||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL);
|
GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL);
|
||||||
|
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
|
@ -3,6 +3,8 @@ package assemblyline.common;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.inventory.IInventory;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.common.Configuration;
|
import net.minecraftforge.common.Configuration;
|
||||||
|
@ -19,6 +21,7 @@ import assemblyline.common.machine.BlockMulti;
|
||||||
import assemblyline.common.machine.BlockMulti.MachineType;
|
import assemblyline.common.machine.BlockMulti.MachineType;
|
||||||
import assemblyline.common.machine.ItemBlockMulti;
|
import assemblyline.common.machine.ItemBlockMulti;
|
||||||
import assemblyline.common.machine.belt.BlockConveyorBelt;
|
import assemblyline.common.machine.belt.BlockConveyorBelt;
|
||||||
|
import cpw.mods.fml.common.ICraftingHandler;
|
||||||
import cpw.mods.fml.common.Loader;
|
import cpw.mods.fml.common.Loader;
|
||||||
import cpw.mods.fml.common.Mod;
|
import cpw.mods.fml.common.Mod;
|
||||||
import cpw.mods.fml.common.Mod.Init;
|
import cpw.mods.fml.common.Mod.Init;
|
||||||
|
@ -85,6 +88,20 @@ public class AssemblyLine
|
||||||
|
|
||||||
UpdateNotifier.INSTANCE.checkUpdate(NAME, VERSION, "http://calclavia.com/downloads/al/recommendedversion.txt");
|
UpdateNotifier.INSTANCE.checkUpdate(NAME, VERSION, "http://calclavia.com/downloads/al/recommendedversion.txt");
|
||||||
|
|
||||||
|
GameRegistry.registerCraftingHandler(new ICraftingHandler()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void onCrafting(EntityPlayer player, ItemStack itemStack, IInventory craftMatrix)
|
||||||
|
{
|
||||||
|
System.out.println("TEST");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSmelting(EntityPlayer player, ItemStack item)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
proxy.preInit();
|
proxy.preInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
15
src/minecraft/assemblyline/common/ItemBlueprint.java
Normal file
15
src/minecraft/assemblyline/common/ItemBlueprint.java
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
package assemblyline.common;
|
||||||
|
|
||||||
|
import universalelectricity.prefab.UETab;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
|
||||||
|
public class ItemBlueprint extends Item
|
||||||
|
{
|
||||||
|
public ItemBlueprint(int id)
|
||||||
|
{
|
||||||
|
super(id);
|
||||||
|
this.setIconIndex(Item.paper.getIconFromDamage(0));
|
||||||
|
this.setCreativeTab(UETab.INSTANCE);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -2,10 +2,13 @@ package assemblyline.common.block;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemBlock;
|
import net.minecraft.item.ItemBlock;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.potion.Potion;
|
||||||
|
import net.minecraft.potion.PotionEffect;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
public class ItemBlockCrate extends ItemBlock
|
public class ItemBlockCrate extends ItemBlock
|
||||||
|
@ -30,7 +33,21 @@ public class ItemBlockCrate extends ItemBlock
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
par3List.add("Empty");
|
par3List.add("Empty");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onUpdate(ItemStack itemStack, World par2World, Entity entity, int par4, boolean par5)
|
||||||
|
{
|
||||||
|
if (entity instanceof EntityPlayer)
|
||||||
|
{
|
||||||
|
EntityPlayer player = (EntityPlayer) entity;
|
||||||
|
ItemStack containingStack = getContainingItemStack(itemStack);
|
||||||
|
|
||||||
|
if (containingStack != null)
|
||||||
|
{
|
||||||
|
player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 5, (int)((float) containingStack.stackSize / (float) TileEntityCrate.MAX_LIMIT) * 5));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@ import com.google.common.io.ByteArrayDataInput;
|
||||||
|
|
||||||
public class TileEntityCrate extends TileEntityAdvanced implements ISidedInventory, IPacketReceiver
|
public class TileEntityCrate extends TileEntityAdvanced implements ISidedInventory, IPacketReceiver
|
||||||
{
|
{
|
||||||
|
public static final int MAX_LIMIT = 2048;
|
||||||
private ItemStack[] containingItems = new ItemStack[1];
|
private ItemStack[] containingItems = new ItemStack[1];
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -226,7 +227,7 @@ public class TileEntityCrate extends TileEntityAdvanced implements ISidedInvento
|
||||||
@Override
|
@Override
|
||||||
public int getInventoryStackLimit()
|
public int getInventoryStackLimit()
|
||||||
{
|
{
|
||||||
return 4096;
|
return MAX_LIMIT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in a new issue