Auto update mappings

This commit is contained in:
modmuss50 2016-05-06 22:13:24 +01:00
parent 595c9575b1
commit 4095a0b52d
79 changed files with 704 additions and 644 deletions

View file

@ -49,21 +49,21 @@ public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, II
{
Item item = stack.getItem();
if (item instanceof ItemBlock && Block.getBlockFromItem(item) != Blocks.air)
if (item instanceof ItemBlock && Block.getBlockFromItem(item) != Blocks.AIR)
{
Block block = Block.getBlockFromItem(item);
if (block == Blocks.wooden_slab)
if (block == Blocks.WOODEN_SLAB)
{
return 150;
}
if (block.getMaterial(block.getDefaultState()) == Material.wood)
if (block.getMaterial(block.getDefaultState()) == Material.WOOD)
{
return 300;
}
if (block == Blocks.coal_block)
if (block == Blocks.COAL_BLOCK)
{
return 16000;
}
@ -75,15 +75,15 @@ public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, II
return 200;
// if (item instanceof ItemHoe && ((ItemHoe)
// item).getToolMaterialName().equals("WOOD")) return 200;
if (item == Items.stick)
if (item == Items.STICK)
return 100;
if (item == Items.coal)
if (item == Items.COAL)
return 1600;
if (item == Items.lava_bucket)
if (item == Items.LAVA_BUCKET)
return 20000;
if (item == Item.getItemFromBlock(Blocks.sapling))
if (item == Item.getItemFromBlock(Blocks.SAPLING))
return 100;
if (item == Items.blaze_rod)
if (item == Items.BLAZE_ROD)
return 2400;
return GameRegistry.getFuelValue(stack);
}

View file

@ -40,22 +40,22 @@ public class TileIronFurnace extends TileMachineBase implements IInventoryProvid
{
Block block = Block.getBlockFromItem(item);
if (block == Blocks.wooden_slab)
if (block == Blocks.WOODEN_SLAB)
{
return 150;
}
if (block == Blocks.log)
if (block == Blocks.LOG)
{
return 1200;
}
if (block.getMaterial(block.getDefaultState()) == Material.wood)
if (block.getMaterial(block.getDefaultState()) == Material.WOOD)
{
return 300;
}
if (block == Blocks.coal_block)
if (block == Blocks.COAL_BLOCK)
{
return 16000;
}
@ -67,15 +67,15 @@ public class TileIronFurnace extends TileMachineBase implements IInventoryProvid
return 200;
if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD"))
return 200;
if (item == Items.stick)
if (item == Items.STICK)
return 100;
if (item == Items.coal)
if (item == Items.COAL)
return 1600;
if (item == Items.lava_bucket)
if (item == Items.LAVA_BUCKET)
return 20000;
if (item == new ItemStack(Blocks.sapling).getItem())
if (item == new ItemStack(Blocks.SAPLING).getItem())
return 100;
if (item == Items.blaze_rod)
if (item == Items.BLAZE_ROD)
return 2400;
return GameRegistry.getFuelValue(stack);
}

View file

@ -32,7 +32,7 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha
if (!worldObj.isRemote)
{
if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY() + 1, getPos().getZ()))
.getBlock() == Blocks.dragon_egg)
.getBlock() == Blocks.DRAGON_EGG)
{
addEnergy(euTick);
}

View file

@ -29,23 +29,23 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable
if (!worldObj.isRemote)
{
if (worldObj.getBlockState(new BlockPos(getPos().getX() + 1, getPos().getY(), getPos().getZ()))
.getBlock() == Blocks.lava)
.getBlock() == Blocks.LAVA)
{
addEnergy(euTick);
} else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() + 1))
.getBlock() == Blocks.lava)
.getBlock() == Blocks.LAVA)
{
addEnergy(euTick);
} else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() - 1))
.getBlock() == Blocks.lava)
.getBlock() == Blocks.LAVA)
{
addEnergy(euTick);
} else if (worldObj.getBlockState(new BlockPos(getPos().getX() - 1, getPos().getY(), getPos().getZ()))
.getBlock() == Blocks.lava)
.getBlock() == Blocks.LAVA)
{
addEnergy(euTick);
} else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY() - 1, getPos().getZ()))
.getBlock() == Blocks.lava)
.getBlock() == Blocks.LAVA)
{
addEnergy(euTick);
}

View file

@ -153,7 +153,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
{
if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(),
getPos().getY() + direction.getFrontOffsetY(), getPos().getZ() + direction.getFrontOffsetZ()))
.getBlock() == Blocks.lava)
.getBlock() == Blocks.LAVA)
{
addEnergy(1);
}
@ -167,7 +167,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
{
if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(),
getPos().getY() + direction.getFrontOffsetY(),
getPos().getZ() + direction.getFrontOffsetZ())).getBlock() == Blocks.lava)
getPos().getZ() + direction.getFrontOffsetZ())).getBlock() == Blocks.LAVA)
{
didFindLava = true;
}

View file

@ -37,7 +37,7 @@ public class TileWaterMill extends TilePowerAcceptor
waterblocks = 0;
for (EnumFacing facing : EnumFacing.HORIZONTALS)
{
if (worldObj.getBlockState(getPos().offset(facing)).getBlock() == Blocks.water)
if (worldObj.getBlockState(getPos().offset(facing)).getBlock() == Blocks.WATER)
{
waterblocks++;
}