diff --git a/src/main/scala/edx/core/ClientProxy.scala b/src/main/scala/edx/core/ClientProxy.scala index 38a64a53c..dc84bf8cd 100644 --- a/src/main/scala/edx/core/ClientProxy.scala +++ b/src/main/scala/edx/core/ClientProxy.scala @@ -6,13 +6,9 @@ import codechicken.multipart.TileMultipart import cpw.mods.fml.client.FMLClientHandler import cpw.mods.fml.client.registry.{ClientRegistry, RenderingRegistry} import cpw.mods.fml.relauncher.{Side, SideOnly} -import edx.basic.BasicContent -import edx.basic.process.mixing.TileGlassJar -import edx.basic.process.sifting.TileSieve import edx.basic.process.smelting.firebox.{RenderHotPlate, TileHotPlate} import edx.basic.process.smelting.{RenderCastingMold, TileCastingMold} import edx.electrical.ElectricalContent -import edx.electrical.battery.TileBattery import edx.electrical.multimeter.{GuiMultimeter, PartMultimeter, RenderMultimeter} import edx.electrical.tesla.{RenderTesla, TileTesla} import edx.electrical.transformer.RenderTransformer @@ -52,8 +48,6 @@ import resonant.lib.transform.vector.Vector3 override def init() { //Basic - ItemRenderHandler.register(Item.getItemFromBlock(BasicContent.blockGlassJar), new TileGlassJar) - ItemRenderHandler.register(Item.getItemFromBlock(BasicContent.blockSieve), new TileSieve) //Mechanical ItemRenderHandler.register(MechanicalContent.itemGear, RenderGear) @@ -67,7 +61,6 @@ import resonant.lib.transform.vector.Vector3 ItemRenderHandler.register(ElectricalContent.itemTransformer, RenderTransformer) ItemRenderHandler.register(ElectricalContent.itemMultimeter, RenderMultimeter) ItemRenderHandler.register(ElectricalContent.itemQuantumGlyph, RenderQuantumGlyph) - ItemRenderHandler.register(Item.getItemFromBlock(ElectricalContent.blockBattery), new TileBattery) ClientRegistry.bindTileEntitySpecialRenderer(classOf[TileTesla], new RenderTesla) diff --git a/src/main/scala/edx/electrical/battery/TileBattery.scala b/src/main/scala/edx/electrical/battery/TileBattery.scala index e68ecae78..d87887df3 100644 --- a/src/main/scala/edx/electrical/battery/TileBattery.scala +++ b/src/main/scala/edx/electrical/battery/TileBattery.scala @@ -85,9 +85,8 @@ class TileBattery extends SpatialTile(Material.iron) with TIO with TElectric wit { if (energy > 0) { - //TODO: Voltage of battery should decrease over time. - dcNode.generateVoltage(500) - + //TODO: Allow player to set the power output + dcNode.generatePower(100000) val dissipatedEnergy = dcNode.power / 20 energy -= dissipatedEnergy markUpdate()