Skip to content

Commit

Permalink
fix some rendering, icon, and forgedirection issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@progwml6
progwml6 committed Jan 1, 2014
1 parent c0599dc commit e187d85
Show file tree
Hide file tree
Showing 25 changed files with 476 additions and 472 deletions.
12 changes: 6 additions & 6 deletions src/main/java/tconstruct/client/armor/RenderArmorCast.java
View file
Expand Up @@ -11,9 +11,9 @@
import net.minecraft.client.renderer.*;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;

public class RenderArmorCast implements IItemRenderer
{
Expand Down Expand Up @@ -49,7 +49,7 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data)
{
RenderBlocks renderer = Minecraft.getMinecraft().renderGlobal.globalRenderBlocks;
Tessellator tessellator = Tessellator.instance;
Icon baseIcon = item.getItem() instanceof ArmorPattern ? ((ArmorPattern) item.getItem()).getBaseIcon() : item.getIconIndex();
IIcon baseIcon = item.getItem() instanceof ArmorPattern ? ((ArmorPattern) item.getItem()).getBaseIcon() : item.getIconIndex();
GL11.glPushMatrix();
switch (type)
{
Expand All @@ -70,9 +70,9 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data)
default:
break;
}
renderer.setRenderBounds(0.1F, 0.1F, 0.1F, 0.9F, 0.83F, 0.9F);
renderer.func_147782_a(0.1F, 0.1F, 0.1F, 0.9F, 0.83F, 0.9F);
renderCube(tessellator, renderer, baseIcon);
renderer.setRenderBounds(0.1F, 0.1F, 0.1F, 0.9F, 1.0F, 0.9F);
renderer.func_147782_a(0.1F, 0.1F, 0.1F, 0.9F, 1.0F, 0.9F);
ArrayList<ForgeDirection> sides = new ArrayList<ForgeDirection>();
sides.add(ForgeDirection.NORTH);
sides.add(ForgeDirection.SOUTH);
Expand Down Expand Up @@ -129,7 +129,7 @@ public void renderSelectedCube (Tessellator tessellator, RenderBlocks renderer,
public void renderCastTop (ItemStack par1ItemStack, ItemRenderType type)
{
GL11.glPushMatrix();
Icon icon = par1ItemStack.getIconIndex();
IIcon icon = par1ItemStack.getIconIndex();

if (icon == null)
{
Expand Down
73 changes: 38 additions & 35 deletions src/main/java/tconstruct/client/block/BarricadeRender.java
View file
Expand Up @@ -27,100 +27,101 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block
if (meta / 4 == 0)
{
//if (type >= 0)
renderer.setRenderBounds(0.125, 0.0, 0.5, 0.375, 1.0, 0.75);
renderer.renderStandardBlock(barricade, x, y, z);
//TODO func_147782_a
renderer.func_147782_a(0.125, 0.0, 0.5, 0.375, 1.0, 0.75);
renderer.func_147784_q(barricade, x, y, z);

if (type >= 1)
{
renderer.setRenderBounds(0.625, 0.0, 0.5, 0.875, 1.0, 0.75);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.625, 0.0, 0.5, 0.875, 1.0, 0.75);
renderer.func_147784_q(barricade, x, y, z);
}

if (type >= 2)
{
renderer.setRenderBounds(0.0, 0.125, 0.25, 1.0, 0.375, 0.5);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.0, 0.125, 0.25, 1.0, 0.375, 0.5);
renderer.func_147784_q(barricade, x, y, z);
}

if (type >= 3)
{
renderer.setRenderBounds(0.0, 0.625, 0.25, 1.0, 0.875, 0.5);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.0, 0.625, 0.25, 1.0, 0.875, 0.5);
renderer.func_147784_q(barricade, x, y, z);
}
}

if (meta / 4 == 1)
{
//if (type >= 0)
renderer.setRenderBounds(0.25, 0.0, 0.125, 0.5, 1.0, 0.375);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.25, 0.0, 0.125, 0.5, 1.0, 0.375);
renderer.func_147784_q(barricade, x, y, z);

