diff --git a/src/resonantinduction/ResonantInduction.java b/src/resonantinduction/ResonantInduction.java index 5a0df48e..98c66726 100644 --- a/src/resonantinduction/ResonantInduction.java +++ b/src/resonantinduction/ResonantInduction.java @@ -14,6 +14,7 @@ import resonantinduction.contractor.ItemBlockContractor; import resonantinduction.contractor.TileEntityEMContractor; import resonantinduction.entangler.ItemQuantumEntangler; import resonantinduction.multimeter.BlockMultimeter; +import resonantinduction.multimeter.ItemBlockMultimeter; import resonantinduction.multimeter.TileEntityMultimeter; import resonantinduction.tesla.BlockTesla; import resonantinduction.tesla.TileEntityTesla; @@ -141,7 +142,7 @@ public class ResonantInduction CONFIGURATION.save(); GameRegistry.registerBlock(blockTesla, blockTesla.getUnlocalizedName()); - GameRegistry.registerBlock(blockMultimeter, blockMultimeter.getUnlocalizedName()); + GameRegistry.registerBlock(blockMultimeter, ItemBlockMultimeter.class, blockMultimeter.getUnlocalizedName()); GameRegistry.registerBlock(blockEMContractor, ItemBlockContractor.class, blockEMContractor.getUnlocalizedName()); // Tiles diff --git a/src/resonantinduction/multimeter/ItemBlockMultimeter.java b/src/resonantinduction/multimeter/ItemBlockMultimeter.java new file mode 100644 index 00000000..fa76cbef --- /dev/null +++ b/src/resonantinduction/multimeter/ItemBlockMultimeter.java @@ -0,0 +1,37 @@ +/** + * + */ +package resonantinduction.multimeter; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +/** + * ItemBlock for the Multimeter + * + * @author Calclavia + * + */ +public class ItemBlockMultimeter extends ItemBlock +{ + public ItemBlockMultimeter(int par1) + { + super(par1); + } + + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World world, int x, int y, int z, int par7, float par8, float par9, float par10) + { + if (par2EntityPlayer.isSneaking()) + { + if (!world.isRemote) + { + par2EntityPlayer.addChatMessage("Energy: " + TileEntityMultimeter.getDetectedEnergy(world.getBlockTileEntity(x, y, z)) + " J"); + } + return true; + } + + return super.onItemUse(par1ItemStack, par2EntityPlayer, world, x, y, z, par7, par8, par9, par10); + } +} diff --git a/src/resonantinduction/multimeter/TileEntityMultimeter.java b/src/resonantinduction/multimeter/TileEntityMultimeter.java index ac64cac3..57c6dab0 100644 --- a/src/resonantinduction/multimeter/TileEntityMultimeter.java +++ b/src/resonantinduction/multimeter/TileEntityMultimeter.java @@ -126,11 +126,17 @@ public class TileEntityMultimeter extends TileEntityBase implements IPacketRecei ForgeDirection opp = direction.getOpposite(); TileEntity tileEntity = this.worldObj.getBlockTileEntity(this.xCoord + opp.offsetX, this.yCoord + opp.offsetY, this.zCoord + opp.offsetZ); + return getDetectedEnergy(tileEntity); + } + + public static float getDetectedEnergy(TileEntity tileEntity) + { // TODO: Universal Compatiblity in the future. if (tileEntity instanceof TileEntityTesla) { return ((TileEntityTesla) tileEntity).getEnergyStored(); } + return 0; }