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

Improved readability of variables

Browse Source 
Hopefully improved semantics of variables

Fixed typos

Added hyphenations
This commit is contained in:
thatsIch
2014-09-28 11:47:17 +02:00
parent 6b60a0996b
commit 76b147fd5b
220 changed files with 1643 additions and 1662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/AEBaseBlock.java
+15 -15
View File
@@ -60,8 +60,8 @@ import cpw.mods.fml.relauncher.SideOnly;
public class AEBaseBlock extends BlockContainer implements IAEFeature
{
private String FeatureFullname;
private String FeatureSubname;
private String featureFullName;
private String featureSubName;
private AEFeatureHandler feature;
private Class<? extends TileEntity> tileEntityType = null;
@@ -79,7 +79,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
@Override
public String toString()
{
return FeatureFullname;
return featureFullName;
}
@SideOnly(Side.CLIENT)
@@ -178,14 +178,14 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
protected void setTileEntity(Class<? extends TileEntity> c)
{
AEBaseTile.registerTileItem( c, new ItemStackSrc( this, 0 ) );
GameRegistry.registerTileEntity( tileEntityType = c, FeatureFullname );
GameRegistry.registerTileEntity( tileEntityType = c, featureFullName );
isInventory = IInventory.class.isAssignableFrom( c );
setTileProvider( hasBlockTileEntity() );
}
protected void setFeature(EnumSet<AEFeature> f)
{
feature = new AEFeatureHandler( f, this, FeatureSubname );
feature = new AEFeatureHandler( f, this, featureSubName );
}
protected AEBaseBlock(Class<?> c, Material mat) {
@@ -203,7 +203,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
ReflectionHelper.setPrivateValue( Block.class, this, b, "isTileProvider" );
}
protected AEBaseBlock(Class<?> c, Material mat, String subname) {
protected AEBaseBlock(Class<?> c, Material mat, String subName) {
super( mat );
if ( mat == AEGlassMaterial.instance )
@@ -215,8 +215,8 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
else
setStepSound( Block.soundTypeMetal );
FeatureFullname = AEFeatureHandler.getName( c, subname );
FeatureSubname = subname;
featureFullName = AEFeatureHandler.getName( c, subName );
featureSubName = subName;
}
@Override
@@ -689,7 +689,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
if ( is.getItem() instanceof IMemoryCard && !(this instanceof BlockCableBus) )
{
IMemoryCard memc = (IMemoryCard) is.getItem();
IMemoryCard memoryCard = (IMemoryCard) is.getItem();
if ( player.isSneaking() )
{
AEBaseTile t = getTileEntity( w, x, y, z );
@@ -699,24 +699,24 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
NBTTagCompound data = t.downloadSettings( SettingsFrom.MEMORY_CARD );
if ( data != null )
{
memc.setMemoryCardContents( is, name, data );
memc.notifyUser( player, MemoryCardMessages.SETTINGS_SAVED );
memoryCard.setMemoryCardContents( is, name, data );
memoryCard.notifyUser( player, MemoryCardMessages.SETTINGS_SAVED );
return true;
}
}
}
else
{
String name = memc.getSettingsName( is );
NBTTagCompound data = memc.getData( is );
String name = memoryCard.getSettingsName( is );
NBTTagCompound data = memoryCard.getData( is );
if ( getUnlocalizedName().equals( name ) )
{
AEBaseTile t = getTileEntity( w, x, y, z );
t.uploadSettings( SettingsFrom.MEMORY_CARD, data );
memc.notifyUser( player, MemoryCardMessages.SETTINGS_LOADED );
memoryCard.notifyUser( player, MemoryCardMessages.SETTINGS_LOADED );
}
else
memc.notifyUser( player, MemoryCardMessages.INVALID_MACHINE );
memoryCard.notifyUser( player, MemoryCardMessages.INVALID_MACHINE );
return false;
}
}
src/main/java/appeng/block/misc/BlockCellWorkbench.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class BlockCellWorkbench extends AEBaseBlock
if ( tg != null )
{
if ( Platform.isServer() )
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_CELLWORKBENCH );
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_CELL_WORKBENCH );
return true;
}
return false;
src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java
+4 -4
View File
@@ -52,15 +52,15 @@ public class BlockQuartzGrowthAccelerator extends AEBaseBlock implements IOrient
if ( !AEConfig.instance.enableEffects )
return;
TileQuartzGrowthAccelerator tqga = getTileEntity( w, x, y, z );
TileQuartzGrowthAccelerator tileQuartzGrowthAccelerator = getTileEntity( w, x, y, z );
if ( tqga != null && tqga.hasPower && CommonHelper.proxy.shouldAddParticles( r ) )
if ( tileQuartzGrowthAccelerator != null && tileQuartzGrowthAccelerator.hasPower && CommonHelper.proxy.shouldAddParticles( r ) )
{
double d0 = (double) (r.nextFloat() - 0.5F);
double d1 = (double) (r.nextFloat() - 0.5F);
ForgeDirection up = tqga.getUp();
ForgeDirection forward = tqga.getForward();
ForgeDirection up = tileQuartzGrowthAccelerator.getUp();
ForgeDirection forward = tileQuartzGrowthAccelerator.getForward();
ForgeDirection west = Platform.crossProduct( forward, up );
double rx = 0.5 + x;
src/main/java/appeng/block/misc/BlockTinyTNT.java
+7 -7
View File
@@ -127,19 +127,19 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
{
if ( !w.isRemote )
{
EntityTinyTNTPrimed entitytntprimed = new EntityTinyTNTPrimed( w, x + 0.5F, y + 0.5F, z + 0.5F, exp.getExplosivePlacedBy() );
entitytntprimed.fuse = w.rand.nextInt( entitytntprimed.fuse / 4 ) + entitytntprimed.fuse / 8;
w.spawnEntityInWorld( entitytntprimed );
EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, x + 0.5F, y + 0.5F, z + 0.5F, exp.getExplosivePlacedBy() );
primedTinyTNTEntity.fuse = w.rand.nextInt( primedTinyTNTEntity.fuse / 4 ) + primedTinyTNTEntity.fuse / 8;
w.spawnEntityInWorld( primedTinyTNTEntity );
}
}
public void startFuse(World w, int x, int y, int z, EntityLivingBase ignitor)
public void startFuse(World w, int x, int y, int z, EntityLivingBase igniter)
{
if ( !w.isRemote )
{
EntityTinyTNTPrimed entitytntprimed = new EntityTinyTNTPrimed( w, x + 0.5F, y + 0.5F, z + 0.5F, ignitor );
w.spawnEntityInWorld( entitytntprimed );
w.playSoundAtEntity( entitytntprimed, "game.tnt.primed", 1.0F, 1.0F );
EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, x + 0.5F, y + 0.5F, z + 0.5F, igniter );
w.spawnEntityInWorld( primedTinyTNTEntity );
w.playSoundAtEntity( primedTinyTNTEntity, "game.tnt.primed", 1.0F, 1.0F );
}
}
src/main/java/appeng/block/misc/BlockVibrationChamber.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class BlockVibrationChamber extends AEBaseBlock
TileVibrationChamber tc = getTileEntity( w, x, y, z );
if ( tc != null && !player.isSneaking() )
{
Platform.openGUI( player, tc, ForgeDirection.getOrientation( side ), GuiBridge.GUI_VIBRATIONCHAMBER );
Platform.openGUI( player, tc, ForgeDirection.getOrientation( side ), GuiBridge.GUI_VIBRATION_CHAMBER );
return true;
}
}
src/main/java/appeng/block/networking/BlockCableBus.java
+6 -6
View File
@@ -92,10 +92,10 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
@SideOnly(Side.CLIENT)
public boolean addHitEffects(World world, MovingObjectPosition target, EffectRenderer effectRenderer)
{
Object pobj = cb( world, target.blockX, target.blockY, target.blockZ );
if ( pobj instanceof IPartHost )
Object object = cb( world, target.blockX, target.blockY, target.blockZ );
if ( object instanceof IPartHost )
{
IPartHost host = (IPartHost) pobj;
IPartHost host = (IPartHost) object;
for (ForgeDirection side : ForgeDirection.values())
{
@@ -138,10 +138,10 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
@SideOnly(Side.CLIENT)
public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer)
{
Object pobj = cb( world, x, y, z );
if ( pobj instanceof IPartHost )
Object object = cb( world, x, y, z );
if ( object instanceof IPartHost )
{
IPartHost host = (IPartHost) pobj;
IPartHost host = (IPartHost) object;
for (ForgeDirection side : ForgeDirection.values())
{
src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, Block pointlessnumber)
public void onNeighborBlockChange(World w, int x, int y, int z, Block pointlessNumber)
{
TileQuantumBridge bridge = getTileEntity( w, x, y, z );
if ( bridge != null )
src/main/java/appeng/block/qnb/BlockQuantumRing.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class BlockQuantumRing extends AEBaseBlock implements ICustomCollision
}
@Override
public void onNeighborBlockChange(World w, int x, int y, int z, Block pointlessnumber)
public void onNeighborBlockChange(World w, int x, int y, int z, Block pointlessNumber)
{
TileQuantumBridge bridge = getTileEntity( w, x, y, z );
if ( bridge != null )
src/main/java/appeng/block/solids/OreQuartz.java
+3 -3
View File
@@ -113,11 +113,11 @@ public class OreQuartz extends AEBaseBlock
}
@Override
public void dropBlockAsItemWithChance(World w, int x, int y, int z, int blockid, float something, int meta)
public void dropBlockAsItemWithChance(World w, int x, int y, int z, int blockID, float something, int meta)
{
super.dropBlockAsItemWithChance( w, x, y, z, blockid, something, meta );
super.dropBlockAsItemWithChance( w, x, y, z, blockID, something, meta );
if ( getItemDropped( blockid, w.rand, meta ) != Item.getItemFromBlock( this ) )
if ( getItemDropped( blockID, w.rand, meta ) != Item.getItemFromBlock( this ) )
{
int xp = MathHelper.getRandomIntegerInRange( w.rand, 2, 5 );
src/main/java/appeng/block/spatial/BlockSpatialIOPort.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class BlockSpatialIOPort extends AEBaseBlock
if ( tg != null )
{
if ( Platform.isServer() )
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_SPATIALIOPORT );
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_SPATIAL_IO_PORT );
return true;
}
return false;