if (type >= 1)
{
renderer.setRenderBounds(0.25, 0.0, 0.625, 0.5, 1.0, 0.875);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.25, 0.0, 0.625, 0.5, 1.0, 0.875);
renderer.func_147784_q(barricade, x, y, z);
}

if (type >= 2)
{
renderer.setRenderBounds(0.5, 0.125, 0.0, 0.75, 0.375, 1.0);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.5, 0.125, 0.0, 0.75, 0.375, 1.0);
renderer.func_147784_q(barricade, x, y, z);
}

if (type >= 3)
{
renderer.setRenderBounds(0.5, 0.625, 0.0, 0.75, 0.875, 1.0);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.5, 0.625, 0.0, 0.75, 0.875, 1.0);
renderer.func_147784_q(barricade, x, y, z);
}
}

if (meta / 4 == 2)
{
//if (type >= 0)
renderer.setRenderBounds(0.125, 0.0, 0.25, 0.375, 1.0, 0.5);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.125, 0.0, 0.25, 0.375, 1.0, 0.5);
renderer.func_147784_q(barricade, x, y, z);

if (type >= 1)
{
renderer.setRenderBounds(0.625, 0.0, 0.25, 0.875, 1.0, 0.5);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.625, 0.0, 0.25, 0.875, 1.0, 0.5);
renderer.func_147784_q(barricade, x, y, z);
}

if (type >= 2)
{
renderer.setRenderBounds(0.0, 0.125, 0.5, 1.0, 0.375, 0.75);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.0, 0.125, 0.5, 1.0, 0.375, 0.75);
renderer.func_147784_q(barricade, x, y, z);
}

if (type >= 3)
{
renderer.setRenderBounds(0.0, 0.625, 0.5, 1.0, 0.875, 0.75);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.0, 0.625, 0.5, 1.0, 0.875, 0.75);
renderer.func_147784_q(barricade, x, y, z);
}
}

if (meta / 4 == 3)
{
//if (type >= 0)
renderer.setRenderBounds(0.5, 0.0, 0.125, 0.75, 1.0, 0.375);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.5, 0.0, 0.125, 0.75, 1.0, 0.375);
renderer.func_147784_q(barricade, x, y, z);

if (type >= 1)
{
renderer.setRenderBounds(0.5, 0.0, 0.625, 0.75, 1.0, 0.875);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.5, 0.0, 0.625, 0.75, 1.0, 0.875);
renderer.func_147784_q(barricade, x, y, z);
}

if (type >= 2)
{
renderer.setRenderBounds(0.25, 0.125, 0.0, 0.5, 0.375, 1.0);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.25, 0.125, 0.0, 0.5, 0.375, 1.0);
renderer.func_147784_q(barricade, x, y, z);
}

if (type >= 3)
{
renderer.setRenderBounds(0.25, 0.625, 0.0, 0.5, 0.875, 1.0);
renderer.renderStandardBlock(barricade, x, y, z);
renderer.func_147782_a(0.25, 0.625, 0.0, 0.5, 0.875, 1.0);
renderer.func_147784_q(barricade, x, y, z);
}
}

Expand All @@ -134,15 +135,15 @@ public void renderInventoryBlock (Block block, int metadata, int modelID, Render
{
if (modelID == model)
{
renderer.setRenderBounds(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F);
renderer.func_147782_a(0.375F, 0.0F, 0.375F, 0.625F, 1.0F, 0.625F);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
renderer.setRenderBounds(0.375F, 0.375F, 0.0F, 0.625F, 0.625F, 1.0F);
renderer.func_147782_a(0.375F, 0.375F, 0.0F, 0.625F, 0.625F, 1.0F);
TProxyClient.renderStandardInvBlock(renderer, block, metadata);
}
}

@Override
public boolean shouldRender3DInInventory ()
public boolean shouldRender3DInInventory (int modelId)
{
return true;
}
Expand All @@ -152,4 +153,6 @@ public int getRenderId ()
{
return model;
}


}

0 comments on commit e187d85

Please sign in to comment.