From 23ae6402864d486ec476d31f5a244333d18f1d79 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 10 Oct 2015 15:29:02 +0200 Subject: [PATCH] Solar Panel & Heat Collector energy storage info --- .../blocks/BlockFurnaceSolar.java | 14 ++++++++++++++ .../blocks/BlockHeatCollector.java | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java index a7dd996d6..4c95c9d8c 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java @@ -18,11 +18,13 @@ import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -37,6 +39,18 @@ public class BlockFurnaceSolar extends BlockContainerBase implements IActAddItem this.setBlockBounds(0F, 0F, 0F, 1F, 3F/16F, 1F); } + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){ + if(!world.isRemote){ + TileEntityFurnaceSolar generator = (TileEntityFurnaceSolar)world.getTileEntity(x, y, z); + if(generator != null){ + player.addChatComponentMessage(new ChatComponentText(generator.storage.getEnergyStored()+"/"+generator.storage.getMaxEnergyStored()+" RF")); + } + return true; + } + return true; + } + @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityFurnaceSolar(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java index 5adcdb375..93d8611c6 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java @@ -18,10 +18,12 @@ import ellpeck.actuallyadditions.util.ModUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -48,6 +50,18 @@ public class BlockHeatCollector extends BlockContainerBase implements IActAddIte return side == 1 ? this.topIcon : (side == 0 ? this.bottomIcon : this.blockIcon); } + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){ + if(!world.isRemote){ + TileEntityHeatCollector generator = (TileEntityHeatCollector)world.getTileEntity(x, y, z); + if(generator != null){ + player.addChatComponentMessage(new ChatComponentText(generator.storage.getEnergyStored()+"/"+generator.storage.getMaxEnergyStored()+" RF")); + } + return true; + } + return true; + } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){