tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Attempt to get test battery pushing 100 C

Browse source
This commit is contained in:
Calclavia 2014-10-12 17:13:48 +08:00
parent 1d87c44b8b
commit e0f3540789
4 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/scala/resonantinduction/electrical/ElectricalContent.scala
View file

@ -8,8 +8,7 @@ import ic2.api.item.IC2Items
import net.minecraft.block.Block
import net.minecraft.init.{Blocks, Items}
import net.minecraft.item.{Item, ItemStack}
import net.minecraft.nbt.{NBTTagCompound, NBTTagList, NBTTagString}
import net.minecraft.util.{EnumChatFormatting, ResourceLocation}
import net.minecraft.util.ResourceLocation
import net.minecraftforge.client.event.TextureStitchEvent
import net.minecraftforge.common.MinecraftForge
import net.minecraftforge.oredict.{OreDictionary, ShapelessOreRecipe}
@ -81,9 +80,9 @@ object ElectricalContent extends ContentHolder
itemFocusingMatrix = new ItemFocusingMatrix()
tierOneBattery = ItemBlockBattery.setTier(new ItemStack(ElectricalContent.blockBattery, 1, 0), 0.asInstanceOf[Byte])
tierTwoBattery = ItemBlockBattery.setTier(new ItemStack(ElectricalContent.blockBattery, 1, 0), 1.asInstanceOf[Byte])
tierThreeBattery = ItemBlockBattery.setTier(new ItemStack(ElectricalContent.blockBattery, 1, 0), 2.asInstanceOf[Byte])
tierOneBattery = ItemBlockBattery.setTier(new ItemStack(ElectricalContent.blockBattery, 1, 0), 0)
tierTwoBattery = ItemBlockBattery.setTier(new ItemStack(ElectricalContent.blockBattery, 1, 0), 1)
tierThreeBattery = ItemBlockBattery.setTier(new ItemStack(ElectricalContent.blockBattery, 1, 0), 2)
/** Register all parts */
ResonantPartFactory.register(classOf[PartFramedWire])
@ -179,5 +178,4 @@ object ElectricalContent extends ContentHolder
RenderFramedWire.insulationIcon = event.map.registerIcon(Reference.prefix + "models/insulation")
}
}
}

9
src/main/scala/resonantinduction/electrical/battery/ItemBlockBattery.scala
View file

@ -17,19 +17,20 @@ import universalelectricity.api.item.IEnergyItem
import universalelectricity.compatibility.Compatibility
import resonant.lib.wrapper.WrapList._
@UniversalClass object ItemBlockBattery
@UniversalClass
object ItemBlockBattery
{
def setTier(itemStack: ItemStack, tier: Byte): ItemStack =
def setTier(itemStack: ItemStack, tier: Int): ItemStack =
{
if (itemStack.getTagCompound == null)
{
itemStack.setTagCompound(new NBTTagCompound)
}
itemStack.getTagCompound.setByte("tier", tier)
itemStack.getTagCompound.setByte("tier", tier.toByte)
return itemStack
}
def getTier(itemStack: ItemStack): Byte =
def getTier(itemStack: ItemStack): Int =
{
if (itemStack.getTagCompound == null)
{

28
src/main/scala/resonantinduction/electrical/battery/TileBattery.scala
View file

@ -12,6 +12,7 @@ import resonant.lib.content.prefab.java.TileElectric
import resonant.lib.network.discriminator.{PacketTile, PacketType}
import resonant.lib.network.handle.IPacketReceiver
import resonant.lib.network.netty.AbstractPacket
import universalelectricity.simulator.dc.micro.DCNode
/** A modular battery box that allows shared connections with boxes next to it.
*
@ -49,11 +50,32 @@ class TileBattery extends TileElectric(Material.iron) with IPacketReceiver
isOpaqueCube(false)
itemBlock(classOf[ItemBlockBattery])
override def update
//TODO: Test, remove this
private val node = new DCNode(this)
{
super.update
if (!this.worldObj.isRemote)
override def charge(terminal: ForgeDirection): Double = 0
/*
{
if (getInputDirections().contains(terminal))
return 0
else if (getOutputDirections().contains(terminal))
return 0
return super.charge
}
*/
}
override def update()
{
super.update()
if (!world.isRemote)
{
//TODO: Test, remove this
node.buffer(100)
if (markDistributionUpdate && ticks % 5 == 0)
{
markDistributionUpdate = false

2
src/main/scala/resonantinduction/electrical/wire/flat/PartFlatWire.scala
View file

@ -101,7 +101,7 @@ class PartFlatWire extends PartAbstract with TWire with TFacePart with TNormalOc
if (player.isSneaking)
{
node.charge(100)
node.buffer(100)
}
}