Fix all the non-horrible blocks.

Down to 851 errors with package exclusions.
This commit is contained in:
Ben Spiers committed 2016-01-25 16:44:58 +00:00
1 parent 1591f921e1
commit 18a1dedf92
12 files changed
+367 -421

No files matched your search

@@ -14,13 +14,15 @@ import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
@@ -42,19 +44,21 @@ public class BlockGasTank extends BlockContainer
setCreativeTab(Mekanism.tabMekanism);
}
/*
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister register)
public void registerBlockIcons(IIconRegister register)
{
blockIcon = register.registerIcon("mekanism:SteelCasing");
}
*/
@Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack itemstack)
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
{
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z);
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos);
int side = MathHelper.floor_double((double)(entityliving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
int side = MathHelper.floor_double((double)(placer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
int change = 3;
switch(side)
@@ -66,25 +70,25 @@ public class BlockGasTank extends BlockContainer
}
tileEntity.setFacing((short)change);
tileEntity.redstone = world.isBlockIndirectlyGettingPowered(x, y, z);
tileEntity.redstone = world.isBlockIndirectlyGettingPowered(pos) > 0;
}
@Override
public void onNeighborBlockChange(World world, int x, int y, int z, Block block)
public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock)
{
if(!world.isRemote)
{
TileEntity tileEntity = world.getTileEntity(x, y, z);
TileEntity tileEntity = world.getTileEntity(pos);
if(tileEntity instanceof TileEntityBasicBlock)
{
((TileEntityBasicBlock)tileEntity).onNeighborChange(block);
((TileEntityBasicBlock)tileEntity).onNeighborChange(neighborBlock);
}
}
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float playerX, float playerY, float playerZ)
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer entityplayer, EnumFacing side, float hitX, float hitY, float hitZ)
{
if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem()))
{
@@ -96,27 +100,27 @@ public class BlockGasTank extends BlockContainer
return true;
}
TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z);
TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(pos);
if(entityplayer.getCurrentEquippedItem() != null)
{
Item tool = entityplayer.getCurrentEquippedItem().getItem();
if(MekanismUtils.hasUsableWrench(entityplayer, x, y, z))
if(MekanismUtils.hasUsableWrench(entityplayer, pos))
{
if(entityplayer.isSneaking())
{
dismantleBlock(world, x, y, z, false);
dismantleBlock(world, pos, false);
return true;
}
if(MekanismUtils.isBCWrench(tool))
((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z);
((IToolWrench)tool).wrenchUsed(entityplayer, pos);
int change = EnumFacing.ROTATION_MATRIX[EnumFacing.UP.ordinal()][tileEntity.facing];
int change = tileEntity.facing.rotateY().ordinal();
tileEntity.setFacing((short)change);
world.notifyBlocksOfNeighborChange(x, y, z, this);
world.notifyNeighborsOfStateChange(pos, this);
return true;
}
}
@@ -125,7 +129,7 @@ public class BlockGasTank extends BlockContainer
{
if(!entityplayer.isSneaking())
{
entityplayer.openGui(Mekanism.instance, 10, world, x, y, z);
entityplayer.openGui(Mekanism.instance, 10, world, pos.getX(), pos.getY(), pos.getZ());
return true;
}
}
@@ -133,7 +137,7 @@ public class BlockGasTank extends BlockContainer
}
@Override
public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest)
public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest)
{
if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest)
{
@@ -142,19 +146,19 @@ public class BlockGasTank extends BlockContainer
double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, getPickBlock(null, world, x, y, z, player));
EntityItem entityItem = new EntityItem(world, pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, getPickBlock(null, world, pos, player));
world.spawnEntityInWorld(entityItem);
}
return world.setBlockToAir(x, y, z);
return world.setBlockToAir(pos);
}
public ItemStack dismantleBlock(World world, int x, int y, int z, boolean returnBlock)
public ItemStack dismantleBlock(World world, BlockPos pos, boolean returnBlock)
{
ItemStack itemStack = getPickBlock(null, world, x, y, z, null);
ItemStack itemStack = getPickBlock(null, world, pos, null);
world.setBlockToAir(x, y, z);
world.setBlockToAir(pos);
if(!returnBlock)
{
@@ -163,7 +167,7 @@ public class BlockGasTank extends BlockContainer
double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, itemStack);
EntityItem entityItem = new EntityItem(world, pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, itemStack);
world.spawnEntityInWorld(entityItem);
}
@@ -178,17 +182,11 @@ public class BlockGasTank extends BlockContainer
}
@Override
public Item getItemDropped(int i, Random random, int j)
public Item getItemDropped(IBlockState state, Random random, int fortune)
{
return null;
}
@Override
public boolean renderAsNormalBlock()
{
return false;
}
@Override
public boolean isOpaqueCube()
{
@@ -198,7 +196,7 @@ public class BlockGasTank extends BlockContainer
@Override
public int getRenderType()
{
return -1;
return 3;
}
@Override
@@ -208,16 +206,16 @@ public class BlockGasTank extends BlockContainer
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player)
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player)
{
TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z);
TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(pos);
ItemStack itemStack = new ItemStack(MekanismBlocks.GasTank);
IGasItem storageTank = (IGasItem)itemStack.getItem();
storageTank.setGas(itemStack, tileEntity.gasTank.getGas());
ISustainedInventory inventory = (ISustainedInventory)itemStack.getItem();
inventory.setInventory(((ISustainedInventory)tileEntity).getInventory(), itemStack);
inventory.setInventory(tileEntity.getInventory(), itemStack);
return itemStack;
}
@@ -229,16 +227,16 @@ public class BlockGasTank extends BlockContainer
}
@Override
public int getComparatorInputOverride(World world, int x, int y, int z, int par5)
public int getComparatorInputOverride(World world, BlockPos pos)
{
TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z);
TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(pos);
return tileEntity.getRedstoneLevel();
}
@Override
public EnumFacing[] getValidRotations(World world, int x, int y, int z)
public EnumFacing[] getValidRotations(World world, BlockPos pos)
{
TileEntity tile = world.getTileEntity(x, y, z);
TileEntity tile = world.getTileEntity(pos);
EnumFacing[] valid = new EnumFacing[6];
if(tile instanceof TileEntityBasicBlock)
@@ -258,9 +256,9 @@ public class BlockGasTank extends BlockContainer
}
@Override
public boolean rotateBlock(World world, int x, int y, int z, EnumFacing axis)
public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
{
TileEntity tile = world.getTileEntity(x, y, z);
TileEntity tile = world.getTileEntity(pos);
if(tile instanceof TileEntityBasicBlock)
{