This commit is contained in:
Modmuss50 2015-11-23 19:37:39 +00:00
parent 30879a534a
commit ef82ceb714
14 changed files with 156 additions and 120 deletions

View file

@ -1,11 +1,11 @@
package techreborn.blocks; package techreborn.blocks;
import ic2.api.item.IC2Items;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.BlockDynamicLiquid; import net.minecraft.block.BlockDynamicLiquid;
import net.minecraft.block.BlockStaticLiquid; import net.minecraft.block.BlockStaticLiquid;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.EnumCreatureType;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
@ -16,6 +16,7 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
@ -27,6 +28,7 @@ import techreborn.init.ModBlocks;
import techreborn.tiles.TileMachineBase; import techreborn.tiles.TileMachineBase;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockMachineBase extends BlockContainer { public class BlockMachineBase extends BlockContainer {
@ -43,62 +45,75 @@ public class BlockMachineBase extends BlockContainer {
return new TileMachineBase(); return new TileMachineBase();
} }
@Deprecated
public void onBlockAdded(World world, int x, int y, int z) { public void onBlockAdded(World world, int x, int y, int z) {
super.onBlockAdded(world, x, y, z);
this.setDefaultDirection(world, x, y, z);
} }
private void setDefaultDirection(World world, int x, int y, int z) { @Override
public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) {
super.onBlockAdded(worldIn, pos, state);
onBlockAdded(worldIn, pos.getX(), pos.getY(), pos.getZ());
this.setDefaultDirection(worldIn, pos);
}
private void setDefaultDirection(World world, BlockPos pos) {
if (!world.isRemote) { if (!world.isRemote) {
Block block1 = world.getBlock(x, y, z - 1); Block block1 = world.getBlockState(new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1)).getBlock();
Block block2 = world.getBlock(x, y, z + 1); Block block2 = world.getBlockState(new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1)).getBlock();
Block block3 = world.getBlock(x - 1, y, z); Block block3 = world.getBlockState(new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ())).getBlock();
Block block4 = world.getBlock(x + 1, y, z); Block block4 = world.getBlockState(new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ())).getBlock();
byte b = 3; byte b = 3;
if (block1.func_149730_j() && !block2.func_149730_j()) { if (block1.isOpaqueCube() && !block2.isOpaqueCube()) {
b = 3; b = 3;
} }
if (block2.func_149730_j() && !block1.func_149730_j()) { if (block2.isOpaqueCube() && !block1.isOpaqueCube()) {
b = 2; b = 2;
} }
if (block3.func_149730_j() && !block4.func_149730_j()) { if (block3.isOpaqueCube() && !block4.isOpaqueCube()) {
b = 5; b = 5;
} }
if (block4.func_149730_j() && !block3.func_149730_j()) { if (block4.isOpaqueCube() && !block3.isOpaqueCube()) {
b = 4; b = 4;
} }
world.setBlockMetadataWithNotify(x, y, z, b, 2); //TODO 1.8 meta
setTileRotation(world, x, y, z, b); // world.setBlockMetadataWithNotify(x, y, z, b, 2);
setTileRotation(world, pos, b);
} }
} }
@Deprecated
public void onBlockPlacedBy(World world, int x, int y, int z, public void onBlockPlacedBy(World world, int x, int y, int z,
EntityLivingBase player, ItemStack itemstack) { EntityLivingBase player, ItemStack itemstack) {
}
@Override
public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
super.onBlockPlacedBy(worldIn, pos, state, placer, stack);
onBlockPlacedBy(worldIn, pos.getX(), pos.getY(), pos.getZ(), placer, stack);
int l = MathHelper int l = MathHelper
.floor_double((double) (player.rotationYaw * 4.0F / 360F) + 0.5D) & 3; .floor_double((double) (placer.rotationYaw * 4.0F / 360F) + 0.5D) & 3;
if (l == 0) { if (l == 0) {
setTileRotation(world, x, y, z, 2); setTileRotation(worldIn, pos, 2);
} }
if (l == 1) { if (l == 1) {
setTileRotation(world, x, y, z, 5); setTileRotation(worldIn, pos, 5);
} }
if (l == 2) { if (l == 2) {
setTileRotation(world, x, y, z, 3); setTileRotation(worldIn, pos, 3);
} }
if (l == 3) { if (l == 3) {
setTileRotation(world, x, y, z, 4); setTileRotation(worldIn, pos, 4);
} }
super.onBlockPlacedBy(world, x, y, z, player, itemstack);
} }
public boolean canCreatureSpawn(EnumCreatureType type, World world, int x, public boolean canCreatureSpawn(EnumCreatureType type, World world, int x,
@ -106,14 +121,20 @@ public class BlockMachineBase extends BlockContainer {
return false; return false;
} }
@Override @Deprecated
public void breakBlock(World world, int x, int y, int z, Block block, int meta) { public void breakBlock(World world, int x, int y, int z, Block block, int meta) {
dropInventory(world, x, y, z);
super.breakBlock(world, x, y, z, block, meta);
} }
protected void dropInventory(World world, int x, int y, int z) { @Override
TileEntity tileEntity = world.getTileEntity(x, y, z); public void breakBlock(World worldIn, BlockPos pos, IBlockState state) {
super.breakBlock(worldIn, pos, state);
breakBlock(worldIn, pos.getX(), pos.getY(), pos.getZ(), state.getBlock(), 0);
dropInventory(worldIn, pos);
}
protected void dropInventory(World world, BlockPos pos) {
TileEntity tileEntity = world.getTileEntity(pos);
if (!(tileEntity instanceof IInventory)) { if (!(tileEntity instanceof IInventory)) {
return; return;
@ -126,7 +147,7 @@ public class BlockMachineBase extends BlockContainer {
if (itemStack != null && itemStack.stackSize > 0) { if (itemStack != null && itemStack.stackSize > 0) {
if (itemStack.getItem() instanceof ItemBlock) { if (itemStack.getItem() instanceof ItemBlock) {
if (((ItemBlock) itemStack.getItem()).field_150939_a instanceof BlockFluidBase || ((ItemBlock) itemStack.getItem()).field_150939_a instanceof BlockStaticLiquid || ((ItemBlock) itemStack.getItem()).field_150939_a instanceof BlockDynamicLiquid) { if (((ItemBlock) itemStack.getItem()).block instanceof BlockFluidBase || ((ItemBlock) itemStack.getItem()).block instanceof BlockStaticLiquid || ((ItemBlock) itemStack.getItem()).block instanceof BlockDynamicLiquid) {
return; return;
} }
} }
@ -136,7 +157,7 @@ public class BlockMachineBase extends BlockContainer {
float dY = rand.nextFloat() * 0.8F + 0.1F; float dY = rand.nextFloat() * 0.8F + 0.1F;
float dZ = rand.nextFloat() * 0.8F + 0.1F; float dZ = rand.nextFloat() * 0.8F + 0.1F;
EntityItem entityItem = new EntityItem(world, x + dX, y + dY, z + dZ, itemStack.copy()); EntityItem entityItem = new EntityItem(world, pos.getX() + dX, pos.getY() + dY, pos.getZ() + dZ, itemStack.copy());
if (itemStack.hasTagCompound()) { if (itemStack.hasTagCompound()) {
entityItem.getEntityItem().setTagCompound((NBTTagCompound) itemStack.getTagCompound().copy()); entityItem.getEntityItem().setTagCompound((NBTTagCompound) itemStack.getTagCompound().copy());
@ -152,33 +173,32 @@ public class BlockMachineBase extends BlockContainer {
} }
} }
public void setTileRotation(World world, int x, int y, int z, int meta) { public void setTileRotation(World world, BlockPos pos, int meta) {
if (world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileMachineBase) { if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof TileMachineBase) {
((TileMachineBase) world.getTileEntity(x, y, z)).setRotation(meta); ((TileMachineBase) world.getTileEntity(pos)).setRotation(meta);
} }
} }
public int getTileRotation(World world, int x, int y, int z) { public int getTileRotation(World world, BlockPos pos) {
if (world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileMachineBase) { if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof TileMachineBase) {
return ((TileMachineBase) world.getTileEntity(x, y, z)).getRotation(); return ((TileMachineBase) world.getTileEntity(pos)).getRotation();
} }
return 0; return 0;
} }
public int getTileRotation(IBlockAccess blockAccess, int x, int y, int z) { public int getTileRotation(IBlockAccess blockAccess, BlockPos pos) {
return blockAccess.getTileEntity(x, y, z) != null ? getTileRotation(blockAccess.getTileEntity(x, y, z).getWorld(), x, y, z) : 0; return blockAccess.getTileEntity(pos) != null ? getTileRotation(blockAccess.getTileEntity(pos).getWorld(), pos) : 0;
} }
@Override @Override
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) { public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
ArrayList<ItemStack> items = new ArrayList<ItemStack>(); ArrayList<ItemStack> items = new ArrayList<ItemStack>();
if (Loader.isModLoaded("IC2")) { // if (Loader.isModLoaded("IC2")) {
ItemStack stack = IC2Items.getItem(isAdvanced() ? "advancedMachine" : "machine").copy(); // ItemStack stack = IC2Items.getItem(isAdvanced() ? "advancedMachine" : "machine").copy();
stack.stackSize = 1; // stack.stackSize = 1;
items.add(stack); // items.add(stack);
} else { // } //TODO ic2
items.add(isAdvanced() ? new ItemStack(Item.getItemFromBlock(ModBlocks.MachineCasing), 1, 2) : new ItemStack(Item.getItemFromBlock(ModBlocks.MachineCasing), 1, 0)); items.add(isAdvanced() ? new ItemStack(Item.getItemFromBlock(ModBlocks.MachineCasing), 1, 2) : new ItemStack(Item.getItemFromBlock(ModBlocks.MachineCasing), 1, 0));
}
return items; return items;
} }
@ -187,33 +207,42 @@ public class BlockMachineBase extends BlockContainer {
} }
@Override @Override
public boolean rotateBlock(World worldObj, int x, int y, int z, EnumFacing axis) { public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) {
if (axis == null) { if (axis == null) {
return false; return false;
} else { } else {
TileEntity tile = worldObj.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(pos);
if (tile != null && tile instanceof TileMachineBase) { if (tile != null && tile instanceof TileMachineBase) {
TileMachineBase machineBase = (TileMachineBase) tile; TileMachineBase machineBase = (TileMachineBase) tile;
machineBase.setRotation(EnumFacing.getOrientation(machineBase.getRotation()).getRotation(axis).ordinal()); machineBase.setRotation(EnumFacing.getFront(machineBase.getRotation()).getOpposite().ordinal());
return true; return true;
} }
return false; return false;
} }
} }
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float hitX, float hitY, float hitZ) { public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ) {
if(fillBlockWithFluid(world, x, y, z, entityplayer, side, hitX, hitY, hitZ)){ if(fillBlockWithFluid(worldIn, pos, playerIn)){
return true; return true;
} }
return super.onBlockActivated(world, x, y, z, entityplayer, side, hitX, hitY, hitZ); if(onBlockActivated(worldIn, pos.getX(), pos.getY(), pos.getZ(), playerIn, side.getIndex(), hitX, hitY, hitZ)){
return true;
}
return super.onBlockActivated(worldIn, pos, state, playerIn, side, hitX, hitY, hitZ);
} }
public boolean fillBlockWithFluid(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float hitX, float hitY, float hitZ) { @Deprecated
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float hitX, float hitY, float hitZ) {
return false;
}
public boolean fillBlockWithFluid(World world, BlockPos pos, EntityPlayer entityplayer) {
ItemStack current = entityplayer.inventory.getCurrentItem(); ItemStack current = entityplayer.inventory.getCurrentItem();
if (current != null) { if (current != null) {
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(pos);
if (tile instanceof IFluidHandler) { if (tile instanceof IFluidHandler) {
IFluidHandler tank = (IFluidHandler) tile; IFluidHandler tank = (IFluidHandler) tile;

View file

@ -3,10 +3,13 @@ package techreborn.blocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
@ -29,70 +32,70 @@ public class BlockQuantumChest extends BlockContainer {
} }
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumFacing side, float hitX, float hitY, float hitZ) {
EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (!playerIn.isSneaking())
if (!player.isSneaking()) playerIn.openGui(Core.INSTANCE, GuiHandler.quantumChestID, worldIn, pos.getX(),
player.openGui(Core.INSTANCE, GuiHandler.quantumChestID, world, x, pos.getY(), pos.getZ());
y, z);
return true; return true;
} }
@Override
public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) {
public void onBlockAdded(World world, int x, int y, int z) { super.onBlockAdded(worldIn, pos, state);
this.setDefaultDirection(worldIn, pos);
super.onBlockAdded(world, x, y, z);
this.setDefaultDirection(world, x, y, z);
} }
private void setDefaultDirection(World world, int x, int y, int z) { private void setDefaultDirection(World world, BlockPos pos) {
if (!world.isRemote) { if (!world.isRemote) {
Block block1 = world.getBlock(x, y, z - 1); Block block1 = world.getBlockState(new BlockPos(pos.getX(), pos.getY(), pos.getZ() - 1)).getBlock();
Block block2 = world.getBlock(x, y, z + 1); Block block2 = world.getBlockState(new BlockPos(pos.getX(), pos.getY(), pos.getZ() + 1)).getBlock();
Block block3 = world.getBlock(x - 1, y, z); Block block3 = world.getBlockState(new BlockPos(pos.getX() - 1, pos.getY(), pos.getZ())).getBlock();
Block block4 = world.getBlock(x + 1, y, z); Block block4 = world.getBlockState(new BlockPos(pos.getX() + 1, pos.getY(), pos.getZ())).getBlock();
byte b = 3; byte b = 3;
if (block1.func_149730_j() && !block2.func_149730_j()) { if (block1.isOpaqueCube() && !block2.isOpaqueCube()) {
b = 3; b = 3;
} }
if (block2.func_149730_j() && !block1.func_149730_j()) { if (block2.isOpaqueCube() && !block1.isOpaqueCube()) {
b = 2; b = 2;
} }
if (block3.func_149730_j() && !block4.func_149730_j()) { if (block3.isOpaqueCube() && !block4.isOpaqueCube()) {
b = 5; b = 5;
} }
if (block4.func_149730_j() && !block3.func_149730_j()) { if (block4.isOpaqueCube() && !block3.isOpaqueCube()) {
b = 4; b = 4;
} }
world.setBlockMetadataWithNotify(x, y, z, b, 2); //TODO 1.8 meta
// world.setBlockMetadataWithNotify(x, y, z, b, 2);
// setTileRotation(world, pos, b);
} }
} }
public void onBlockPlacedBy(World world, int x, int y, int z, @Override
EntityLivingBase player, ItemStack itemstack) { public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
super.onBlockPlacedBy(worldIn, pos, state, placer, stack);
int l = MathHelper //TODO fix rotaion
.floor_double((double) (player.rotationYaw * 4.0F / 360F) + 0.5D) & 3;
if (l == 0) { // int l = MathHelper
world.setBlockMetadataWithNotify(x, y, z, 2, 2); // .floor_double((double) (placer.rotationYaw * 4.0F / 360F) + 0.5D) & 3;
} //
if (l == 1) { // if (l == 0) {
world.setBlockMetadataWithNotify(x, y, z, 5, 2); // setTileRotation(worldIn, pos, 2);
} // }
if (l == 2) { // if (l == 1) {
world.setBlockMetadataWithNotify(x, y, z, 3, 2); // setTileRotation(worldIn, pos, 5);
} // }
if (l == 3) { // if (l == 2) {
world.setBlockMetadataWithNotify(x, y, z, 4, 2); // setTileRotation(worldIn, pos, 3);
} // }
super.onBlockPlacedBy(world, x, y, z, player, itemstack); // if (l == 3) {
// setTileRotation(worldIn, pos, 4);
// }
} }
} }

