run through remap script

This commit is contained in:
Progwml6 committed 2014-02-05 08:28:53 -05:00
1 parent 689aeba09b
commit b8cf7cdc5e
208 files changed
+4117 -4117

No files matched your search

@@ -78,7 +78,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
return StatCollector.translateToLocal("entity." + s + ".name");
}
public IEntityLivingData func_110161_a (IEntityLivingData par1EntityLivingData)
public IEntityLivingData onSpawnWithEgg (IEntityLivingData par1EntityLivingData)
{
Object par1EntityLivingData1 = super.onSpawnWithEgg(par1EntityLivingData);
@@ -104,7 +104,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
{
BlueSlime slime = new BlueSlime(this.worldObj);
slime.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F);
slime.func_110161_a(par1EntityLivingData);
slime.onSpawnWithEgg(par1EntityLivingData);
this.worldObj.spawnEntityInWorld(slime);
}
@@ -315,7 +315,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
this.sizeOffset = 1.0F;
}
this.func_70808_l();
this.alterSquishAmount();
if (this.worldObj.isRemote)
{
@@ -378,7 +378,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
return false;
}
protected void func_70808_l ()
protected void alterSquishAmount ()
{
this.sizeOffset *= 0.6F;
}
+21 -21
View File
@@ -38,7 +38,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
/** Array of item stacks stored in minecart (for storage minecarts). */
protected ItemStack[] cargoItems;
protected int fuel;
protected boolean field_70499_f;
protected boolean isInReverse;
/** The type of minecart, 2 for powered, 1 for storage. */
private int pullcartType;
@@ -89,7 +89,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
super(par1World);
this.cargoItems = new ItemStack[36];
this.fuel = 0;
this.field_70499_f = false;
this.isInReverse = false;
this.field_82345_h = true;
this.preventEntitySpawning = true;
this.setSize(0.98F, 0.7F);
@@ -186,8 +186,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
}
else
{
this.func_70494_i(-this.func_70493_k());
this.func_70497_h(10);
this.setRollingDirection(-this.getRollingDirection());
this.setRollingAmplitude(10);
this.setBeenAttacked();
this.setDamage(this.getDamage() + par2 * 10);
@@ -222,8 +222,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
*/
public void performHurtAnimation ()
{
this.func_70494_i(-this.func_70493_k());
this.func_70497_h(10);
this.setRollingDirection(-this.getRollingDirection());
this.setRollingAmplitude(10);
this.setDamage(this.getDamage() + this.getDamage() * 10);
}
@@ -297,9 +297,9 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
*/
public void onUpdate ()
{
if (this.func_70496_j() > 0)
if (this.getRollingAmplitude() > 0)
{
this.func_70497_h(this.func_70496_j() - 1);
this.setRollingAmplitude(this.getRollingAmplitude() - 1);
}
if (this.getDamage() > 0)
@@ -409,7 +409,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
double var4 = 0.4D;
double var6 = 0.0078125D;
Block var8 = this.worldObj.func_147439_a(var45, var2, var47);
Block var8 = this.worldObj.getBlock(var45, var2, var47);
moveMinecartOffRail(var45, var2, var47);
if (entityFollowing != null)
@@ -424,7 +424,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
{
this.rotationYaw = (float) (Math.atan2(var50, var49) * 180.0D / Math.PI);
if (this.field_70499_f)
if (this.isInReverse)
{
this.rotationYaw += 180.0F;
}
@@ -435,7 +435,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
if (var51 < -170.0D || var51 >= 170.0D)
{
this.rotationYaw += 180.0F;
this.field_70499_f = !this.field_70499_f;
this.isInReverse = !this.isInReverse;
}
this.setRotation(this.rotationYaw, this.rotationPitch);
@@ -572,7 +572,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
--var10;
}
Block var12 = this.worldObj.func_147439_a(var9, var10, var11);
Block var12 = this.worldObj.getBlock(var9, var10, var11);
return null;
}
@@ -588,7 +588,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
--var8;
}
Block var10 = this.worldObj.func_147439_a(var7, var8, var9);
Block var10 = this.worldObj.getBlock(var7, var8, var9);
if (BlockRail.func_150051_a(var10))
{
@@ -709,12 +709,12 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
if (getSizeInventory() > 0)
{
NBTTagList var2 = par1NBTTagCompound.func_150295_c("Items",9);
NBTTagList var2 = par1NBTTagCompound.getTagList("Items",9);
this.cargoItems = new ItemStack[this.getSizeInventory()];
for (int var3 = 0; var3 < var2.tagCount(); ++var3)
{
NBTTagCompound var4 = (NBTTagCompound) var2.func_150305_b(var3);
NBTTagCompound var4 = (NBTTagCompound) var2.getCompoundTagAt(var3);
int var5 = var4.getByte("Slot") & 255;
if (var5 >= 0 && var5 < this.cargoItems.length)
@@ -1079,22 +1079,22 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
return this.dataWatcher.getWatchableObjectInt(19);
}
public void func_70497_h (int par1)
public void setRollingAmplitude (int par1)
{
this.dataWatcher.updateObject(17, Integer.valueOf(par1));
}
public int func_70496_j ()
public int getRollingAmplitude ()
{
return this.dataWatcher.getWatchableObjectInt(17);
}
public void func_70494_i (int par1)
public void setRollingDirection (int par1)
{
this.dataWatcher.updateObject(18, Integer.valueOf(par1));
}
public int func_70493_k ()
public int getRollingDirection ()
{
return this.dataWatcher.getWatchableObjectInt(18);
}
@@ -1451,14 +1451,14 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
}
@Override
public String func_145825_b ()
public String getInventoryName ()
{
//TODO get inventory name
return null;
}
@Override
public boolean func_145818_k_ ()
public boolean hasCustomInventoryName ()
{
return false;
}
@@ -173,7 +173,7 @@ public class EntityLandmineFirework extends Entity
nbttagcompound = itemstack.getTagCompound().getCompoundTag("Fireworks");
}
this.worldObj.func_92088_a(this.posX, this.posY, this.posZ, this.motionX, this.motionY, this.motionZ, nbttagcompound);
this.worldObj.makeFireworks(this.posX, this.posY, this.posZ, this.motionX, this.motionY, this.motionZ, nbttagcompound);
}
super.handleHealthUpdate(par1);
@@ -105,10 +105,10 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI);
}
Block i = this.worldObj.func_147439_a(this.field_145791_d, this.field_145792_e, this.field_145789_f);
Block i = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f);
i.func_149719_a(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
AxisAlignedBB axisalignedbb = i.func_149668_a(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
i.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
AxisAlignedBB axisalignedbb = i.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f);
if (axisalignedbb != null && axisalignedbb.isVecInside(this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ)))
{
@@ -124,7 +124,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
{
if (!worldObj.isRemote)
{
Block j = this.worldObj.func_147439_a(this.field_145791_d, this.field_145792_e, this.field_145789_f);
Block j = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f);
int k = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f);
if (j == this.field_145790_g && k == this.inData)
@@ -297,7 +297,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer
&& this.shootingEntity instanceof EntityPlayerMP)
{
((EntityPlayerMP) this.shootingEntity).playerNetServerHandler.func_147359_a(new S2BPacketChangeGameState(6, 0));
((EntityPlayerMP) this.shootingEntity).playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(6, 0));
//TConstruct.packetPipeline.sendTo(new S2BPacketChangeGameState(6, 0), (EntityPlayerMP) this.shootingEntity);
}
}
@@ -337,7 +337,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
this.field_145791_d = movingobjectposition.blockX;
this.field_145792_e = movingobjectposition.blockY;
this.field_145789_f = movingobjectposition.blockZ;
this.field_145790_g = this.worldObj.func_147439_a(this.field_145791_d, this.field_145792_e, this.field_145789_f);
this.field_145790_g = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f);
this.inData = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f);
this.motionX = (double) ((float) (movingobjectposition.hitVec.xCoord - this.posX));
this.motionY = (double) ((float) (movingobjectposition.hitVec.yCoord - this.posY));
@@ -353,7 +353,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
if (this.field_145790_g != Blocks.air)
{
this.field_145790_g.func_149670_a(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this);
this.field_145790_g.onEntityCollidedWithBlock(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f, this);
}
}
}
@@ -439,7 +439,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
if (slotID >= 0)
{
living.setCurrentItemOrArmor(slotID, par1ItemStack);
living.func_96120_a(slotID, 2.0f);
living.setEquipmentDropChance(slotID, 2.0f);
par1ItemStack.stackSize = 0;
return true;
}
@@ -64,7 +64,7 @@ public class DaggerEntity extends RotatingBase
xTile = movingobjectposition.blockX;
yTile = movingobjectposition.blockY;
zTile = movingobjectposition.blockZ;
inTile = worldObj.func_147439_a(xTile, yTile, zTile);
inTile = worldObj.getBlock(xTile, yTile, zTile);
motionX = (float) (movingobjectposition.hitVec.xCoord - posX);
motionY = (float) (movingobjectposition.hitVec.yCoord - posY);
motionZ = (float) (movingobjectposition.hitVec.zCoord - posZ);
@@ -182,7 +182,7 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData
}
if (onGround)
{
Block i = worldObj.func_147439_a(xTile, yTile, zTile);
Block i = worldObj.getBlock(xTile, yTile, zTile);
if (i != inTile)
{
onGround = false;
@@ -342,7 +342,7 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData
tags.setShort("xTile", (short) xTile);
tags.setShort("yTile", (short) yTile);
tags.setShort("zTile", (short) zTile);
tags.setString("inTile", (String) inTile.func_149739_a());
tags.setString("inTile", (String) inTile.getUnlocalizedName());
tags.setByte("shake", (byte) arrowShake);
tags.setByte("onGround", (byte) (onGround ? 1 : 0));
tags.setBoolean("Retrieval", doNotRetrieve);