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

Code format

Browse Source
This commit is contained in:
yueh
2016-01-01 01:48:15 +01:00
parent 68c3ea5ae9
commit ab689f2a48
96 changed files with 419 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/AEBaseBlock.java
+1 -1
View File
@@ -169,7 +169,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
{
final Class<? extends BaseBlockRender> re = this.getRenderer();
if( re == null )
{
{
return null; // use 1.8 models.
}
final BaseBlockRender renderer = re.newInstance();
src/main/java/appeng/block/misc/BlockLightDetector.java
+13 -11
View File
@@ -18,6 +18,7 @@
package appeng.block.misc;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
@@ -44,6 +45,7 @@ import appeng.helpers.ICustomCollision;
import appeng.helpers.MetaRotation;
import appeng.tile.misc.TileLightDetector;
public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock, ICustomCollision
{
@@ -86,7 +88,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
final IBlockState state,
final EnumFacing side )
{
if ( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, pos ) ).isReady() )
if( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, pos ) ).isReady() )
{
return ( (World) w ).getLightFromNeighbors( pos ) - 6;
}
@@ -103,7 +105,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
super.onNeighborChange( world, pos, neighbor );
final TileLightDetector tld = this.getTileEntity( world, pos );
if ( tld != null )
if( tld != null )
{
tld.updateLight();
}
@@ -165,12 +167,12 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
final List<AxisAlignedBB> out,
final Entity e )
{/*
* double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 *
* getUp().offsetY; double zOff = -0.15 * getUp().offsetZ; out.add(
* AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff +
* (double) y + 0.15, zOff + (double) z + 0.15,// ahh xOff + (double) x
* + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) );
*/
* double xOff = -0.15 * getUp().offsetX; double yOff = -0.15 *
* getUp().offsetY; double zOff = -0.15 * getUp().offsetZ; out.add(
* AxisAlignedBB.getBoundingBox( xOff + (double) x + 0.15, yOff +
* (double) y + 0.15, zOff + (double) z + 0.15,// ahh xOff + (double) x
* + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) );
*/
}
@Override
@@ -181,7 +183,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
final Block neighborBlock )
{
final EnumFacing up = getOrientable( w, pos ).getUp();
if ( !canPlaceAt( w, pos, up.getOpposite() ) )
if( !canPlaceAt( w, pos, up.getOpposite() ) )
{
dropTorch( w, pos );
}
@@ -200,9 +202,9 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
final World w,
final BlockPos pos )
{
for ( final EnumFacing dir : EnumFacing.VALUES )
for( final EnumFacing dir : EnumFacing.VALUES )
{
if ( canPlaceAt( w, pos, dir ) )
if( canPlaceAt( w, pos, dir ) )
{
return true;
}
src/main/java/appeng/block/networking/BlockCableBus.java
+20 -18
View File
@@ -18,6 +18,7 @@
package appeng.block.networking;
import java.util.EnumSet;
import java.util.List;
import java.util.Random;
@@ -68,10 +69,11 @@ import appeng.tile.networking.TileCableBus;
import appeng.tile.networking.TileCableBusTESR;
import appeng.util.Platform;
// TODO: MFR INTEGRATION
//@Interface( iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = IntegrationType.MFR )
public class BlockCableBus extends AEBaseTileBlock // implements
// IRedNetConnection
// IRedNetConnection
{
private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer();
@@ -175,11 +177,11 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final BlockPos pos )
{
final IBlockState block = world.getBlockState( pos );
if ( block != null && block.getBlock() != this )
if( block != null && block.getBlock() != this )
{
return block.getBlock().getLightValue( world, pos );
}
if ( block == null )
if( block == null )
{
return 0;
}
@@ -219,10 +221,10 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final EntityPlayer player,
final boolean willHarvest )
{
if ( player.capabilities.isCreativeMode )
if( player.capabilities.isCreativeMode )
{
final AEBaseTile tile = this.getTileEntity( world, pos );
if ( tile != null )
if( tile != null )
{
tile.disableDrops();
}
@@ -237,7 +239,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final BlockPos pos,
EnumFacing side )
{
if ( side == null )
if( side == null )
{
side = EnumFacing.UP;
}
@@ -249,7 +251,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
public boolean canRenderInLayer(
final EnumWorldBlockLayer layer )
{
if ( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
{
return layer == EnumWorldBlockLayer.CUTOUT || layer == EnumWorldBlockLayer.TRANSLUCENT;
}
@@ -266,11 +268,11 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final Vec3 v3 = target.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() );
final SelectedPart sp = cb( world, pos ).selectPart( v3 );
if ( sp.part != null )
if( sp.part != null )
{
return sp.part.getItemStack( PartItemStack.Pick );
}
else if ( sp.facade != null )
else if( sp.facade != null )
{
return sp.facade.getItemStack();
}
@@ -286,7 +288,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final EffectRenderer effectRenderer )
{
final Object object = cb( world, target.getBlockPos() );
if ( object instanceof IPartHost )
if( object instanceof IPartHost )
{
final IPartHost host = (IPartHost) object;
@@ -320,7 +322,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final EffectRenderer effectRenderer )
{
final Object object = cb( world, pos );
if ( object instanceof IPartHost )
if( object instanceof IPartHost )
{
final IPartHost host = (IPartHost) object;
@@ -349,7 +351,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final IBlockState state,
final Block neighborBlock )
{
if ( Platform.isServer() )
if( Platform.isServer() )
{
cb( w, pos ).onNeighborChanged();
}
@@ -362,11 +364,11 @@ public class BlockCableBus extends AEBaseTileBlock // implements
final TileEntity te = w.getTileEntity( pos );
ICableBusContainer out = null;
if ( te instanceof TileCableBus )
if( te instanceof TileCableBus )
{
out = ( (TileCableBus) te ).getCableBus();
}
else if ( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.FMP ) )
else if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.FMP ) )
{
out = ( (IFMP) IntegrationRegistry.INSTANCE.getInstance( IntegrationType.FMP ) ).getCableContainer( te );
}
@@ -414,7 +416,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
{
return cb( world, pos ).recolourBlock( side, AEColor.values()[color.ordinal()], who );
}
catch ( final Throwable ignored )
catch( final Throwable ignored )
{
}
return false;
@@ -437,12 +439,12 @@ public class BlockCableBus extends AEBaseTileBlock // implements
{
final TileEntity te = w.getTileEntity( pos );
if ( noTesrTile.isInstance( te ) )
if( noTesrTile.isInstance( te ) )
{
return (T) te;
}
if ( tesrTile != null && tesrTile.isInstance( te ) )
if( tesrTile != null && tesrTile.isInstance( te ) )
{
return (T) te;
}
@@ -463,7 +465,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements
noTesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBus.class.getName() );
setTileEntity( noTesrTile );
GameRegistry.registerTileEntity( noTesrTile, "BlockCableBus" );
if ( Platform.isClient() )
if( Platform.isClient() )
{
tesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBusTESR.class.getName() );
GameRegistry.registerTileEntity( tesrTile, "ClientOnly_TESR_CableBus" );
src/main/java/appeng/client/ItemRenderType.java
+2
View File
@@ -1,5 +1,7 @@
package appeng.client;
public enum ItemRenderType
{
INVENTORY, ENTITY
src/main/java/appeng/client/SmartModel.java
+3 -1
View File
@@ -1,6 +1,7 @@
package appeng.client;
import java.util.Collections;
import java.util.List;
@@ -23,6 +24,7 @@ import appeng.client.render.BlockRenderInfo;
import appeng.client.render.ModelGenerator;
import appeng.client.texture.MissingIcon;
// net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer
public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemModel
{
@@ -65,7 +67,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode
{
return false;
}
@Override
public TextureAtlasSprite getParticleTexture()
{
src/main/java/appeng/client/gui/AEBaseGui.java
+4 -4
View File
@@ -823,11 +823,11 @@ public abstract class AEBaseGui extends GuiContainer
final float f1 = 0.00390625F;
final float f = 0.00390625F;
final float par6 = 16;
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + par6, this.zLevel).tex( ( par3 + 0 ) * f, ( par4 + par6 ) * f1 ).endVertex();
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + par6, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + par6 ) * f1 ).endVertex();
final float par5 = 16;
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + par6, this.zLevel).tex( ( par3 + par5 ) * f, ( par4 + par6 ) * f1 ).endVertex();
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + 0, this.zLevel).tex( ( par3 + par5 ) * f, ( par4 + 0 ) * f1 ).endVertex();
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + 0, this.zLevel).tex( ( par3 + 0 ) * f, ( par4 + 0 ) * f1 ).endVertex();
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + par6, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + par6 ) * f1 ).endVertex();
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + 0, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + 0 ) * f1 ).endVertex();
worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + 0, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + 0 ) * f1 ).endVertex();
tessellator.draw();
}
catch( final Exception err )
src/main/java/appeng/client/render/AppEngRenderItem.java
+6 -6
View File
@@ -141,12 +141,12 @@ public class AppEngRenderItem extends RenderItem
{
final WorldRenderer wr = par1Tessellator.getWorldRenderer();
wr.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM);
wr.color( (par6>>16)&0xff,(par6>>8)&0xff,(par6)&0xff,(par6>>24)&0xff ).pos( par2, par3, 0.0D ).endVertex();
wr.color( (par6>>16)&0xff,(par6>>8)&0xff,(par6)&0xff,(par6>>24)&0xff ).pos(par2, par3 + par5, 0.0D ).endVertex();
wr.color( (par6>>16)&0xff,(par6>>8)&0xff,(par6)&0xff,(par6>>24)&0xff ).pos( par2 + par4, par3 + par5, 0.0D ).endVertex();
wr.color( (par6>>16)&0xff,(par6>>8)&0xff,(par6)&0xff,(par6>>24)&0xff ).pos( par2 + par4, par3, 0.0D ).endVertex();
wr.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM );
wr.color( ( par6 >> 16 ) & 0xff, ( par6 >> 8 ) & 0xff, ( par6 ) & 0xff, ( par6 >> 24 ) & 0xff ).pos( par2, par3, 0.0D ).endVertex();
wr.color( ( par6 >> 16 ) & 0xff, ( par6 >> 8 ) & 0xff, ( par6 ) & 0xff, ( par6 >> 24 ) & 0xff ).pos( par2, par3 + par5, 0.0D ).endVertex();
wr.color( ( par6 >> 16 ) & 0xff, ( par6 >> 8 ) & 0xff, ( par6 ) & 0xff, ( par6 >> 24 ) & 0xff ).pos( par2 + par4, par3 + par5, 0.0D ).endVertex();
wr.color( ( par6 >> 16 ) & 0xff, ( par6 >> 8 ) & 0xff, ( par6 ) & 0xff, ( par6 >> 24 ) & 0xff ).pos( par2 + par4, par3, 0.0D ).endVertex();
par1Tessellator.draw();
}
src/main/java/appeng/client/render/SMFace.java
-1
View File
@@ -2,7 +2,6 @@
package appeng.client.render;
import org.lwjgl.util.vector.Vector3f;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
src/main/java/appeng/client/render/SpatialSkyRender.java
+4 -4
View File
@@ -109,10 +109,10 @@ public class SpatialSkyRender extends IRenderHandler
}
worldrenderer.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM );
worldrenderer.color(0f,0f,0f,1f).pos( -100.0D, -100.0D, -100.0D).tex( 0.0D, 0.0D ).endVertex();
worldrenderer.color(0f,0f,0f,1f).pos( -100.0D, -100.0D, 100.0D).tex( 0.0D, 16.0D ).endVertex();
worldrenderer.color(0f,0f,0f,1f).pos( 100.0D, -100.0D, 100.0D).tex( 16.0D, 16.0D ).endVertex();
worldrenderer.color(0f,0f,0f,1f).pos( 100.0D, -100.0D, -100.0D).tex( 16.0D, 0.0D ).endVertex();
worldrenderer.color( 0f, 0f, 0f, 1f ).pos( -100.0D, -100.0D, -100.0D ).tex( 0.0D, 0.0D ).endVertex();
worldrenderer.color( 0f, 0f, 0f, 1f ).pos( -100.0D, -100.0D, 100.0D ).tex( 0.0D, 16.0D ).endVertex();
worldrenderer.color( 0f, 0f, 0f, 1f ).pos( 100.0D, -100.0D, 100.0D ).tex( 16.0D, 16.0D ).endVertex();
worldrenderer.color( 0f, 0f, 0f, 1f ).pos( 100.0D, -100.0D, -100.0D ).tex( 16.0D, 0.0D ).endVertex();
tessellator.draw();
GL11.glPopMatrix();
}
src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java
+16 -16
View File
@@ -193,31 +193,31 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
final IAESprite ic = ExtraBlockTextures.BlockInscriberInside.getIcon();
tess.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM );
float middle = 0.5f;
middle += 0.02f;
final float TwoPx = 2.0f / 16.0f;
tess.pos( TwoPx, middle + press, TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) ).endVertex();
tess.pos( TwoPx, middle + press, TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle + press, TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 2 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle + press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) ).endVertex();
tess.pos( TwoPx, middle + press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 13 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle + press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) ).endVertex();
tess.pos( TwoPx, middle + press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 13 ) ).endVertex();
tess.pos( TwoPx, middle + press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle + press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) ).endVertex();
tess.pos( TwoPx, middle + press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle + press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) ).endVertex();
final float base = 0.4f;
tess.pos( 1.0 - TwoPx, middle + base, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
tess.pos( TwoPx, middle + base, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle + base, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
tess.pos( TwoPx, middle + base, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
middle -= 2.0f * 0.02f;
tess.pos( 1.0 - TwoPx, middle - press, TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) ).endVertex();
tess.pos( TwoPx, middle - press, TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 2 ) ).endVertex();
tess.pos( TwoPx, middle - press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle - press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 13 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle - press, TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 2 ) ).endVertex();
tess.pos( TwoPx, middle - press, TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 2 ) ).endVertex();
tess.pos( TwoPx, middle - press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 13 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle - press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 13 ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle - press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) ).endVertex();
tess.pos( TwoPx, middle - press, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) ).endVertex();
tess.pos( TwoPx, middle - base, 1.0 - TwoPx).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle + -base, 1.0 - TwoPx).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle - press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 ) ).endVertex();
tess.pos( TwoPx, middle - press, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 ) ).endVertex();
tess.pos( TwoPx, middle - base, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 14 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
tess.pos( 1.0 - TwoPx, middle + -base, 1.0 - TwoPx ).tex( ic.getInterpolatedU( 2 ), ic.getInterpolatedV( 3 - 16 * ( press - base ) ) ).endVertex();
Tessellator.getInstance().draw();
src/main/java/appeng/client/render/effects/CraftingFx.java
+4 -4
View File
@@ -97,10 +97,10 @@ public class CraftingFx extends EntityBreakingFX
// AELog.info( "" + partialTick );
final float f14 = 1.0F;
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX - x * scale - rx * scale, offY - y * scale, offZ - z * scale - rz * scale).tex( f7, f9 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX - x * scale + rx * scale, offY + y * scale, offZ - z * scale + rz * scale).tex( f7, f8 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX + x * scale + rx * scale, offY + y * scale, offZ + z * scale + rz * scale).tex( f6, f8 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX + x * scale - rx * scale, offY - y * scale, offZ + z * scale - rz * scale).tex( f6, f9 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX - x * scale - rx * scale, offY - y * scale, offZ - z * scale - rz * scale ).tex( f7, f9 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX - x * scale + rx * scale, offY + y * scale, offZ - z * scale + rz * scale ).tex( f7, f8 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX + x * scale + rx * scale, offY + y * scale, offZ + z * scale + rz * scale ).tex( f6, f8 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( offX + x * scale - rx * scale, offY - y * scale, offZ + z * scale - rz * scale ).tex( f6, f9 ).endVertex();
}
}
src/main/java/appeng/client/render/effects/EnergyFx.java
+4 -4
View File
@@ -87,10 +87,10 @@ public class EnergyFx extends EntityBreakingFX
if( blkX == this.startBlkX && blkY == this.startBlkY && blkZ == this.startBlkZ )
{
final float f14 = 1.0F;
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10).tex( f7, f9 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10).tex( f7, f8 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10).tex( f6, f8 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10).tex( f6, f9 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10 ).tex( f7, f9 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10 ).tex( f7, f8 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10 ).tex( f6, f8 ).endVertex();
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10 ).tex( f6, f9 ).endVertex();
}
}
src/main/java/appeng/client/render/effects/LightningFX.java
+11 -11
View File
@@ -91,7 +91,7 @@ public class LightningFX extends EntityFX
float green = this.particleGreen * j * 0.95f;
float blue = this.particleBlue * j;
float alpha = this.particleAlpha;
if( this.particleAge == 3 )
{
this.regen();
@@ -126,9 +126,9 @@ public class LightningFX extends EntityFX
offX *= 0.001;
offY *= 0.001;
offZ *= 0.001;
red=this.particleRed * j * 0.4f;
green=this.particleGreen * j * 0.25f;
blue= this.particleBlue * j * 0.45f;
red = this.particleRed * j * 0.4f;
green = this.particleGreen * j * 0.25f;
blue = this.particleBlue * j * 0.45f;
}
else
{
@@ -136,7 +136,7 @@ public class LightningFX extends EntityFX
offY = 0;
offZ = 0;
scale = 0.02;
red= this.particleRed * j * 0.9f;
red = this.particleRed * j * 0.9f;
green = this.particleGreen * j * 0.65f;
blue = this.particleBlue * j * 0.85f;
}
@@ -191,7 +191,7 @@ public class LightningFX extends EntityFX
b[1] = y;
b[2] = z;
this.draw( red,green,blue,tess, a, b, f6, f8 );
this.draw( red, green, blue, tess, a, b, f6, f8 );
x = xN;
y = yN;
@@ -210,14 +210,14 @@ public class LightningFX extends EntityFX
this.hasData = false;
}
private void draw( float red,float green, float blue, final WorldRenderer tess, final double[] a, final double[] b, final double f6, final double f8 )
private void draw( float red, float green, float blue, final WorldRenderer tess, final double[] a, final double[] b, final double f6, final double f8 )
{
if( this.hasData )
{
tess.color(red,green,blue,particleAlpha).pos( a[0], a[1], a[2]).tex( f6, f8 ).endVertex();
tess.color(red,green,blue,particleAlpha).pos( this.vertices[0], this.vertices[1], this.vertices[2]).tex( f6, f8 ).endVertex();
tess.color(red,green,blue,particleAlpha).pos( this.verticesWithUV[0], this.verticesWithUV[1], this.verticesWithUV[2]).tex( f6, f8 ).endVertex();
tess.color(red,green,blue,particleAlpha).pos( b[0], b[1], b[2]).tex( f6, f8 ).endVertex();
tess.color( red, green, blue, particleAlpha ).pos( a[0], a[1], a[2] ).tex( f6, f8 ).endVertex();
tess.color( red, green, blue, particleAlpha ).pos( this.vertices[0], this.vertices[1], this.vertices[2] ).tex( f6, f8 ).endVertex();
tess.color( red, green, blue, particleAlpha ).pos( this.verticesWithUV[0], this.verticesWithUV[1], this.verticesWithUV[2] ).tex( f6, f8 ).endVertex();
tess.color( red, green, blue, particleAlpha ).pos( b[0], b[1], b[2] ).tex( f6, f8 ).endVertex();
}
this.hasData = true;
for( int x = 0; x < 3; x++ )
src/main/java/appeng/client/render/effects/MatterCannonFX.java
+5 -5
View File
@@ -84,9 +84,9 @@ public class MatterCannonFX extends EntityBreakingFX
final float f13 = (float) ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * par2 - interpPosZ );
final float f14 = 1.0F;
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10).tex( f7, f9 );
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10).tex( f7, f8 );
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10).tex( f6, f8 );
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10).tex( f6, f9 );
}
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10 ).tex( f7, f9 );
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10 ).tex( f7, f8 );
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10 ).tex( f6, f8 );
par1Tessellator.color( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha ).pos( f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10 ).tex( f6, f9 );
}
}
src/main/java/appeng/client/render/items/ToolBiometricCardRender.java
+5 -6
View File
@@ -25,22 +25,21 @@ import appeng.client.ItemRenderType;
// TODO - PORT
public class ToolBiometricCardRender // TileEntityItemStackRenderer
public class ToolBiometricCardRender // TileEntityItemStackRenderer
{
public boolean handleRenderType( final ItemStack item, final ItemRenderType type )
{
return true;
}
public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item )//, final ItemRendererHelper helper )
public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item )// , final ItemRendererHelper
// helper )
{
return false;//return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION;
return false;// return helper == ItemRendererHelper.ENTITY_BOBBING || helper ==
// ItemRendererHelper.ENTITY_ROTATION;
}
public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
{
/*
src/main/java/appeng/client/render/items/ToolColorApplicatorRender.java
+3 -2
View File
@@ -24,7 +24,7 @@ import net.minecraft.item.ItemStack;
import appeng.client.ItemRenderType;
public class ToolColorApplicatorRender
public class ToolColorApplicatorRender
{
public boolean handleRenderType( final ItemStack item, final ItemRenderType type )
@@ -34,7 +34,8 @@ public class ToolColorApplicatorRender
public boolean shouldUseRenderHelper( final ItemRenderType type, final ItemStack item )
{
return false;//return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION;
return false;// return helper == ItemRendererHelper.ENTITY_BOBBING || helper ==
// ItemRendererHelper.ENTITY_ROTATION;
}
public void renderItem( final ItemRenderType type, final ItemStack item, final Object... data )
src/main/java/appeng/core/stats/PlayerStatsRegistration.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class PlayerStatsRegistration
/**
* is true if the {@link appeng.core.features.AEFeature#Achievements} is enabled in the
*
* @param config}
* @param config
*/
private final boolean isAchievementFeatureEnabled;
src/main/java/appeng/items/tools/ToolBiometricCard.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard
if( Platform.isClient() )
{
// TODO - PORT ToolBiometricCardRender
//MinecraftForgeClient.registerItemRenderer( this, new ToolBiometricCardRender() );
// MinecraftForgeClient.registerItemRenderer( this, new ToolBiometricCardRender() );
}
}
src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
+2 -2
View File
@@ -108,8 +108,8 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
this.setFeature( EnumSet.of( AEFeature.ColorApplicator, AEFeature.PoweredTools ) );
if( Platform.isClient() )
{
//TODO - color applicator
//MinecraftForgeClient.registerItemRenderer( this, new ToolColorApplicatorRender() );
// TODO - color applicator
// MinecraftForgeClient.registerItemRenderer( this, new ToolColorApplicatorRender() );
}
}
src/main/java/appeng/server/ServerHelper.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class ServerHelper extends CommonHelper
if( server != null )
{
return (List)server.getConfigurationManager().playerEntityList;
return (List) server.getConfigurationManager().playerEntityList;
}
}
src/main/java/appeng/tile/AEBaseTile.java
+4 -2
View File
@@ -411,14 +411,16 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
@Override
public EnumFacing getForward()
{
if ( forward == null ) return EnumFacing.NORTH;
if( forward == null )
return EnumFacing.NORTH;
return this.forward;
}
@Override
public EnumFacing getUp()
{
if ( up == null ) return EnumFacing.UP;
if( up == null )
return EnumFacing.UP;
return this.up;
}
src/main/java/appeng/tile/misc/TileLightDetector.java
-1
View File
@@ -19,7 +19,6 @@
package appeng.tile.misc;
import net.minecraft.util.ITickable;
import appeng.tile.AEBaseTile;