From 7df5888bd3e4580ae19e5c37ca9926d7b256dbb1 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Tue, 2 Jul 2013 19:03:03 -0400 Subject: [PATCH] Added EnergyMeter --- common/mekanism/common/ItemEnergyMeter.java | 46 ++++++++++++++++++ common/mekanism/common/Mekanism.java | 6 ++- .../mekanism/textures/items/EnergyMeter.png | Bin 0 -> 1028 bytes 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 common/mekanism/common/ItemEnergyMeter.java create mode 100644 resources/mods/mekanism/textures/items/EnergyMeter.png diff --git a/common/mekanism/common/ItemEnergyMeter.java b/common/mekanism/common/ItemEnergyMeter.java new file mode 100644 index 000000000..6afe62393 --- /dev/null +++ b/common/mekanism/common/ItemEnergyMeter.java @@ -0,0 +1,46 @@ +package mekanism.common; + +import java.util.ArrayList; + +import mekanism.api.EnumColor; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class ItemEnergyMeter extends ItemEnergized +{ + public static double ENERGY_PER_USE = 400; + + public ItemEnergyMeter(int id) + { + super(id, 60000, 120); + } + + @Override + public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) + { + if(!world.isRemote) + { + TileEntity tileEntity = world.getBlockTileEntity(x, y, z); + + if(tileEntity instanceof IUniversalCable) + { + if(getEnergy(stack) >= ENERGY_PER_USE) + { + setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE); + + IUniversalCable cable = (IUniversalCable)tileEntity; + + player.sendChatToPlayer(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------"); + player.sendChatToPlayer(EnumColor.GREY + " *Cables: " + EnumColor.DARK_GREY + cable.getNetwork().cables.size()); + player.sendChatToPlayer(EnumColor.GREY + " *Acceptors: " + EnumColor.DARK_GREY + cable.getNetwork().possibleAcceptors.size()); + player.sendChatToPlayer(EnumColor.GREY + " *Needed energy: " + EnumColor.DARK_GREY + cable.getNetwork().getEnergyNeeded(new ArrayList()) + "J"); + player.sendChatToPlayer(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"); + } + } + } + + return false; + } +} diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index 4ff20bb74..293b579c7 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -9,13 +9,13 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; +import mekanism.api.GasNetwork.GasTransferEvent; import mekanism.api.GasTransmission; import mekanism.api.InfuseObject; import mekanism.api.InfuseRegistry; import mekanism.api.InfuseType; import mekanism.api.InfusionInput; import mekanism.api.Object3D; -import mekanism.api.GasNetwork.GasTransferEvent; import mekanism.client.SoundHandler; import mekanism.common.IFactory.RecipeType; import mekanism.common.LiquidNetwork.LiquidTransferEvent; @@ -156,6 +156,7 @@ public class Mekanism public static Item PortableTeleporter; public static Item TeleportationCore; public static Item Configurator; + public static Item EnergyMeter; //Blocks public static Block BasicBlock; @@ -486,6 +487,7 @@ public class Mekanism LanguageRegistry.addName(PortableTeleporter, "Portable Teleporter"); LanguageRegistry.addName(TeleportationCore, "Teleportation Core"); LanguageRegistry.addName(Configurator, "Configurator"); + LanguageRegistry.addName(EnergyMeter, "EnergyMeter"); //Localization for BasicBlock LanguageRegistry.instance().addStringLocalization("tile.BasicBlock.OsmiumBlock.name", "Osmium Block"); @@ -604,6 +606,7 @@ public class Mekanism Clump = new ItemClump(configuration.getItem("Clump", 11219).getInt()-256); DirtyDust = new ItemDirtyDust(configuration.getItem("DirtyDust", 11220).getInt()-256); Configurator = new ItemConfigurator(configuration.getItem("Configurator", 11221).getInt()).setUnlocalizedName("Configurator"); + EnergyMeter = new ItemEnergyMeter(configuration.getItem("EnergyMeter", 11222).getInt()).setUnlocalizedName("EnergyMeter"); configuration.save(); //Registrations @@ -633,6 +636,7 @@ public class Mekanism GameRegistry.registerItem(Clump, "Clump"); GameRegistry.registerItem(DirtyDust, "DirtyDust"); GameRegistry.registerItem(Configurator, "Configurator"); + GameRegistry.registerItem(EnergyMeter, "EnergyMeter"); } /** diff --git a/resources/mods/mekanism/textures/items/EnergyMeter.png b/resources/mods/mekanism/textures/items/EnergyMeter.png new file mode 100644 index 0000000000000000000000000000000000000000..0ddc0aceb9c564e3621995c54020b01375911bc2 GIT binary patch literal 1028 zcmV+f1pE7mP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv000AXNklLNxS)36S#Q|I?3WDNBPy#{QDoPMy)j$!t>(W(0N+;;BDsB1K|B)vm z&Am4<;NtL%@1AphXS~k^!1bJ>b-uN=h4b_CTSjxxi;D|vZf+XsXaQDMR&aK9W@OBP zBrw5EptS%C3kwNnAR3Kgb#*m00E>%@31@&ATUuI59Y7=!F*4?)JmmmKM@I<(oSvRy zZEej+N81C-%gfl?+cPreWMFr97ZVc`Mmk!6!NEb}XdD1WKQl9v8i0X;0SpZd85wf` zrlzJaJw0utqs%}s7(_-!1~M}o62SY`i{|EL^!E1R;NZXr;PCJe-QC@2Y;1)8ga7FO z4Gj&Ttgo*d0c>w?qrJUdbnIXD(*QgXkCcGvY-(ykC=`kd!Splw`T2R#VFo;xo~Hp= z?<`3_qoF}wF!B0;|KHi!!R+iTT3cHM*#4em2H1eUYo9pn>gtjwWpZ*-qNKCO5)Owk zIyx#N%d;&lEf^jiM&NfqnT7v0Apz{KHfn2Y(bv}}8K8`hkAt@(80?6=ojm^A)ak=>2?HeKM5XiW0RI5>!gl#TIGo-90000