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

Reduces visibility of internal fields/methods

Browse Source 
Reduces the visibility of all fields to private and create setters/getters
when necessary. Exceptions are fields with GuiSync as these need to be
public.

Reduces the visibility of internal methods to private/protected/default when possible.
This commit is contained in:
yueh
2015-10-08 15:42:42 +02:00
parent f054bd699b
commit e94a0cfccf
497 changed files with 7865 additions and 6908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/AppEngRenderItem.java
+16 -4
View File
@@ -19,6 +19,10 @@
package appeng.client.render;
import javax.annotation.Nonnull;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer;
@@ -27,8 +31,6 @@ import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.resources.model.ModelManager;
import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11;
import appeng.api.storage.data.IAEItemStack;
import appeng.core.AEConfig;
import appeng.core.localization.GuiText;
@@ -55,7 +57,7 @@ public class AppEngRenderItem extends RenderItem
private static final ISlimReadableNumberConverter SLIM_CONVERTER = ReadableNumberConverter.INSTANCE;
private static final IWideReadableNumberConverter WIDE_CONVERTER = ReadableNumberConverter.INSTANCE;
public IAEItemStack aeStack;
private IAEItemStack aeStack = null;
@Override
public void renderItemOverlayIntoGUI(
@@ -137,7 +139,7 @@ public class AppEngRenderItem extends RenderItem
private void renderQuad( final Tessellator par1Tessellator, final int par2, final int par3, final int par4, final int par5, final int par6 )
{
final WorldRenderer wr = par1Tessellator.getWorldRenderer();
wr.startDrawingQuads();
wr.setColorOpaque_I( par6 );
wr.addVertex( par2, par3, 0.0D );
@@ -158,4 +160,14 @@ public class AppEngRenderItem extends RenderItem
return WIDE_CONVERTER.toWideReadableForm( originalSize );
}
}
public IAEItemStack getAeStack()
{
return this.aeStack;
}
public void setAeStack( @Nonnull final IAEItemStack aeStack )
{
this.aeStack = aeStack;
}
}
src/main/java/appeng/client/render/BaseBlockRender.java
+42 -42
View File
@@ -24,6 +24,9 @@ import java.util.EnumSet;
import javax.annotation.Nullable;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.WorldRenderer;
@@ -40,9 +43,6 @@ import net.minecraftforge.client.IItemRenderer.ItemRenderType;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import appeng.api.util.AEPartLocation;
import appeng.api.util.IOrientable;
import appeng.block.AEBaseBlock;
@@ -80,7 +80,7 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
setOriMap();
}
public static void setOriMap()
private static void setOriMap()
{
// pointed up...
ORIENTATION_MAP[0][3][1] = 0;
@@ -279,7 +279,7 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
return ( r << 16 ) | ( g << 8 ) | b;
}
public double getTesrRenderDistance()
double getTesrRenderDistance()
{
return this.renderDistance;
}
@@ -294,14 +294,14 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
block.setRenderStateByMeta( item.getItemDamage() );
}
renderer.uvRotateBottom = info.getTexture( AEPartLocation.DOWN ).setFlip( getOrientation( EnumFacing.DOWN, EnumFacing.SOUTH, EnumFacing.UP ) );
renderer.uvRotateTop = info.getTexture( AEPartLocation.UP ).setFlip( getOrientation( EnumFacing.UP, EnumFacing.SOUTH, EnumFacing.UP ) );
renderer.setUvRotateBottom( info.getTexture( AEPartLocation.DOWN ).setFlip( getOrientation( EnumFacing.DOWN, EnumFacing.SOUTH, EnumFacing.UP ) ) );
renderer.setUvRotateTop( info.getTexture( AEPartLocation.UP ).setFlip( getOrientation( EnumFacing.UP, EnumFacing.SOUTH, EnumFacing.UP ) ) );
renderer.uvRotateEast = info.getTexture( AEPartLocation.EAST ).setFlip( getOrientation( EnumFacing.EAST, EnumFacing.SOUTH, EnumFacing.UP ) );
renderer.uvRotateWest = info.getTexture( AEPartLocation.WEST ).setFlip( getOrientation( EnumFacing.WEST, EnumFacing.SOUTH, EnumFacing.UP ) );
renderer.setUvRotateEast( info.getTexture( AEPartLocation.EAST ).setFlip( getOrientation( EnumFacing.EAST, EnumFacing.SOUTH, EnumFacing.UP ) ) );
renderer.setUvRotateWest( info.getTexture( AEPartLocation.WEST ).setFlip( getOrientation( EnumFacing.WEST, EnumFacing.SOUTH, EnumFacing.UP ) ) );
renderer.uvRotateNorth = info.getTexture( AEPartLocation.NORTH ).setFlip( getOrientation( EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.UP ) );
renderer.uvRotateSouth = info.getTexture( AEPartLocation.SOUTH ).setFlip( getOrientation( EnumFacing.SOUTH, EnumFacing.SOUTH, EnumFacing.UP ) );
renderer.setUvRotateNorth( info.getTexture( AEPartLocation.NORTH ).setFlip( getOrientation( EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.UP ) ) );
renderer.setUvRotateSouth( info.getTexture( AEPartLocation.SOUTH ).setFlip( getOrientation( EnumFacing.SOUTH, EnumFacing.SOUTH, EnumFacing.UP ) ) );
}
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), block, item, 0xffffff, renderer );
@@ -311,10 +311,10 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
info.setTemporaryRenderIcon( null );
}
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
}
public static int getOrientation( final EnumFacing in, final EnumFacing forward, final EnumFacing up )
static int getOrientation( final EnumFacing in, final EnumFacing forward, final EnumFacing up )
{
if( in == null // 1
|| forward == null // 2
@@ -339,51 +339,51 @@ 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);
if( sides.contains( AEPartLocation.DOWN ) )
{
tess.setNormal( 0.0F, -1.0F, 0.0F );
tess.setColorOpaque_I( color );
tess.renderFaceYNeg( block, zero, this.firstNotNull( tess.overrideBlockTexture, 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.overrideBlockTexture, 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.overrideBlockTexture, 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.overrideBlockTexture, 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.overrideBlockTexture, 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.overrideBlockTexture, 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() ]) );
}
}
public IAESprite firstNotNull( final IAESprite... s )
private IAESprite firstNotNull( final IAESprite... s )
{
for( final IAESprite o : s )
{
@@ -415,20 +415,20 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
final EnumFacing forward = te.getForward();
final EnumFacing up = te.getUp();
renderer.uvRotateBottom = info.getTexture( AEPartLocation.DOWN ).setFlip( getOrientation( EnumFacing.DOWN, forward, up ) );
renderer.uvRotateTop = info.getTexture( AEPartLocation.UP ).setFlip( getOrientation( EnumFacing.UP, forward, up ) );
renderer.setUvRotateBottom( info.getTexture( AEPartLocation.DOWN ).setFlip( getOrientation( EnumFacing.DOWN, forward, up ) ) );
renderer.setUvRotateTop( info.getTexture( AEPartLocation.UP ).setFlip( getOrientation( EnumFacing.UP, forward, up ) ) );
renderer.uvRotateEast = info.getTexture( AEPartLocation.EAST ).setFlip( getOrientation( EnumFacing.EAST, forward, up ) );
renderer.uvRotateWest = info.getTexture( AEPartLocation.WEST ).setFlip( getOrientation( EnumFacing.WEST, forward, up ) );
renderer.setUvRotateEast( info.getTexture( AEPartLocation.EAST ).setFlip( getOrientation( EnumFacing.EAST, forward, up ) ) );
renderer.setUvRotateWest( info.getTexture( AEPartLocation.WEST ).setFlip( getOrientation( EnumFacing.WEST, forward, up ) ) );
renderer.uvRotateNorth = info.getTexture( AEPartLocation.NORTH ).setFlip( getOrientation( EnumFacing.NORTH, forward, up ) );
renderer.uvRotateSouth = info.getTexture( AEPartLocation.SOUTH ).setFlip( getOrientation( EnumFacing.SOUTH, forward, up ) );
renderer.setUvRotateNorth( info.getTexture( AEPartLocation.NORTH ).setFlip( getOrientation( EnumFacing.NORTH, forward, up ) ) );
renderer.setUvRotateSouth( info.getTexture( AEPartLocation.SOUTH ).setFlip( getOrientation( EnumFacing.SOUTH, forward, up ) ) );
}
}
public void postRenderInWorld( final ModelGenerator renderer )
{
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
}
@Nullable
@@ -483,12 +483,12 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
bZ += 1;
}
renderer.renderMinX = Math.min( aX, bX );
renderer.renderMinY = Math.min( aY, bY );
renderer.renderMinZ = Math.min( aZ, bZ );
renderer.renderMaxX = Math.max( aX, bX );
renderer.renderMaxY = Math.max( aY, bY );
renderer.renderMaxZ = Math.max( aZ, bZ );
renderer.setRenderMinX( Math.min( aX, bX ) );
renderer.setRenderMinY( Math.min( aY, bY ) );
renderer.setRenderMinZ( Math.min( aZ, bZ ) );
renderer.setRenderMaxX( Math.max( aX, bX ) );
renderer.setRenderMaxY( Math.max( aY, bY ) );
renderer.setRenderMaxZ( Math.max( aZ, bZ ) );
}
@SideOnly( Side.CLIENT )
@@ -642,14 +642,14 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
final double maxY = ( forward.getFrontOffsetY() > 0 ? 1 : 0 ) + this.mapFaceUV( west.getFrontOffsetY(), u2 ) + this.mapFaceUV( up.getFrontOffsetY(), v2 );
final double maxZ = ( forward.getFrontOffsetZ() > 0 ? 1 : 0 ) + this.mapFaceUV( west.getFrontOffsetZ(), u2 ) + this.mapFaceUV( up.getFrontOffsetZ(), v2 );
renderer.renderMinX = Math.max( 0.0, Math.min( minX, maxX ) - ( forward.getFrontOffsetX() != 0 ? 0 : 0.001 ) );
renderer.renderMaxX = Math.min( 1.0, Math.max( minX, maxX ) + ( forward.getFrontOffsetX() != 0 ? 0 : 0.001 ) );
renderer.setRenderMinX( Math.max( 0.0, Math.min( minX, maxX ) - ( forward.getFrontOffsetX() != 0 ? 0 : 0.001 ) ) );
renderer.setRenderMaxX( Math.min( 1.0, Math.max( minX, maxX ) + ( forward.getFrontOffsetX() != 0 ? 0 : 0.001 ) ) );
renderer.renderMinY = Math.max( 0.0, Math.min( minY, maxY ) - ( forward.getFrontOffsetY() != 0 ? 0 : 0.001 ) );
renderer.renderMaxY = Math.min( 1.0, Math.max( minY, maxY ) + ( forward.getFrontOffsetY() != 0 ? 0 : 0.001 ) );
renderer.setRenderMinY( Math.max( 0.0, Math.min( minY, maxY ) - ( forward.getFrontOffsetY() != 0 ? 0 : 0.001 ) ) );
renderer.setRenderMaxY( Math.min( 1.0, Math.max( minY, maxY ) + ( forward.getFrontOffsetY() != 0 ? 0 : 0.001 ) ) );
renderer.renderMinZ = Math.max( 0.0, Math.min( minZ, maxZ ) - ( forward.getFrontOffsetZ() != 0 ? 0 : 0.001 ) );
renderer.renderMaxZ = Math.min( 1.0, Math.max( minZ, maxZ ) + ( forward.getFrontOffsetZ() != 0 ? 0 : 0.001 ) );
renderer.setRenderMinZ( Math.max( 0.0, Math.min( minZ, maxZ ) - ( forward.getFrontOffsetZ() != 0 ? 0 : 0.001 ) ) );
renderer.setRenderMaxZ( Math.min( 1.0, Math.max( minZ, maxZ ) + ( forward.getFrontOffsetZ() != 0 ? 0 : 0.001 ) ) );
}
private double mapFaceUV( final int offset, final int uv )
@@ -670,7 +670,7 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
public void renderTile( final B block, final T tile, final WorldRenderer tess, final double x, final double y, final double z, final float f, final ModelGenerator renderer )
{
renderer.uvRotateBottom = renderer.uvRotateTop = renderer.uvRotateEast = renderer.uvRotateWest = renderer.uvRotateNorth = renderer.uvRotateSouth = 0;
renderer.setUvRotateBottom( renderer.setUvRotateTop( renderer.setUvRotateEast( renderer.setUvRotateWest( renderer.setUvRotateNorth( renderer.setUvRotateSouth( 0 ) ) ) ) ) );
final AEPartLocation up = AEPartLocation.UP;
final AEPartLocation forward = AEPartLocation.SOUTH;
@@ -700,7 +700,7 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
renderer.setTranslation( 0, 0, 0 );
RenderHelper.enableStandardItemLighting();
renderer.uvRotateBottom = renderer.uvRotateTop = renderer.uvRotateEast = renderer.uvRotateWest = renderer.uvRotateNorth = renderer.uvRotateSouth = 0;
renderer.setUvRotateBottom( renderer.setUvRotateTop( renderer.setUvRotateEast( renderer.setUvRotateWest( renderer.setUvRotateNorth( renderer.setUvRotateSouth( 0 ) ) ) ) ) );
}
protected void applyTESRRotation( final double x, final double y, final double z, final EnumFacing forward, final EnumFacing up )
src/main/java/appeng/client/render/BlockRenderInfo.java
+7 -2
View File
@@ -28,7 +28,7 @@ import appeng.client.texture.TmpFlippableIcon;
public class BlockRenderInfo
{
public final BaseBlockRender rendererInstance;
private final BaseBlockRender rendererInstance;
private final TmpFlippableIcon tmpTopIcon = new TmpFlippableIcon();
private final TmpFlippableIcon tmpBottomIcon = new TmpFlippableIcon();
private final TmpFlippableIcon tmpSouthIcon = new TmpFlippableIcon();
@@ -131,8 +131,13 @@ public class BlockRenderInfo
return this.topIcon;
}
public boolean isValid()
boolean isValid()
{
return this.topIcon != null && this.bottomIcon != null && this.southIcon != null && this.northIcon != null && this.eastIcon != null && this.westIcon != null;
}
public BaseBlockRender getRendererInstance()
{
return this.rendererInstance;
}
}
src/main/java/appeng/client/render/BusRenderHelper.java
+20 -20
View File
@@ -125,16 +125,16 @@ public final class BusRenderHelper implements IPartRenderHelper
}
/*
public void setRenderColor( int color )
{
for( Block block : AEApi.instance().definitions().blocks().multiPart().maybeBlock().asSet() )
{
final BlockCableBus cableBus = (BlockCableBus) block;
cableBus.setRenderColor( color );
}
}
*/
* public void setRenderColor( int color )
* {
* for( Block block : AEApi.instance().definitions().blocks().multiPart().maybeBlock().asSet() )
* {
* final BlockCableBus cableBus = (BlockCableBus) block;
* cableBus.setRenderColor( color );
* }
* }
*/
public void setOrientation( final EnumFacing dx, final EnumFacing dy, final EnumFacing dz )
{
this.ax = dx == null ? EnumFacing.EAST : dx;
@@ -250,7 +250,7 @@ public final class BusRenderHelper implements IPartRenderHelper
this.renderingForPass = pass;
}
public boolean renderThis()
private boolean renderThis()
{
if( this.renderingForPass == this.currentPass || this.noAlphaPass )
{
@@ -304,7 +304,7 @@ public final class BusRenderHelper implements IPartRenderHelper
}
}
public EnumFacing mapRotation( final EnumFacing dir )
private EnumFacing mapRotation( final EnumFacing dir )
{
final EnumFacing forward = this.az;
final EnumFacing up = this.ay;
@@ -353,7 +353,7 @@ public final class BusRenderHelper implements IPartRenderHelper
{
return EnumFacing.EAST;
}
return null;
}
@@ -396,14 +396,14 @@ public final class BusRenderHelper implements IPartRenderHelper
final EnumFacing forward = BusRenderHelper.INSTANCE.az;
final EnumFacing up = BusRenderHelper.INSTANCE.ay;
renderer.uvRotateBottom = info.getTexture( AEPartLocation.DOWN ).setFlip( BaseBlockRender.getOrientation( EnumFacing.DOWN, forward, up ) );
renderer.uvRotateTop = info.getTexture( AEPartLocation.UP ).setFlip( BaseBlockRender.getOrientation( EnumFacing.UP, forward, up ) );
renderer.setUvRotateBottom( info.getTexture( AEPartLocation.DOWN ).setFlip( BaseBlockRender.getOrientation( EnumFacing.DOWN, forward, up ) ) );
renderer.setUvRotateTop( info.getTexture( AEPartLocation.UP ).setFlip( BaseBlockRender.getOrientation( EnumFacing.UP, forward, up ) ) );
renderer.uvRotateEast = info.getTexture( AEPartLocation.EAST ).setFlip( BaseBlockRender.getOrientation( EnumFacing.EAST, forward, up ) );
renderer.uvRotateWest = info.getTexture( AEPartLocation.WEST ).setFlip( BaseBlockRender.getOrientation( EnumFacing.WEST, forward, up ) );
renderer.setUvRotateEast( info.getTexture( AEPartLocation.EAST ).setFlip( BaseBlockRender.getOrientation( EnumFacing.EAST, forward, up ) ) );
renderer.setUvRotateWest( info.getTexture( AEPartLocation.WEST ).setFlip( BaseBlockRender.getOrientation( EnumFacing.WEST, forward, up ) ) );
renderer.uvRotateNorth = info.getTexture( AEPartLocation.NORTH ).setFlip( BaseBlockRender.getOrientation( EnumFacing.NORTH, forward, up ) );
renderer.uvRotateSouth = info.getTexture( AEPartLocation.SOUTH ).setFlip( BaseBlockRender.getOrientation( EnumFacing.SOUTH, forward, up ) );
renderer.setUvRotateNorth( info.getTexture( AEPartLocation.NORTH ).setFlip( BaseBlockRender.getOrientation( EnumFacing.NORTH, forward, up ) ) );
renderer.setUvRotateSouth( info.getTexture( AEPartLocation.SOUTH ).setFlip( BaseBlockRender.getOrientation( EnumFacing.SOUTH, forward, up ) ) );
this.bbr.renderBlockBounds( renderer, this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ, this.ax, this.ay, this.az );
@@ -430,7 +430,7 @@ public final class BusRenderHelper implements IPartRenderHelper
@Override
public void setFacesToRender( final EnumSet<EnumFacing> faces )
{
BusRenderer.INSTANCE.renderer.renderFaces = faces;
BusRenderer.INSTANCE.getRenderer().setRenderFaces( faces );
}
@Override
src/main/java/appeng/client/render/BusRenderer.java
+20 -10
View File
@@ -50,7 +50,7 @@ public class BusRenderer implements IItemRenderer
public static final BusRenderer INSTANCE = new BusRenderer();
private static final Map<Integer, IPart> RENDER_PART = new HashMap<Integer, IPart>();
public ModelGenerator renderer;
private ModelGenerator renderer;
@Override
public boolean handleRenderType( final ItemStack item, final ItemRenderType type )
@@ -113,18 +113,18 @@ public class BusRenderer implements IItemRenderer
GL11.glScaled( 1.2, 1.2, 1. );
GL11.glColor4f( 1, 1, 1, 1 );
this.renderer.setColorOpaque_F( 1, 1, 1 );
this.renderer.setBrightness( 14 << 20 | 14 << 4 );
this.getRenderer().setColorOpaque_F( 1, 1, 1 );
this.getRenderer().setBrightness( 14 << 20 | 14 << 4 );
BusRenderHelper.INSTANCE.setBounds( 0, 0, 0, 1, 1, 1 );
BusRenderHelper.INSTANCE.setTexture( null );
BusRenderHelper.INSTANCE.setInvColor( 0xffffff );
this.renderer.blockAccess = ClientHelper.proxy.getWorld();
this.getRenderer().setBlockAccess( ClientHelper.proxy.getWorld() );
BusRenderHelper.INSTANCE.setOrientation( EnumFacing.EAST, EnumFacing.UP, EnumFacing.SOUTH );
this.renderer.uvRotateBottom = this.renderer.uvRotateEast = this.renderer.uvRotateNorth = this.renderer.uvRotateSouth = this.renderer.uvRotateTop = this.renderer.uvRotateWest = 0;
this.renderer.overrideBlockTexture = null;
this.getRenderer().setUvRotateBottom( this.getRenderer().setUvRotateEast( this.getRenderer().setUvRotateNorth( this.getRenderer().setUvRotateSouth( this.getRenderer().setUvRotateTop( this.getRenderer().setUvRotateWest( 0 ) ) ) ) ) );
this.getRenderer().setOverrideBlockTexture( null );
if( item.getItem() instanceof IFacadeItem )
{
@@ -139,7 +139,7 @@ public class BusRenderer implements IItemRenderer
if( fp != null )
{
fp.renderInventory( BusRenderHelper.INSTANCE, this.renderer );
fp.renderInventory( BusRenderHelper.INSTANCE, this.getRenderer() );
}
}
else
@@ -153,18 +153,18 @@ public class BusRenderer implements IItemRenderer
GL11.glTranslatef( 0.0f, 0.0f, -0.04f * ( 8 - depth ) - 0.06f );
}
ip.renderInventory( BusRenderHelper.INSTANCE, this.renderer );
ip.renderInventory( BusRenderHelper.INSTANCE, this.getRenderer() );
}
}
this.renderer.uvRotateBottom = this.renderer.uvRotateEast = this.renderer.uvRotateNorth = this.renderer.uvRotateSouth = this.renderer.uvRotateTop = this.renderer.uvRotateWest = 0;
this.getRenderer().setUvRotateBottom( this.getRenderer().setUvRotateEast( this.getRenderer().setUvRotateNorth( this.getRenderer().setUvRotateSouth( this.getRenderer().setUvRotateTop( this.getRenderer().setUvRotateWest( 0 ) ) ) ) ) );
GL11.glPopAttrib();
GL11.glPopMatrix();
}
@Nullable
public IPart getRenderer( final ItemStack is, final IPartItem c )
private IPart getRenderer( final ItemStack is, final IPartItem c )
{
final int id = ( Item.getIdFromItem( is.getItem() ) << Platform.DEF_OFFSET ) | is.getItemDamage();
@@ -180,4 +180,14 @@ public class BusRenderer implements IItemRenderer
return part;
}
public ModelGenerator getRenderer()
{
return this.renderer;
}
public void setRenderer( ModelGenerator renderer )
{
this.renderer = renderer;
}
}
src/main/java/appeng/client/render/CableRenderHelper.java
+25 -15
View File
@@ -50,9 +50,9 @@ public class CableRenderHelper
public void renderStatic( final CableBusContainer cableBusContainer, final IFacadeContainer iFacadeContainer )
{
final TileEntity te = cableBusContainer.getTile();
final ModelGenerator renderer = BusRenderer.INSTANCE.renderer;
final ModelGenerator renderer = BusRenderer.INSTANCE.getRenderer();
if( renderer.overrideBlockTexture != null )
if( renderer.getOverrideBlockTexture() != null )
{
BusRenderHelper.INSTANCE.setPass( 0 );
}
@@ -61,9 +61,9 @@ public class CableRenderHelper
BusRenderHelper.INSTANCE.setPass( MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.TRANSLUCENT ? 1 : 0 );
}
if( renderer.blockAccess == null )
if( renderer.getBlockAccess() == null )
{
renderer.blockAccess = Minecraft.getMinecraft().theWorld;
renderer.setBlockAccess( Minecraft.getMinecraft().theWorld );
}
for( final AEPartLocation s : AEPartLocation.values() )
@@ -72,16 +72,21 @@ public class CableRenderHelper
if( part != null )
{
this.setSide( s );
renderer.renderAllFaces = true;
renderer.setRenderAllFaces( true );
//renderer.flipTexture = false;
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
// renderer.flipTexture = false;
renderer.setUvRotateBottom( 0 );
renderer.setUvRotateEast( 0 );
renderer.setUvRotateNorth( 0 );
renderer.setUvRotateSouth( 0 );
renderer.setUvRotateTop( 0 );
renderer.setUvRotateWest( 0 );
renderer.setOverrideBlockTexture( null );
part.renderStatic( te.getPos(), BusRenderHelper.INSTANCE, renderer );
//renderer.faces = EnumSet.allOf( EnumFacing.class );
//renderer.useTextures = true;
// renderer.faces = EnumSet.allOf( EnumFacing.class );
// renderer.useTextures = true;
}
}
@@ -151,18 +156,23 @@ public class CableRenderHelper
}
}
renderer.flipTexture = false;
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setFlipTexture( false );
renderer.setUvRotateBottom( 0 );
renderer.setUvRotateEast( 0 );
renderer.setUvRotateNorth( 0 );
renderer.setUvRotateSouth( 0 );
renderer.setUvRotateTop( 0 );
renderer.setUvRotateWest( 0 );
renderer.setOverrideBlockTexture( null );
this.setSide( s );
fPart.renderStatic( te.getPos(), BusRenderHelper.INSTANCE, renderer, iFacadeContainer, b == null ? null : b.getBoundingBox(), cableBusContainer.getPart( s ) == null );
}
}
//renderer.isFacade = false;
//renderer.enableAO = false;
// renderer.isFacade = false;
// renderer.enableAO = false;
// renderer.sett
}
}
@@ -266,7 +276,7 @@ public class CableRenderHelper
}
BusRenderHelper.INSTANCE.setOrientation( ax, ay, az );
part.renderDynamic( x, y, z, BusRenderHelper.INSTANCE, BusRenderer.INSTANCE.renderer );
part.renderDynamic( x, y, z, BusRenderHelper.INSTANCE, BusRenderer.INSTANCE.getRenderer() );
}
}
}
src/main/java/appeng/client/render/IconUnwrapper.java
+9 -9
View File
@@ -7,15 +7,15 @@ import appeng.client.texture.IAESprite;
public class IconUnwrapper extends TextureAtlasSprite
{
int width;
int height;
float max_u;
float min_u;
float min_v;
float max_v;
private int width;
private int height;
private float max_u;
private float min_u;
private float min_v;
private float max_v;
protected IconUnwrapper(
final IAESprite src )
{
src/main/java/appeng/client/render/ModelGenerator.java
+383 -209
View File
@@ -1,5 +1,7 @@
package appeng.client.render;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
@@ -32,21 +34,22 @@ import appeng.client.texture.MissingIcon;
import appeng.items.AEBaseItem;
import appeng.items.parts.ItemMultiPart;
public class ModelGenerator
{
private static final class CachedModel implements IBakedModel
{
List<BakedQuad>[] faces = new List[6];
List<BakedQuad> general;
private List<BakedQuad>[] faces = new List[6];
private List<BakedQuad> general;
public CachedModel()
{
this.general = new ArrayList<BakedQuad>();
for ( final EnumFacing f : EnumFacing.VALUES )
for( final EnumFacing f : EnumFacing.VALUES )
this.faces[f.ordinal()] = new ArrayList<BakedQuad>();
}
@Override
public boolean isGui3d()
{
@@ -91,45 +94,66 @@ public class ModelGenerator
}
}
public int uvRotateBottom;
public int uvRotateEast;
public int uvRotateNorth;
public int uvRotateSouth;
public int uvRotateTop;
public int uvRotateWest;
public IAESprite overrideBlockTexture;
public boolean renderAllFaces;
private int uvRotateBottom;
private int uvRotateEast;
private int uvRotateNorth;
private int uvRotateSouth;
private int uvRotateTop;
private int uvRotateWest;
private IAESprite overrideBlockTexture;
private boolean renderAllFaces;
public double renderMinX;
public double renderMaxX;
public double renderMinY;
public double renderMaxY;
public double renderMinZ;
public double renderMaxZ;
private double renderMinX;
private double renderMaxX;
public IBlockAccess blockAccess;
CachedModel generatedModel = new CachedModel();
private double renderMinY;
private double renderMaxY;
private double renderMinZ;
private double renderMaxZ;
private IBlockAccess blockAccess;
private CachedModel generatedModel = new CachedModel();
// used to create faces...
final FaceBakery faceBakery = new FaceBakery();
private final FaceBakery faceBakery = new FaceBakery();
float tx=0,ty=0,tz=0;
final float[] defUVs = { 0, 0, 1, 1 };
private float tx = 0, ty = 0, tz = 0;
private final float[] defUVs = { 0, 0, 1, 1 };
private final float[] quadsUV = {
0,
0,
1,
1,
0,
0,
1,
1
};
private EnumSet<EnumFacing> renderFaces = EnumSet.allOf( EnumFacing.class );
private boolean flipTexture = false;
private List<SMFace> faces = new ArrayList();
private int point = 0;
private int brightness = -1;
private float[][] points = new float[4][];
private EnumFacing currentFace = EnumFacing.UP;
private int color = -1;
public void setRenderBoundsFromBlock(
final Block block )
{
if ( block == null ) return;
if( block == null )
return;
this.renderMinX = block.getBlockBoundsMinX();
this.renderMinY = block.getBlockBoundsMinY();
this.renderMinZ = block.getBlockBoundsMinZ();
this.renderMaxX = block.getBlockBoundsMaxX();
this.renderMaxY = block.getBlockBoundsMaxY();
this.renderMaxZ = block.getBlockBoundsMaxZ();
this.setRenderMinX( block.getBlockBoundsMinX() );
this.setRenderMinY( block.getBlockBoundsMinY() );
this.setRenderMinZ( block.getBlockBoundsMinZ() );
this.setRenderMaxX( block.getBlockBoundsMaxX() );
this.setRenderMaxY( block.getBlockBoundsMaxY() );
this.setRenderMaxZ( block.getBlockBoundsMaxZ() );
}
public void setRenderBounds(
@@ -140,20 +164,18 @@ public class ModelGenerator
final double h,
final double i )
{
this.renderMinX = d;
this.renderMinY = e;
this.renderMinZ = f;
this.renderMaxX = g;
this.renderMaxY = h;
this.renderMaxZ = i;
this.setRenderMinX( d );
this.setRenderMinY( e );
this.setRenderMinZ( f );
this.setRenderMaxX( g );
this.setRenderMaxY( h );
this.setRenderMaxZ( i );
}
int color = -1;
public void setBrightness(
final int i )
{
this.brightness =i;
this.brightness = i;
}
public void setColorRGBA_F(
@@ -162,7 +184,7 @@ public class ModelGenerator
final int b,
final float a )
{
final int alpha = ( int ) ( a * 0xff );
final int alpha = (int) ( a * 0xff );
this.color = alpha << 24 |
r << 16 |
b << 8 |
@@ -173,29 +195,30 @@ public class ModelGenerator
final int whiteVariant )
{
final int alpha = 0xff;
this.color = //alpha << 24 |
whiteVariant;
this.color = // alpha << 24 |
whiteVariant;
}
public void setColorOpaque(
final int r,
final int g,
final int b )
{
final int alpha = 0xff;
this.color =// alpha << 24 |
r << 16 |
this.color = // alpha << 24 |
r << 16 |
g << 8 |
b;
}
public void setColorOpaque_F(
final int r,
final int g,
final int b )
{
final int alpha = 0xff;
this.color = //alpha << 24 |
Math.min( 0xff, Math.max( 0, r ) ) << 16 |
this.color = // alpha << 24 |
Math.min( 0xff, Math.max( 0, r ) ) << 16 |
Math.min( 0xff, Math.max( 0, g ) ) << 8 |
Math.min( 0xff, Math.max( 0, b ) );
}
@@ -205,12 +228,12 @@ public class ModelGenerator
final float bf,
final float gf )
{
final int r = (int)( rf * 0xff );
final int g = (int)( gf * 0xff );
final int b = (int)( bf * 0xff );
final int r = (int) ( rf * 0xff );
final int g = (int) ( gf * 0xff );
final int b = (int) ( bf * 0xff );
final int alpha = 0xff;
this.color = //alpha << 24 |
Math.min( 0xff, Math.max( 0, r ) ) << 16 |
this.color = // alpha << 24 |
Math.min( 0xff, Math.max( 0, r ) ) << 16 |
Math.min( 0xff, Math.max( 0, g ) ) << 8 |
Math.min( 0xff, Math.max( 0, b ) );
}
@@ -219,24 +242,24 @@ public class ModelGenerator
final ItemStack is )
{
final Item it = is.getItem();
if ( it instanceof ItemMultiPart )
return ( (ItemMultiPart) it).getIcon( is);
if( it instanceof ItemMultiPart )
return ( (ItemMultiPart) it ).getIcon( is );
final Block blk = Block.getBlockFromItem( it );
if ( blk != null )
return this.getIcon(blk.getStateFromMeta( is.getMetadata() ))[0];
if ( it instanceof AEBaseItem )
if( blk != null )
return this.getIcon( blk.getStateFromMeta( is.getMetadata() ) )[0];
if( it instanceof AEBaseItem )
{
final IAESprite ico = ( (AEBaseItem)it ).getIcon(is);
if ( ico != null ) return ico;
final IAESprite ico = ( (AEBaseItem) it ).getIcon( is );
if( ico != null )
return ico;
}
return new MissingIcon( is );
}
return new MissingIcon( is );
}
public IAESprite[] getIcon(
final IBlockState state )
@@ -244,62 +267,58 @@ public class ModelGenerator
final IAESprite[] out = new IAESprite[6];
final Block blk = state.getBlock();
if ( blk instanceof AEBaseBlock )
if( blk instanceof AEBaseBlock )
{
final AEBaseBlock base = (AEBaseBlock)blk;
for ( final EnumFacing face : EnumFacing.VALUES )
final AEBaseBlock base = (AEBaseBlock) blk;
for( final EnumFacing face : EnumFacing.VALUES )
out[face.ordinal()] = base.getIcon( face, state );
}
else
{
final TextureAtlasSprite spite = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( state );
if ( spite == null )
if( spite == null )
{
out[0] = new MissingIcon( blk );
out[1] = new MissingIcon( blk );
out[2] = new MissingIcon( blk );
out[3] = new MissingIcon( blk );
out[4] = new MissingIcon( blk );
out[5] = new MissingIcon( blk );
out[0] = new MissingIcon( blk );
out[1] = new MissingIcon( blk );
out[2] = new MissingIcon( blk );
out[3] = new MissingIcon( blk );
out[4] = new MissingIcon( blk );
out[5] = new MissingIcon( blk );
}
else
{
final IAESprite mySpite = new BaseIcon( spite );
out[0] = mySpite;
out[1] = mySpite;
out[2] = mySpite;
out[3] = mySpite;
out[4] = mySpite;
out[5] = mySpite;
out[0] = mySpite;
out[1] = mySpite;
out[2] = mySpite;
out[3] = mySpite;
out[4] = mySpite;
out[5] = mySpite;
}
}
return out;
}
public IAESprite[] getIcon( final IBlockAccess world, final BlockPos pos)
public IAESprite[] getIcon( final IBlockAccess world, final BlockPos pos )
{
final IBlockState state = world.getBlockState( pos );
final Block blk = state.getBlock();
if ( blk instanceof AEBaseBlock )
if( blk instanceof AEBaseBlock )
{
final IAESprite[] out = new IAESprite[6];
final AEBaseBlock base = (AEBaseBlock)blk;
for ( final EnumFacing face : EnumFacing.VALUES )
final AEBaseBlock base = (AEBaseBlock) blk;
for( final EnumFacing face : EnumFacing.VALUES )
out[face.ordinal()] = base.getIcon( world, pos, face );
return out;
}
return this.getIcon( state );
}
int point =0;
int brightness = -1;
float[][] points = new float[4][];
public void addVertexWithUV(
final EnumFacing face,
final double x,
@@ -308,48 +327,48 @@ public class ModelGenerator
final double u,
final double v )
{
this.points[this.point++] = new float[]{ (float)x+ this.tx, (float)y+ this.ty, (float)z+ this.tz, (float)u, (float)v };
if ( this.point == 4 )
this.points[this.point++] = new float[] { (float) x + this.tx, (float) y + this.ty, (float) z + this.tz, (float) u, (float) v };
if( this.point == 4 )
{
this.brightness = -1;
final int[] vertData = {
Float.floatToRawIntBits( this.points[0][0] ),
Float.floatToRawIntBits( this.points[0][1] ),
Float.floatToRawIntBits( this.points[0][2] ),
this.brightness,
Float.floatToRawIntBits( this.points[0][3] ),
Float.floatToRawIntBits( this.points[0][4] ),
0,
Float.floatToRawIntBits( this.points[0][0] ),
Float.floatToRawIntBits( this.points[0][1] ),
Float.floatToRawIntBits( this.points[0][2] ),
this.brightness,
Float.floatToRawIntBits( this.points[0][3] ),
Float.floatToRawIntBits( this.points[0][4] ),
0,
Float.floatToRawIntBits( this.points[1][0] ),
Float.floatToRawIntBits( this.points[1][1] ),
Float.floatToRawIntBits( this.points[1][2] ),
this.brightness,
Float.floatToRawIntBits( this.points[1][3] ),
Float.floatToRawIntBits( this.points[1][4] ),
0,
Float.floatToRawIntBits( this.points[2][0] ),
Float.floatToRawIntBits( this.points[2][1] ),
Float.floatToRawIntBits( this.points[2][2] ),
this.brightness,
Float.floatToRawIntBits( this.points[2][3] ),
Float.floatToRawIntBits( this.points[2][4] ),
0,
Float.floatToRawIntBits( this.points[3][0] ),
Float.floatToRawIntBits( this.points[3][1] ),
Float.floatToRawIntBits( this.points[3][2] ),
this.brightness,
Float.floatToRawIntBits( this.points[3][3] ),
Float.floatToRawIntBits( this.points[3][4] ),
0,
Float.floatToRawIntBits( this.points[1][0] ),
Float.floatToRawIntBits( this.points[1][1] ),
Float.floatToRawIntBits( this.points[1][2] ),
this.brightness,
Float.floatToRawIntBits( this.points[1][3] ),
Float.floatToRawIntBits( this.points[1][4] ),
0,
Float.floatToRawIntBits( this.points[2][0] ),
Float.floatToRawIntBits( this.points[2][1] ),
Float.floatToRawIntBits( this.points[2][2] ),
this.brightness,
Float.floatToRawIntBits( this.points[2][3] ),
Float.floatToRawIntBits( this.points[2][4] ),
0,
Float.floatToRawIntBits( this.points[3][0] ),
Float.floatToRawIntBits( this.points[3][1] ),
Float.floatToRawIntBits( this.points[3][2] ),
this.brightness,
Float.floatToRawIntBits( this.points[3][3] ),
Float.floatToRawIntBits( this.points[3][4] ),
0,
};
this.generatedModel.general.add( new IColoredBakedQuad.ColoredBakedQuad( vertData, this.color, face ));
this.generatedModel.general.add( new IColoredBakedQuad.ColoredBakedQuad( vertData, this.color, face ) );
this.point =0;
this.point = 0;
}
}
@@ -357,9 +376,9 @@ public class ModelGenerator
final Block block,
final BlockPos pos )
{
//setRenderBoundsFromBlock( block );
// setRenderBoundsFromBlock( block );
final IAESprite[] textures = this.getIcon( this.blockAccess,pos );
final IAESprite[] textures = this.getIcon( this.getBlockAccess(), pos );
this.setColorOpaque_I( 0xffffff );
this.renderFaceXNeg( block, pos, textures[EnumFacing.WEST.ordinal()] );
@@ -368,7 +387,7 @@ public class ModelGenerator
this.renderFaceYPos( block, pos, textures[EnumFacing.UP.ordinal()] );
this.renderFaceZNeg( block, pos, textures[EnumFacing.NORTH.ordinal()] );
this.renderFaceZPos( block, pos, textures[EnumFacing.SOUTH.ordinal()] );
return false;
}
@@ -377,9 +396,9 @@ public class ModelGenerator
final int y,
final int z )
{
this.tx =x;
this.ty =y;
this.tz =z;
this.tx = x;
this.ty = y;
this.tz = z;
}
public boolean isAlphaPass()
@@ -387,31 +406,17 @@ public class ModelGenerator
return MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.TRANSLUCENT;
}
final float[] quadsUV = {
0,
0,
1,
1,
0,
0,
1,
1
};
public EnumSet<EnumFacing> renderFaces = EnumSet.allOf(EnumFacing.class);
public boolean flipTexture=false;
private List<SMFace> faces = new ArrayList();
private float[] getFaceUvs(
final EnumFacing face,
final Vector3f to_16,
final Vector3f from_16 )
final Vector3f from_16 )
{
float from_a = 0;
float from_b = 0;
float to_a = 0;
float to_b = 0;
switch ( face )
switch( face )
{
case UP:
from_a = from_16.x / 16.0f;
@@ -473,57 +478,57 @@ public class ModelGenerator
return afloat;
}
public void renderFaceXNeg(
final Block blk,
final BlockPos pos,
final IAESprite lights )
{
final boolean isEdge = this.renderMinX < 0.0001;
final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMinZ * 16.0f);
final Vector3f from = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMaxZ * 16.0f);
{
final boolean isEdge = this.getRenderMinX() < 0.0001;
final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
final Vector3f from = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMaxY() * 16.0f, (float) this.getRenderMaxZ() * 16.0f );
final EnumFacing myFace = EnumFacing.WEST;
this.addFace(myFace, isEdge,to,from, this.defUVs,lights );
this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
}
public void renderFaceYNeg(
final Block blk,
final BlockPos pos,
final IAESprite lights )
{
final boolean isEdge = this.renderMinY < 0.0001;
final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMinZ * 16.0f );
final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMaxZ * 16.0f );
{
final boolean isEdge = this.getRenderMinY() < 0.0001;
final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
final Vector3f from = new Vector3f( (float) this.getRenderMaxX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMaxZ() * 16.0f );
final EnumFacing myFace = EnumFacing.DOWN;
this.addFace(myFace, isEdge,to,from, this.defUVs, lights );
this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
}
public void renderFaceZNeg(
final Block blk,
final BlockPos pos,
final IAESprite lights )
{
final boolean isEdge = this.renderMinZ < 0.0001;
final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMinZ * 16.0f );
final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMinZ * 16.0f );
{
final boolean isEdge = this.getRenderMinZ() < 0.0001;
final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
final Vector3f from = new Vector3f( (float) this.getRenderMaxX() * 16.0f, (float) this.getRenderMaxY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
final EnumFacing myFace = EnumFacing.NORTH;
this.addFace(myFace, isEdge,to,from, this.defUVs, lights );
this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
}
public void renderFaceYPos(
final Block blk,
final BlockPos pos,
final IAESprite lights )
{
final boolean isEdge = this.renderMaxY > 0.9999;
final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMinZ * 16.0f );
final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMaxZ * 16.0f);
{
final boolean isEdge = this.getRenderMaxY() > 0.9999;
final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMaxY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
final Vector3f from = new Vector3f( (float) this.getRenderMaxX() * 16.0f, (float) this.getRenderMaxY() * 16.0f, (float) this.getRenderMaxZ() * 16.0f );
final EnumFacing myFace = EnumFacing.UP;
this.addFace(myFace, isEdge,to,from, this.defUVs,lights );
this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
}
public void renderFaceZPos(
@@ -531,12 +536,12 @@ public class ModelGenerator
final BlockPos pos,
final IAESprite lights )
{
final boolean isEdge = this.renderMaxZ > 0.9999;
final Vector3f to = new Vector3f( (float) this.renderMinX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMaxZ * 16.0f );
final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMaxZ * 16.0f );
final boolean isEdge = this.getRenderMaxZ() > 0.9999;
final Vector3f to = new Vector3f( (float) this.getRenderMinX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMaxZ() * 16.0f );
final Vector3f from = new Vector3f( (float) this.getRenderMaxX() * 16.0f, (float) this.getRenderMaxY() * 16.0f, (float) this.getRenderMaxZ() * 16.0f );
final EnumFacing myFace = EnumFacing.SOUTH;
this.addFace(myFace, isEdge,to,from, this.defUVs,lights );
this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
}
public void renderFaceXPos(
@@ -544,45 +549,43 @@ public class ModelGenerator
final BlockPos pos,
final IAESprite lights )
{
final boolean isEdge = this.renderMaxX > 0.9999;
final Vector3f to = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMinY * 16.0f, (float) this.renderMinZ * 16.0f );
final Vector3f from = new Vector3f( (float) this.renderMaxX * 16.0f, (float) this.renderMaxY * 16.0f, (float) this.renderMaxZ * 16.0f );
final boolean isEdge = this.getRenderMaxX() > 0.9999;
final Vector3f to = new Vector3f( (float) this.getRenderMaxX() * 16.0f, (float) this.getRenderMinY() * 16.0f, (float) this.getRenderMinZ() * 16.0f );
final Vector3f from = new Vector3f( (float) this.getRenderMaxX() * 16.0f, (float) this.getRenderMaxY() * 16.0f, (float) this.getRenderMaxZ() * 16.0f );
final EnumFacing myFace = EnumFacing.EAST;
this.addFace(myFace, isEdge,to,from, this.defUVs, lights );
this.addFace( myFace, isEdge, to, from, this.defUVs, lights );
}
private void addFace(
final EnumFacing face , final boolean isEdge,
final EnumFacing face, final boolean isEdge,
final Vector3f to,
final Vector3f from,
final float[] defUVs2,
IAESprite texture )
{
if ( this.overrideBlockTexture != null )
texture = this.overrideBlockTexture;
if( this.getOverrideBlockTexture() != null )
texture = this.getOverrideBlockTexture();
this.faces.add( new SMFace( face, isEdge, this.color, to, from, defUVs2, new IconUnwrapper( texture ) ) );
}
EnumFacing currentFace = EnumFacing.UP;
public void setNormal(
final float x,
final float y,
final float z )
{
if ( x > 0.5 )
if( x > 0.5 )
this.currentFace = EnumFacing.EAST;
if ( x < -0.5 )
if( x < -0.5 )
this.currentFace = EnumFacing.WEST;
if ( y > 0.5 )
if( y > 0.5 )
this.currentFace = EnumFacing.UP;
if ( y < -0.5 )
if( y < -0.5 )
this.currentFace = EnumFacing.DOWN;
if ( z > 0.5 )
if( z > 0.5 )
this.currentFace = EnumFacing.SOUTH;
if ( z < -0.5 )
if( z < -0.5 )
this.currentFace = EnumFacing.NORTH;
}
@@ -595,31 +598,202 @@ public class ModelGenerator
public void finalizeModel( final boolean Flip )
{
ModelRotation mr = ModelRotation.X0_Y0;
if ( Flip )
mr = ModelRotation.X0_Y180;
for ( final SMFace face : this.faces )
if( Flip )
mr = ModelRotation.X0_Y180;
for( final SMFace face : this.faces )
{
final EnumFacing myFace = face.face;
final float[] uvs = this.getFaceUvs( myFace, face.from, face.to );
final EnumFacing myFace = face.getFace();
final float[] uvs = this.getFaceUvs( myFace, face.getFrom(), face.getTo() );
final BlockFaceUV uv = new BlockFaceUV( uvs, 0 );
final BlockPartFace bpf = new BlockPartFace( myFace, face.color, "", uv );
BakedQuad bf = this.faceBakery.makeBakedQuad( face.to, face.from, bpf, face.spite, myFace, mr, null, true, true );
bf = new IColoredBakedQuad.ColoredBakedQuad( bf.getVertexData(), face.color, bf.getFace() );
if ( face.isEdge )
final BlockPartFace bpf = new BlockPartFace( myFace, face.getColor(), "", uv );
BakedQuad bf = this.faceBakery.makeBakedQuad( face.getTo(), face.getFrom(), bpf, face.getSpite(), myFace, mr, null, true, true );
bf = new IColoredBakedQuad.ColoredBakedQuad( bf.getVertexData(), face.getColor(), bf.getFace() );
if( face.isEdge )
this.generatedModel.getFaceQuads( myFace ).add( bf );
else
this.generatedModel.getGeneralQuads().add( bf );
}
}
public IBakedModel getOutput()
{
return this.generatedModel;
}
public IAESprite getOverrideBlockTexture()
{
return overrideBlockTexture;
}
public IBlockAccess getBlockAccess()
{
return blockAccess;
}
public void setBlockAccess( IBlockAccess blockAccess )
{
this.blockAccess = blockAccess;
}
public boolean isRenderAllFaces()
{
return renderAllFaces;
}
public void setRenderAllFaces( boolean renderAllFaces )
{
this.renderAllFaces = renderAllFaces;
}
public int getUvRotateBottom()
{
return uvRotateBottom;
}
public int setUvRotateBottom( int uvRotateBottom )
{
this.uvRotateBottom = uvRotateBottom;
return uvRotateBottom;
}
public int getUvRotateEast()
{
return uvRotateEast;
}
public int setUvRotateEast( int uvRotateEast )
{
this.uvRotateEast = uvRotateEast;
return uvRotateEast;
}
public int getUvRotateNorth()
{
return uvRotateNorth;
}
public int setUvRotateNorth( int uvRotateNorth )
{
this.uvRotateNorth = uvRotateNorth;
return uvRotateNorth;
}
public int getUvRotateSouth()
{
return uvRotateSouth;
}
public int setUvRotateSouth( int uvRotateSouth )
{
this.uvRotateSouth = uvRotateSouth;
return uvRotateSouth;
}
public int getUvRotateTop()
{
return uvRotateTop;
}
public int setUvRotateTop( int uvRotateTop )
{
this.uvRotateTop = uvRotateTop;
return uvRotateTop;
}
public int getUvRotateWest()
{
return uvRotateWest;
}
public int setUvRotateWest( int uvRotateWest )
{
this.uvRotateWest = uvRotateWest;
return uvRotateWest;
}
public double getRenderMinX()
{
return renderMinX;
}
public void setRenderMinX( double renderMinX )
{
this.renderMinX = renderMinX;
}
public double getRenderMinY()
{
return renderMinY;
}
public void setRenderMinY( double renderMinY )
{
this.renderMinY = renderMinY;
}
public double getRenderMinZ()
{
return renderMinZ;
}
public void setRenderMinZ( double renderMinZ )
{
this.renderMinZ = renderMinZ;
}
public double getRenderMaxX()
{
return renderMaxX;
}
public void setRenderMaxX( double renderMaxX )
{
this.renderMaxX = renderMaxX;
}
public double getRenderMaxY()
{
return renderMaxY;
}
public void setRenderMaxY( double renderMaxY )
{
this.renderMaxY = renderMaxY;
}
public double getRenderMaxZ()
{
return renderMaxZ;
}
public void setRenderMaxZ( double renderMaxZ )
{
this.renderMaxZ = renderMaxZ;
}
public boolean isFlipTexture()
{
return flipTexture;
}
public void setFlipTexture( boolean flipTexture )
{
this.flipTexture = flipTexture;
}
public EnumSet<EnumFacing> getRenderFaces()
{
return renderFaces;
}
public void setRenderFaces( EnumSet<EnumFacing> renderFaces )
{
this.renderFaces = renderFaces;
}
}
src/main/java/appeng/client/render/RenderBlocksWorkaround.java
+22 -8
View File
@@ -30,17 +30,31 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class RenderBlocksWorkaround extends ModelGenerator
{
public boolean flipTexture;
public EnumSet<EnumFacing> faces;
public boolean useTextures;
public EnumSet<EnumFacing> renderFaces;
public float opacity;
private boolean flipTexture;
private EnumSet<EnumFacing> faces;
private boolean useTextures;
private EnumSet<EnumFacing> renderFaces;
private float opacity;
public void setTexture(
final Object object )
{
// TODO Auto-generated method stub
}
public void setOpacity( float f )
{
this.opacity = f;
}
public EnumSet<EnumFacing> getFaces()
{
return faces;
}
public void setFaces( EnumSet<EnumFacing> faces )
{
this.faces = faces;
}
}
src/main/java/appeng/client/render/SMFace.java
+36 -11
View File
@@ -8,18 +8,18 @@ import net.minecraft.util.EnumFacing;
public class SMFace
{
public final EnumFacing face;
public final boolean isEdge;
private final EnumFacing face;
private final boolean isEdge;
private final Vector3f to;
private final Vector3f from;
private final float[] uv;
private final TextureAtlasSprite spite;
private final int color;
public final Vector3f to;
public final Vector3f from;
public final float[] uv;
public final TextureAtlasSprite spite;
public final int color;
public SMFace(
final EnumFacing face , final boolean isEdge,
final int color,
@@ -37,4 +37,29 @@ public class SMFace
this.spite = iconUnwrapper;
}
public int getColor()
{
return color;
}
public EnumFacing getFace()
{
return face;
}
public Vector3f getFrom()
{
return from;
}
public Vector3f getTo()
{
return to;
}
public TextureAtlasSprite getSpite()
{
return spite;
}
}
src/main/java/appeng/client/render/TESRWrapper.java
+2 -3
View File
@@ -37,8 +37,7 @@ import appeng.tile.AEBaseTile;
public class TESRWrapper extends TileEntitySpecialRenderer
{
public final ModelGenerator renderBlocksInstance = new ModelGenerator();
private final ModelGenerator renderBlocksInstance = new ModelGenerator();
private final BaseBlockRender blkRender;
private final double maxDistance;
@@ -68,7 +67,7 @@ public class TESRWrapper extends TileEntitySpecialRenderer
{
GL11.glPushMatrix();
this.renderBlocksInstance.blockAccess = te.getWorld();
this.renderBlocksInstance.setBlockAccess( te.getWorld() );
this.blkRender.renderTile( (AEBaseBlock) b, (AEBaseTile) te, tess.getWorldRenderer(), x, y, z, f, this.renderBlocksInstance );
GL11.glPopMatrix();
src/main/java/appeng/client/render/WorldRender.java
+7 -7
View File
@@ -36,10 +36,10 @@ import appeng.core.AELog;
public final class WorldRender implements ISimpleBlockRenderingHandler
{
public static final WorldRender INSTANCE = new WorldRender();
public final HashMap<AEBaseBlock, BaseBlockRender> blockRenders = new HashMap<AEBaseBlock, BaseBlockRender>();
private static final WorldRender INSTANCE = new WorldRender();
private final HashMap<AEBaseBlock, BaseBlockRender> blockRenders = new HashMap<AEBaseBlock, BaseBlockRender>();
private final ModelGenerator renderer = new ModelGenerator();
boolean hasError = false;
private boolean hasError = false;
private WorldRender()
{
@@ -66,10 +66,10 @@ public final class WorldRender implements ISimpleBlockRenderingHandler
private BaseBlockRender getRender( final AEBaseBlock block )
{
return block.getRendererInstance().rendererInstance;
return block.getRendererInstance().getRendererInstance();
}
public void renderItemBlock( final ItemStack item, final ItemRenderType type, final Object[] data )
void renderItemBlock( final ItemStack item, final ItemRenderType type, final Object[] data )
{
final Block blk = Block.getBlockFromItem( item.getItem() );
if( blk instanceof AEBaseBlock )
@@ -77,9 +77,9 @@ public final class WorldRender implements ISimpleBlockRenderingHandler
final AEBaseBlock block = (AEBaseBlock) blk;
this.renderer.setRenderBoundsFromBlock( block );
this.renderer.uvRotateBottom = this.renderer.uvRotateEast = this.renderer.uvRotateNorth = this.renderer.uvRotateSouth = this.renderer.uvRotateTop = this.renderer.uvRotateWest = 0;
this.renderer.setUvRotateBottom( this.renderer.setUvRotateEast( this.renderer.setUvRotateNorth( this.renderer.setUvRotateSouth( this.renderer.setUvRotateTop( this.renderer.setUvRotateWest( 0 ) ) ) ) ) );
this.getRender( block ).renderInventory( block, item, this.renderer, type, data );
this.renderer.uvRotateBottom = this.renderer.uvRotateEast = this.renderer.uvRotateNorth = this.renderer.uvRotateSouth = this.renderer.uvRotateTop = this.renderer.uvRotateWest = 0;
this.renderer.setUvRotateBottom( this.renderer.setUvRotateEast( this.renderer.setUvRotateNorth( this.renderer.setUvRotateSouth( this.renderer.setUvRotateTop( this.renderer.setUvRotateWest( 0 ) ) ) ) ) );
}
else
{
src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java
+15 -15
View File
@@ -87,16 +87,16 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 14, 14, 0, 16, 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, 14, 2, 0, 16, 14, 2 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 0, 2, 14, 2, 14, 16 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.setInvRenderBounds( renderer, 1, 1, 1, 15, 15, 15 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
renderer.setOverrideBlockTexture( null );
}
@@ -106,7 +106,7 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
{
final TileMolecularAssembler tma = maBlock.getTileEntity( world, pos );
if ( renderer.isAlphaPass() )
if( renderer.isAlphaPass() )
{
if( tma.isPowered() )
{
@@ -125,10 +125,10 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
return false;
}
//BusRenderer.INSTANCE.renderer.blockAccess = renderer.blockAccess;
//renderer = BusRenderer.INSTANCE.renderer;
BusRenderer.INSTANCE.renderer=renderer;
// BusRenderer.INSTANCE.renderer.blockAccess = renderer.blockAccess;
// renderer = BusRenderer.INSTANCE.renderer;
BusRenderer.INSTANCE.setRenderer( renderer );
this.preRenderInWorld( maBlock, world, pos, renderer );
final IOrientable te = this.getOrientable( maBlock, world, pos );
@@ -137,12 +137,12 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
final EnumFacing fdz = te.getForward();
final EnumFacing fdx = Platform.crossProduct( fdz, fdy ).getOpposite();
renderer.renderAllFaces = true;
renderer.setRenderAllFaces( true );
this.renderCableAt( 0.11D, world, pos, maBlock, renderer, 0.141D, false );
this.renderCableAt( 0.188D, world, pos, maBlock, renderer, 0.1875D, true );
maBlock.getRendererInstance().setTemporaryRenderIcon( renderer.getIcon( world.getBlockState( pos ) )[0] );
maBlock.getRendererInstance().setTemporaryRenderIcon( renderer.getIcon( world.getBlockState( pos ) )[0] );
this.renderBlockBounds( renderer, 2, 14, 0, 14, 16, 2, fdx, fdy, fdz );
renderer.renderStandardBlock( maBlock, pos );
@@ -186,14 +186,14 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
maBlock.getRendererInstance().setTemporaryRenderIcon( null );
renderer.renderAllFaces = false;
renderer.setRenderAllFaces( false );
this.postRenderInWorld( renderer );
return true;
}
public void renderCableAt( final double thickness, final IBlockAccess world, final BlockPos pos, final BlockMolecularAssembler block, final ModelGenerator renderer, final double pull, final boolean covered )
private void renderCableAt( final double thickness, final IBlockAccess world, final BlockPos pos, final BlockMolecularAssembler block, final ModelGenerator renderer, final double pull, final boolean covered )
{
IAESprite texture = null;
@@ -242,7 +242,7 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
block.getRendererInstance().setTemporaryRenderIcon( null );
}
IAESprite getConnectedCable( final IBlockAccess world, final BlockPos pos, final EnumFacing side, final boolean covered, final ModelGenerator renderer )
private IAESprite getConnectedCable( final IBlockAccess world, final BlockPos pos, final EnumFacing side, final boolean covered, final ModelGenerator renderer )
{
final int tileYPos = pos.getY() + side.getFrontOffsetY();
if( -1 < tileYPos && tileYPos < 256 )
@@ -259,9 +259,9 @@ public class RenderBlockAssembler extends BaseBlockRender<BlockMolecularAssemble
{
if( covered )
{
return pc.getCoveredTexture( pc.getCableColor(),renderer );
return pc.getCoveredTexture( pc.getCableColor(), renderer );
}
return pc.getGlassTexture( pc.getCableColor(),renderer );
return pc.getGlassTexture( pc.getCableColor(), renderer );
}
}
}
src/main/java/appeng/client/render/blocks/RenderBlockCharger.java
+4 -4
View File
@@ -56,7 +56,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
@Override
public void renderInventory( final BlockCharger blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.renderAllFaces = true;
renderer.setRenderAllFaces( true );
this.setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
@@ -78,7 +78,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
this.setInvRenderBounds( renderer, 3, 12, 3, 13, 13, 13 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
renderer.renderAllFaces = false;
renderer.setRenderAllFaces( false );
blk.getRendererInstance().setTemporaryRenderIcon( null );
}
@@ -93,7 +93,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
final EnumFacing fdz = te.getForward();
final EnumFacing fdx = Platform.crossProduct( fdz, fdy ).getOpposite();
renderer.renderAllFaces = true;
renderer.setRenderAllFaces( true );
this.renderBlockBounds( renderer, 6, 1, 0, 10, 15, 2, fdx, fdy, fdz );
boolean out = renderer.renderStandardBlock( block, pos );
@@ -115,7 +115,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
this.renderBlockBounds( renderer, 3, 12, 3, 13, 13, 13, fdx, fdy, fdz );
out = renderer.renderStandardBlock( block, pos );
renderer.renderAllFaces = false;
renderer.setRenderAllFaces( false );
block.getRendererInstance().setTemporaryRenderIcon( null );
this.postRenderInWorld( renderer );
src/main/java/appeng/client/render/blocks/RenderBlockController.java
+11 -11
View File
@@ -73,10 +73,10 @@ public class RenderBlockController extends BaseBlockRender<BlockController, Tile
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumn.getIcon() );
}
renderer.uvRotateEast = 1;
renderer.uvRotateWest = 1;
renderer.uvRotateTop = 1;
renderer.uvRotateBottom = 1;
renderer.setUvRotateEast( 1 );
renderer.setUvRotateWest( 1 );
renderer.setUvRotateTop( 1 );
renderer.setUvRotateBottom( 1 );
}
else if( !xx && yy && !zz )
{
@@ -97,8 +97,8 @@ public class RenderBlockController extends BaseBlockRender<BlockController, Tile
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumn.getIcon() );
}
renderer.uvRotateEast = 0;
renderer.uvRotateNorth = 0;
renderer.setUvRotateEast( 0 );
renderer.setUvRotateNorth( 0 );
}
else if( !xx && !yy && zz )
{
@@ -119,14 +119,14 @@ public class RenderBlockController extends BaseBlockRender<BlockController, Tile
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumn.getIcon() );
}
renderer.uvRotateNorth = 1;
renderer.uvRotateSouth = 1;
renderer.uvRotateTop = 0;
renderer.setUvRotateNorth( 1 );
renderer.setUvRotateSouth( 1 );
renderer.setUvRotateTop( 0 );
}
else if( ( xx ? 1 : 0 ) + ( yy ? 1 : 0 ) + ( zz ? 1 : 0 ) >= 2 )
{
final int v = ( Math.abs( pos.getX() ) + Math.abs( pos.getY() ) + Math.abs( pos.getZ() ) ) % 2;
renderer.uvRotateEast = renderer.uvRotateBottom = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setUvRotateEast( renderer.setUvRotateBottom( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
if( v == 0 )
{
@@ -171,7 +171,7 @@ public class RenderBlockController extends BaseBlockRender<BlockController, Tile
}
blk.getRendererInstance().setTemporaryRenderIcon( null );
renderer.uvRotateEast = renderer.uvRotateBottom = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setUvRotateEast( renderer.setUvRotateBottom( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
return out;
}
src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java
+41 -34
View File
@@ -68,32 +68,39 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
formed = true;
emitsLight = ct.isPowered();
}
final boolean isMonitor = blk.getClass() == BlockCraftingMonitor.class;
final IAESprite theIcon = renderer.getIcon( w.getBlockState( pos ) )[EnumFacing.SOUTH.ordinal()];
int meta = 1;
for( final Block craftingBlock : AEApi.instance().definitions().blocks().craftingUnit().maybeBlock().asSet() )
{
if ( craftingBlock == blk )
if( craftingBlock == blk )
meta = 0;
}
IAESprite nonForward = theIcon;
if( isMonitor )
{
for( final Block craftingBlock : AEApi.instance().definitions().blocks().craftingUnit().maybeBlock().asSet() )
{
nonForward = renderer.getIcon( craftingBlock.getDefaultState() )[EnumFacing.SOUTH.ordinal()]; // craftingBlock.getIcon( 0, meta | ( formed ? 8 : 0 ) );
nonForward = renderer.getIcon( craftingBlock.getDefaultState() )[EnumFacing.SOUTH.ordinal()]; // craftingBlock.getIcon(
// 0,
// meta
// | (
// formed
// ? 8 :
// 0 )
// );
}
}
if( formed && renderer.overrideBlockTexture == null )
if( formed && renderer.getOverrideBlockTexture() == null )
{
renderer = BusRenderer.INSTANCE.renderer;
renderer = BusRenderer.INSTANCE.getRenderer();
final BusRenderHelper i = BusRenderHelper.INSTANCE;
renderer.blockAccess = w;
renderer.setBlockAccess( w );
i.setPass( MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.TRANSLUCENT ? 1 : 0 );
i.setOrientation( EnumFacing.EAST, EnumFacing.UP, EnumFacing.SOUTH );
@@ -129,7 +136,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
this.handleSide( blk, meta, pos, i, renderer, ct.getForward() == side ? theIcon : nonForward, LocalEmit, isMonitor, side, w );
}
//BusRenderer.INSTANCE.renderer.isFacade = false;
// BusRenderer.INSTANCE.renderer.isFacade = false;
i.setFacesToRender( EnumSet.allOf( EnumFacing.class ) );
return true;
@@ -254,7 +261,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
{
final TileCraftingMonitorTile sr = blk.getTileEntity( w, pos );
final AEColor col = sr.getColor();
renderer.setColorOpaque_I( col.whiteVariant );
renderer.setBrightness( 13 << 20 | 13 << 4 );
i.renderFace( pos, color, side, renderer );
@@ -305,41 +312,41 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
switch( a )
{
case DOWN:
renderer.renderMinY = 0;
renderer.renderMaxY = width;
renderer.setRenderMinY( 0 );
renderer.setRenderMaxY( width );
break;
case EAST:
renderer.renderMaxX = 1;
renderer.renderMinX = 1.0 - width;
renderer.uvRotateTop = 1;
renderer.uvRotateBottom = 1;
renderer.uvRotateWest = 1;
renderer.uvRotateEast = 1;
renderer.setRenderMaxX( 1 );
renderer.setRenderMinX( 1.0 - width );
renderer.setUvRotateTop( 1 );
renderer.setUvRotateBottom( 1 );
renderer.setUvRotateWest( 1 );
renderer.setUvRotateEast( 1 );
break;
case NORTH:
renderer.renderMinZ = 0;
renderer.renderMaxZ = width;
renderer.uvRotateWest = 1;
renderer.uvRotateNorth = 1;
renderer.uvRotateSouth = 1;
renderer.setRenderMinZ( 0 );
renderer.setRenderMaxZ( width );
renderer.setUvRotateWest( 1 );
renderer.setUvRotateNorth( 1 );
renderer.setUvRotateSouth( 1 );
break;
case SOUTH:
renderer.renderMaxZ = 1;
renderer.renderMinZ = 1.0 - width;
renderer.uvRotateNorth = 1;
renderer.uvRotateSouth = 1;
renderer.setRenderMaxZ( 1 );
renderer.setRenderMinZ( 1.0 - width );
renderer.setUvRotateNorth( 1 );
renderer.setUvRotateSouth( 1 );
break;
case UP:
renderer.renderMaxY = 1;
renderer.renderMinY = 1.0 - width;
renderer.setRenderMaxY( 1 );
renderer.setRenderMinY( 1.0 - width );
break;
case WEST:
renderer.renderMinX = 0;
renderer.renderMaxX = width;
renderer.uvRotateTop = 1;
renderer.uvRotateBottom = 1;
renderer.uvRotateWest = 1;
renderer.uvRotateEast = 1;
renderer.setRenderMinX( 0 );
renderer.setRenderMaxX( width );
renderer.setUvRotateTop( 1 );
renderer.setUvRotateBottom( 1 );
renderer.setUvRotateWest( 1 );
renderer.setUvRotateEast( 1 );
break;
default:
}
src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPUMonitor.java
+7 -7
View File
@@ -63,10 +63,10 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU<BlockC
{
final IAEItemStack ais = tile.getJobProgress();
if( tile.dspList == null )
if( tile.getDisplayList() == null )
{
tile.updateList = true;
tile.dspList = GLAllocation.generateDisplayLists( 1 );
tile.setUpdateList( true );
tile.setDisplayList( GLAllocation.generateDisplayLists( 1 ) );
}
if( ais != null )
@@ -74,16 +74,16 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU<BlockC
GL11.glPushMatrix();
GL11.glTranslated( x + 0.5, y + 0.5, z + 0.5 );
if( tile.updateList )
if( tile.isUpdateList() )
{
tile.updateList = false;
GL11.glNewList( tile.dspList, GL11.GL_COMPILE_AND_EXECUTE );
tile.setUpdateList( false );
GL11.glNewList( tile.getDisplayList(), GL11.GL_COMPILE_AND_EXECUTE );
this.tesrRenderScreen( tess, tile, ais );
GL11.glEndList();
}
else
{
GL11.glCallList( tile.dspList );
GL11.glCallList( tile.getDisplayList() );
}
GL11.glPopMatrix();
src/main/java/appeng/client/render/blocks/RenderBlockCrank.java
+6 -6
View File
@@ -49,7 +49,7 @@ public class RenderBlockCrank extends BaseBlockRender<BlockCrank, TileCrank>
@Override
public void renderInventory( final BlockCrank blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.renderAllFaces = true;
renderer.setRenderAllFaces( 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, obj );
@@ -57,7 +57,7 @@ public class RenderBlockCrank extends BaseBlockRender<BlockCrank, TileCrank>
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, obj );
renderer.renderAllFaces = false;
renderer.setRenderAllFaces( false );
}
@Override
@@ -90,19 +90,19 @@ public class RenderBlockCrank extends BaseBlockRender<BlockCrank, TileCrank>
this.applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() );
GL11.glTranslated( 0.5, 0, 0.5 );
GL11.glRotatef( tile.visibleRotation, 0, 1, 0 );
GL11.glRotatef( tile.getVisibleRotation(), 0, 1, 0 );
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();
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 );
/*
renderBlocks.renderAllFaces = true;
renderBlocks.blockAccess = tc.getWorld();
src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java
+2 -2
View File
@@ -64,9 +64,9 @@ public class RenderBlockEnergyCube extends BaseBlockRender<BlockEnergyCell, Tile
@Override
public boolean renderInWorld( final BlockEnergyCell blk, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
renderer.overrideBlockTexture = renderer.getIcon( world.getBlockState( pos ) )[0];// blk.getIcon( 0, meta );
renderer.setOverrideBlockTexture( renderer.getIcon( world.getBlockState( pos ) )[0] );// blk.getIcon( 0, meta );
final boolean out = renderer.renderStandardBlock( blk, pos );
renderer.overrideBlockTexture = null;
renderer.setOverrideBlockTexture( null );
return out;
}
src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java
+8 -8
View File
@@ -68,7 +68,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
@Override
public void renderInventory( final BlockInscriber blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.renderAllFaces = true;
renderer.setRenderAllFaces( true );
this.setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 );
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
@@ -99,7 +99,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
blk.getRendererInstance().setTemporaryRenderIcon( null );
renderer.renderAllFaces = false;
renderer.setRenderAllFaces( false );
// blk.getRendererInstance().setTemporaryRenderIcon( null );
}
@@ -119,7 +119,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
final EnumFacing fdz = te.getForward();
final EnumFacing fdx = Platform.crossProduct( fdz, fdy ).getOpposite();
renderer.renderAllFaces = true;
renderer.setRenderAllFaces( true );
// sides...
this.renderBlockBounds( renderer, 3, 1, 0, 13, 15, 3, fdx, fdy, fdz );
@@ -140,7 +140,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
block.getRendererInstance().setTemporaryRenderIcon( null );
renderer.renderAllFaces = false;
renderer.setRenderAllFaces( false );
block.getRendererInstance().setTemporaryRenderIcon( null );
this.postRenderInWorld( renderer );
@@ -170,13 +170,13 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
long absoluteProgress = 0;
if( tile.smash )
if( tile.isSmash() )
{
final long currentTime = System.currentTimeMillis();
absoluteProgress = currentTime - tile.clientStart;
absoluteProgress = currentTime - tile.getClientStart();
if( absoluteProgress > 800 )
{
tile.smash = false;
tile.setSmash( false );
}
}
@@ -262,7 +262,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
}
}
public void renderItem( ItemStack sis, final float o, final AEBaseBlock block, final AEBaseTile tile, final WorldRenderer tess, final double x, final double y, final double z, final float f, final ModelGenerator renderer )
private void renderItem( ItemStack sis, final float o, final AEBaseBlock block, final AEBaseTile tile, final WorldRenderer tess, final double x, final double y, final double z, final float f, final ModelGenerator renderer )
{
if( sis != null )
{
src/main/java/appeng/client/render/blocks/RenderBlockPaint.java
+14 -14
View File
@@ -79,19 +79,19 @@ public class RenderBlockPaint extends BaseBlockRender<BlockPaint, TilePaint>
final int lumen = 14 << 20 | 14 << 4;
for( final Splotch s : tp.getDots() )
{
if( !validSides.contains( s.side ) )
if( !validSides.contains( s.getSide() ) )
{
continue;
}
if( s.lumen )
if( s.isLumen() )
{
tess.setColorOpaque_I( s.color.whiteVariant );
tess.setColorOpaque_I( s.getColor().whiteVariant );
tess.setBrightness( lumen );
}
else
{
tess.setColorOpaque_I( s.color.mediumVariant );
tess.setColorOpaque_I( s.getColor().mediumVariant );
tess.setBrightness( brightness );
}
@@ -106,13 +106,13 @@ public class RenderBlockPaint extends BaseBlockRender<BlockPaint, TilePaint>
pos_x = Math.max( buffer, Math.min( 1.0 - buffer, pos_x ) );
pos_y = Math.max( buffer, Math.min( 1.0 - buffer, pos_y ) );
if( s.side == EnumFacing.SOUTH || s.side == EnumFacing.NORTH )
if( s.getSide() == EnumFacing.SOUTH || s.getSide() == EnumFacing.NORTH )
{
pos_x += x;
pos_y += y;
}
else if( s.side == EnumFacing.UP || s.side == EnumFacing.DOWN )
else if( s.getSide() == EnumFacing.UP || s.getSide() == EnumFacing.DOWN )
{
pos_x += x;
pos_y += z;
@@ -123,18 +123,18 @@ public class RenderBlockPaint extends BaseBlockRender<BlockPaint, TilePaint>
pos_x += y;
pos_y += z;
}
final IAESprite ico = icoSet[s.getSeed() % icoSet.length];
final EnumFacing rs = s.side.getOpposite();
switch( s.side )
final EnumFacing rs = s.getSide().getOpposite();
switch( s.getSide() )
{
case UP:
offset = 1.0 - offset;
tess.addVertexWithUV( rs,pos_x - buffer, y + offset, pos_y - buffer, ico.getMinU(), ico.getMinV() );
tess.addVertexWithUV( rs,pos_x + buffer, y + offset, pos_y - buffer, ico.getMaxU(), ico.getMinV() );
tess.addVertexWithUV( rs,pos_x + buffer, y + offset, pos_y + buffer, ico.getMaxU(), ico.getMaxV() );
tess.addVertexWithUV( rs,pos_x - buffer, y + offset, pos_y + buffer, ico.getMinU(), ico.getMaxV() );
tess.addVertexWithUV( rs, pos_x - buffer, y + offset, pos_y - buffer, ico.getMinU(), ico.getMinV() );
tess.addVertexWithUV( rs, pos_x + buffer, y + offset, pos_y - buffer, ico.getMaxU(), ico.getMinV() );
tess.addVertexWithUV( rs, pos_x + buffer, y + offset, pos_y + buffer, ico.getMaxU(), ico.getMaxV() );
tess.addVertexWithUV( rs, pos_x - buffer, y + offset, pos_y + buffer, ico.getMinU(), ico.getMaxV() );
break;
case DOWN:
src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class RenderBlockQuartzAccelerator extends BaseBlockRender<BlockQuartzGro
final TileEntity te = world.getTileEntity( pos );
if( te instanceof TileQuartzGrowthAccelerator )
{
if( ( (TileQuartzGrowthAccelerator) te ).hasPower )
if( ( (TileQuartzGrowthAccelerator) te ).isPowered() )
{
final IAESprite top_Bottom = ExtraBlockTextures.BlockQuartzGrowthAcceleratorOn.getIcon();
final IAESprite side = ExtraBlockTextures.BlockQuartzGrowthAcceleratorSideOn.getIcon();
src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java
+10 -10
View File
@@ -89,7 +89,7 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
@Override
public void renderTile( final BlockSkyChest block, final TileSkyChest skyChest, final WorldRenderer tess, final double x, final double y, final double z, final float partialTick, final ModelGenerator renderer )
{
if( skyChest == null )
if( skyChest == null )
{
return;
}
@@ -113,28 +113,28 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
GL11.glTranslatef( -0.0F, -1.0F, -1.0F );
final long now = System.currentTimeMillis();
final long distance = now - skyChest.lastEvent;
final long distance = now - skyChest.getLastEvent();
if( skyChest.playerOpen > 0 )
if( skyChest.getPlayerOpen() > 0 )
{
skyChest.lidAngle += distance * 0.0001;
skyChest.setLidAngle( skyChest.getLidAngle() + distance * 0.0001f );
}
else
{
skyChest.lidAngle -= distance * 0.0001;
skyChest.setLidAngle( skyChest.getLidAngle() - distance * 0.0001f );
}
if( skyChest.lidAngle > 0.5f )
if( skyChest.getLidAngle() > 0.5f )
{
skyChest.lidAngle = 0.5f;
skyChest.setLidAngle( 0.5f );
}
if( skyChest.lidAngle < 0.0f )
if( skyChest.getLidAngle() < 0.0f )
{
skyChest.lidAngle = 0.0f;
skyChest.setLidAngle( 0.0f );
}
float lidAngle = skyChest.lidAngle;
float lidAngle = skyChest.getLidAngle();
lidAngle = 1.0F - lidAngle;
lidAngle = 1.0F - lidAngle * lidAngle * lidAngle;
src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java
+120 -122
View File
@@ -45,8 +45,7 @@ import appeng.tile.misc.TileSkyCompass;
public class RenderBlockSkyCompass extends BaseBlockRender<BlockSkyCompass, TileSkyCompass>
{
final ModelCompass model = new ModelCompass();
float r = 0;
private final ModelCompass model = new ModelCompass();
public RenderBlockSkyCompass()
{
@@ -57,122 +56,121 @@ public class RenderBlockSkyCompass extends BaseBlockRender<BlockSkyCompass, Tile
public void renderInventory( final BlockSkyCompass blk, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
/*
if( type == ItemRenderType.INVENTORY )
{
boolean isGood = false;
IInventory inv = Minecraft.getMinecraft().thePlayer.inventory;
for( int x = 0; x < inv.getSizeInventory(); x++ )
{
if( inv.getStackInSlot( x ) == is )
{
isGood = true;
}
}
if( !isGood )
{
type = ItemRenderType.FIRST_PERSON_MAP;
}
}
GL11.glEnable( GL12.GL_RESCALE_NORMAL );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
ResourceLocation loc = new ResourceLocation( "appliedenergistics2", "textures/models/compass.png" );
Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
if( type == ItemRenderType.ENTITY )
{
GL11.glRotatef( -90.0f, 0.0f, 0.0f, 1.0f );
GL11.glScalef( 1.0F, -1F, -1F );
GL11.glScalef( 2.5f, 2.5f, 2.5f );
GL11.glTranslatef( -0.25F, -1.65F, -0.19F );
}
else
{
if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
{
GL11.glRotatef( 15.3f, 0.0f, 0.0f, 1.0f );
}
GL11.glScalef( 1.0F, -1F, -1F );
GL11.glScalef( 2.5f, 2.5f, 2.5f );
if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
{
GL11.glTranslatef( 0.3F, -1.65F, -0.19F );
}
else
{
GL11.glTranslatef( 0.2F, -1.65F, -0.19F );
}
}
long now = System.currentTimeMillis();
if( type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.INVENTORY || type == ItemRenderType.EQUIPPED )
{
EntityPlayer p = Minecraft.getMinecraft().thePlayer;
float rYaw = p.rotationYaw;
if( type == ItemRenderType.EQUIPPED )
{
p = (EntityPlayer) obj[1];
rYaw = p.renderYawOffset;
}
int x = (int) p.posX;
int y = (int) p.posY;
int z = (int) p.posZ;
CompassResult cr = CompassManager.INSTANCE.getCompassDirection( 0, x, y, z );
for( int i = 0; i < 3; i++ )
{
for( int j = 0; j < 3; j++ )
{
CompassManager.INSTANCE.getCompassDirection( 0, x + i - 1, y, z + j - 1 );
}
}
if( cr.hasResult )
{
if( cr.spin )
{
now %= 100000;
this.model.renderAll( ( now / 50000.0f ) * (float) Math.PI * 500.0f );
}
else
{
if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
{
float offRads = rYaw / 180.0f * (float) Math.PI;
float adjustment = (float) Math.PI * 0.74f;
this.model.renderAll( (float) this.flipidiy( cr.rad + offRads + adjustment ) );
}
else
{
float offRads = rYaw / 180.0f * (float) Math.PI;
float adjustment = (float) Math.PI * -0.74f;
this.model.renderAll( (float) this.flipidiy( cr.rad + offRads + adjustment ) );
}
}
}
else
{
now %= 1000000;
this.model.renderAll( ( now / 500000.0f ) * (float) Math.PI * 500.0f );
}
}
else
{
now %= 100000;
this.model.renderAll( ( now / 50000.0f ) * (float) Math.PI * 500.0f );
}
GL11.glDisable( GL12.GL_RESCALE_NORMAL );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
*/
* if( type == ItemRenderType.INVENTORY )
* {
* boolean isGood = false;
* IInventory inv = Minecraft.getMinecraft().thePlayer.inventory;
* for( int x = 0; x < inv.getSizeInventory(); x++ )
* {
* if( inv.getStackInSlot( x ) == is )
* {
* isGood = true;
* }
* }
* if( !isGood )
* {
* type = ItemRenderType.FIRST_PERSON_MAP;
* }
* }
* GL11.glEnable( GL12.GL_RESCALE_NORMAL );
* GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
* ResourceLocation loc = new ResourceLocation( "appliedenergistics2", "textures/models/compass.png" );
* Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
* if( type == ItemRenderType.ENTITY )
* {
* GL11.glRotatef( -90.0f, 0.0f, 0.0f, 1.0f );
* GL11.glScalef( 1.0F, -1F, -1F );
* GL11.glScalef( 2.5f, 2.5f, 2.5f );
* GL11.glTranslatef( -0.25F, -1.65F, -0.19F );
* }
* else
* {
* if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
* {
* GL11.glRotatef( 15.3f, 0.0f, 0.0f, 1.0f );
* }
* GL11.glScalef( 1.0F, -1F, -1F );
* GL11.glScalef( 2.5f, 2.5f, 2.5f );
* if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
* {
* GL11.glTranslatef( 0.3F, -1.65F, -0.19F );
* }
* else
* {
* GL11.glTranslatef( 0.2F, -1.65F, -0.19F );
* }
* }
* long now = System.currentTimeMillis();
* if( type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.INVENTORY || type ==
* ItemRenderType.EQUIPPED )
* {
* EntityPlayer p = Minecraft.getMinecraft().thePlayer;
* float rYaw = p.rotationYaw;
* if( type == ItemRenderType.EQUIPPED )
* {
* p = (EntityPlayer) obj[1];
* rYaw = p.renderYawOffset;
* }
* int x = (int) p.posX;
* int y = (int) p.posY;
* int z = (int) p.posZ;
* CompassResult cr = CompassManager.INSTANCE.getCompassDirection( 0, x, y, z );
* for( int i = 0; i < 3; i++ )
* {
* for( int j = 0; j < 3; j++ )
* {
* CompassManager.INSTANCE.getCompassDirection( 0, x + i - 1, y, z + j - 1 );
* }
* }
* if( cr.isValidResult() )
* {
* if( cr.isSpin() )
* {
* now %= 100000;
* this.model.renderAll( ( now / 50000.0f ) * (float) Math.PI * 500.0f );
* }
* else
* {
* if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
* {
* <<<<<<< HEAD
* float offRads = rYaw / 180.0f * (float) Math.PI;
* float adjustment = (float) Math.PI * 0.74f;
* this.model.renderAll( (float) this.flipidiy( cr.rad + offRads + adjustment ) );
* }
* else
* {
* float offRads = rYaw / 180.0f * (float) Math.PI;
* float adjustment = (float) Math.PI * -0.74f;
* this.model.renderAll( (float) this.flipidiy( cr.rad + offRads + adjustment ) );
* =======
* final float offRads = rYaw / 180.0f * (float) Math.PI;
* final float adjustment = (float) Math.PI * 0.74f;
* this.model.renderAll( (float) this.flipidiy( cr.getRad() + offRads + adjustment ) );
* }
* else
* {
* final float offRads = rYaw / 180.0f * (float) Math.PI;
* final float adjustment = (float) Math.PI * -0.74f;
* this.model.renderAll( (float) this.flipidiy( cr.getRad() + offRads + adjustment ) );
* >>>>>>> 500fc47... Reduces visibility of internal fields/methods
* }
* }
* }
* else
* {
* now %= 1000000;
* this.model.renderAll( ( now / 500000.0f ) * (float) Math.PI * 500.0f );
* }
* }
* else
* {
* now %= 100000;
* this.model.renderAll( ( now / 50000.0f ) * (float) Math.PI * 500.0f );
* }
* GL11.glDisable( GL12.GL_RESCALE_NORMAL );
* GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
*/
}
@Override
@@ -213,23 +211,23 @@ public class RenderBlockSkyCompass extends BaseBlockRender<BlockSkyCompass, Tile
if( skyCompass.getForward() == EnumFacing.UP || skyCompass.getForward() == EnumFacing.DOWN )
{
final BlockPos compassPos = skyCompass.getPos();
cr = CompassManager.INSTANCE.getCompassDirection( 0, compassPos.getX(), compassPos.getY(), compassPos.getZ());
cr = CompassManager.INSTANCE.getCompassDirection( 0, compassPos.getX(), compassPos.getY(), compassPos.getZ() );
}
else
{
cr = new CompassResult( false, true, 0 );
}
if( cr.hasResult )
if( cr.isValidResult() )
{
if( cr.spin )
if( cr.isSpin() )
{
now %= 100000;
this.model.renderAll( ( now / 50000.0f ) * (float) Math.PI * 500.0f );
}
else
{
this.model.renderAll( (float) ( skyCompass.getForward() == EnumFacing.DOWN ? this.flipidiy( cr.rad ) : cr.rad ) );
this.model.renderAll( (float) ( skyCompass.getForward() == EnumFacing.DOWN ? this.flipidiy( cr.getRad() ) : cr.getRad() ) );
}
}
else
src/main/java/appeng/client/render/blocks/RenderBlockWireless.java
+26 -26
View File
@@ -43,7 +43,7 @@ import appeng.util.Platform;
public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWireless>
{
BlockPos center;
private BlockPos center;
private BlockWireless blk;
private boolean hasChan = false;
private boolean hasPower = false;
@@ -62,7 +62,7 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
this.hasPower = false;
final BlockRenderInfo ri = blk.getRendererInstance();
renderer.renderAllFaces = true;
renderer.setRenderAllFaces( true );
IAESprite r = CableBusTextures.PartMonitorSidesStatus.getIcon();
ri.setTemporaryRenderIcons( r, r, CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), r, r );
@@ -107,8 +107,8 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
this.blk = blk;
if( tw != null )
{
this.hasChan = ( tw.clientFlags & ( TileWireless.POWERED_FLAG | TileWireless.CHANNEL_FLAG ) ) == ( TileWireless.POWERED_FLAG | TileWireless.CHANNEL_FLAG );
this.hasPower = ( tw.clientFlags & TileWireless.POWERED_FLAG ) == TileWireless.POWERED_FLAG;
this.hasChan = ( tw.getClientFlags() & ( TileWireless.POWERED_FLAG | TileWireless.CHANNEL_FLAG ) ) == ( TileWireless.POWERED_FLAG | TileWireless.CHANNEL_FLAG );
this.hasPower = ( tw.getClientFlags() & TileWireless.POWERED_FLAG ) == TileWireless.POWERED_FLAG;
final BlockRenderInfo ri = blk.getRendererInstance();
@@ -116,7 +116,7 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
final EnumFacing fdz = tw.getForward();
final EnumFacing fdx = Platform.crossProduct( fdz, fdy ).getOpposite();
renderer.renderAllFaces = true;
renderer.setRenderAllFaces( true );
IAESprite r = CableBusTextures.PartMonitorSidesStatus.getIcon();
ri.setTemporaryRenderIcons( r, r, CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), r, r );
@@ -202,7 +202,7 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
}
ri.setTemporaryRenderIcon( null );
renderer.renderAllFaces = false;
renderer.setRenderAllFaces( false );
}
return true;
@@ -216,34 +216,34 @@ public class RenderBlockWireless extends BaseBlockRender<BlockWireless, TileWire
switch( z )
{
case DOWN:
renderer.uvRotateNorth = 3;
renderer.uvRotateSouth = 3;
renderer.uvRotateEast = 3;
renderer.uvRotateWest = 3;
renderer.setUvRotateNorth( 3 );
renderer.setUvRotateSouth( 3 );
renderer.setUvRotateEast( 3 );
renderer.setUvRotateWest( 3 );
break;
case EAST:
renderer.uvRotateTop = 1;
renderer.uvRotateBottom = 2;
renderer.uvRotateEast = 2;
renderer.uvRotateWest = 1;
renderer.setUvRotateTop( 1 );
renderer.setUvRotateBottom( 2 );
renderer.setUvRotateEast( 2 );
renderer.setUvRotateWest( 1 );
break;
case NORTH:
renderer.uvRotateTop = 0;
renderer.uvRotateBottom = 0;
renderer.uvRotateNorth = 2;
renderer.uvRotateSouth = 1;
renderer.setUvRotateTop( 0 );
renderer.setUvRotateBottom( 0 );
renderer.setUvRotateNorth( 2 );
renderer.setUvRotateSouth( 1 );
break;
case SOUTH:
renderer.uvRotateTop = 3;
renderer.uvRotateBottom = 3;
renderer.uvRotateNorth = 1;
renderer.uvRotateSouth = 2;
renderer.setUvRotateTop( 3 );
renderer.setUvRotateBottom( 3 );
renderer.setUvRotateNorth( 1 );
renderer.setUvRotateSouth( 2 );
break;
case WEST:
renderer.uvRotateTop = 2;
renderer.uvRotateBottom = 1;
renderer.uvRotateEast = 1;
renderer.uvRotateWest = 2;
renderer.setUvRotateTop( 2 );
renderer.setUvRotateBottom( 1 );
renderer.setUvRotateEast( 1 );
renderer.setUvRotateWest( 2 );
break;
default:
break;
src/main/java/appeng/client/render/blocks/RenderDrive.java
+51 -51
View File
@@ -47,10 +47,10 @@ public class RenderDrive extends BaseBlockRender<BlockDrive, TileDrive>
@Override
public void renderInventory( final BlockDrive block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.overrideBlockTexture = ExtraBlockTextures.White.getIcon();
renderer.setOverrideBlockTexture( ExtraBlockTextures.White.getIcon() );
this.renderInvBlock( EnumSet.of( AEPartLocation.SOUTH ), block, is, 0x000000, renderer );
renderer.overrideBlockTexture = null;
renderer.setOverrideBlockTexture( null );
super.renderInventory( block, is, renderer, type, obj );
}
@@ -219,40 +219,40 @@ public class RenderDrive extends BaseBlockRender<BlockDrive, TileDrive>
switch( forward.getFrontOffsetX() + forward.getFrontOffsetY() * 2 + forward.getFrontOffsetZ() * 3 )
{
case 1:
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMinZ, u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMinY, z + renderer.renderMaxZ, u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMinY, z + renderer.renderMinZ, 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.renderMaxX, y + renderer.renderMinY, z + renderer.renderMinZ, u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMinY, z + renderer.renderMaxZ, u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMinZ, 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.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMinZ, u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.renderMinX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.renderMinX, y + renderer.renderMaxY, z + renderer.renderMinZ, 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.renderMinX, y + renderer.renderMaxY, z + renderer.renderMinZ, u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.renderMinX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMinZ, 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.renderMaxX, y + renderer.renderMinY, z + renderer.renderMaxZ, u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.renderMinX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.renderMinX, y + renderer.renderMinY, z + renderer.renderMaxZ, 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.renderMinX, y + renderer.renderMinY, z + renderer.renderMaxZ, u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.renderMinX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMinY, z + renderer.renderMaxZ, 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;
}
@@ -303,47 +303,47 @@ public class RenderDrive extends BaseBlockRender<BlockDrive, TileDrive>
switch( forward.getFrontOffsetX() + forward.getFrontOffsetY() * 2 + forward.getFrontOffsetZ() * 3 )
{
case 1:
renderer.addVertexWithUV( forward, x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMinZ, u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMinY, z + renderer.renderMaxZ, u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMinY, z + renderer.renderMinZ, 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.renderMaxX, y + renderer.renderMinY, z + renderer.renderMinZ, u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMinY, z + renderer.renderMaxZ, u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMinZ, 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.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMinZ, u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.renderMinX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.renderMinX, y + renderer.renderMaxY, z + renderer.renderMinZ, 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.renderMinX, y + renderer.renderMaxY, z + renderer.renderMinZ, u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.renderMinX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMinZ, 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.renderMaxX, y + renderer.renderMinY, z + renderer.renderMaxZ, u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.renderMinX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.renderMinX, y + renderer.renderMinY, z + renderer.renderMaxZ, 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.renderMinX, y + renderer.renderMinY, z + renderer.renderMaxZ, u1, v1 );
renderer.addVertexWithUV( forward,x + renderer.renderMinX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u2, v2 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMaxY, z + renderer.renderMaxZ, u3, v3 );
renderer.addVertexWithUV( forward,x + renderer.renderMaxX, y + renderer.renderMinY, z + renderer.renderMaxZ, 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;
}
}
}
}
renderer.overrideBlockTexture = null;
renderer.setOverrideBlockTexture( null );
return result;
}
}
src/main/java/appeng/client/render/blocks/RenderMEChest.java
+4 -4
View File
@@ -53,13 +53,13 @@ public class RenderMEChest extends BaseBlockRender<BlockChest, TileChest>
public void renderInventory( final BlockChest block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.setBrightness( 0 );
renderer.overrideBlockTexture = ExtraBlockTextures.White.getIcon();
renderer.setOverrideBlockTexture( ExtraBlockTextures.White.getIcon() );
this.renderInvBlock( EnumSet.of( AEPartLocation.SOUTH ), block, is, 0x000000, renderer );
renderer.overrideBlockTexture = ExtraBlockTextures.MEChest.getIcon();
renderer.setOverrideBlockTexture( ExtraBlockTextures.MEChest.getIcon() );
this.renderInvBlock( EnumSet.of( AEPartLocation.UP ), block, is, this.adjustBrightness( AEColor.Transparent.whiteVariant, 0.7 ), renderer );
renderer.overrideBlockTexture = null;
renderer.setOverrideBlockTexture( null );
super.renderInventory( block, is, renderer, type, obj );
}
@@ -179,7 +179,7 @@ public class RenderMEChest extends BaseBlockRender<BlockChest, TileChest>
this.renderFace( pos, imb, ico == null ? ExtraBlockTextures.MEChest.getIcon() : ico, renderer, up );
}
renderer.overrideBlockTexture = null;
renderer.setOverrideBlockTexture( null );
this.postRenderInWorld( renderer );
return result;
src/main/java/appeng/client/render/blocks/RenderQNB.java
+2 -2
View File
@@ -65,7 +65,7 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
return false;
}
renderer.renderAllFaces = true;
renderer.setRenderAllFaces( true );
final IDefinitions definitions = AEApi.instance().definitions();
final IBlocks blocks = definitions.blocks();
@@ -157,7 +157,7 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
}
}
renderer.renderAllFaces = false;
renderer.setRenderAllFaces( false );
return true;
}
src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java
+8 -8
View File
@@ -38,7 +38,7 @@ import appeng.tile.AEBaseTile;
public class RenderQuartzGlass extends BaseBlockRender<QuartzGlassBlock, AEBaseTile>
{
static byte[][][] offsets;
private static byte[][][] offsets;
public RenderQuartzGlass()
{
@@ -60,9 +60,9 @@ public class RenderQuartzGlass extends BaseBlockRender<QuartzGlassBlock, AEBaseT
@Override
public void renderInventory( final QuartzGlassBlock block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.overrideBlockTexture = ExtraBlockTextures.GlassFrame.getIcon();
renderer.setOverrideBlockTexture( ExtraBlockTextures.GlassFrame.getIcon() );
super.renderInventory( block, is, renderer, type, obj );
renderer.overrideBlockTexture = null;
renderer.setOverrideBlockTexture( null );
super.renderInventory( block, is, renderer, type, obj );
}
@@ -81,22 +81,22 @@ public class RenderQuartzGlass extends BaseBlockRender<QuartzGlassBlock, AEBaseT
switch( Math.abs( ( offsets[cx][cy][cz] + ( pos.getX()+pos.getY()+pos.getZ() ) ) % 4 ) )
{
case 0:
renderer.overrideBlockTexture = new OffsetIcon( renderer.getIcon( world.getBlockState( pos ) )[0], u / 2, v / 2 );
renderer.setOverrideBlockTexture( new OffsetIcon( renderer.getIcon( world.getBlockState( pos ) )[0], u / 2, v / 2 ) );
break;
case 1:
renderer.overrideBlockTexture = new OffsetIcon( ExtraBlockTextures.BlockQuartzGlassB.getIcon(), u / 2, v / 2 );
renderer.setOverrideBlockTexture( new OffsetIcon( ExtraBlockTextures.BlockQuartzGlassB.getIcon(), u / 2, v / 2 ) );
break;
case 2:
renderer.overrideBlockTexture = new OffsetIcon( ExtraBlockTextures.BlockQuartzGlassC.getIcon(), u, v );
renderer.setOverrideBlockTexture( new OffsetIcon( ExtraBlockTextures.BlockQuartzGlassC.getIcon(), u, v ) );
break;
case 3:
renderer.overrideBlockTexture = new OffsetIcon( ExtraBlockTextures.BlockQuartzGlassD.getIcon(), u, v );
renderer.setOverrideBlockTexture( new OffsetIcon( ExtraBlockTextures.BlockQuartzGlassD.getIcon(), u, v ) );
break;
}
final boolean result = renderer.renderStandardBlock( imb, pos );
renderer.overrideBlockTexture = null;
renderer.setOverrideBlockTexture( null );
this.renderEdge( imb, world, pos, renderer, AEPartLocation.UP, AEPartLocation.EAST );
this.renderEdge( imb, world, pos, renderer, AEPartLocation.UP, AEPartLocation.WEST );
this.renderEdge( imb, world, pos, renderer, AEPartLocation.UP, AEPartLocation.NORTH );
src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java
+4 -4
View File
@@ -68,7 +68,7 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
blk.getRendererInstance().setTemporaryRenderIcon( renderer.getIcon( Blocks.hopper.getDefaultState() )[0] );
renderer.renderAllFaces = true;
renderer.setRenderAllFaces( true );
final float top = 8.0f / 16.0f;
final float bottom = 7.0f / 16.0f;
@@ -87,7 +87,7 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer );
renderer.renderAllFaces = false;
renderer.setRenderAllFaces( false );
blk.getRendererInstance().setTemporaryRenderIcon( null );
}
@@ -96,7 +96,7 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
{
final IOrientable te = ( (IOrientableBlock) block ).getOrientable( world, pos );
renderer.renderAllFaces = true;
renderer.setRenderAllFaces( true );
float zOff = 0.0f;
float yOff = 0.0f;
float xOff = 0.0f;
@@ -197,7 +197,7 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
}
}
renderer.renderAllFaces = false;
renderer.setRenderAllFaces( false );
block.getRendererInstance().setTemporaryRenderIcon( null );
return out;
src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java
+30 -30
View File
@@ -45,9 +45,9 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
@Override
public void renderInventory( final BlockSpatialPylon block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.overrideBlockTexture = ExtraBlockTextures.BlockSpatialPylon_dim.getIcon();
renderer.setOverrideBlockTexture( ExtraBlockTextures.BlockSpatialPylon_dim.getIcon() );
super.renderInventory( block, is, renderer, type, obj );
renderer.overrideBlockTexture = null;
renderer.setOverrideBlockTexture( null );
super.renderInventory( block, is, renderer, type, obj );
}
@@ -68,24 +68,24 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
ori = EnumFacing.EAST;
if( ( displayBits & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MAX )
{
renderer.uvRotateEast = 1;
renderer.uvRotateWest = 2;
renderer.uvRotateTop = 2;
renderer.uvRotateBottom = 1;
renderer.setUvRotateEast( 1 );
renderer.setUvRotateWest( 2 );
renderer.setUvRotateTop( 2 );
renderer.setUvRotateBottom( 1 );
}
else if( ( displayBits & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MIN )
{
renderer.uvRotateEast = 2;
renderer.uvRotateWest = 1;
renderer.uvRotateTop = 1;
renderer.uvRotateBottom = 2;
renderer.setUvRotateEast( 2 );
renderer.setUvRotateWest( 1 );
renderer.setUvRotateTop( 1 );
renderer.setUvRotateBottom( 2 );
}
else
{
renderer.uvRotateEast = 1;
renderer.uvRotateWest = 1;
renderer.uvRotateTop = 1;
renderer.uvRotateBottom = 1;
renderer.setUvRotateEast( 1 );
renderer.setUvRotateWest( 1 );
renderer.setUvRotateTop( 1 );
renderer.setUvRotateBottom( 1 );
}
}
@@ -94,10 +94,10 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
ori = EnumFacing.UP;
if( ( displayBits & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MAX )
{
renderer.uvRotateNorth = 3;
renderer.uvRotateSouth = 3;
renderer.uvRotateEast = 3;
renderer.uvRotateWest = 3;
renderer.setUvRotateNorth( 3 );
renderer.setUvRotateSouth( 3 );
renderer.setUvRotateEast( 3 );
renderer.setUvRotateWest( 3 );
}
}
@@ -106,20 +106,20 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
ori = EnumFacing.NORTH;
if( ( displayBits & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MAX )
{
renderer.uvRotateSouth = 1;
renderer.uvRotateNorth = 2;
renderer.setUvRotateSouth( 1 );
renderer.setUvRotateNorth( 2 );
}
else if( ( displayBits & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MIN )
{
renderer.uvRotateNorth = 1;
renderer.uvRotateSouth = 2;
renderer.uvRotateTop = 3;
renderer.uvRotateBottom = 3;
renderer.setUvRotateNorth( 1 );
renderer.setUvRotateSouth( 2 );
renderer.setUvRotateTop( 3 );
renderer.setUvRotateBottom( 3 );
}
else
{
renderer.uvRotateNorth = 1;
renderer.uvRotateSouth = 2;
renderer.setUvRotateNorth( 1 );
renderer.setUvRotateSouth( 2 );
}
}
@@ -149,18 +149,18 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
}
bri.setTemporaryRenderIcon( null );
renderer.uvRotateEast = renderer.uvRotateWest = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateBottom = 0;
renderer.setUvRotateEast( renderer.setUvRotateWest( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateBottom( 0 ) ) ) ) ) );
return r;
}
renderer.overrideBlockTexture = 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.overrideBlockTexture = ExtraBlockTextures.BlockSpatialPylon_dim.getIcon();
renderer.setOverrideBlockTexture( ExtraBlockTextures.BlockSpatialPylon_dim.getIcon() );
result = renderer.renderStandardBlock( imb, pos );
renderer.overrideBlockTexture = null;
renderer.setOverrideBlockTexture( null );
return result;
}
src/main/java/appeng/client/render/blocks/RenderTinyTNT.java
+2 -2
View File
@@ -52,10 +52,10 @@ public class RenderTinyTNT extends BaseBlockRender<BlockTinyTNT, AEBaseTile>
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.renderAllFaces = true;
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 );
renderer.renderAllFaces = false;
renderer.setRenderAllFaces( false );
return out;
}
}
src/main/java/appeng/client/render/blocks/RendererCableBus.java
+14 -14
View File
@@ -59,16 +59,16 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
renderer.setColorOpaque_F( 1, 1, 1 );
renderer.setBrightness( 14 << 20 | 14 << 4 );
BusRenderer.INSTANCE.renderer = renderer; // post data to this...
BusRenderer.INSTANCE.setRenderer( renderer ); // post data to this...
BusRenderHelper.INSTANCE.setBounds( 0, 0, 0, 1, 1, 1 );
BusRenderHelper.INSTANCE.setTexture( null );
BusRenderHelper.INSTANCE.setInvColor( 0xffffff );
renderer.blockAccess = ClientHelper.proxy.getWorld();
renderer.setBlockAccess( ClientHelper.proxy.getWorld() );
BusRenderHelper.INSTANCE.setOrientation( EnumFacing.EAST, EnumFacing.UP, EnumFacing.SOUTH );
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.overrideBlockTexture = null;
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
renderer.setOverrideBlockTexture( null );
if( item.getItem() instanceof IFacadeItem )
{
@@ -94,7 +94,7 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
}
}
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
}
public IPart getRenderer( final ItemStack is, final IPartItem c )
@@ -116,7 +116,7 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
public static final BusRenderer INSTANCE = new BusRenderer();
private static final Map<Integer, IPart> RENDER_PART = new HashMap<Integer, IPart>();
@Override
public boolean renderInWorld( final BlockCableBus block, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer )
{
@@ -124,12 +124,12 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
if( t instanceof TileCableBus )
{
BusRenderer.INSTANCE.renderer = renderer; // post data to this...
BusRenderer.INSTANCE.renderer.renderAllFaces = true;
BusRenderer.INSTANCE.renderer.blockAccess = renderer.blockAccess;
BusRenderer.INSTANCE.renderer.overrideBlockTexture = renderer.overrideBlockTexture;
( (TileCableBus) t ).cb.renderStatic();
BusRenderer.INSTANCE.renderer.renderAllFaces = false;
BusRenderer.INSTANCE.setRenderer( renderer ); // post data to this...
BusRenderer.INSTANCE.getRenderer().setRenderAllFaces( true );
BusRenderer.INSTANCE.getRenderer().setBlockAccess( renderer.getBlockAccess() );
BusRenderer.INSTANCE.getRenderer().setOverrideBlockTexture( renderer.getOverrideBlockTexture() );
( (TileCableBus) t ).getCableBus().renderStatic();
BusRenderer.INSTANCE.getRenderer().setRenderAllFaces( false );
}
return BusRenderHelper.INSTANCE.getItemsRendered() > 0;
@@ -140,8 +140,8 @@ public class RendererCableBus extends BaseBlockRender<BlockCableBus, TileCableBu
{
if( cableBus != null )
{
BusRenderer.INSTANCE.renderer.overrideBlockTexture = null;
cableBus.cb.renderDynamic( x, y, z );
BusRenderer.INSTANCE.getRenderer().setOverrideBlockTexture( null );
cableBus.getCableBus().renderDynamic( x, y, z );
}
}
}
src/main/java/appeng/client/render/blocks/RendererSecurity.java
+4 -4
View File
@@ -47,13 +47,13 @@ public class RendererSecurity extends BaseBlockRender<BlockSecurity, TileSecurit
@Override
public void renderInventory( final BlockSecurity block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj )
{
renderer.overrideBlockTexture = ExtraBlockTextures.getMissing();
renderer.setOverrideBlockTexture( ExtraBlockTextures.getMissing() );
this.renderInvBlock( EnumSet.of( AEPartLocation.SOUTH ), block, is, 0x000000, renderer );
renderer.overrideBlockTexture = ExtraBlockTextures.MEChest.getIcon();
renderer.setOverrideBlockTexture( ExtraBlockTextures.MEChest.getIcon() );
this.renderInvBlock( EnumSet.of( AEPartLocation.UP ), block, is, this.adjustBrightness( AEColor.Transparent.whiteVariant, 0.7 ), renderer );
renderer.overrideBlockTexture = null;
renderer.setOverrideBlockTexture( null );
super.renderInventory( block, is, renderer, type, obj );
}
@@ -93,7 +93,7 @@ public class RendererSecurity extends BaseBlockRender<BlockSecurity, TileSecurit
this.renderFace( pos, imb, ico, renderer, up );
}
renderer.overrideBlockTexture = null;
renderer.setOverrideBlockTexture( null );
this.postRenderInWorld( renderer );
return result;
src/main/java/appeng/client/render/effects/AssemblerFX.java
+3 -5
View File
@@ -32,10 +32,9 @@ import appeng.entity.EntityFloatingItem;
public class AssemblerFX extends EntityFX
{
final IAEItemStack item;
final EntityFloatingItem fi;
final float speed;
float time = 0;
private final EntityFloatingItem fi;
private final float speed;
private float time = 0;
public AssemblerFX( final World w, final double x, final double y, final double z, final double r, final double g, final double b, final float speed, final IAEItemStack is )
{
@@ -43,7 +42,6 @@ public class AssemblerFX extends EntityFX
this.motionX = 0;
this.motionY = 0;
this.motionZ = 0;
this.item = is;
this.speed = speed;
this.fi = new EntityFloatingItem( this, w, x, y, z, is.getItemStack() );
w.spawnEntityInWorld( this.fi );
src/main/java/appeng/client/render/effects/LightningArcFX.java
+10 -8
View File
@@ -28,9 +28,9 @@ public class LightningArcFX extends LightningFX
{
private static final Random RANDOM_GENERATOR = new Random();
final double rx;
final double ry;
final double rz;
private final double rx;
private final double ry;
private final double rz;
public LightningArcFX( final World w, final double x, final double y, final double z, final double ex, final double ey, final double ez, final double r, final double g, final double b )
{
@@ -47,17 +47,19 @@ public class LightningArcFX extends LightningFX
@Override
protected void regen()
{
final double i = 1.0 / ( this.steps - 1 );
final double i = 1.0 / ( this.getSteps() - 1 );
final double lastDirectionX = this.rx * i;
final double lastDirectionY = this.ry * i;
final double lastDirectionZ = this.rz * i;
final double len = Math.sqrt( lastDirectionX * lastDirectionX + lastDirectionY * lastDirectionY + lastDirectionZ * lastDirectionZ );
for( int s = 0; s < this.steps; s++ )
for( int s = 0; s < this.getSteps(); s++ )
{
this.Steps[s][0] = ( lastDirectionX + ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * len * 1.2 ) / 2.0;
this.Steps[s][1] = ( lastDirectionY + ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * len * 1.2 ) / 2.0;
this.Steps[s][2] = ( lastDirectionZ + ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * len * 1.2 ) / 2.0;
final double[][] localSteps = this.getPrecomputedSteps();
localSteps[s][0] = ( lastDirectionX + ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * len * 1.2 ) / 2.0;
localSteps[s][1] = ( lastDirectionY + ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * len * 1.2 ) / 2.0;
localSteps[s][2] = ( lastDirectionZ + ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * len * 1.2 ) / 2.0;
}
}
}
src/main/java/appeng/client/render/effects/LightningFX.java
+21 -16
View File
@@ -34,12 +34,12 @@ public class LightningFX extends EntityFX
{
private static final Random RANDOM_GENERATOR = new Random();
final int steps = this.getSteps();
final double[][] Steps;
private static final int STEPS = 5;
private final double[][] precomputedSteps;
private final double[] vertices = new double[3];
private final double[] verticesWithUV = new double[3];
float currentPoint = 0;
boolean hasData = false;
private boolean hasData = false;
public LightningFX( final World w, final double x, final double y, final double z, final double r, final double g, final double b )
{
@@ -50,7 +50,7 @@ public class LightningFX extends EntityFX
protected LightningFX( final World w, final double x, final double y, final double z, final double r, final double g, final double b, final int maxAge )
{
super( w, x, y, z, r, g, b );
this.Steps = new double[this.steps][3];
this.precomputedSteps = new double[LightningFX.STEPS][3];
this.motionX = 0;
this.motionY = 0;
this.motionZ = 0;
@@ -63,17 +63,17 @@ public class LightningFX extends EntityFX
double lastDirectionX = ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * 0.9;
double lastDirectionY = ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * 0.9;
double lastDirectionZ = ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * 0.9;
for( int s = 0; s < this.steps; s++ )
for( int s = 0; s < LightningFX.STEPS; s++ )
{
this.Steps[s][0] = lastDirectionX = ( lastDirectionX + ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * 0.9 ) / 2.0;
this.Steps[s][1] = lastDirectionY = ( lastDirectionY + ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * 0.9 ) / 2.0;
this.Steps[s][2] = lastDirectionZ = ( lastDirectionZ + ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * 0.9 ) / 2.0;
this.precomputedSteps[s][0] = lastDirectionX = ( lastDirectionX + ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * 0.9 ) / 2.0;
this.precomputedSteps[s][1] = lastDirectionY = ( lastDirectionY + ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * 0.9 ) / 2.0;
this.precomputedSteps[s][2] = lastDirectionZ = ( lastDirectionZ + ( RANDOM_GENERATOR.nextDouble() - 0.5 ) * 0.9 ) / 2.0;
}
}
private int getSteps()
protected int getSteps()
{
return 5;
return LightningFX.STEPS;
}
@Override
@@ -141,11 +141,11 @@ public class LightningFX extends EntityFX
double y = ( this.prevPosY + ( this.posY - this.prevPosY ) * l - interpPosY ) - offY;
double z = ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * l - interpPosZ ) - offZ;
for( int s = 0; s < this.steps; s++ )
for( int s = 0; s < LightningFX.STEPS; s++ )
{
final double xN = x + this.Steps[s][0];
final double yN = y + this.Steps[s][1];
final double zN = z + this.Steps[s][2];
final double xN = x + this.precomputedSteps[s][0];
final double yN = y + this.precomputedSteps[s][1];
final double zN = z + this.precomputedSteps[s][2];
final double xD = xN - x;
final double yD = yN - y;
@@ -170,7 +170,7 @@ public class LightningFX extends EntityFX
oz = ( xD * 0 ) - ( 1 * yD );
}
final double ss = Math.sqrt( ox * ox + oy * oy + oz * oz ) / ( ( ( (double) this.steps - (double) s ) / this.steps ) * scale );
final double ss = Math.sqrt( ox * ox + oy * oy + oz * oz ) / ( ( ( (double) LightningFX.STEPS - (double) s ) / LightningFX.STEPS ) * scale );
ox /= ss;
oy /= ss;
oz /= ss;
@@ -218,4 +218,9 @@ public class LightningFX extends EntityFX
this.verticesWithUV[x] = b[x];
}
}
protected double[][] getPrecomputedSteps()
{
return this.precomputedSteps;
}
}
src/main/java/appeng/client/render/items/PaintBallRender.java
+106 -107
View File
@@ -19,110 +19,109 @@
package appeng.client.render.items;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraftforge.client.IItemRenderer;
import appeng.api.util.AEColor;
import appeng.client.texture.ExtraItemTextures;
import appeng.items.misc.ItemPaintBall;
public class PaintBallRender implements IItemRenderer
{
@Override
public boolean handleRenderType( final ItemStack item, final ItemRenderType type )
{
return true;
}
@Override
public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item, final ItemRendererHelper helper )
{
return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION;
}
@Override
public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
{
IIcon par2Icon = item.getIconIndex();
if( item.getItemDamage() >= 20 )
{
par2Icon = ExtraItemTextures.ItemPaintBallShimmer.getIcon();
}
final float f4 = par2Icon.getMinU();
final float f5 = par2Icon.getMaxU();
final float f6 = par2Icon.getMinV();
final float f7 = par2Icon.getMaxV();
final ItemPaintBall ipb = (ItemPaintBall) item.getItem();
final Tessellator tessellator = Tessellator.instance;
GL11.glPushMatrix();
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
final AEColor col = ipb.getColor( item );
final int colorValue = item.getItemDamage() >= 20 ? col.mediumVariant : col.mediumVariant;
final int r = ( colorValue >> 16 ) & 0xff;
final int g = ( colorValue >> 8 ) & 0xff;
final int b = ( colorValue ) & 0xff;
if( item.getItemDamage() >= 20 )
{
final float fail = 0.7f;
final int full = (int) ( 255 * 0.3 );
GL11.glColor4ub( (byte) ( full + r * fail ), (byte) ( full + g * fail ), (byte) ( full + b * fail ), (byte) 255 );
}
else
{
GL11.glColor4ub( (byte) r, (byte) g, (byte) b, (byte) 255 );
}
if( type == ItemRenderType.INVENTORY )
{
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
{
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
}
final float f12 = 0.0625F;
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 );
}
GL11.glColor4f( 1, 1, 1, 1.0F );
GL11.glPopAttrib();
GL11.glPopMatrix();
}
}
//import org.lwjgl.opengl.GL11;
//
//import net.minecraft.client.renderer.ItemRenderer;
//import net.minecraft.client.renderer.Tessellator;
//import net.minecraft.item.ItemStack;
//import net.minecraftforge.client.IItemRenderer;
//
//import appeng.api.util.AEColor;
//import appeng.client.texture.ExtraItemTextures;
//import appeng.items.misc.ItemPaintBall;
//
//
//public class PaintBallRender implements IItemRenderer
//{
//
// @Override
// public boolean handleRenderType( final ItemStack item, final ItemRenderType type )
// {
// return true;
// }
//
// @Override
// public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item, final ItemRendererHelper helper )
// {
// return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION;
// }
//
// @Override
// public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
// {
// IIcon par2Icon = item.getIconIndex();
// if( item.getItemDamage() >= 20 )
// {
// par2Icon = ExtraItemTextures.ItemPaintBallShimmer.getIcon();
// }
//
// final float f4 = par2Icon.getMinU();
// final float f5 = par2Icon.getMaxU();
// final float f6 = par2Icon.getMinV();
// final float f7 = par2Icon.getMaxV();
//
// final ItemPaintBall ipb = (ItemPaintBall) item.getItem();
//
// final Tessellator tessellator = Tessellator.getInstance();
// GL11.glPushMatrix();
// GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
//
// final AEColor col = ipb.getColor( item );
//
// final int colorValue = item.getItemDamage() >= 20 ? col.mediumVariant : col.mediumVariant;
// final int r = ( colorValue >> 16 ) & 0xff;
// final int g = ( colorValue >> 8 ) & 0xff;
// final int b = ( colorValue ) & 0xff;
//
// if( item.getItemDamage() >= 20 )
// {
// final float fail = 0.7f;
// final int full = (int) ( 255 * 0.3 );
// GL11.glColor4ub( (byte) ( full + r * fail ), (byte) ( full + g * fail ), (byte) ( full + b * fail ), (byte) 255 );
// }
// else
// {
// GL11.glColor4ub( (byte) r, (byte) g, (byte) b, (byte) 255 );
// }
//
// if( type == ItemRenderType.INVENTORY )
// {
// 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
// {
// GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
// }
// final float f12 = 0.0625F;
// 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 );
// }
//
// GL11.glColor4f( 1, 1, 1, 1.0F );
//
// GL11.glPopAttrib();
// GL11.glPopMatrix();
// }
//}
src/main/java/appeng/client/render/model/ModelCompass.java
+7 -7
View File
@@ -26,14 +26,14 @@ import net.minecraft.client.model.ModelRenderer;
public class ModelCompass extends ModelBase
{
final ModelRenderer Ring1;
final ModelRenderer Ring2;
final ModelRenderer Ring3;
final ModelRenderer Ring4;
final ModelRenderer Middle;
final ModelRenderer Base;
private final ModelRenderer Ring1;
private final ModelRenderer Ring2;
private final ModelRenderer Ring3;
private final ModelRenderer Ring4;
private final ModelRenderer Middle;
private final ModelRenderer Base;
final ModelRenderer Pointer;
private final ModelRenderer Pointer;
public ModelCompass()
{