View file

@ -3,6 +3,7 @@ package techreborn.blocks;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
import techreborn.client.GuiHandler; import techreborn.client.GuiHandler;
@ -24,7 +25,7 @@ public class BlockQuantumTank extends BlockMachineBase {
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if(fillBlockWithFluid(world, x, y, z, player, side, hitX, hitY, hitZ)){ if(fillBlockWithFluid(world, new BlockPos(x, y, z), player)){
return true; return true;
} }
if (!player.isSneaking()) if (!player.isSneaking())

View file

@ -2,6 +2,7 @@ package techreborn.blocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -42,7 +43,7 @@ public class BlockStorage extends Block {
} }
@Override @Override
public Item getItemDropped(int par1, Random random, int par2) { public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return Item.getItemFromBlock(this); return Item.getItemFromBlock(this);
} }
@ -55,10 +56,7 @@ public class BlockStorage extends Block {
} }
@Override @Override
public int damageDropped(int metaData) { public int damageDropped(IBlockState state) {
return metaData; return super.damageDropped(state);
} }
} }

View file

@ -2,6 +2,7 @@ package techreborn.blocks;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -36,8 +37,9 @@ public class BlockStorage2 extends Block {
setHardness(2f); setHardness(2f);
} }
@Override @Override
public Item getItemDropped(int par1, Random random, int par2) { public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return Item.getItemFromBlock(this); return Item.getItemFromBlock(this);
} }
@ -50,10 +52,7 @@ public class BlockStorage2 extends Block {
} }
@Override @Override
public int damageDropped(int metaData) { public int damageDropped(IBlockState state) {
return metaData; return super.damageDropped(state); //TODO fix for 1.8
} }
} }

