Anvilcraft/ModularPowersuits
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed graphical meters

Browse source
This commit is contained in:
MachineMuse 2014-09-10 12:03:39 -06:00
parent bb837e5325
commit 732bba5146
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/scala/net/machinemuse/powersuits/block/BlockLuxCapacitor.java
View file

@ -85,7 +85,8 @@ public class BlockLuxCapacitor extends Block {
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister iconRegister) {
@Override
public void registerBlockIcons(IIconRegister iconRegister) {
this.blockIcon = iconRegister.registerIcon(MuseIcon.ICON_PREFIX + "bluelight");
}

2
src/main/scala/net/machinemuse/powersuits/block/BlockTinkerTable.scala
View file

@ -40,7 +40,7 @@ object BlockTinkerTable extends Block(Material.iron) {
this
}
@SideOnly(Side.CLIENT) def registerIcons(iconRegister: IIconRegister) {
@SideOnly(Side.CLIENT) override def registerBlockIcons(iconRegister: IIconRegister) {
this.blockIcon = iconRegister.registerIcon(MuseIcon.ICON_PREFIX + "heatresistantplating")
energyIcon = blockIcon
}

8
src/main/scala/net/machinemuse/powersuits/event/ClientTickHandler.scala
View file

@ -4,6 +4,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent
import cpw.mods.fml.common.gameevent.TickEvent
import cpw.mods.fml.common.gameevent.TickEvent.{ClientTickEvent, RenderTickEvent}
import net.machinemuse.general.gui.{EnergyMeter, HeatMeter}
import net.machinemuse.numina.general.MuseLogger
import net.machinemuse.numina.network.{MusePacket, PacketSender}
import net.machinemuse.powersuits.block.BlockTinkerTable
import net.machinemuse.powersuits.common.Config
@ -45,7 +46,7 @@ class ClientTickHandler {
if (inputmap.hasChanged) {
inputmap.refresh()
val inputPacket: MusePacket = new MusePacketPlayerUpdate(player, inputmap)
PacketSender.sendToServer(inputPacket.getPacket131)
PacketSender.sendToServer(inputPacket)
}
}
}
@ -71,12 +72,15 @@ class ClientTickHandler {
val maxEnergy: Double = ElectricItemUtils.getMaxEnergy(player)
val currHeat: Double = MuseHeatUtils.getPlayerHeat(player)
val maxHeat: Double = MuseHeatUtils.getMaxHeat(player)
MuseLogger.logDebug("A")
if (maxEnergy > 0 && BlockTinkerTable.energyIcon != null) {
MuseLogger.logDebug("B")
val currStr: String = MuseStringUtils.formatNumberShort(currEnergy)
val maxStr: String = MuseStringUtils.formatNumberShort(maxEnergy)
val currHeatStr: String = MuseStringUtils.formatNumberShort(currHeat)
val maxHeatStr: String = MuseStringUtils.formatNumberShort(maxHeat)
if (Config.useGraphicalMeters) {
if (Config.useGraphicalMeters) { MuseLogger.logDebug("C")
if (energy == null) {
energy = new EnergyMeter
heat = new HeatMeter