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

Replaces all local variables regarding their naming conventions

Browse Source
This commit is contained in:
thatsIch
2015-05-08 23:34:24 +02:00
parent d8ac614a17
commit 513292cd08
18 changed files with 132 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/Platform.java
+11 -11
View File
@@ -191,7 +191,7 @@ public class Platform
p = PowerUnits.AE.convertTo( displayUnits, p );
int offset = 0;
String Lvl = "";
String level = "";
String[] preFixes = new String[] { "k", "M", "G", "T", "P", "T", "P", "E", "Z", "Y" };
String unitName = displayUnits.name();
@@ -208,12 +208,12 @@ public class Platform
while( p > 1000 && offset < preFixes.length )
{
p /= 1000;
Lvl = preFixes[offset];
level = preFixes[offset];
offset++;
}
DecimalFormat df = new DecimalFormat( "#.##" );
return df.format( p ) + ' ' + Lvl + unitName + ( isRate ? "/t" : "" );
return df.format( p ) + ' ' + level + unitName + ( isRate ? "/t" : "" );
}
public static ForgeDirection crossProduct( ForgeDirection forward, ForgeDirection up )
@@ -1273,10 +1273,10 @@ public class Platform
}
else
{
float APercentDamaged = 1.0f - (float) a.getItemDamageForDisplay() / (float) a.getMaxDamage();
float BPercentDamaged = 1.0f - (float) b.getItemDamageForDisplay() / (float) b.getMaxDamage();
float percentDamagedOfA = 1.0f - (float) a.getItemDamageForDisplay() / (float) a.getMaxDamage();
float percentDamagedOfB = 1.0f - (float) b.getItemDamageForDisplay() / (float) b.getMaxDamage();
return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
return ( percentDamagedOfA > mode.breakPoint ) == ( percentDamagedOfB > mode.breakPoint );
}
}
catch( Throwable e )
@@ -1291,10 +1291,10 @@ public class Platform
}
else
{
float APercentDamaged = (float) a.getItemDamage() / (float) a.getMaxDamage();
float BPercentDamaged = (float) b.getItemDamage() / (float) b.getMaxDamage();
float percentDamagedOfA = (float) a.getItemDamage() / (float) a.getMaxDamage();
float percentDamagedOfB = (float) b.getItemDamage() / (float) b.getMaxDamage();
return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
return ( percentDamagedOfA > mode.breakPoint ) == ( percentDamagedOfB > mode.breakPoint );
}
}
}
@@ -1649,9 +1649,9 @@ public class Platform
return 0;
}
for( Integer Side : sides )
for( int side : sides )
{
int c = ( Side << ( offset % 8 ) ) ^ ( 1 << dir.ordinal() );
int c = ( side << ( offset % 8 ) ) ^ ( 1 << dir.ordinal() );
offset++;
hash = c + ( hash << 6 ) + ( hash << 16 ) - hash;
}
src/main/java/appeng/util/item/AEFluidStack.java
+4 -4
View File
@@ -113,8 +113,8 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
{
byte mask = data.readByte();
// byte PriorityType = (byte) (mask & 0x03);
byte StackType = (byte) ( ( mask & 0x0C ) >> 2 );
byte CountReqType = (byte) ( ( mask & 0x30 ) >> 4 );
byte stackType = (byte) ( ( mask & 0x0C ) >> 2 );
byte countReqType = (byte) ( ( mask & 0x30 ) >> 4 );
boolean isCraftable = ( mask & 0x40 ) > 0;
boolean hasTagCompound = ( mask & 0x80 ) > 0;
@@ -140,8 +140,8 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
}
// long priority = getPacketValue( PriorityType, data );
long stackSize = getPacketValue( StackType, data );
long countRequestable = getPacketValue( CountReqType, data );
long stackSize = getPacketValue( stackType, data );
long countRequestable = getPacketValue( countReqType, data );
FluidStack fluidStack = FluidStack.loadFluidStackFromNBT( d );
if( fluidStack == null )
src/main/java/appeng/util/item/AEItemStack.java
+16 -16
View File
@@ -147,8 +147,8 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
{
byte mask = data.readByte();
// byte PriorityType = (byte) (mask & 0x03);
byte StackType = (byte) ( ( mask & 0x0C ) >> 2 );
byte CountReqType = (byte) ( ( mask & 0x30 ) >> 4 );
byte stackType = (byte) ( ( mask & 0x0C ) >> 2 );
byte countReqType = (byte) ( ( mask & 0x30 ) >> 4 );
boolean isCraftable = ( mask & 0x40 ) > 0;
boolean hasTagCompound = ( mask & 0x80 ) > 0;
@@ -171,8 +171,8 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
}
// long priority = getPacketValue( PriorityType, data );
long stackSize = getPacketValue( StackType, data );
long countRequestable = getPacketValue( CountReqType, data );
long stackSize = getPacketValue( stackType, data );
long countRequestable = getPacketValue( countReqType, data );
ItemStack itemstack = ItemStack.loadItemStackFromNBT( d );
if( itemstack == null )
@@ -289,10 +289,10 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
}
else
{
float APercentDamaged = 1.0f - (float) a.getItemDamageForDisplay() / (float) a.getMaxDamage();
float BPercentDamaged = 1.0f - (float) b.getItemDamageForDisplay() / (float) b.getMaxDamage();
float percentDamageOfA = 1.0f - (float) a.getItemDamageForDisplay() / (float) a.getMaxDamage();
float percentDamageOfB = 1.0f - (float) b.getItemDamageForDisplay() / (float) b.getMaxDamage();
return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
return ( percentDamageOfA > mode.breakPoint ) == ( percentDamageOfB > mode.breakPoint );
}
}
catch( Throwable e )
@@ -307,10 +307,10 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
}
else
{
float APercentDamaged = (float) a.getItemDamage() / (float) a.getMaxDamage();
float BPercentDamaged = (float) b.getItemDamage() / (float) b.getMaxDamage();
float percentDamageOfA = (float) a.getItemDamage() / (float) a.getMaxDamage();
float percentDamageOfB = (float) b.getItemDamage() / (float) b.getMaxDamage();
return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
return ( percentDamageOfA > mode.breakPoint ) == ( percentDamageOfB > mode.breakPoint );
}
}
}
@@ -343,10 +343,10 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
}
else
{
float APercentDamaged = 1.0f - (float) a.getItemDamageForDisplay() / (float) a.getMaxDamage();
float BPercentDamaged = 1.0f - (float) o.getItemDamageForDisplay() / (float) o.getMaxDamage();
float percentDamageOfA = 1.0f - (float) a.getItemDamageForDisplay() / (float) a.getMaxDamage();
float percentDamageOfB = 1.0f - (float) o.getItemDamageForDisplay() / (float) o.getMaxDamage();
return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
return ( percentDamageOfA > mode.breakPoint ) == ( percentDamageOfB > mode.breakPoint );
}
}
catch( Throwable e )
@@ -361,10 +361,10 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
}
else
{
float APercentDamaged = (float) a.getItemDamage() / (float) a.getMaxDamage();
float BPercentDamaged = (float) o.getItemDamage() / (float) o.getMaxDamage();
float percentDamageOfA = (float) a.getItemDamage() / (float) a.getMaxDamage();
float percentDamageOfB = (float) o.getItemDamage() / (float) o.getMaxDamage();
return ( APercentDamaged > mode.breakPoint ) == ( BPercentDamaged > mode.breakPoint );
return ( percentDamageOfA > mode.breakPoint ) == ( percentDamageOfB > mode.breakPoint );
}
}
}