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

Changed access to use this qualifier

Browse Source
This commit is contained in:
yueh
2014-12-29 15:13:47 +01:00
parent 2a5e57a59b
commit f471513bd0
604 changed files with 11573 additions and 11573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/entity/EntityChargedQuartz.java
+15 -15
View File
@@ -59,36 +59,36 @@ final public class EntityChargedQuartz extends AEBaseEntityItem
if ( !AEConfig.instance.isFeatureEnabled( AEFeature.inWorldFluix ) )
return;
if ( Platform.isClient() && delay++ > 30 && AEConfig.instance.enableEffects )
if ( Platform.isClient() && this.delay++ > 30 && AEConfig.instance.enableEffects )
{
CommonHelper.proxy.spawnEffect( EffectType.Lightning, worldObj, posX, posY, posZ, null );
delay = 0;
CommonHelper.proxy.spawnEffect( EffectType.Lightning, this.worldObj, this.posX, this.posY, this.posZ, null );
this.delay = 0;
}
int j = MathHelper.floor_double( this.posX );
int i = MathHelper.floor_double( this.posY );
int k = MathHelper.floor_double( this.posZ );
Material mat = worldObj.getBlock( j, i, k ).getMaterial();
Material mat = this.worldObj.getBlock( j, i, k ).getMaterial();
if ( Platform.isServer() && mat.isLiquid() )
{
transformTime++;
if ( transformTime > 60 )
this.transformTime++;
if ( this.transformTime > 60 )
{
if ( !transform() )
transformTime = 0;
if ( !this.transform() )
this.transformTime = 0;
}
}
else
transformTime = 0;
this.transformTime = 0;
}
public boolean transform()
{
ItemStack item = getEntityItem();
ItemStack item = this.getEntityItem();
if ( AEApi.instance().materials().materialCertusQuartzCrystalCharged.sameAsStack( item ) )
{
AxisAlignedBB region = AxisAlignedBB.getBoundingBox( posX - 1, posY - 1, posZ - 1, posX + 1, posY + 1, posZ + 1 );
AxisAlignedBB region = AxisAlignedBB.getBoundingBox( this.posX - 1, this.posY - 1, this.posZ - 1, this.posX + 1, this.posY + 1, this.posZ + 1 );
List<Entity> l = this.getCheckedEntitiesWithinAABBExcludingEntity( region );
EntityItem redstone = null;
@@ -112,12 +112,12 @@ final public class EntityChargedQuartz extends AEBaseEntityItem
if ( redstone != null && netherQuartz != null )
{
getEntityItem().stackSize--;
this.getEntityItem().stackSize--;
redstone.getEntityItem().stackSize--;
netherQuartz.getEntityItem().stackSize--;
if ( getEntityItem().stackSize <= 0 )
setDead();
if ( this.getEntityItem().stackSize <= 0 )
this.setDead();
if ( redstone.getEntityItem().stackSize <= 0 )
redstone.setDead();
@@ -126,7 +126,7 @@ final public class EntityChargedQuartz extends AEBaseEntityItem
netherQuartz.setDead();
ItemStack Output = AEApi.instance().materials().materialFluixCrystal.stack( 2 );
worldObj.spawnEntityInWorld( new EntityItem( worldObj, posX, posY, posZ, Output ) );
this.worldObj.spawnEntityInWorld( new EntityItem( this.worldObj, this.posX, this.posY, this.posZ, Output ) );
return true;
}
src/main/java/appeng/entity/EntityFloatingItem.java
+4 -4
View File
@@ -34,7 +34,7 @@ final public class EntityFloatingItem extends EntityItem
public EntityFloatingItem(Entity parent, World p_i1710_1_, double p_i1710_2_, double p_i1710_4_, double p_i1710_6_, ItemStack p_i1710_8_) {
super( p_i1710_1_, p_i1710_2_, p_i1710_4_, p_i1710_6_, p_i1710_8_ );
motionX = motionY = motionZ = 0.0d;
this.motionX = this.motionY = this.motionZ = 0.0d;
this.hoverStart = 0.5f;
this.rotationYaw = 0;
this.parent = parent;
@@ -45,11 +45,11 @@ final public class EntityFloatingItem extends EntityItem
@Override
public void onUpdate()
{
if ( !isDead && parent.isDead )
if ( !this.isDead && this.parent.isDead )
this.setDead();
if ( superDeath++ > 100 )
setDead();
if ( this.superDeath++ > 100 )
this.setDead();
this.age = ageStatic;
}
src/main/java/appeng/entity/EntityGrowingCrystal.java
+20 -20
View File
@@ -55,8 +55,8 @@ final public class EntityGrowingCrystal extends EntityItem
if ( !AEConfig.instance.isFeatureEnabled( AEFeature.inWorldPurification ) )
return;
if ( age > 600 )
age = 100;
if ( this.age > 600 )
this.age = 100;
ItemStack is = this.getEntityItem();
Item gc = is.getItem();
@@ -67,25 +67,25 @@ final public class EntityGrowingCrystal extends EntityItem
int i = MathHelper.floor_double( this.posY );
int k = MathHelper.floor_double( this.posZ );
Block blk = worldObj.getBlock( j, i, k );
Block blk = this.worldObj.getBlock( j, i, k );
Material mat = blk.getMaterial();
IGrowableCrystal cry = (IGrowableCrystal) is.getItem();
float multiplier = cry.getMultiplier( blk, mat );
int speed = (int) Math.max( 1, getSpeed( j, i, k ) * multiplier );
int speed = (int) Math.max( 1, this.getSpeed( j, i, k ) * multiplier );
boolean isClient = Platform.isClient();
if ( mat.isLiquid() )
{
if ( isClient )
progress_1000++;
this.progress_1000++;
else
progress_1000 += speed;
this.progress_1000 += speed;
}
else
progress_1000 = 0;
this.progress_1000 = 0;
if ( isClient )
{
@@ -109,18 +109,18 @@ final public class EntityGrowingCrystal extends EntityItem
if ( speed > 500 )
len = 1;
if ( progress_1000 >= len )
if ( this.progress_1000 >= len )
{
progress_1000 = 0;
CommonHelper.proxy.spawnEffect( EffectType.Vibrant, worldObj, posX, posY + 0.2, posZ, null );
this.progress_1000 = 0;
CommonHelper.proxy.spawnEffect( EffectType.Vibrant, this.worldObj, this.posX, this.posY + 0.2, this.posZ, null );
}
}
else
{
if ( progress_1000 > 1000 )
if ( this.progress_1000 > 1000 )
{
progress_1000 -= 1000;
setEntityItemStack( cry.triggerGrowth( is ) );
this.progress_1000 -= 1000;
this.setEntityItemStack( cry.triggerGrowth( is ) );
}
}
}
@@ -133,22 +133,22 @@ final public class EntityGrowingCrystal extends EntityItem
int qty = 0;
if ( isAccelerated( x + 1, y, z ) )
if ( this.isAccelerated( x + 1, y, z ) )
qty += per + qty * mul;
if ( isAccelerated( x, y + 1, z ) )
if ( this.isAccelerated( x, y + 1, z ) )
qty += per + qty * mul;
if ( isAccelerated( x, y, z + 1 ) )
if ( this.isAccelerated( x, y, z + 1 ) )
qty += per + qty * mul;
if ( isAccelerated( x - 1, y, z ) )
if ( this.isAccelerated( x - 1, y, z ) )
qty += per + qty * mul;
if ( isAccelerated( x, y - 1, z ) )
if ( this.isAccelerated( x, y - 1, z ) )
qty += per + qty * mul;
if ( isAccelerated( x, y, z - 1 ) )
if ( this.isAccelerated( x, y, z - 1 ) )
qty += per + qty * mul;
return qty;
@@ -156,7 +156,7 @@ final public class EntityGrowingCrystal extends EntityItem
private boolean isAccelerated(int x, int y, int z)
{
TileEntity te = worldObj.getTileEntity( x, y, z );
TileEntity te = this.worldObj.getTileEntity( x, y, z );
return te instanceof ICrystalGrowthAccelerator && ( ( ICrystalGrowthAccelerator ) te ).isPowered();
}
src/main/java/appeng/entity/EntitySingularity.java
+5 -5
View File
@@ -57,7 +57,7 @@ final public class EntitySingularity extends AEBaseEntityItem
{
if ( src.isExplosion() )
{
doExplosion();
this.doExplosion();
return false;
}
@@ -72,10 +72,10 @@ final public class EntitySingularity extends AEBaseEntityItem
if ( !AEConfig.instance.isFeatureEnabled( AEFeature.inWorldSingularity ) )
return;
ItemStack item = getEntityItem();
ItemStack item = this.getEntityItem();
if ( AEApi.instance().materials().materialSingularity.sameAsStack( item ) )
{
AxisAlignedBB region = AxisAlignedBB.getBoundingBox( posX - 4, posY - 4, posZ - 4, posX + 4, posY + 4, posZ + 4 );
AxisAlignedBB region = AxisAlignedBB.getBoundingBox( this.posX - 4, this.posY - 4, this.posZ - 4, this.posX + 4, this.posY + 4, this.posZ + 4 );
List<Entity> l = this.getCheckedEntitiesWithinAABBExcludingEntity( region );
for ( Entity e : l )
@@ -121,11 +121,11 @@ final public class EntitySingularity extends AEBaseEntityItem
cmp.setLong( "freq", ( new Date() ).getTime() * 100 + ( randTickSeed++ ) % 100 );
item.stackSize--;
worldObj.spawnEntityInWorld( new EntitySingularity( worldObj, posX, posY, posZ, Output ) );
this.worldObj.spawnEntityInWorld( new EntitySingularity( this.worldObj, this.posX, this.posY, this.posZ, Output ) );
}
if ( item.stackSize <= 0 )
setDead();
this.setDead();
}
}
}
src/main/java/appeng/entity/EntityTinyTNTPrimed.java
+18 -18
View File
@@ -78,14 +78,14 @@ final public class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit
if ( this.isInWater() && Platform.isServer() ) // put out the fuse.
{
EntityItem item = new EntityItem( worldObj, this.posX, this.posY, this.posZ, AEApi.instance().blocks().blockTinyTNT.stack( 1 ) );
item.motionX = motionX;
item.motionY = motionY;
item.motionZ = motionZ;
EntityItem item = new EntityItem( this.worldObj, this.posX, this.posY, this.posZ, AEApi.instance().blocks().blockTinyTNT.stack( 1 ) );
item.motionX = this.motionX;
item.motionY = this.motionY;
item.motionZ = this.motionZ;
item.prevPosX = this.prevPosX;
item.prevPosY = this.prevPosY;
item.prevPosZ = this.prevPosZ;
worldObj.spawnEntityInWorld( item );
this.worldObj.spawnEntityInWorld( item );
this.setDead();
}
@@ -127,22 +127,22 @@ final public class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit
if ( AEConfig.instance.isFeatureEnabled( AEFeature.TinyTNTBlockDamage ) )
{
posY -= 0.25;
Explosion ex = new Explosion( worldObj, this, posX, posY, posZ, 0.2f );
this.posY -= 0.25;
Explosion ex = new Explosion( this.worldObj, this, this.posX, this.posY, this.posZ, 0.2f );
for (int x = (int) (posX - 2); x <= posX + 2; x++)
for (int x = (int) (this.posX - 2); x <= this.posX + 2; x++)
{
for (int y = (int) (posY - 2); y <= posY + 2; y++)
for (int y = (int) (this.posY - 2); y <= this.posY + 2; y++)
{
for (int z = (int) (posZ - 2); z <= posZ + 2; z++)
for (int z = (int) (this.posZ - 2); z <= this.posZ + 2; z++)
{
Block block = worldObj.getBlock( x, y, z );
if ( block != null && !block.isAir( worldObj, x, y, z ) )
Block block = this.worldObj.getBlock( x, y, z );
if ( block != null && !block.isAir( this.worldObj, x, y, z ) )
{
float strength = (float) (2.3f - (((x + 0.5f) - posX) * ((x + 0.5f) - posX) + ((y + 0.5f) - posY) * ((y + 0.5f) - posY) + ((z + 0.5f) - posZ)
* ((z + 0.5f) - posZ)));
float strength = (float) (2.3f - (((x + 0.5f) - this.posX) * ((x + 0.5f) - this.posX) + ((y + 0.5f) - this.posY) * ((y + 0.5f) - this.posY) + ((z + 0.5f) - this.posZ)
* ((z + 0.5f) - this.posZ)));
float resistance = block.getExplosionResistance( this, worldObj, x, y, z, posX, posY, posZ );
float resistance = block.getExplosionResistance( this, this.worldObj, x, y, z, this.posX, this.posY, this.posZ );
strength -= (resistance + 0.3F) * 0.11f;
if ( strength > 0.01 )
@@ -164,19 +164,19 @@ final public class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit
}
}
CommonHelper.proxy.sendToAllNearExcept( null, posX, posY, posZ, 64, this.worldObj, new PacketMockExplosion( posX, posY, posZ ) );
CommonHelper.proxy.sendToAllNearExcept( null, this.posX, this.posY, this.posZ, 64, this.worldObj, new PacketMockExplosion( this.posX, this.posY, this.posZ ) );
}
@Override
public void writeSpawnData(ByteBuf data)
{
data.writeByte( fuse );
data.writeByte( this.fuse );
}
@Override
public void readSpawnData(ByteBuf data)
{
fuse = data.readByte();
this.fuse = data.readByte();
}
}