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

Puts everywhere brackets

Browse Source
This commit is contained in:
thatsIch
2015-04-29 02:30:53 +02:00
parent 23aa8fd72d
commit 64ed05a1b4
465 changed files with 6726 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/misc/BlockCellWorkbench.java
+4
View File
@@ -47,13 +47,17 @@ public class BlockCellWorkbench extends AEBaseBlock
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
{
if( p.isSneaking() )
{
return false;
}
TileCellWorkbench tg = this.getTileEntity( w, x, y, z );
if( tg != null )
{
if( Platform.isServer() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_CELL_WORKBENCH );
}
return true;
}
return false;
src/main/java/appeng/block/misc/BlockCharger.java
+6
View File
@@ -71,7 +71,9 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
{
if( player.isSneaking() )
{
return false;
}
if( Platform.isServer() )
{
@@ -90,10 +92,14 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision
public void randomDisplayTick( World w, int x, int y, int z, Random r )
{
if( !AEConfig.instance.enableEffects )
{
return;
}
if( r.nextFloat() < 0.98 )
{
return;
}
AEBaseTile tile = this.getTileEntity( w, x, y, z );
if( tile instanceof TileCharger )
src/main/java/appeng/block/misc/BlockCondenser.java
+2
View File
@@ -47,7 +47,9 @@ public class BlockCondenser extends AEBaseBlock
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
{
if( player.isSneaking() )
{
return false;
}
if( Platform.isServer() )
{
src/main/java/appeng/block/misc/BlockInscriber.java
+4
View File
@@ -57,13 +57,17 @@ public class BlockInscriber extends AEBaseBlock
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
{
if( p.isSneaking() )
{
return false;
}
TileInscriber tg = this.getTileEntity( w, x, y, z );
if( tg != null )
{
if( Platform.isServer() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_INSCRIBER );
}
return true;
}
return false;
src/main/java/appeng/block/misc/BlockInterface.java
+4
View File
@@ -56,13 +56,17 @@ public class BlockInterface extends AEBaseBlock
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
{
if( p.isSneaking() )
{
return false;
}
TileInterface tg = this.getTileEntity( w, x, y, z );
if( tg != null )
{
if( Platform.isServer() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_INTERFACE );
}
return true;
}
return false;
src/main/java/appeng/block/misc/BlockLightDetector.java
+4
View File
@@ -46,7 +46,9 @@ public class BlockLightDetector extends BlockQuartzTorch
public int isProvidingWeakPower( IBlockAccess w, int x, int y, int z, int side )
{
if( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, x, y, z ) ).isReady() )
{
return ( (World) w ).getBlockLightValue( x, y, z ) - 6;
}
return 0;
}
@@ -58,7 +60,9 @@ public class BlockLightDetector extends BlockQuartzTorch
TileLightDetector tld = this.getTileEntity( world, x, y, z );
if( tld != null )
{
tld.updateLight();
}
}
@Override
src/main/java/appeng/block/misc/BlockPaint.java
+4
View File
@@ -88,7 +88,9 @@ public class BlockPaint extends AEBaseBlock
TilePaint tp = this.getTileEntity( w, x, y, z );
if( tp != null )
{
tp.onNeighborBlockChange();
}
}
@Override
@@ -107,7 +109,9 @@ public class BlockPaint extends AEBaseBlock
public void fillWithRain( World w, int x, int y, int z )
{
if( Platform.isServer() )
{
w.setBlock( x, y, z, Platform.AIR, 0, 3 );
}
}
@Override
src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java
+10
View File
@@ -68,7 +68,9 @@ public class BlockQuartzGrowthAccelerator extends AEBaseBlock implements IOrient
public void randomDisplayTick( World w, int x, int y, int z, Random r )
{
if( !AEConfig.instance.enableEffects )
{
return;
}
TileQuartzGrowthAccelerator tileQuartzGrowthAccelerator = this.getTileEntity( w, x, y, z );
@@ -98,25 +100,33 @@ public class BlockQuartzGrowthAccelerator extends AEBaseBlock implements IOrient
dx = 0.6;
dz = d1;
if( !w.getBlock( x + west.offsetX, y + west.offsetY, z + west.offsetZ ).isAir( w, x + west.offsetX, y + west.offsetY, z + west.offsetZ ) )
{
return;
}
break;
case 1:
dx = d1;
dz += 0.6;
if( !w.getBlock( x + forward.offsetX, y + forward.offsetY, z + forward.offsetZ ).isAir( w, x + forward.offsetX, y + forward.offsetY, z + forward.offsetZ ) )
{
return;
}
break;
case 2:
dx = d1;
dz = -0.6;
if( !w.getBlock( x - forward.offsetX, y - forward.offsetY, z - forward.offsetZ ).isAir( w, x - forward.offsetX, y - forward.offsetY, z - forward.offsetZ ) )
{
return;
}
break;
case 3:
dx = -0.6;
dz = d1;
if( !w.getBlock( x - west.offsetX, y - west.offsetY, z - west.offsetZ ).isAir( w, x - west.offsetX, y - west.offsetY, z - west.offsetZ ) )
{
return;
}
break;
}
src/main/java/appeng/block/misc/BlockQuartzTorch.java
+10
View File
@@ -107,10 +107,14 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
public void randomDisplayTick( World w, int x, int y, int z, Random r )
{
if( !AEConfig.instance.enableEffects )
{
return;
}
if( r.nextFloat() < 0.98 )
{
return;
}
ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
double xOff = -0.3 * up.offsetX;
@@ -132,7 +136,9 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
{
ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
if( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) )
{
this.dropTorch( w, x, y, z );
}
}
private void dropTorch( World w, int x, int y, int z )
@@ -146,8 +152,12 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
public boolean canPlaceBlockAt( World w, int x, int y, int z )
{
for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
{
if( this.canPlaceAt( w, x, y, z, dir ) )
{
return true;
}
}
return false;
}
src/main/java/appeng/block/misc/BlockSecurity.java
+4
View File
@@ -55,13 +55,17 @@ public class BlockSecurity extends AEBaseBlock
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
{
if( p.isSneaking() )
{
return false;
}
TileSecurity tg = this.getTileEntity( w, x, y, z );
if( tg != null )
{
if( Platform.isClient() )
{
return true;
}
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_SECURITY );
return true;
src/main/java/appeng/block/misc/BlockSkyCompass.java
+8
View File
@@ -80,7 +80,9 @@ public class BlockSkyCompass extends AEBaseBlock implements ICustomCollision
{
TileSkyCompass sc = this.getTileEntity( w, x, y, z );
if( sc != null )
{
return false;
}
return this.canPlaceAt( w, x, y, z, forward.getOpposite() );
}
@@ -95,7 +97,9 @@ public class BlockSkyCompass extends AEBaseBlock implements ICustomCollision
TileSkyCompass sc = this.getTileEntity( w, x, y, z );
ForgeDirection up = sc.getForward();
if( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) )
{
this.dropTorch( w, x, y, z );
}
}
private void dropTorch( World w, int x, int y, int z )
@@ -109,8 +113,12 @@ public class BlockSkyCompass extends AEBaseBlock implements ICustomCollision
public boolean canPlaceBlockAt( World w, int x, int y, int z )
{
for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
{
if( this.canPlaceAt( w, x, y, z, dir ) )
{
return true;
}
}
return false;
}
src/main/java/appeng/block/misc/BlockVibrationChamber.java
+4
View File
@@ -68,7 +68,9 @@ public class BlockVibrationChamber extends AEBaseBlock
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
{
if( player.isSneaking() )
{
return false;
}
if( Platform.isServer() )
{
@@ -87,7 +89,9 @@ public class BlockVibrationChamber extends AEBaseBlock
public void randomDisplayTick( World w, int x, int y, int z, Random r )
{
if( !AEConfig.instance.enableEffects )
{
return;
}
AEBaseTile tile = this.getTileEntity( w, x, y, z );
if( tile instanceof TileVibrationChamber )