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

@@ -70,7 +70,7 @@ public class MiningExplosion extends Explosion
int l = MathHelper.floor_double(d0);
int i1 = MathHelper.floor_double(d1);
int j1 = MathHelper.floor_double(d2);
Block k1 = this.world.func_147439_a(l, i1, j1);
Block k1 = this.world.getBlock(l, i1, j1);
if (k1 != Blocks.air)
{
@@ -169,10 +169,10 @@ public class MiningExplosion extends Explosion
while (iterator.hasNext())
{
chunkposition = (ChunkPosition) iterator.next();
i = chunkposition.field_151329_a;
j = chunkposition.field_151327_b;
k = chunkposition.field_151328_c;
l = this.world.func_147439_a(i, j, k);
i = chunkposition.chunkPosX;
j = chunkposition.chunkPosY;
k = chunkposition.chunkPosZ;
l = this.world.getBlock(i, j, k);
if (par1)
{
@@ -199,9 +199,9 @@ public class MiningExplosion extends Explosion
{
Block block = l;
if (block.func_149659_a(this))
if (block.canDropFromExplosion(this))
{
block.func_149690_a(this.world, i, j, k, this.world.getBlockMetadata(i, j, k), 1.0F, 0);
block.dropBlockAsItemWithChance(this.world, i, j, k, this.world.getBlockMetadata(i, j, k), 1.0F, 0);
}
block.onBlockExploded(this.world, i, j, k, this);
@@ -216,15 +216,15 @@ public class MiningExplosion extends Explosion
while (iterator.hasNext())
{
chunkposition = (ChunkPosition) iterator.next();
i = chunkposition.field_151329_a;
j = chunkposition.field_151327_b;
k = chunkposition.field_151328_c;
l = this.world.func_147439_a(i, j, k);
Block i1 = this.world.func_147439_a(i, j - 1, k);
i = chunkposition.chunkPosX;
j = chunkposition.chunkPosY;
k = chunkposition.chunkPosZ;
l = this.world.getBlock(i, j, k);
Block i1 = this.world.getBlock(i, j - 1, k);
if (l == Blocks.air && i1.func_149662_c() && this.random.nextInt(3) == 0)
if (l == Blocks.air && i1.isOpaqueCube() && this.random.nextInt(3) == 0)
{
this.world.func_147449_b(i, j, k, Blocks.fire);
this.world.setBlock(i, j, k, Blocks.fire);
}
}
}
@@ -35,6 +35,6 @@ public class SmelteryDamageSource extends DamageSource
EntityLivingBase entityliving1 = par1EntityLiving.func_94060_bK();
String s = "death." + type + this.damageType;
String s1 = s + ".player";
return entityliving1 != null && StatCollector.func_94522_b(s1) ? new ChatComponentTranslation(s1, new Object[] {par1EntityLiving.func_145748_c_(), entityliving1.func_145748_c_()}): new ChatComponentTranslation(s, new Object[] {par1EntityLiving.func_145748_c_()});
return entityliving1 != null && StatCollector.canTranslate(s1) ? new ChatComponentTranslation(s1, new Object[] {par1EntityLiving.func_145748_c_(), entityliving1.func_145748_c_()}): new ChatComponentTranslation(s, new Object[] {par1EntityLiving.func_145748_c_()});
}
}
@@ -264,7 +264,7 @@ public class TEventHandler
for (int i = 0; i < event.drops.size(); i++)
{
ItemStack is = event.drops.get(i).getEntityItem();
if (FurnaceRecipes.smelting().func_151395_a(is) != null && FurnaceRecipes.smelting().func_151395_a(is).getItem() instanceof ItemFood)
if (FurnaceRecipes.smelting().getSmeltingResult(is) != null && FurnaceRecipes.smelting().getSmeltingResult(is).getItem() instanceof ItemFood)
{
NBTTagCompound stackCompound = is.getTagCompound();
if (stackCompound == null)
@@ -282,7 +282,7 @@ public class TEventHandler
{
ItemStack dropStack = new ItemStack(TRepo.heartCanister, 1, 1);
EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack);
entityitem.field_145804_b = 10;
entityitem.delayBeforeCanPickup = 10;
event.drops.add(entityitem);
}
@@ -290,7 +290,7 @@ public class TEventHandler
{
ItemStack dropStack = new ItemStack(TRepo.heartCanister, 1, 1);
EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack);
entityitem.field_145804_b = 10;
entityitem.delayBeforeCanPickup = 10;
event.drops.add(entityitem);
}
@@ -477,7 +477,7 @@ public class TEventHandler
void addDrops (LivingDropsEvent event, ItemStack dropStack)
{
EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack);
entityitem.field_145804_b = 10;
entityitem.delayBeforeCanPickup = 10;
event.drops.add(entityitem);
}
@@ -563,7 +563,7 @@ public class TEventHandler
return;
}
Block bID = evt.world.func_147439_a(hitX, hitY, hitZ);
Block bID = evt.world.getBlock(hitX, hitY, hitZ);
for (int id = 0; id < TRepo.fluidBlocks.length; id++)
{
if (bID == TRepo.fluidBlocks[id])
@@ -651,7 +651,7 @@ public class TEventHandler
{
if (event.action == Action.LEFT_CLICK_BLOCK)
{
Block block = event.entity.worldObj.func_147439_a(event.x, event.y, event.z);
Block block = event.entity.worldObj.getBlock(event.x, event.y, event.z);
if (block instanceof TankAirBlock)
{
event.setCanceled(true);
@@ -44,32 +44,32 @@ public class Helper
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderer.func_147806_b(block, 0, 0, 0, renderer.func_147787_a(block, 1, metadata));
renderer.renderFaceYPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 1, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1.0F, 0.0F);
renderer.func_147768_a(block, 0, 0, 0, renderer.func_147787_a(block, 0, metadata));
renderer.renderFaceYNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 0, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderer.func_147764_f(block, 0, 0, 0, renderer.func_147787_a(block, 2, metadata));
renderer.renderFaceXPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 2, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1.0F, 0.0F, 0.0F);
renderer.func_147798_e(block, 0, 0, 0, renderer.func_147787_a(block, 3, metadata));
renderer.renderFaceXNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 3, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderer.func_147734_d(block, 0, 0, 0, renderer.func_147787_a(block, 4, metadata));
renderer.renderFaceZPos(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 4, metadata));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1.0F);
renderer.func_147761_c(block, 0, 0, 0, renderer.func_147787_a(block, 5, metadata));
renderer.renderFaceZNeg(block, 0, 0, 0, renderer.getBlockIconFromSideAndMetadata(block, 5, metadata));
tessellator.draw();
}
@@ -60,12 +60,12 @@ public abstract class Behavior
addBehavior(new ItemStack(Items.shears), shear);
//Make sure the part below this comment is executed last(to avoid conflicts)
Iterator i1 = Block.field_149771_c.iterator();
Iterator i1 = Block.blockRegistry.iterator();
while(i1.hasNext()){
Object ob = i1.next();
if(ob != null && ob instanceof Block){
Block b = (Block) ob;
if(b.func_149688_o().isOpaque() && b.func_149686_d() && !b.func_149744_f() && !(b instanceof ITileEntityProvider) && !behaviorsListBlocks.containsKey(new ItemStack(b))){
if(b.getMaterial().isOpaque() && b.renderAsNormalBlock() && !b.canProvidePower() && !(b instanceof ITileEntityProvider) && !behaviorsListBlocks.containsKey(new ItemStack(b))){
addBehavior(new ItemStack(b), blockThrow);
}
}
@@ -43,10 +43,10 @@ public class BehaviorFirecharge extends Behavior
{
for (int j = par4 - 2; j <= (par4 + 2); j++)
{
if ((par1World.func_147439_a(i, par3, j) == null || (par1World.func_147439_a(i, par3, j) != null && par1World.func_147439_a(i, par3, j).isReplaceable(
par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Blocks.fire.func_149742_c(par1World, i, par3, j))
if ((par1World.getBlock(i, par3, j) == null || (par1World.getBlock(i, par3, j) != null && par1World.getBlock(i, par3, j).isReplaceable(
par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Blocks.fire.canPlaceBlockAt(par1World, i, par3, j))
{
par1World.func_147449_b(i, par3, j, Blocks.fire);
par1World.setBlock(i, par3, j, Blocks.fire);
}
}
}
@@ -83,7 +83,7 @@ public class BehaviorShears extends Behavior
double d1 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
double d2 = (double) (par1World.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
EntityItem entityitem = new EntityItem(par1World, (double) par2 + d0, (double) par3 + d1, (double) par4 + d2, par5ItemStack);
entityitem.field_145804_b = 10;
entityitem.delayBeforeCanPickup = 10;
par1World.spawnEntityInWorld(entityitem);
}
}
@@ -68,7 +68,7 @@ public abstract class SpecialStackHandler
return;
}
TileEntityLandmine tileEntity = (TileEntityLandmine) par1World.func_147438_o(x, y, z);
TileEntityLandmine tileEntity = (TileEntityLandmine) par1World.getTileEntity(x, y, z);
while (item.stackSize > 0)
{
@@ -89,7 +89,7 @@ public class PacketPipeline extends MessageToMessageCodec<FMLProxyPacket, Abstra
case SERVER:
INetHandler netHandler = ctx.channel().attr(NetworkRegistry.NET_HANDLER).get();
player = ((NetHandlerPlayServer) netHandler).field_147369_b;
player = ((NetHandlerPlayServer) netHandler).playerEntity;
pkt.handleServerSide(player);
break;
@@ -61,7 +61,7 @@ public class PacketSmeltery extends AbstractPacket {
public void handleServerSide(EntityPlayer player) {
World world = player.worldObj;
TileEntity te = world.func_147438_o(x, y, z);
TileEntity te = world.getTileEntity(x, y, z);
if (te instanceof SmelteryLogic)
{
@@ -84,8 +84,8 @@ public class PacketSmeltery extends AbstractPacket {
((SmelteryLogic) te).moltenMetal.add(0, temp);
}
//TODO check if this works like it should
//Old code: PacketDispatcher.sendPacketToAllInDimension(te.func_145844_m(), dimension);
FMLCommonHandler.instance().getClientToServerNetworkManager().func_150725_a(te.func_145844_m());
//Old code: PacketDispatcher.sendPacketToAllInDimension(te.getDescriptionPacket(), dimension);
FMLCommonHandler.instance().getClientToServerNetworkManager().scheduleOutboundPacket(te.getDescriptionPacket());
}
}
@@ -48,7 +48,7 @@ public class PacketStencilTable extends AbstractPacket {
@Override
public void handleServerSide(EntityPlayer player) {
World world = player.worldObj;
TileEntity te = world.func_147438_o(x, y, z);
TileEntity te = world.getTileEntity(x, y, z);
if (te instanceof InventoryLogic) {
((InventoryLogic) te).setInventorySlotContents(1, contents);
@@ -46,7 +46,7 @@ public class PacketToolStation extends AbstractPacket {
@Override
public void handleServerSide(EntityPlayer player) {
World world = player.worldObj;
TileEntity te = world.func_147438_o(x, y, z);
TileEntity te = world.getTileEntity(x, y, z);
if (te instanceof ToolStationLogic) {
((ToolStationLogic) te).setToolname(toolName);
@@ -95,13 +95,13 @@ public class ArmorExtended implements IInventory
}
@Override
public String func_145825_b ()
public String getInventoryName ()
{
return "";
}
@Override
public boolean func_145818_k_ ()
public boolean hasCustomInventoryName ()
{
return false;
}
@@ -258,10 +258,10 @@ public class ArmorExtended implements IInventory
public void readFromNBT (EntityPlayer entityplayer)
{
NBTTagCompound tags = entityplayer.getEntityData();
NBTTagList tagList = tags.func_150295_c("TConstruct.Inventory",9);
NBTTagList tagList = tags.getTagList("TConstruct.Inventory",9);
for (int i = 0; i < tagList.tagCount(); ++i)
{
NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.func_150305_b(i);
NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.getCompoundTagAt(i);
int j = nbttagcompound.getByte("Slot") & 255;
ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound);
@@ -83,13 +83,13 @@ public class KnapsackInventory implements IInventory
}
@Override
public String func_145825_b ()
public String getInventoryName ()
{
return "tconstruct.knapsack";
}
@Override
public boolean func_145818_k_ ()
public boolean hasCustomInventoryName ()
{
return false;
}
@@ -149,10 +149,10 @@ public class KnapsackInventory implements IInventory
public void readFromNBT (EntityPlayer entityplayer)
{
NBTTagCompound tags = entityplayer.getEntityData();
NBTTagList tagList = tags.func_150295_c("TConstruct.Knapsack", 9);
NBTTagList tagList = tags.getTagList("TConstruct.Knapsack", 9);
for (int i = 0; i < tagList.tagCount(); ++i)
{
NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.func_150305_b(i);
NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.getCompoundTagAt(i);
int j = nbttagcompound.getByte("Slot") & 255;
ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound);