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

Formatted code

Browse Source
This commit is contained in:
yueh
2015-12-24 02:03:16 +01:00
parent e94a0cfccf
commit c9e8a6e939
216 changed files with 1196 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/BaseBlockRender.java
+21 -21
View File
@@ -66,7 +66,7 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
private final FloatBuffer rotMat = BufferUtils.createFloatBuffer( 16 );
private static int dynRender = 0;
private final ModelResourceLocation modelPath = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, "DynamicRender"+dynRender++ ), "inventory" );
private final ModelResourceLocation modelPath = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, "DynamicRender" + dynRender++ ), "inventory" );
public BaseBlockRender()
{
@@ -330,7 +330,7 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
return ORIENTATION_MAP[a][b][c];
}
public void renderInvBlock( final EnumSet<AEPartLocation> sides, final B block, final ItemStack item, final int color, final ModelGenerator tess )
public void renderInvBlock( final EnumSet<AEPartLocation> sides, final B block, final ItemStack item, final int color, final ModelGenerator tess )
{
if( block != null && block.hasSubtypes() && item != null )
{
@@ -338,48 +338,48 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
}
final IAESprite[] icons = tess.getIcon( item == null ? block.getDefaultState() : block.getStateFromMeta( item.getMetadata() ) );
final BlockPos zero = new BlockPos(0,0,0);
final BlockPos zero = new BlockPos( 0, 0, 0 );
if( sides.contains( AEPartLocation.DOWN ) )
{
tess.setNormal( 0.0F, -1.0F, 0.0F );
tess.setColorOpaque_I( color );
tess.renderFaceYNeg( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.DOWN ), icons[ AEPartLocation.DOWN.ordinal() ] ) );
tess.renderFaceYNeg( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.DOWN ), icons[AEPartLocation.DOWN.ordinal()] ) );
}
if( sides.contains( AEPartLocation.UP ) )
{
tess.setNormal( 0.0F, 1.0F, 0.0F );
tess.setColorOpaque_I( color );
tess.renderFaceYPos( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.UP ), icons[ AEPartLocation.UP.ordinal() ] ) );
tess.renderFaceYPos( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.UP ), icons[AEPartLocation.UP.ordinal()] ) );
}
if( sides.contains( AEPartLocation.NORTH ) )
{
tess.setNormal( 0.0F, 0.0F, -1.0F );
tess.setColorOpaque_I( color );
tess.renderFaceZNeg( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.NORTH ), icons[ AEPartLocation.NORTH.ordinal() ] ) );
tess.renderFaceZNeg( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.NORTH ), icons[AEPartLocation.NORTH.ordinal()] ) );
}
if( sides.contains( AEPartLocation.SOUTH ) )
{
tess.setNormal( 0.0F, 0.0F, 1.0F );
tess.setColorOpaque_I( color );
tess.renderFaceZPos( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.SOUTH ), icons[ AEPartLocation.SOUTH.ordinal() ] ) );
tess.renderFaceZPos( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.SOUTH ), icons[AEPartLocation.SOUTH.ordinal()] ) );
}
if( sides.contains( AEPartLocation.WEST ) )
{
tess.setNormal( -1.0F, 0.0F, 0.0F );
tess.setColorOpaque_I( color );
tess.renderFaceXNeg( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.WEST ), icons[ AEPartLocation.WEST.ordinal() ] ) );
tess.renderFaceXNeg( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.WEST ), icons[AEPartLocation.WEST.ordinal()] ) );
}
if( sides.contains( AEPartLocation.EAST ) )
{
tess.setNormal( 1.0F, 0.0F, 0.0F );
tess.setColorOpaque_I( color );
tess.renderFaceXPos( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.EAST ), icons[ AEPartLocation.EAST.ordinal() ]) );
tess.renderFaceXPos( block, zero, this.firstNotNull( tess.getOverrideBlockTexture(), block.getRendererInstance().getTexture( AEPartLocation.EAST ), icons[AEPartLocation.EAST.ordinal()] ) );
}
}
@@ -557,25 +557,25 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
final double layerBX = 0.0;
final double layerAY = 0.0;
this.renderFace(orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
// u -> u
0, 1.0,
// v -> v
0, edgeThickness, ico, flip );
this.renderFace( orientation,tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
// u -> u
0.0, edgeThickness,
// v -> v
edgeThickness, 1.0 - edgeThickness, ico, flip );
this.renderFace( orientation,tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
// u -> u
1.0 - edgeThickness, 1.0,
// v -> v
edgeThickness, 1.0 - edgeThickness, ico, flip );
this.renderFace( orientation,tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
this.renderFace( orientation, tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
// u -> u
0, 1.0,
// v -> v
@@ -583,14 +583,14 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
}
@SideOnly( Side.CLIENT )
private void renderFace( final EnumFacing face, final ModelGenerator tess, final double offsetX, final double offsetY, final double offsetZ, final double ax, final double ay, final double az, final double bx, final double by, final double bz, final double ua, final double ub, final double va, final double vb, final IAESprite ico, final boolean flip )
private void renderFace( final EnumFacing face, final ModelGenerator tess, final double offsetX, final double offsetY, final double offsetZ, final double ax, final double ay, final double az, final double bx, final double by, final double bz, final double ua, final double ub, final double va, final double vb, final IAESprite ico, final boolean flip )
{
if( flip )
{
tess.addVertexWithUV( face,offsetX + ax * ua + bx * va, offsetY + ay * ua + by * va, offsetZ + az * ua + bz * va, ico.getInterpolatedU( ua * 16.0 ), ico.getInterpolatedV( va * 16.0 ) );
tess.addVertexWithUV( face,offsetX + ax * ua + bx * vb, offsetY + ay * ua + by * vb, offsetZ + az * ua + bz * vb, ico.getInterpolatedU( ua * 16.0 ), ico.getInterpolatedV( vb * 16.0 ) );
tess.addVertexWithUV( face,offsetX + ax * ub + bx * vb, offsetY + ay * ub + by * vb, offsetZ + az * ub + bz * vb, ico.getInterpolatedU( ub * 16.0 ), ico.getInterpolatedV( vb * 16.0 ) );
tess.addVertexWithUV( face,offsetX + ax * ub + bx * va, offsetY + ay * ub + by * va, offsetZ + az * ub + bz * va, ico.getInterpolatedU( ub * 16.0 ), ico.getInterpolatedV( va * 16.0 ) );
tess.addVertexWithUV( face, offsetX + ax * ua + bx * va, offsetY + ay * ua + by * va, offsetZ + az * ua + bz * va, ico.getInterpolatedU( ua * 16.0 ), ico.getInterpolatedV( va * 16.0 ) );
tess.addVertexWithUV( face, offsetX + ax * ua + bx * vb, offsetY + ay * ua + by * vb, offsetZ + az * ua + bz * vb, ico.getInterpolatedU( ua * 16.0 ), ico.getInterpolatedV( vb * 16.0 ) );
tess.addVertexWithUV( face, offsetX + ax * ub + bx * vb, offsetY + ay * ub + by * vb, offsetZ + az * ub + bz * vb, ico.getInterpolatedU( ub * 16.0 ), ico.getInterpolatedV( vb * 16.0 ) );
tess.addVertexWithUV( face, offsetX + ax * ub + bx * va, offsetY + ay * ub + by * va, offsetZ + az * ub + bz * va, ico.getInterpolatedU( ub * 16.0 ), ico.getInterpolatedV( va * 16.0 ) );
}
else
{
@@ -691,7 +691,7 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
final BlockPos pos = tile.getPos();
renderer.setTranslation( -pos.getX(), -pos.getY(), -pos.getZ() );
renderer.setTranslation( -pos.getX(), -pos.getY(), -pos.getZ() );
// note that this is a terrible approach...
renderer.setRenderBoundsFromBlock( block );
@@ -753,9 +753,9 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
GL11.glPushMatrix();
GL11.glTranslatef( 0, -0.14F, 0 );
//RenderItem.renderInFrame = true;
// RenderItem.renderInFrame = true;
Minecraft.getMinecraft().getRenderManager().renderEntityWithPosYaw( entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F );
//RenderItem.renderInFrame = false;
// RenderItem.renderInFrame = false;
GL11.glPopMatrix();
}
src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java
+3
View File
@@ -1,9 +1,12 @@
package appeng.client.render;
import net.minecraft.block.Block;
import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess;
public interface ISimpleBlockRenderingHandler
{
src/main/java/appeng/client/render/IconUnwrapper.java
+11 -10
View File
@@ -1,6 +1,7 @@
package appeng.client.render;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import appeng.client.texture.IAESprite;
@@ -71,17 +72,17 @@ public class IconUnwrapper extends TextureAtlasSprite
}
@Override
public float getInterpolatedU( final double d)
{
final float f = this.max_u - this.min_u;
return this.min_u + f * (float)d / 16.0F;
}
public float getInterpolatedU( final double d )
{
final float f = this.max_u - this.min_u;
return this.min_u + f * (float) d / 16.0F;
}
@Override
public float getInterpolatedV( final double d)
{
final float f = this.max_v - this.min_v;
return this.min_v + f * ((float)d / 16.0F);
}
public float getInterpolatedV( final double d )
{
final float f = this.max_v - this.min_v;
return this.min_v + f * ( (float) d / 16.0F );
}
}
src/main/java/appeng/client/render/SMFace.java
+7 -4
View File
@@ -1,10 +1,13 @@
package appeng.client.render;
import javax.vecmath.Vector3f;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.EnumFacing;
public class SMFace
{
@@ -21,7 +24,7 @@ public class SMFace
private final int color;
public SMFace(
final EnumFacing face , final boolean isEdge,
final EnumFacing face, final boolean isEdge,
final int color,
final Vector3f to,
final Vector3f from,
@@ -29,10 +32,10 @@ public class SMFace
final TextureAtlasSprite iconUnwrapper )
{
this.color = color;
this.face=face;
this.face = face;
this.isEdge = isEdge;
this.to=to;
this.from=from;
this.to = to;
this.from = from;
this.uv = defUVs2;
this.spite = iconUnwrapper;
}
src/main/java/appeng/client/render/SpatialSkyRender.java
+3 -3
View File
@@ -76,7 +76,7 @@ public class SpatialSkyRender extends IRenderHandler
GL11.glDepthMask( false );
GL11.glColor4f( 0.0f, 0.0f, 0.0f, 1.0f );
final Tessellator tessellator = Tessellator.getInstance();
final WorldRenderer worldrenderer = tessellator.getWorldRenderer();
final WorldRenderer worldrenderer = tessellator.getWorldRenderer();
for( int i = 0; i < 6; ++i )
{
@@ -145,8 +145,8 @@ public class SpatialSkyRender extends IRenderHandler
private void renderTwinkles()
{
final Tessellator tessellator = Tessellator.getInstance();
final WorldRenderer worldrenderer = tessellator.getWorldRenderer();
worldrenderer.startDrawingQuads();
final WorldRenderer worldrenderer = tessellator.getWorldRenderer();
worldrenderer.startDrawingQuads();
for( int i = 0; i < 50; ++i )
{
src/main/java/appeng/client/render/blocks/RenderBlockCharger.java
+13 -12
View File
@@ -63,20 +63,20 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
blk.getRendererInstance().setTemporaryRenderIcons( ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null, null );
this.setInvRenderBounds( renderer, 2, 0, 2, 14, 3, 14 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 3, 3, 3, 13, 4, 13 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
blk.getRendererInstance().setTemporaryRenderIcon( null );
blk.getRendererInstance().setTemporaryRenderIcons( null, ExtraBlockTextures.BlockChargerInside.getIcon(), null, null, null, null );
this.setInvRenderBounds( renderer, 2, 13, 2, 14, 16, 14 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 3, 12, 3, 13, 13, 13 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
renderer.setRenderAllFaces( false );
blk.getRendererInstance().setTemporaryRenderIcon( null );
@@ -140,14 +140,15 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
final Block blk = Block.getBlockFromItem( sis.getItem() );
/*
if( sis.getItemSpriteNumber() == 0 && block != null && IRenderHelper.renderItemIn3d( blk.getRenderType() ) )
{
GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
GL11.glRotatef( 15.0f, 0.0f, 1.0f, 0.0f );
GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f );
}
*/
* if( sis.getItemSpriteNumber() == 0 && block != null && IRenderHelper.renderItemIn3d(
* blk.getRenderType() ) )
* {
* GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
* GL11.glRotatef( 15.0f, 0.0f, 1.0f, 0.0f );
* GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f );
* }
*/
// << 20 | light << 4;
final int br = tile.getWorld().getCombinedLight( tile.getPos(), 0 );
final int var11 = br % 65536;
src/main/java/appeng/client/render/blocks/RenderBlockController.java
+3 -3
View File
@@ -44,11 +44,11 @@ public class RenderBlockController extends BaseBlockRender<BlockController, Tile
public boolean renderInWorld( final BlockController blk, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
final boolean xx = this.getTileEntity( world, pos.offset( EnumFacing.WEST ) ) instanceof TileController && this.getTileEntity( world, pos.offset( EnumFacing.EAST ) ) instanceof TileController;
final boolean xx = this.getTileEntity( world, pos.offset( EnumFacing.WEST ) ) instanceof TileController && this.getTileEntity( world, pos.offset( EnumFacing.EAST ) ) instanceof TileController;
final boolean yy = this.getTileEntity( world, pos.offset( EnumFacing.DOWN ) ) instanceof TileController && this.getTileEntity( world, pos.offset( EnumFacing.UP ) ) instanceof TileController;
final boolean zz = this.getTileEntity( world, pos.offset( EnumFacing.SOUTH )) instanceof TileController && this.getTileEntity( world, pos.offset( EnumFacing.NORTH ) ) instanceof TileController;
final boolean zz = this.getTileEntity( world, pos.offset( EnumFacing.SOUTH ) ) instanceof TileController && this.getTileEntity( world, pos.offset( EnumFacing.NORTH ) ) instanceof TileController;
final BlockController.ControllerBlockState meta = ( ControllerBlockState ) world.getBlockState( pos ).getValue( BlockController.CONTROLLER_STATE );
final BlockController.ControllerBlockState meta = (ControllerBlockState) world.getBlockState( pos ).getValue( BlockController.CONTROLLER_STATE );
final boolean hasPower = meta != BlockController.ControllerBlockState.OFFLINE;
final boolean isConflict = meta == BlockController.ControllerBlockState.CONFLICTED;
src/main/java/appeng/client/render/blocks/RenderBlockCrank.java
+13 -15
View File
@@ -94,29 +94,27 @@ public class RenderBlockCrank extends BaseBlockRender<BlockCrank, TileCrank>
GL11.glScalef( -1, 1, 1 );
GL11.glTranslated( -0.5, 0, -0.5 );
//tess.setTranslation( -tc.getPos().getX(), -tc.getPos().getY(), -tc.getPos().getZ() );
//tess.startDrawingQuads();
// tess.setTranslation( -tc.getPos().getX(), -tc.getPos().getY(), -tc.getPos().getZ() );
// tess.startDrawingQuads();
final RenderItem ri = Minecraft.getMinecraft().getRenderItem();
final ItemStack stack = new ItemStack( blk );
final IBakedModel model = ri.getItemModelMesher().getItemModel( stack );
Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor( model, 1.0F, 1.0F, 1.0F, 1.0F );
Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor( model, 1.0F, 1.0F, 1.0F, 1.0F );
/*
renderBlocks.renderAllFaces = true;
renderBlocks.blockAccess = tc.getWorld();
* renderBlocks.renderAllFaces = true;
* renderBlocks.blockAccess = tc.getWorld();
* renderBlocks.setRenderBounds( 0.5D - 0.05, 0.5D - 0.5, 0.5D - 0.05, 0.5D + 0.05, 0.5D + 0.1, 0.5D + 0.05 );
* renderBlocks.renderStandardBlock( blk, tc.getPos());
* renderBlocks.setRenderBounds( 0.70D - 0.15, 0.55D - 0.05, 0.5D - 0.05, 0.70D + 0.15, 0.55D + 0.05, 0.5D +
* 0.05 );
* renderBlocks.renderStandardBlock( blk, tc.getPos() );
*/
renderBlocks.setRenderBounds( 0.5D - 0.05, 0.5D - 0.5, 0.5D - 0.05, 0.5D + 0.05, 0.5D + 0.1, 0.5D + 0.05 );
renderBlocks.renderStandardBlock( blk, tc.getPos());
renderBlocks.setRenderBounds( 0.70D - 0.15, 0.55D - 0.05, 0.5D - 0.05, 0.70D + 0.15, 0.55D + 0.05, 0.5D + 0.05 );
renderBlocks.renderStandardBlock( blk, tc.getPos() );
*/
//Tessellator.getInstance().draw();
//tess.setTranslation( 0, 0, 0 );
// Tessellator.getInstance().draw();
// tess.setTranslation( 0, 0, 0 );
RenderHelper.enableStandardItemLighting();
}
}
src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java
+14 -12
View File
@@ -74,19 +74,19 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
// sides...
this.setInvRenderBounds( renderer, 3, 1, 0, 13, 15, 3 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 0, 1, 0, 3, 15, 16 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 13, 1, 0, 16, 15, 16 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 1, 0, 1, 15, 2, 15 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 1, 14, 1, 15, 16, 15 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockInscriberInside.getIcon() );
@@ -252,7 +252,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
}
}
this.renderItem( is, 0.0f, block, tile, tess, x,y,z, f, renderer );
this.renderItem( is, 0.0f, block, tile, tess, x, y, z, f, renderer );
}
else
{
@@ -279,12 +279,14 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
final Block blk = Block.getBlockFromItem( sis.getItem() );
/*
if( sis.getItemSpriteNumber() == 0 && block != null && IRenderHelper.renderItemIn3d( blk.getRenderType() ) )
{
GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
GL11.glRotatef( 15.0f, 0.0f, 1.0f, 0.0f );
GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f );
}*/
* if( sis.getItemSpriteNumber() == 0 && block != null && IRenderHelper.renderItemIn3d(
* blk.getRenderType() ) )
* {
* GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
* GL11.glRotatef( 15.0f, 0.0f, 1.0f, 0.0f );
* GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f );
* }
*/
GL11.glRotatef( 90.0f, 1, 0, 0 );
src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java
+14 -14
View File
@@ -59,25 +59,25 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
@Override
public void renderInventory( final BlockSkyChest blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
//GL11.glEnable( GL12.GL_RESCALE_NORMAL );
//GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
// GL11.glEnable( GL12.GL_RESCALE_NORMAL );
// GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
//final int metaData = is.getItemDamage();
//final ResourceLocation loc = METADATA_TO_TEXTURE[metaData];
// final int metaData = is.getItemDamage();
// final ResourceLocation loc = METADATA_TO_TEXTURE[metaData];
//Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
// Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
//final float lidAngle = 0.0f;
// final float lidAngle = 0.0f;
//GL11.glScalef( 1.0F, -1F, -1F );
//GL11.glTranslatef( -0.0F, -1.0F, -1.0F );
// GL11.glScalef( 1.0F, -1F, -1F );
// GL11.glTranslatef( -0.0F, -1.0F, -1.0F );
//this.model.chestLid.offsetY = -( 0.9f / 16.0f );
//this.model.chestLid.rotateAngleX = -( ( lidAngle * 3.141593F ) / 2.0F );
//this.model.renderAll();
// this.model.chestLid.offsetY = -( 0.9f / 16.0f );
// this.model.chestLid.rotateAngleX = -( ( lidAngle * 3.141593F ) / 2.0F );
// this.model.renderAll();
//GL11.glDisable( GL12.GL_RESCALE_NORMAL );
//GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
// GL11.glDisable( GL12.GL_RESCALE_NORMAL );
// GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
}
@Override
@@ -103,7 +103,7 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
final IBlockState metaData = skyChest.getWorld().getBlockState( skyChest.getPos() );
final ResourceLocation loc = METADATA_TO_TEXTURE[ ((BlockSkyChest)metaData.getBlock()).type == SkyChestType.BLOCK ? 1 : 0 ];
final ResourceLocation loc = METADATA_TO_TEXTURE[( (BlockSkyChest) metaData.getBlock() ).type == SkyChestType.BLOCK ? 1 : 0];
Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
src/main/java/appeng/client/render/blocks/RenderBlockWireless.java
+4 -4
View File
@@ -57,7 +57,7 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
public void renderInventory( final BlockWireless blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
this.blk = blk;
this.center = new BlockPos(0,0,0);
this.center = new BlockPos( 0, 0, 0 );
this.hasChan = false;
this.hasPower = false;
final BlockRenderInfo ri = blk.getRendererInstance();
@@ -74,7 +74,7 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
this.renderBlockBounds( renderer, 5, 5, 1, 11, 11, 2, EnumFacing.EAST, EnumFacing.UP, EnumFacing.SOUTH );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
//renderer.startDrawingQuads();
// renderer.startDrawingQuads();
ri.setTemporaryRenderIcon( null );
this.renderTorchAtAngle( renderer, EnumFacing.EAST, EnumFacing.UP, EnumFacing.SOUTH );
super.postRenderInWorld( renderer );
@@ -88,7 +88,7 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
for( final AEPartLocation side : sides )
{
this.renderBlockBounds( renderer, 8 + ( side.xOffset != 0 ? side.xOffset * 2 : -2 ), 8 + ( side.yOffset != 0 ? side.yOffset * 2 : -2 ), 2 + ( side.zOffset != 0 ? side.zOffset * 2 : -1 ) + s, 8 + ( side.xOffset != 0 ? side.xOffset * 4 : 2 ), 8 + ( side.yOffset != 0 ? side.yOffset * 4 : 2 ), 2 + ( side.zOffset != 0 ? side.zOffset * 5 : 1 ) + s, EnumFacing.EAST, EnumFacing.UP, EnumFacing.SOUTH );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
}
s = 3;
@@ -250,7 +250,7 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
}
renderer.setColorOpaque_I( 0xffffff );
this.renderBlockBounds( renderer, 0, 7, 1, 16, 9, 16, x,y,z );
this.renderBlockBounds( renderer, 0, 7, 1, 16, 9, 16, x, y, z );
this.renderFace( this.center, this.blk, sides, renderer, y );
this.renderFace( this.center, this.blk, sides, renderer, y.getOpposite() );
src/main/java/appeng/client/render/blocks/RenderDrive.java
+51 -52
View File
@@ -191,7 +191,6 @@ public class RenderDrive extends BaseBlockRender<BlockDrive, TileDrive>
break;
}
double u1 = ico.getInterpolatedU( ( spin % 4 < 2 ) ? 1 : 6 );
double u2 = ico.getInterpolatedU( ( ( spin + 1 ) % 4 < 2 ) ? 1 : 6 );
double u3 = ico.getInterpolatedU( ( ( spin + 2 ) % 4 < 2 ) ? 1 : 6 );
@@ -210,49 +209,49 @@ public class RenderDrive extends BaseBlockRender<BlockDrive, TileDrive>
double v3 = ico.getInterpolatedV( ( ( spin + 3 ) % 4 < 2 ) ? m : mx );
double v4 = ico.getInterpolatedV( ( ( spin ) % 4 < 2 ) ? m : mx );
final int x= pos.getX();
final int y= pos.getY();
final int z= pos.getZ();
final int x = pos.getX();
final int y = pos.getY();
final int z = pos.getZ();
renderer.setBrightness( b );
renderer.setColorOpaque_I( 0xffffff );
switch( forward.getFrontOffsetX() + forward.getFrontOffsetY() * 2 + forward.getFrontOffsetZ() * 3 )
{
case 1:
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u4, v4 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u4, v4 );
break;
case -1:
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 );
break;
case -2:
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 );
break;
case 2:
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 );
break;
case 3:
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 );
break;
case -3:
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 );
break;
}
@@ -304,39 +303,39 @@ public class RenderDrive extends BaseBlockRender<BlockDrive, TileDrive>
{
case 1:
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u4, v4 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u4, v4 );
break;
case -1:
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 );
break;
case -2:
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 );
break;
case 2:
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u1, v1 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMinZ(), u4, v4 );
break;
case 3:
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 );
break;
case -3:
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u1, v1 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMinX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u2, v2 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMaxY(), z + renderer.getRenderMaxZ(), u3, v3 );
renderer.addVertexWithUV( forward, x + renderer.getRenderMaxX(), y + renderer.getRenderMinY(), z + renderer.getRenderMaxZ(), u4, v4 );
break;
}
}
src/main/java/appeng/client/render/blocks/RenderQNB.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
{
final EnumSet<AEPartLocation> sides = tqb.getConnections();
this.renderCableAt( 0.11D, world, pos, block, renderer, renderer.getIcon( parts.cableGlass().stack( AEColor.Transparent, 1 ) ), 0.141D, sides );
this.renderCableAt( 0.11D, world, pos, block, renderer, renderer.getIcon( parts.cableGlass().stack( AEColor.Transparent, 1 ) ), 0.141D, sides );
final Item transCoveredCable = parts.cableCovered().item( AEColor.Transparent );
this.renderCableAt( 0.188D, world, pos, block, renderer, renderer.getIcon( parts.cableCovered().stack( AEColor.Transparent, 1 ) ), 0.1875D, sides );
src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java
+5 -5
View File
@@ -78,7 +78,7 @@ public class RenderQuartzGlass extends BaseBlockRender<QuartzGlassBlock, AEBaseT
final int u = offsets[cx][cy][cz] % 4;
final int v = offsets[9 - cx][9 - cy][9 - cz] % 4;
switch( Math.abs( ( offsets[cx][cy][cz] + ( pos.getX()+pos.getY()+pos.getZ() ) ) % 4 ) )
switch( Math.abs( ( offsets[cx][cy][cz] + ( pos.getX() + pos.getY() + pos.getZ() ) ) % 4 ) )
{
case 0:
renderer.setOverrideBlockTexture( new OffsetIcon( renderer.getIcon( world.getBlockState( pos ) )[0], u / 2, v / 2 ) );
@@ -216,20 +216,20 @@ public class RenderQuartzGlass extends BaseBlockRender<QuartzGlassBlock, AEBaseT
private boolean isFlush( final QuartzGlassBlock imb, final IBlockAccess world, final int x, final int y, final int z )
{
return this.isGlass( imb, world, new BlockPos(x, y, z) );
return this.isGlass( imb, world, new BlockPos( x, y, z ) );
}
private boolean isGlass( final QuartzGlassBlock imb, final IBlockAccess world, final BlockPos pos)
private boolean isGlass( final QuartzGlassBlock imb, final IBlockAccess world, final BlockPos pos )
{
return this.isQuartzGlass( world, pos ) || this.isVibrantQuartzGlass( world, pos );
}
private boolean isQuartzGlass( final IBlockAccess world, final BlockPos pos)
private boolean isQuartzGlass( final IBlockAccess world, final BlockPos pos )
{
return AEApi.instance().definitions().blocks().quartzGlass().isSameAs( world, pos );
}
private boolean isVibrantQuartzGlass( final IBlockAccess world, final BlockPos pos)
private boolean isVibrantQuartzGlass( final IBlockAccess world, final BlockPos pos )
{
return AEApi.instance().definitions().blocks().quartzVibrantGlass().isSameAs( world, pos );
}
src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java
+2 -2
View File
@@ -76,7 +76,7 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
final float Point2 = 6.0f / 16.0f;
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point2 + zOff, Point13 + xOff, top + yOff, Point3 + zOff );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point12 + zOff, Point13 + xOff, top + yOff, Point13 + zOff );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
@@ -154,7 +154,7 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
if( te != null )
{
final AEPartLocation forward = AEPartLocation.fromFacing( te.getUp());
final AEPartLocation forward = AEPartLocation.fromFacing( te.getUp() );
switch( forward )
{
case EAST:
src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java
+7 -7
View File
@@ -56,13 +56,13 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
{
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
final TileSpatialPylon sp = imb.getTileEntity( world, pos );
final TileSpatialPylon sp = imb.getTileEntity( world, pos );
final int displayBits = ( sp == null ) ? 0 : sp.getDisplayBits();
if( displayBits != 0 )
{
EnumFacing ori = null;//AEPartLocation.INTERNAL;
EnumFacing ori = null;// AEPartLocation.INTERNAL;
if( ( displayBits & TileSpatialPylon.DISPLAY_Z ) == TileSpatialPylon.DISPLAY_X )
{
ori = EnumFacing.EAST;
@@ -125,7 +125,7 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
final BlockRenderInfo bri = imb.getRendererInstance();
bri.setTemporaryRenderIcon( null );
bri.setTemporaryRenderIcons( this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.UP, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.DOWN, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.SOUTH, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.NORTH, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.EAST, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.WEST , renderer) );
bri.setTemporaryRenderIcons( this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.UP, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.DOWN, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.SOUTH, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.NORTH, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.EAST, renderer ), this.getBlockTextureFromSideOutside( imb, sp, displayBits, ori, EnumFacing.WEST, renderer ) );
final boolean r = renderer.renderStandardBlock( imb, pos );
@@ -137,13 +137,13 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
for( final EnumFacing d : EnumFacing.VALUES )
{
this.renderFace( pos, imb, this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, d,renderer ), renderer, d );
this.renderFace( pos, imb, this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, d, renderer ), renderer, d );
}
}
else
{
bri.setTemporaryRenderIcon( null );
bri.setTemporaryRenderIcons( this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, EnumFacing.UP,renderer ), this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, EnumFacing.DOWN,renderer ), this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, EnumFacing.SOUTH,renderer ), this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, EnumFacing.NORTH,renderer ), this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, EnumFacing.EAST,renderer ), this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, EnumFacing.WEST,renderer ) );
bri.setTemporaryRenderIcons( this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, EnumFacing.UP, renderer ), this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, EnumFacing.DOWN, renderer ), this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, EnumFacing.SOUTH, renderer ), this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, EnumFacing.NORTH, renderer ), this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, EnumFacing.EAST, renderer ), this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, EnumFacing.WEST, renderer ) );
renderer.renderStandardBlock( imb, pos );
}
@@ -154,7 +154,7 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
return r;
}
renderer.setOverrideBlockTexture( renderer.getIcon( world.getBlockState( pos ) )[0] );//imb.getIcon( 0, 0 );
renderer.setOverrideBlockTexture( renderer.getIcon( world.getBlockState( pos ) )[0] );// imb.getIcon( 0, 0 );
boolean result = renderer.renderStandardBlock( imb, pos );
renderer.setOverrideBlockTexture( ExtraBlockTextures.BlockSpatialPylon_dim.getIcon() );
@@ -210,6 +210,6 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
return good ? ExtraBlockTextures.BlockSpatialPylonE_dim.getIcon() : ExtraBlockTextures.BlockSpatialPylonE_red.getIcon();
}
return renderer.getIcon( blk.getDefaultState() )[0];//blk.getIcon( 0, 0 );
return renderer.getIcon( blk.getDefaultState() )[0];// blk.getIcon( 0, 0 );
}
}
src/main/java/appeng/client/render/blocks/RenderTinyTNT.java
+2 -2
View File
@@ -43,7 +43,7 @@ public class RenderTinyTNT extends BaseBlockRender<BlockTinyTNT, AEBaseTile>
@Override
public void renderInventory( final BlockTinyTNT block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() )) );
renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() ) ) );
renderer.setRenderBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f );
super.renderInventory( block, is, renderer, type, obj );
}
@@ -51,7 +51,7 @@ public class RenderTinyTNT extends BaseBlockRender<BlockTinyTNT, AEBaseTile>
@Override
public boolean renderInWorld( final BlockTinyTNT imb, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() )) );
renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() ) ) );
renderer.setRenderAllFaces( true );
renderer.setRenderBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f );
final boolean out = super.renderInWorld( imb, world, pos, renderer );
src/main/java/appeng/client/render/effects/AssemblerFX.java
+2 -2
View File
@@ -73,8 +73,8 @@ public class AssemblerFX extends EntityFX
}
@Override
public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY )
{
public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY )
{
this.time += l;
if( this.time > 4.0 )
{
src/main/java/appeng/client/render/effects/CraftingFx.java
+2 -2
View File
@@ -68,8 +68,8 @@ public class CraftingFx extends EntityBreakingFX
}
@Override
public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float partialTick, final float x, final float y, final float z, final float rx, final float rz)
{
public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float partialTick, final float x, final float y, final float z, final float rx, final float rz )
{
if( partialTick < 0 || partialTick > 1 )
{
return;
src/main/java/appeng/client/render/effects/EnergyFx.java
+2 -2
View File
@@ -67,8 +67,8 @@ public class EnergyFx extends EntityBreakingFX
}
@Override
public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7)
{
public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7 )
{
final float f6 = this.particleTextureIndex.getMinU();
final float f7 = this.particleTextureIndex.getMaxU();
final float f8 = this.particleTextureIndex.getMinV();
src/main/java/appeng/client/render/effects/LightningFX.java
+2 -2
View File
@@ -84,8 +84,8 @@ public class LightningFX extends EntityFX
}
@Override
public void renderParticle( final WorldRenderer tess, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY )
{
public void renderParticle( final WorldRenderer tess, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY )
{
final float j = 1.0f;
tess.setColorRGBA_F( this.particleRed * j * 0.9f, this.particleGreen * j * 0.95f, this.particleBlue * j, this.particleAlpha );
if( this.particleAge == 3 )
src/main/java/appeng/client/render/effects/MatterCannonFX.java
+2 -2
View File
@@ -70,8 +70,8 @@ public class MatterCannonFX extends EntityBreakingFX
}
@Override
public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7 )
{
public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7 )
{
final float f6 = this.particleTextureIndex.getMinU();
final float f7 = this.particleTextureIndex.getMaxU();
final float f8 = this.particleTextureIndex.getMinV();
src/main/java/appeng/client/render/items/PaintBallRender.java
+1 -1
View File
@@ -124,4 +124,4 @@ package appeng.client.render.items;
// GL11.glPopAttrib();
// GL11.glPopMatrix();
// }
//}
// }
src/main/java/appeng/client/render/items/ToolBiometricCardRender.java
+90 -103
View File
@@ -42,108 +42,95 @@ public class ToolBiometricCardRender implements IItemRenderer // TileEntityItemS
public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
{
/*
TextureAtlasSprite par2Icon = item.getIconIndex();
float f4 = par2Icon.getMinU();
float f5 = par2Icon.getMaxU();
float f6 = par2Icon.getMinV();
float f7 = par2Icon.getMaxV();
float f12 = 0.0625F;
Tessellator tessellator = Tessellator.instance;
GL11.glPushMatrix();
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
if( type == ItemRenderType.INVENTORY )
{
GL11.glColor4f( 1, 1, 1, 1.0F );
GL11.glScalef( 16F, 16F, 10F );
GL11.glTranslatef( 0.0F, 1.0F, 0.0F );
GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
GL11.glEnable( GL11.GL_ALPHA_TEST );
tessellator.startDrawingQuads();
tessellator.setNormal( 0.0F, 1.0F, 0.0F );
tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
tessellator.addVertexWithUV( 1, 0, 0, f5, f7 );
tessellator.addVertexWithUV( 1, 1, 0, f5, f6 );
tessellator.addVertexWithUV( 0, 1, 0, f4, f6 );
tessellator.draw();
}
else
{
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(), f12 );
GL11.glDisable( GL11.GL_CULL_FACE );
GL11.glColor4f( 1, 1, 1, 1.0F );
GL11.glScalef( 1F, 1.1F, 1F );
GL11.glTranslatef( 0.0F, 1.07F, f12 / -2.0f );
GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
}
float u = ExtraItemTextures.White.getIcon().getInterpolatedU( 8.1 );
float v = ExtraItemTextures.White.getIcon().getInterpolatedV( 8.1 );
String username = "";
if( item.getItem() instanceof IBiometricCard )
{
GameProfile gp = ( (IBiometricCard) item.getItem() ).getProfile( item );
if( gp != null )
{
username = gp.getName();
}
}
int hash = username.length() > 0 ? username.hashCode() : 0;
GL11.glScalef( 1F / 16F, 1F / 16F, 1F );
GL11.glTranslatef( 4, 6, 0 );
GL11.glDisable( GL11.GL_LIGHTING );
tessellator.startDrawingQuads();
float z = 0;
AEColor col = AEColor.values()[Math.abs( 3 + hash ) % AEColor.values().length];
if( hash == 0 )
{
col = AEColor.Black;
}
for( int x = 0; x < 8; x++ )// 8
{
for( int y = 0; y < 6; y++ )// 6
{
boolean isLit = false;
float scale = 0.3f / 255.0f;
if( x == 0 || y == 0 || x == 7 || y == 5 )
{
isLit = false;
}
else
{
isLit = ( hash & ( 1 << x ) ) != 0 || ( hash & ( 1 << y ) ) != 0;
}
if( isLit )
{
tessellator.setColorOpaque_I( col.mediumVariant );
}
else
{
tessellator.setColorOpaque_F( ( ( col.blackVariant >> 16 ) & 0xff ) * scale, ( ( col.blackVariant >> 8 ) & 0xff ) * scale, ( col.blackVariant & 0xff ) * scale );
}
tessellator.addVertexWithUV( x, y, z, u, v );
tessellator.addVertexWithUV( x + 1, y, z, u, v );
tessellator.addVertexWithUV( x + 1, y + 1, z, u, v );
tessellator.addVertexWithUV( x, y + 1, z, u, v );
}
}
tessellator.draw();
GL11.glPopAttrib();
GL11.glPopMatrix();
*/
* TextureAtlasSprite par2Icon = item.getIconIndex();
* float f4 = par2Icon.getMinU();
* float f5 = par2Icon.getMaxU();
* float f6 = par2Icon.getMinV();
* float f7 = par2Icon.getMaxV();
* float f12 = 0.0625F;
* Tessellator tessellator = Tessellator.instance;
* GL11.glPushMatrix();
* GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
* if( type == ItemRenderType.INVENTORY )
* {
* GL11.glColor4f( 1, 1, 1, 1.0F );
* GL11.glScalef( 16F, 16F, 10F );
* GL11.glTranslatef( 0.0F, 1.0F, 0.0F );
* GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
* GL11.glEnable( GL11.GL_ALPHA_TEST );
* tessellator.startDrawingQuads();
* tessellator.setNormal( 0.0F, 1.0F, 0.0F );
* tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
* tessellator.addVertexWithUV( 1, 0, 0, f5, f7 );
* tessellator.addVertexWithUV( 1, 1, 0, f5, f6 );
* tessellator.addVertexWithUV( 0, 1, 0, f4, f6 );
* tessellator.draw();
* }
* else
* {
* GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
* ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(),
* f12 );
* GL11.glDisable( GL11.GL_CULL_FACE );
* GL11.glColor4f( 1, 1, 1, 1.0F );
* GL11.glScalef( 1F, 1.1F, 1F );
* GL11.glTranslatef( 0.0F, 1.07F, f12 / -2.0f );
* GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
* }
* float u = ExtraItemTextures.White.getIcon().getInterpolatedU( 8.1 );
* float v = ExtraItemTextures.White.getIcon().getInterpolatedV( 8.1 );
* String username = "";
* if( item.getItem() instanceof IBiometricCard )
* {
* GameProfile gp = ( (IBiometricCard) item.getItem() ).getProfile( item );
* if( gp != null )
* {
* username = gp.getName();
* }
* }
* int hash = username.length() > 0 ? username.hashCode() : 0;
* GL11.glScalef( 1F / 16F, 1F / 16F, 1F );
* GL11.glTranslatef( 4, 6, 0 );
* GL11.glDisable( GL11.GL_LIGHTING );
* tessellator.startDrawingQuads();
* float z = 0;
* AEColor col = AEColor.values()[Math.abs( 3 + hash ) % AEColor.values().length];
* if( hash == 0 )
* {
* col = AEColor.Black;
* }
* for( int x = 0; x < 8; x++ )// 8
* {
* for( int y = 0; y < 6; y++ )// 6
* {
* boolean isLit = false;
* float scale = 0.3f / 255.0f;
* if( x == 0 || y == 0 || x == 7 || y == 5 )
* {
* isLit = false;
* }
* else
* {
* isLit = ( hash & ( 1 << x ) ) != 0 || ( hash & ( 1 << y ) ) != 0;
* }
* if( isLit )
* {
* tessellator.setColorOpaque_I( col.mediumVariant );
* }
* else
* {
* tessellator.setColorOpaque_F( ( ( col.blackVariant >> 16 ) & 0xff ) * scale, ( ( col.blackVariant >> 8 ) &
* 0xff ) * scale, ( col.blackVariant & 0xff ) * scale );
* }
* tessellator.addVertexWithUV( x, y, z, u, v );
* tessellator.addVertexWithUV( x + 1, y, z, u, v );
* tessellator.addVertexWithUV( x + 1, y + 1, z, u, v );
* tessellator.addVertexWithUV( x, y + 1, z, u, v );
* }
* }
* tessellator.draw();
* GL11.glPopAttrib();
* GL11.glPopMatrix();
*/
}
}
src/main/java/appeng/client/render/items/ToolColorApplicatorRender.java
+92 -109
View File
@@ -42,114 +42,97 @@ public class ToolColorApplicatorRender implements IItemRenderer
public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
{
/*
TextureAtlasSprite par2Icon = item.getIconIndex();
float f4 = par2Icon.getMinU();
float f5 = par2Icon.getMaxU();
float f6 = par2Icon.getMinV();
float f7 = par2Icon.getMaxV();
float f12 = 0.0625F;
Tessellator tessellator = Tessellator.instance;
GL11.glPushMatrix();
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
if( type == ItemRenderType.INVENTORY )
{
GL11.glColor4f( 1, 1, 1, 1.0F );
GL11.glScalef( 16F, 16F, 10F );
GL11.glTranslatef( 0.0F, 1.0F, 0.0F );
GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
GL11.glEnable( GL11.GL_ALPHA_TEST );
tessellator.startDrawingQuads();
tessellator.setNormal( 0.0F, 1.0F, 0.0F );
tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
tessellator.addVertexWithUV( 1, 0, 0, f5, f7 );
tessellator.addVertexWithUV( 1, 1, 0, f5, f6 );
tessellator.addVertexWithUV( 0, 1, 0, f4, f6 );
tessellator.draw();
}
else
{
if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
{
GL11.glTranslatef( 0.0F, 0.0F, 0.0F );
}
else if( type == ItemRenderType.EQUIPPED )
{
GL11.glTranslatef( 0.0F, 0.0F, 0.0F );
}
else
{
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
}
ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(), f12 );
GL11.glDisable( GL11.GL_CULL_FACE );
GL11.glColor4f( 1, 1, 1, 1.0F );
GL11.glScalef( -1F, -1F, 1F );
GL11.glTranslatef( -1.125F, 0.0f, f12 / -2.0f );
GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
}
TextureAtlasSprite dark = ExtraItemTextures.ToolColorApplicatorTip_Dark.getIcon();
TextureAtlasSprite med = ExtraItemTextures.ToolColorApplicatorTip_Medium.getIcon();
TextureAtlasSprite light = ExtraItemTextures.ToolColorApplicatorTip_Light.getIcon();
GL11.glScalef( 1F / 16F, 1F / 16F, 1F );
if( type != ItemRenderType.INVENTORY )
{
GL11.glTranslatef( 2, 0, 0 );
}
GL11.glDisable( GL11.GL_LIGHTING );
AEColor col = null;
col = ( (ToolColorApplicator) item.getItem() ).getActiveColor( item );
if( col != null )
{
tessellator.startDrawingQuads();
f4 = dark.getMinU();
f5 = dark.getMaxU();
f6 = dark.getMinV();
f7 = dark.getMaxV();
tessellator.setColorOpaque_I( col.blackVariant );
tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
tessellator.addVertexWithUV( 16, 0, 0, f5, f7 );
tessellator.addVertexWithUV( 16, 16, 0, f5, f6 );
tessellator.addVertexWithUV( 0, 16, 0, f4, f6 );
f4 = light.getMinU();
f5 = light.getMaxU();
f6 = light.getMinV();
f7 = light.getMaxV();
tessellator.setColorOpaque_I( col.whiteVariant );
tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
tessellator.addVertexWithUV( 16, 0, 0, f5, f7 );
tessellator.addVertexWithUV( 16, 16, 0, f5, f6 );
tessellator.addVertexWithUV( 0, 16, 0, f4, f6 );
f4 = med.getMinU();
f5 = med.getMaxU();
f6 = med.getMinV();
f7 = med.getMaxV();
tessellator.setColorOpaque_I( col.mediumVariant );
tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
tessellator.addVertexWithUV( 16, 0, 0, f5, f7 );
tessellator.addVertexWithUV( 16, 16, 0, f5, f6 );
tessellator.addVertexWithUV( 0, 16, 0, f4, f6 );
tessellator.draw();
}
GL11.glPopAttrib();
GL11.glPopMatrix();
*/
* TextureAtlasSprite par2Icon = item.getIconIndex();
* float f4 = par2Icon.getMinU();
* float f5 = par2Icon.getMaxU();
* float f6 = par2Icon.getMinV();
* float f7 = par2Icon.getMaxV();
* float f12 = 0.0625F;
* Tessellator tessellator = Tessellator.instance;
* GL11.glPushMatrix();
* GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
* if( type == ItemRenderType.INVENTORY )
* {
* GL11.glColor4f( 1, 1, 1, 1.0F );
* GL11.glScalef( 16F, 16F, 10F );
* GL11.glTranslatef( 0.0F, 1.0F, 0.0F );
* GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
* GL11.glEnable( GL11.GL_ALPHA_TEST );
* tessellator.startDrawingQuads();
* tessellator.setNormal( 0.0F, 1.0F, 0.0F );
* tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
* tessellator.addVertexWithUV( 1, 0, 0, f5, f7 );
* tessellator.addVertexWithUV( 1, 1, 0, f5, f6 );
* tessellator.addVertexWithUV( 0, 1, 0, f4, f6 );
* tessellator.draw();
* }
* else
* {
* if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
* {
* GL11.glTranslatef( 0.0F, 0.0F, 0.0F );
* }
* else if( type == ItemRenderType.EQUIPPED )
* {
* GL11.glTranslatef( 0.0F, 0.0F, 0.0F );
* }
* else
* {
* GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
* }
* ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(),
* f12 );
* GL11.glDisable( GL11.GL_CULL_FACE );
* GL11.glColor4f( 1, 1, 1, 1.0F );
* GL11.glScalef( -1F, -1F, 1F );
* GL11.glTranslatef( -1.125F, 0.0f, f12 / -2.0f );
* GL11.glRotatef( 180F, 1.0F, 0.0F, 0.0F );
* }
* TextureAtlasSprite dark = ExtraItemTextures.ToolColorApplicatorTip_Dark.getIcon();
* TextureAtlasSprite med = ExtraItemTextures.ToolColorApplicatorTip_Medium.getIcon();
* TextureAtlasSprite light = ExtraItemTextures.ToolColorApplicatorTip_Light.getIcon();
* GL11.glScalef( 1F / 16F, 1F / 16F, 1F );
* if( type != ItemRenderType.INVENTORY )
* {
* GL11.glTranslatef( 2, 0, 0 );
* }
* GL11.glDisable( GL11.GL_LIGHTING );
* AEColor col = null;
* col = ( (ToolColorApplicator) item.getItem() ).getActiveColor( item );
* if( col != null )
* {
* tessellator.startDrawingQuads();
* f4 = dark.getMinU();
* f5 = dark.getMaxU();
* f6 = dark.getMinV();
* f7 = dark.getMaxV();
* tessellator.setColorOpaque_I( col.blackVariant );
* tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
* tessellator.addVertexWithUV( 16, 0, 0, f5, f7 );
* tessellator.addVertexWithUV( 16, 16, 0, f5, f6 );
* tessellator.addVertexWithUV( 0, 16, 0, f4, f6 );
* f4 = light.getMinU();
* f5 = light.getMaxU();
* f6 = light.getMinV();
* f7 = light.getMaxV();
* tessellator.setColorOpaque_I( col.whiteVariant );
* tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
* tessellator.addVertexWithUV( 16, 0, 0, f5, f7 );
* tessellator.addVertexWithUV( 16, 16, 0, f5, f6 );
* tessellator.addVertexWithUV( 0, 16, 0, f4, f6 );
* f4 = med.getMinU();
* f5 = med.getMaxU();
* f6 = med.getMinV();
* f7 = med.getMaxV();
* tessellator.setColorOpaque_I( col.mediumVariant );
* tessellator.addVertexWithUV( 0, 0, 0, f4, f7 );
* tessellator.addVertexWithUV( 16, 0, 0, f5, f7 );
* tessellator.addVertexWithUV( 16, 16, 0, f5, f6 );
* tessellator.addVertexWithUV( 0, 16, 0, f4, f6 );
* tessellator.draw();
* }
* GL11.glPopAttrib();
* GL11.glPopMatrix();
*/
}
}