fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added 4 View Cell Slots.

Browse Source 
Multiple View Cells now sum together to allow more customization.
View Cells are now protected by Build Security.
Meteorite Compass now renders correctly in other peoples hands.
This commit is contained in:
AlgorithmX2
2014-03-04 21:12:23 -06:00
parent 4536189042
commit 929efa5597
30 changed files with 228 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/render/BaseBlockRender.java
+1 -1
View File
@@ -357,7 +357,7 @@ public class BaseBlockRender
}
}
public void renderInventory(AEBaseBlock block, ItemStack item, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock block, ItemStack item, RenderBlocks renderer, ItemRenderType type, Object[] data)
{
Tessellator tess = Tessellator.instance;
client/render/ItemRenderer.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class ItemRenderer implements IItemRenderer
if ( type == ItemRenderType.INVENTORY )
GL11.glTranslatef( 0.0f, -0.1f, 0.0f );
WorldRender.instance.renderItemBlock( item, type );
WorldRender.instance.renderItemBlock( item, type, data );
GL11.glPopAttrib();
GL11.glPopMatrix();
client/render/WorldRender.java
+2 -2
View File
@@ -58,7 +58,7 @@ public class WorldRender implements ISimpleBlockRenderingHandler
return renderID;
}
public void renderItemBlock(ItemStack item, ItemRenderType type)
public void renderItemBlock(ItemStack item, ItemRenderType type, Object[] data)
{
Block blk = Block.getBlockFromItem( item.getItem() );
if ( blk instanceof AEBaseBlock )
@@ -67,7 +67,7 @@ public class WorldRender implements ISimpleBlockRenderingHandler
renderer.setRenderBoundsFromBlock( block );
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
getRender( block ).renderInventory( block, item, renderer, type );
getRender( block ).renderInventory( block, item, renderer, type, data );
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
}
else
client/render/blocks/RenderBlockCharger.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class RenderBlockCharger extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
Tessellator tess = Tessellator.instance;
client/render/blocks/RenderBlockCrank.java
+3 -3
View File
@@ -25,15 +25,15 @@ public class RenderBlockCrank extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
renderer.renderAllFaces = true;
renderer.setRenderBounds( 0.5D - 0.05, 0.5D - 0.5, 0.5D - 0.05, 0.5D + 0.05, 0.5D + 0.3, 0.5D + 0.05 );
super.renderInventory( blk, is, renderer, type );
super.renderInventory( blk, is, renderer, type, obj );
renderer.setRenderBounds( 0.70D - 0.15, 0.75D - 0.05, 0.5D - 0.05, 0.70D + 0.28, 0.75D + 0.05, 0.5D + 0.05 );
super.renderInventory( blk, is, renderer, type );
super.renderInventory( blk, is, renderer, type, obj );
renderer.renderAllFaces = false;
}
client/render/blocks/RenderBlockEnergyCube.java
+2 -2
View File
@@ -16,7 +16,7 @@ public class RenderBlockEnergyCube extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
IAEItemPowerStorage myItem = (IAEItemPowerStorage) is.getItem();
double internalCurrentPower = myItem.getAECurrentPower( is );
@@ -30,7 +30,7 @@ public class RenderBlockEnergyCube extends BaseBlockRender
meta = 0;
renderer.setOverrideBlockTexture( blk.getIcon( 0, meta ) );
super.renderInventory( blk, is, renderer, type );
super.renderInventory( blk, is, renderer, type, obj );
renderer.setOverrideBlockTexture( null );
}
client/render/blocks/RenderBlockSkyChest.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class RenderBlockSkyChest extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
GL11.glEnable( 32826 /* GL_RESCALE_NORMAL_EXT */);
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
client/render/blocks/RenderBlockSkyCompass.java
+8 -2
View File
@@ -31,7 +31,7 @@ public class RenderBlockSkyCompass extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
GL11.glEnable( 32826 /* GL_RESCALE_NORMAL_EXT */);
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
@@ -62,10 +62,16 @@ public class RenderBlockSkyCompass extends BaseBlockRender
}
long now = System.currentTimeMillis();
if ( type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.INVENTORY )
if ( type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.INVENTORY || type == ItemRenderType.EQUIPPED )
{
EntityPlayer p = Minecraft.getMinecraft().thePlayer;
if ( type == ItemRenderType.EQUIPPED )
{
p = (EntityPlayer) obj[1];
p.rotationYaw = p.renderYawOffset;
}
int x = (int) p.posX;
int y = (int) p.posY;
int z = (int) p.posZ;
client/render/blocks/RenderBlockWireless.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class RenderBlockWireless extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
this.blk = blk;
cenx = 0;
client/render/blocks/RenderDrive.java
+2 -2
View File
@@ -23,13 +23,13 @@ public class RenderDrive extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
renderer.overrideBlockTexture = ExtraTextures.getMissing();
this.renderInvBlock( EnumSet.of( ForgeDirection.SOUTH ), block, is, Tessellator.instance, 0x000000, renderer );
renderer.overrideBlockTexture = null;
super.renderInventory( block, is, renderer, type );
super.renderInventory( block, is, renderer, type, obj );
}
@Override
client/render/blocks/RenderMEChest.java
+2 -2
View File
@@ -27,7 +27,7 @@ public class RenderMEChest extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
renderer.overrideBlockTexture = ExtraTextures.getMissing();
this.renderInvBlock( EnumSet.of( ForgeDirection.SOUTH ), block, is, Tessellator.instance, 0x000000, renderer );
@@ -36,7 +36,7 @@ public class RenderMEChest extends BaseBlockRender
this.renderInvBlock( EnumSet.of( ForgeDirection.UP ), block, is, Tessellator.instance, 0xffffff, renderer );
renderer.overrideBlockTexture = null;
super.renderInventory( block, is, renderer, type );
super.renderInventory( block, is, renderer, type, obj );
}
@Override
client/render/blocks/RenderNull.java
+1 -1
View File
@@ -15,7 +15,7 @@ public class RenderNull extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
}
client/render/blocks/RenderQNB.java
+2 -2
View File
@@ -72,13 +72,13 @@ public class RenderQNB extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock block, ItemStack item, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock block, ItemStack item, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
float px = 2.0f / 16.0f;
float maxpx = 14.0f / 16.0f;
renderer.setRenderBounds( px, px, px, maxpx, maxpx, maxpx );
super.renderInventory( block, item, renderer, type );
super.renderInventory( block, item, renderer, type, obj );
}
@Override
client/render/blocks/RenderQuartzGlass.java
+3 -3
View File
@@ -114,12 +114,12 @@ public class RenderQuartzGlass extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
renderer.overrideBlockTexture = ExtraTextures.GlassFrame.getIcon();
super.renderInventory( block, is, renderer, type );
super.renderInventory( block, is, renderer, type, obj );
renderer.overrideBlockTexture = null;
super.renderInventory( block, is, renderer, type );
super.renderInventory( block, is, renderer, type, obj );
}
@Override
client/render/blocks/RenderQuartzOre.java
+3 -3
View File
@@ -17,11 +17,11 @@ public class RenderQuartzOre extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
super.renderInventory( blk, is, renderer, type );
super.renderInventory( blk, is, renderer, type, obj );
blk.getRendererInstance().setTemporaryRenderIcon( ExtraTextures.OreQuartzStone.getIcon() );
super.renderInventory( blk, is, renderer, type );
super.renderInventory( blk, is, renderer, type, obj );
blk.getRendererInstance().setTemporaryRenderIcon( null );
}
client/render/blocks/RenderQuartzTorch.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class RenderQuartzTorch extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
Tessellator tess = Tessellator.instance;
client/render/blocks/RenderSpatialPylon.java
+3 -3
View File
@@ -21,12 +21,12 @@ public class RenderSpatialPylon extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
renderer.overrideBlockTexture = ExtraTextures.BlockSpatialPylon_dim.getIcon();
super.renderInventory( block, is, renderer, type );
super.renderInventory( block, is, renderer, type, obj );
renderer.overrideBlockTexture = null;
super.renderInventory( block, is, renderer, type );
super.renderInventory( block, is, renderer, type, obj );
}
@Override
client/render/blocks/RenderTinyTNT.java
+2 -2
View File
@@ -15,10 +15,10 @@ public class RenderTinyTNT extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
renderer.setRenderBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f );
super.renderInventory( block, is, renderer, type );
super.renderInventory( block, is, renderer, type, obj );
}
@Override
client/render/blocks/RendererCableBus.java
+1 -1
View File
@@ -19,7 +19,7 @@ public class RendererCableBus extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
// nothin.
}
client/render/blocks/RendererSecurity.java
+2 -2
View File
@@ -22,7 +22,7 @@ public class RendererSecurity extends BaseBlockRender
}
@Override
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type)
public void renderInventory(AEBaseBlock block, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj)
{
renderer.overrideBlockTexture = ExtraTextures.getMissing();
this.renderInvBlock( EnumSet.of( ForgeDirection.SOUTH ), block, is, Tessellator.instance, 0x000000, renderer );
@@ -31,7 +31,7 @@ public class RendererSecurity extends BaseBlockRender
this.renderInvBlock( EnumSet.of( ForgeDirection.UP ), block, is, Tessellator.instance, 0xffffff, renderer );
renderer.overrideBlockTexture = null;
super.renderInventory( block, is, renderer, type );
super.renderInventory( block, is, renderer, type, obj );
}
@Override