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

@@ -36,7 +36,7 @@ public abstract class ArmorCore extends ItemArmor implements IEnergyContainerIte
this.setUnlocalizedName(SET_NAME);
this.armorPart = part;
this.baseProtection = baseProtection;
BlockDispenser.field_149943_a.putObject(this, dispenserBehavior);
BlockDispenser.dispenseBehaviorRegistry.putObject(this, dispenserBehavior);
}
public String getArmorName ()
@@ -180,12 +180,12 @@ public class MultiFluidTank extends LogicComponent implements IFluidTank
@Override
public void readNetworkNBT (NBTTagCompound tags)
{
NBTTagList liquidTag = tags.func_150295_c("Liquids",9);
NBTTagList liquidTag = tags.getTagList("Liquids",9);
fluidlist.clear();
for (int iter = 0; iter < liquidTag.tagCount(); iter++)
{
NBTTagCompound nbt = (NBTTagCompound) liquidTag.func_150305_b(iter);
NBTTagCompound nbt = (NBTTagCompound) liquidTag.getCompoundTagAt(iter);
FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt);
if (fluid != null)
fluidlist.add(fluid);
@@ -43,7 +43,7 @@ public class TankLayerScan extends LogicComponent
master = te;
imaster = (IMasterLogic) te;
scanBlocks = ids;
masterCoord = new CoordTuple(te.field_145851_c, te.field_145848_d, te.field_145849_e);
masterCoord = new CoordTuple(te.xCoord, te.yCoord, te.zCoord);
validAirCoords.add(new int[] { 1, 0 });
validAirCoords.add(new int[] { -1, 0 });
validAirCoords.add(new int[] { 0, 1 });
@@ -68,12 +68,12 @@ public class TankLayerScan extends LogicComponent
{
case 2: // +z
case 3: // -z
if (checkAir(master.field_145851_c, master.field_145848_d, master.field_145849_e - 1) && checkAir(master.field_145851_c, master.field_145848_d, master.field_145849_e + 1))
if (checkAir(master.xCoord, master.yCoord, master.zCoord - 1) && checkAir(master.xCoord, master.yCoord, master.zCoord + 1))
validAir = true;
break;
case 4: // +x
case 5: // -x
if (checkAir(master.field_145851_c - 1, master.field_145848_d, master.field_145849_e) && checkAir(master.field_145851_c + 1, master.field_145848_d, master.field_145849_e))
if (checkAir(master.xCoord - 1, master.yCoord, master.zCoord) && checkAir(master.xCoord + 1, master.yCoord, master.zCoord))
validAir = true;
break;
}
@@ -91,8 +91,8 @@ public class TankLayerScan extends LogicComponent
if (dir == 5)
zPos = 1;
returnStone = new CoordTuple(master.field_145851_c - xPos, master.field_145848_d, master.field_145849_e - zPos);
if (initialRecurseLayer(master.field_145851_c + xPos, master.field_145848_d, master.field_145849_e + zPos))
returnStone = new CoordTuple(master.xCoord - xPos, master.yCoord, master.zCoord - zPos);
if (initialRecurseLayer(master.xCoord + xPos, master.yCoord, master.zCoord + zPos))
{
xPos = 0;
zPos = 0;
@@ -117,7 +117,7 @@ public class TankLayerScan extends LogicComponent
bricks = 0;
//Does the actual adding of blocks in the ring
boolean sealed = floodTest(master.field_145851_c + xPos, master.field_145848_d, master.field_145849_e + zPos);
boolean sealed = floodTest(master.xCoord + xPos, master.yCoord, master.zCoord + zPos);
if (!world.isRemote && debug)
{
TConstruct.logger.info("Air in ring: " + airBlocks);
@@ -126,15 +126,15 @@ public class TankLayerScan extends LogicComponent
if (sealed)
{
blockCoords.add(new CoordTuple(master.field_145851_c, master.field_145848_d, master.field_145849_e)); //Don't forget me!
blockCoords.add(new CoordTuple(master.xCoord, master.yCoord, master.zCoord)); //Don't forget me!
layerAirCoords = new HashSet<CoordTuple>(airCoords);
layerBlockCoords = new HashSet<CoordTuple>(blockCoords);
int lowY = recurseStructureDown(master.field_145848_d - 1);
int lowY = recurseStructureDown(master.yCoord - 1);
if (lowY != -1)
{
completeStructure = true;
structureTop = recurseStructureUp(master.field_145848_d + 1);
structureTop = recurseStructureUp(master.yCoord + 1);
finalizeStructure();
if (!world.isRemote && debug)
@@ -155,9 +155,9 @@ public class TankLayerScan extends LogicComponent
for (CoordTuple coord : blockCoords)
{
TileEntity servant = world.func_147438_o(coord.x, coord.y, coord.z);
TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z);
if (servant instanceof IServantLogic)
((IServantLogic) servant).verifyMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e);
((IServantLogic) servant).verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord);
}
}
@@ -193,7 +193,7 @@ public class TankLayerScan extends LogicComponent
protected boolean checkAir (int x, int y, int z)
{
Block block = world.func_147439_a(x, y, z);
Block block = world.getBlock(x, y, z);
if (block == null || block == Blocks.air)// || block == TContent.tankAir)
return true;
@@ -202,14 +202,14 @@ public class TankLayerScan extends LogicComponent
protected boolean checkServant (int x, int y, int z)
{
Block block = world.func_147439_a(x, y, z);
Block block = world.getBlock(x, y, z);
if (block == null || block == Blocks.air || !isValidBlock(x, y, z))
return false;
if (!block.hasTileEntity(world.getBlockMetadata(x, y, z)))
return false;
TileEntity be = world.func_147438_o(x, y, z);
TileEntity be = world.getTileEntity(x, y, z);
if (be instanceof IServantLogic)
return ((IServantLogic) be).setPotentialMaster(this.imaster, this.world, x, y, z);
@@ -247,7 +247,7 @@ public class TankLayerScan extends LogicComponent
protected boolean isValidBlock (int x, int y, int z)
{
Block block = world.func_147439_a(x, y, z);
Block block = world.getBlock(x, y, z);
if (block != null)
{
for (int i = 0; i < scanBlocks.length; i++)
@@ -417,11 +417,11 @@ public class TankLayerScan extends LogicComponent
int height = -1;
for (CoordTuple coord : blockCoords)
{
TileEntity servant = world.func_147438_o(coord.x, coord.y, coord.z);
TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z);
boolean canPass = false;
if (servant instanceof IServantLogic)
{
canPass = ((IServantLogic) servant).verifyMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e);
canPass = ((IServantLogic) servant).verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord);
if (canPass)
continue;
}
@@ -435,7 +435,7 @@ public class TankLayerScan extends LogicComponent
if (height != -1)
{
if (height <= master.field_145848_d)
if (height <= master.yCoord)
invalidateStructure();
else
invalidateBlocksAbove(height);
@@ -457,11 +457,11 @@ public class TankLayerScan extends LogicComponent
completeStructure = false;
for (CoordTuple coord : blockCoords)
{
TileEntity servant = world.func_147438_o(coord.x, coord.y, coord.z);
TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z);
if (servant instanceof IServantLogic)
((IServantLogic) servant).invalidateMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e);
((IServantLogic) servant).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord);
}
master.func_145831_w().func_147471_g(master.field_145851_c, master.field_145848_d, master.field_145849_e);
master.getWorldObj().markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord);
}
protected void invalidateBlocksAbove (int height)
@@ -471,9 +471,9 @@ public class TankLayerScan extends LogicComponent
if (coord.y < height)
continue;
TileEntity servant = world.func_147438_o(coord.x, coord.y, coord.z);
TileEntity servant = world.getTileEntity(coord.x, coord.y, coord.z);
if (servant instanceof IServantLogic)
((IServantLogic) servant).invalidateMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e);
((IServantLogic) servant).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord);
}
}
@@ -484,10 +484,10 @@ public class TankLayerScan extends LogicComponent
while (i.hasNext())
{
CoordTuple coord = (CoordTuple) i.next();
TileEntity te = world.func_147438_o(coord.x, coord.y, coord.z);
TileEntity te = world.getTileEntity(coord.x, coord.y, coord.z);
if (te != null && te instanceof IServantLogic)
{
((IServantLogic) te).invalidateMaster(imaster, world, master.field_145851_c, master.field_145848_d, master.field_145849_e);
((IServantLogic) te).invalidateMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord);
}
}
}
@@ -497,7 +497,7 @@ public class TankLayerScan extends LogicComponent
public void readFromNBT (NBTTagCompound tags)
{
super.readFromNBT(tags);
NBTTagList layerAir = tags.func_150295_c("AirLayer",11);
NBTTagList layerAir = tags.getTagList("AirLayer",11);
if (layerAir != null)
{
layerAirCoords.clear();
@@ -509,7 +509,7 @@ public class TankLayerScan extends LogicComponent
}
}
NBTTagList blocks = tags.func_150295_c("Blocks", 11);
NBTTagList blocks = tags.getTagList("Blocks", 11);
if (blocks != null)
{
blockCoords.clear();
@@ -521,7 +521,7 @@ public class TankLayerScan extends LogicComponent
}
}
NBTTagList air = tags.func_150295_c("Air", 11);
NBTTagList air = tags.getTagList("Air", 11);
if (air != null)
{
airCoords.clear();
@@ -496,8 +496,8 @@ public class AbilityHelper
return true;
}
Block b = world.func_147439_a(x, y, z);
Block babove = world.func_147439_a(x, y + 1, z);
Block b = world.getBlock(x, y, z);
Block babove = world.getBlock(x, y + 1, z);
if ((side == 0 || babove != Blocks.air || b != Blocks.grass) && b != Blocks.dirt)
{
@@ -506,8 +506,8 @@ public class AbilityHelper
else
{
Block block = Blocks.farmland;
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.field_149762_H.field_150501_a,
(block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, block.field_149762_H.func_150494_d() * 0.8F);
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.soundName,
(block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F);
if (world.isRemote)
{
@@ -515,7 +515,7 @@ public class AbilityHelper
}
else
{
world.func_147449_b(x, y, z, block);
world.setBlock(x, y, z, block);
onBlockChanged(stack, world, Blocks.air, x, y, z, player, random);
return true;
}
@@ -605,7 +605,7 @@ public class AbilityHelper
float f6 = random.nextFloat() * f3 + (1.0F - f3) * 0.5F;
entityitem = new EntityItem(world, f + f4, f1 + f5, f2 + f6, itemstack);
}
entityitem.field_145804_b = 10;
entityitem.delayBeforeCanPickup = 10;
world.spawnEntityInWorld(entityitem);
return entityitem;
}
@@ -27,7 +27,7 @@ public abstract class DualHarvestTool extends HarvestTool
NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
World world = player.worldObj;
int meta = world.getBlockMetadata(x, y, z);
Block block = player.worldObj.func_147439_a(x, y, z);
Block block = player.worldObj.getBlock(x, y, z);
if (block == null || block == Blocks.air)
return false;
int hlvl = block.getHarvestLevel(meta);
@@ -47,10 +47,10 @@ public abstract class DualHarvestTool extends HarvestTool
else
{
if (!player.capabilities.isCreativeMode)
func_150894_a(stack, world, block, x, y, z, player);
onBlockDestroyed(stack, world, block, x, y, z, player);
WorldHelper.setBlockToAir(world, x, y, z);
if (!world.isRemote)
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12));
world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12));
return true;
}
}
@@ -66,7 +66,7 @@ public abstract class DualHarvestTool extends HarvestTool
Material[] materials = getEffectiveMaterials();
for (int i = 0; i < materials.length; i++)
{
if (materials[i] == block.func_149688_o())
if (materials[i] == block.getMaterial())
{
float speed = tags.getInteger("MiningSpeed");
speed /= 100f;
@@ -84,7 +84,7 @@ public abstract class DualHarvestTool extends HarvestTool
materials = getEffectiveSecondaryMaterials();
for (int i = 0; i < materials.length; i++)
{
if (materials[i] == block.func_149688_o())
if (materials[i] == block.getMaterial())
{
float speed = tags.getInteger("MiningSpeed2");
speed /= 100f;
@@ -104,18 +104,18 @@ public abstract class DualHarvestTool extends HarvestTool
public boolean canHarvestBlock (Block block)
{
if (block.func_149688_o().isToolNotRequired())
if (block.getMaterial().isToolNotRequired())
{
return true;
}
for (Material m : getEffectiveMaterials())
{
if (m == block.func_149688_o())
if (m == block.getMaterial())
return true;
}
for (Material m : getEffectiveSecondaryMaterials())
{
if (m == block.func_149688_o())
if (m == block.getMaterial())
return true;
}
return false;
@@ -29,7 +29,7 @@ public abstract class HarvestTool extends ToolCore
NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
World world = player.worldObj;
Block block = player.worldObj.func_147439_a(x, y, z);
Block block = player.worldObj.getBlock(x, y, z);
int meta = world.getBlockMetadata(x, y, z);
//Block block = Block.blocksList[bID];
if (block == null || block == Blocks.air)
@@ -50,9 +50,9 @@ public abstract class HarvestTool extends ToolCore
{
WorldHelper.setBlockToAir(world, x, y, z);
if (!player.capabilities.isCreativeMode)
func_150894_a(stack, world, block, x, y, z, player);
onBlockDestroyed(stack, world, block, x, y, z, player);
if (!world.isRemote)
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12));
world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12));
return true;
}
}
@@ -70,7 +70,7 @@ public abstract class HarvestTool extends ToolCore
Material[] materials = getEffectiveMaterials();
for (int i = 0; i < materials.length; i++)
{
if (materials[i] == block.func_149688_o())
if (materials[i] == block.getMaterial())
{
return calculateStrength(tags, block, meta);
}
@@ -118,13 +118,13 @@ public abstract class HarvestTool extends ToolCore
public boolean canHarvestBlock (Block block)
{
if (block.func_149688_o().isToolNotRequired())
if (block.getMaterial().isToolNotRequired())
{
return true;
}
for (Material m : getEffectiveMaterials())
{
if (m == block.func_149688_o())
if (m == block.getMaterial())
return true;
}
return false;
@@ -613,9 +613,9 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa
}
@Override
public boolean func_150894_a (ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player)
public boolean onBlockDestroyed (ItemStack itemstack, World world, Block block, int x, int y, int z, EntityLivingBase player)
{
if (block != null && (double) block.func_149712_f(world, x, y, z) != 0.0D)
if (block != null && (double) block.getBlockHardness(world, x, y, z) != 0.0D)
{
return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random);
}
@@ -37,7 +37,7 @@ public abstract class Weapon extends ToolCore
for (int i = 0; i < web.length; i++)
{
if (web[i] == block.func_149688_o())
if (web[i] == block.getMaterial())
{
return effectiveSpeed();
}
@@ -82,7 +82,7 @@ public abstract class Weapon extends ToolCore
{
for (int i = 0; i < web.length; i++)
{
if (block.func_149688_o() == web[i])
if (block.getMaterial() == web[i])
return true;
}
return super.canHarvestBlock(block, is);
@@ -123,7 +123,7 @@ public abstract class Weapon extends ToolCore
return new String[] { "weapon", "melee" };
}
public static Material[] web = new Material[] { Material.field_151569_G };
public static Material[] web = new Material[] { Material.web };
public static Material[] none = new Material[0];
}