View file

@ -1,6 +1,7 @@
package techreborn.blocks.fluid; package techreborn.blocks.fluid;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.util.BlockPos;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.BlockFluidClassic;
@ -16,17 +17,17 @@ public class BlockFluidBase extends BlockFluidClassic {
@Override @Override
public boolean canDisplace(IBlockAccess world, int x, int y, int z) { public boolean canDisplace(IBlockAccess world, BlockPos pos) {
if (world.getBlock(x, y, z).getMaterial().isLiquid()) if(world.getBlockState(pos).getBlock().getMaterial().isLiquid())
return false; return false;
return super.canDisplace(world, x, y, z); return super.canDisplace(world, pos);
} }
@Override @Override
public boolean displaceIfPossible(World world, int x, int y, int z) { public boolean displaceIfPossible(World world, BlockPos pos) {
if (world.getBlock(x, y, z).getMaterial().isLiquid()) if(world.getBlockState(pos).getBlock().getMaterial().isLiquid())
return false; return false;
return super.displaceIfPossible(world, x, y, z); return super.displaceIfPossible(world, pos);
} }
} }

View file

@ -3,6 +3,7 @@ package techreborn.blocks.generator;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
import techreborn.blocks.BlockMachineBase; import techreborn.blocks.BlockMachineBase;
@ -26,7 +27,7 @@ public class BlockDieselGenerator extends BlockMachineBase {
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, public boolean onBlockActivated(World world, int x, int y, int z,
EntityPlayer player, int side, float hitX, float hitY, float hitZ) { EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if(fillBlockWithFluid(world, x, y, z, player, side, hitX, hitY, hitZ)){ if(fillBlockWithFluid(world, new BlockPos(x, y, z), player)){
return true; return true;
} }
if (!player.isSneaking()) if (!player.isSneaking())

View file

@ -3,6 +3,7 @@ package techreborn.blocks.generator;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
import techreborn.blocks.BlockMachineBase; import techreborn.blocks.BlockMachineBase;
@ -25,7 +26,7 @@ public class BlockGasTurbine extends BlockMachineBase {
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, public boolean onBlockActivated(World world, int x, int y, int z,
EntityPlayer player, int side, float hitX, float hitY, float hitZ) { EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if(fillBlockWithFluid(world, x, y, z, player, side, hitX, hitY, hitZ)){ if(fillBlockWithFluid(world, new BlockPos(x, y, z), player)){
return true; return true;
} }
if (!player.isSneaking()) if (!player.isSneaking())

View file

@ -5,8 +5,6 @@ import techreborn.blocks.BlockMachineBase;
public class BlockMagicEnergyAbsorber extends BlockMachineBase { public class BlockMagicEnergyAbsorber extends BlockMachineBase {
@
public BlockMagicEnergyAbsorber(Material material) { public BlockMagicEnergyAbsorber(Material material) {
super(material); super(material);
setUnlocalizedName("techreborn.magicenergyabsorber"); setUnlocalizedName("techreborn.magicenergyabsorber");

View file

@ -3,6 +3,7 @@ package techreborn.blocks.generator;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
import techreborn.blocks.BlockMachineBase; import techreborn.blocks.BlockMachineBase;
@ -26,7 +27,7 @@ public class BlockSemiFluidGenerator extends BlockMachineBase {
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, public boolean onBlockActivated(World world, int x, int y, int z,
EntityPlayer player, int side, float hitX, float hitY, float hitZ) { EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if(fillBlockWithFluid(world, x, y, z, player, side, hitX, hitY, hitZ)){ if(fillBlockWithFluid(world, new BlockPos(x, y, z), player)){
return true; return true;
} }
if (!player.isSneaking()) if (!player.isSneaking())

View file

@ -3,6 +3,7 @@ package techreborn.blocks.generator;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
import techreborn.blocks.BlockMachineBase; import techreborn.blocks.BlockMachineBase;
@ -26,7 +27,7 @@ public class BlockThermalGenerator extends BlockMachineBase {
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, public boolean onBlockActivated(World world, int x, int y, int z,
EntityPlayer player, int side, float hitX, float hitY, float hitZ) { EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if(fillBlockWithFluid(world, x, y, z, player, side, hitX, hitY, hitZ)){ if(fillBlockWithFluid(world, new BlockPos(x, y, z), player)){
return true; return true;
} }
if (!player.isSneaking()) if (!player.isSneaking())

View file

@ -3,6 +3,7 @@ package techreborn.blocks.machine;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
import techreborn.blocks.BlockMachineBase; import techreborn.blocks.BlockMachineBase;
@ -25,7 +26,7 @@ public class BlockGrinder extends BlockMachineBase {
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, public boolean onBlockActivated(World world, int x, int y, int z,
EntityPlayer player, int side, float hitX, float hitY, float hitZ) { EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if(fillBlockWithFluid(world, x, y, z, player, side, hitX, hitY, hitZ)){ if(fillBlockWithFluid(world, new BlockPos(x, y, z), player)){
return true; return true;
} }
if (!player.isSneaking()) if (!player.isSneaking())

View file

@ -3,6 +3,7 @@ package techreborn.blocks.machine;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
import techreborn.blocks.BlockMachineBase; import techreborn.blocks.BlockMachineBase;
@ -24,7 +25,7 @@ public class BlockIndustrialSawmill extends BlockMachineBase {
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, public boolean onBlockActivated(World world, int x, int y, int z,
EntityPlayer player, int side, float hitX, float hitY, float hitZ) { EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if(fillBlockWithFluid(world, x, y, z, player, side, hitX, hitY, hitZ)){ if(fillBlockWithFluid(world, new BlockPos(x, y, z), player)){
return true; return true;
} }
if (!player.isSneaking()) if (!player.isSneaking())

View file

@ -3,6 +3,7 @@ package techreborn.blocks.machine;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import techreborn.Core; import techreborn.Core;
import techreborn.blocks.BlockMachineBase; import techreborn.blocks.BlockMachineBase;
@ -27,7 +28,7 @@ public class BlockVacuumFreezer extends BlockMachineBase {
public boolean onBlockActivated(World world, int x, int y, int z, public boolean onBlockActivated(World world, int x, int y, int z,
EntityPlayer player, int side, float hitX, float hitY, float hitZ) { EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
TileVacuumFreezer tileVacuumFreezer = (TileVacuumFreezer) world.getTileEntity(x, y, z); TileVacuumFreezer tileVacuumFreezer = (TileVacuumFreezer) world.getTileEntity(new BlockPos(x, y, z));
tileVacuumFreezer.multiBlockStatus = tileVacuumFreezer.checkMachine() ? 1 : 0; tileVacuumFreezer.multiBlockStatus = tileVacuumFreezer.checkMachine() ? 1 : 0;
if (!player.isSneaking()) if (!player.isSneaking())