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

Basic reformat, hit once, hope never again

Browse Source
This commit is contained in:
thatsIch
2015-04-03 08:54:31 +02:00
parent 4ff1631f89
commit d34c988c88
886 changed files with 31400 additions and 30990 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/items/ItemEncodedPatternRenderer.java
+7 -5
View File
@@ -18,6 +18,7 @@
package appeng.client.render.items;
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;
@@ -29,6 +30,7 @@ import net.minecraftforge.client.IItemRenderer;
import appeng.items.misc.ItemEncodedPattern;
public class ItemEncodedPatternRenderer implements IItemRenderer
{
@@ -36,14 +38,14 @@ public class ItemEncodedPatternRenderer implements IItemRenderer
boolean recursive;
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type)
public boolean handleRenderType( ItemStack item, ItemRenderType type )
{
boolean isShiftHeld = Keyboard.isKeyDown( Keyboard.KEY_LSHIFT ) || Keyboard.isKeyDown( Keyboard.KEY_RSHIFT );
if ( !this.recursive && type == IItemRenderer.ItemRenderType.INVENTORY && isShiftHeld )
if( !this.recursive && type == IItemRenderer.ItemRenderType.INVENTORY && isShiftHeld )
{
ItemEncodedPattern iep = (ItemEncodedPattern) item.getItem();
if ( iep.getOutput( item ) != null )
if( iep.getOutput( item ) != null )
return true;
}
@@ -51,13 +53,13 @@ public class ItemEncodedPatternRenderer implements IItemRenderer
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper)
public boolean shouldUseRenderHelper( ItemRenderType type, ItemStack item, ItemRendererHelper helper )
{
return false;
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
public void renderItem( ItemRenderType type, ItemStack item, Object... data )
{
this.recursive = true;
src/main/java/appeng/client/render/items/PaintBallRender.java
+12 -11
View File
@@ -31,26 +31,27 @@ import appeng.api.util.AEColor;
import appeng.client.texture.ExtraItemTextures;
import appeng.items.misc.ItemPaintBall;
public class PaintBallRender implements IItemRenderer
{
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type)
public boolean handleRenderType( ItemStack item, ItemRenderType type )
{
return true;
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper)
public boolean shouldUseRenderHelper( ItemRenderType type, ItemStack item, ItemRendererHelper helper )
{
return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION;
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
public void renderItem( ItemRenderType type, ItemStack item, Object... data )
{
IIcon par2Icon = item.getIconIndex();
if ( item.getItemDamage() >= 20 )
if( item.getItemDamage() >= 20 )
par2Icon = ExtraItemTextures.ItemPaintBallShimmer.getIcon();
float f4 = par2Icon.getMinU();
@@ -68,19 +69,19 @@ public class PaintBallRender implements IItemRenderer
AEColor col = ipb.getColor( item );
int colorValue = item.getItemDamage() >= 20 ? col.mediumVariant : col.mediumVariant;
int r = (colorValue >> 16) & 0xff;
int g = (colorValue >> 8) & 0xff;
int r = ( colorValue >> 16 ) & 0xff;
int g = ( colorValue >> 8 ) & 0xff;
int b = ( colorValue ) & 0xff;
int full = (int) (255 * 0.3);
int full = (int) ( 255 * 0.3 );
float fail = 0.7f;
if ( item.getItemDamage() >= 20 )
GL11.glColor4ub( (byte) (full + r * fail), (byte) (full + g * fail), (byte) (full + b * fail), (byte) 255 );
if( item.getItemDamage() >= 20 )
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 )
if( type == ItemRenderType.INVENTORY )
{
GL11.glScalef( 16F, 16F, 10F );
GL11.glTranslatef( 0.0F, 1.0F, 0.0F );
@@ -97,7 +98,7 @@ public class PaintBallRender implements IItemRenderer
}
else
{
if ( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
GL11.glTranslatef( 0.0F, 0.0F, 0.0F );
else
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
src/main/java/appeng/client/render/items/ToolBiometricCardRender.java
+17 -16
View File
@@ -18,7 +18,6 @@
package appeng.client.render.items;
import com.mojang.authlib.GameProfile;
import org.lwjgl.opengl.GL11;
@@ -28,27 +27,30 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraftforge.client.IItemRenderer;
import com.mojang.authlib.GameProfile;
import appeng.api.implementations.items.IBiometricCard;
import appeng.api.util.AEColor;
import appeng.client.texture.ExtraItemTextures;
public class ToolBiometricCardRender implements IItemRenderer
{
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type)
public boolean handleRenderType( ItemStack item, ItemRenderType type )
{
return true;
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper)
public boolean shouldUseRenderHelper( ItemRenderType type, ItemStack item, ItemRendererHelper helper )
{
return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION;
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
public void renderItem( ItemRenderType type, ItemStack item, Object... data )
{
IIcon par2Icon = item.getIconIndex();
@@ -62,7 +64,7 @@ public class ToolBiometricCardRender implements IItemRenderer
GL11.glPushMatrix();
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
if ( type == ItemRenderType.INVENTORY )
if( type == ItemRenderType.INVENTORY )
{
GL11.glColor4f( 1, 1, 1, 1.0F );
GL11.glScalef( 16F, 16F, 10F );
@@ -94,10 +96,10 @@ public class ToolBiometricCardRender implements IItemRenderer
float v = ExtraItemTextures.White.getIcon().getInterpolatedV( 8.1 );
String username = "";
if ( item.getItem() instanceof IBiometricCard )
if( item.getItem() instanceof IBiometricCard )
{
GameProfile gp = (( IBiometricCard) item.getItem() ).getProfile(item);
if ( gp != null )
GameProfile gp = ( (IBiometricCard) item.getItem() ).getProfile( item );
if( gp != null )
username = gp.getName();
}
int hash = username.length() > 0 ? username.hashCode() : 0;
@@ -110,26 +112,25 @@ public class ToolBiometricCardRender implements IItemRenderer
float z = 0;
AEColor col = AEColor.values()[Math.abs( 3 + hash ) % AEColor.values().length];
if ( hash == 0 )
if( hash == 0 )
col = AEColor.Black;
for (int x = 0; x < 8; x++)// 8
for( int x = 0; x < 8; x++ )// 8
{
for (int y = 0; y < 6; y++)// 6
for( int y = 0; y < 6; y++ )// 6
{
boolean isLit = false;
float scale = 0.3f / 255.0f;
if ( x == 0 || y == 0 || x == 7 || y == 5 )
if( x == 0 || y == 0 || x == 7 || y == 5 )
isLit = false;
else
isLit = (hash & (1 << x)) != 0 || (hash & (1 << y)) != 0;
isLit = ( hash & ( 1 << x ) ) != 0 || ( hash & ( 1 << y ) ) != 0;
if ( isLit )
if( isLit )
tessellator.setColorOpaque_I( col.mediumVariant );
else
tessellator.setColorOpaque_F( ((col.blackVariant >> 16) & 0xff) * scale, ((col.blackVariant >> 8) & 0xff) * scale,
(col.blackVariant & 0xff) * scale );
tessellator.setColorOpaque_F( ( ( col.blackVariant >> 16 ) & 0xff ) * scale, ( ( col.blackVariant >> 8 ) & 0xff ) * scale, ( col.blackVariant & 0xff ) * scale );
tessellator.addVertexWithUV( x, y, z, u, v );
tessellator.addVertexWithUV( x + 1, y, z, u, v );
src/main/java/appeng/client/render/items/ToolColorApplicatorRender.java
+11 -9
View File
@@ -18,6 +18,7 @@
package appeng.client.render.items;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.renderer.ItemRenderer;
@@ -30,23 +31,24 @@ import appeng.api.util.AEColor;
import appeng.client.texture.ExtraItemTextures;
import appeng.items.tools.powered.ToolColorApplicator;
public class ToolColorApplicatorRender implements IItemRenderer
{
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type)
public boolean handleRenderType( ItemStack item, ItemRenderType type )
{
return true;
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper)
public boolean shouldUseRenderHelper( ItemRenderType type, ItemStack item, ItemRendererHelper helper )
{
return helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION;
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
public void renderItem( ItemRenderType type, ItemStack item, Object... data )
{
IIcon par2Icon = item.getIconIndex();
@@ -60,7 +62,7 @@ public class ToolColorApplicatorRender implements IItemRenderer
GL11.glPushMatrix();
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
if ( type == ItemRenderType.INVENTORY )
if( type == ItemRenderType.INVENTORY )
{
GL11.glColor4f( 1, 1, 1, 1.0F );
GL11.glScalef( 16F, 16F, 10F );
@@ -78,9 +80,9 @@ public class ToolColorApplicatorRender implements IItemRenderer
}
else
{
if ( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
GL11.glTranslatef( 0.0F, 0.0F, 0.0F );
else if ( type == ItemRenderType.EQUIPPED )
else if( type == ItemRenderType.EQUIPPED )
GL11.glTranslatef( 0.0F, 0.0F, 0.0F );
else
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
@@ -98,15 +100,15 @@ public class ToolColorApplicatorRender implements IItemRenderer
IIcon light = ExtraItemTextures.ToolColorApplicatorTip_Light.getIcon();
GL11.glScalef( 1F / 16F, 1F / 16F, 1F );
if ( type != ItemRenderType.INVENTORY )
if( type != ItemRenderType.INVENTORY )
GL11.glTranslatef( 2, 0, 0 );
GL11.glDisable( GL11.GL_LIGHTING );
AEColor col = null;
col = ((ToolColorApplicator) item.getItem()).getActiveColor( item );
col = ( (ToolColorApplicator) item.getItem() ).getActiveColor( item );
if ( col != null )
if( col != null )
{
tessellator.startDrawingQuads();