From f66b97d0cc58ccf76b3c55694642dc3e81835d87 Mon Sep 17 00:00:00 2001 From: bdew Date: Sun, 15 Mar 2015 10:20:19 +0200 Subject: [PATCH] Refactored TileDataSlots into a base trait DataSlotContainer that can be implemented by other things --- src/net/bdew/lib/data/DataSlotBoolean.scala | 4 +- src/net/bdew/lib/data/DataSlotDirection.scala | 4 +- src/net/bdew/lib/data/DataSlotDouble.scala | 4 +- src/net/bdew/lib/data/DataSlotFloat.scala | 4 +- .../bdew/lib/data/DataSlotFluidOption.scala | 4 +- .../bdew/lib/data/DataSlotGameProfile.scala | 4 +- src/net/bdew/lib/data/DataSlotInt.scala | 4 +- src/net/bdew/lib/data/DataSlotInventory.scala | 4 +- src/net/bdew/lib/data/DataSlotItemStack.scala | 4 +- .../bdew/lib/data/DataSlotMovingAverage.scala | 4 +- src/net/bdew/lib/data/DataSlotString.scala | 4 +- src/net/bdew/lib/data/DataSlotTank.scala | 8 +- src/net/bdew/lib/data/base/DataSlot.scala | 2 +- .../lib/data/base/DataSlotContainer.scala | 75 +++++++++++++++++++ .../bdew/lib/data/base/TileDataSlots.scala | 50 +++---------- .../data/DataSlotBlockFaceMap.scala | 4 +- .../data/DataSlotOutputConfig.scala | 4 +- .../lib/multiblock/data/DataSlotPos.scala | 4 +- .../lib/multiblock/data/DataSlotPosSet.scala | 4 +- src/net/bdew/lib/power/DataSlotPower.scala | 4 +- .../bdew/lib/resource/DataSlotResource.scala | 4 +- .../resource/DataSlotResourceKindOption.scala | 4 +- 22 files changed, 127 insertions(+), 80 deletions(-) create mode 100644 src/net/bdew/lib/data/base/DataSlotContainer.scala diff --git a/src/net/bdew/lib/data/DataSlotBoolean.scala b/src/net/bdew/lib/data/DataSlotBoolean.scala index 726caa4..e14823b 100644 --- a/src/net/bdew/lib/data/DataSlotBoolean.scala +++ b/src/net/bdew/lib/data/DataSlotBoolean.scala @@ -9,10 +9,10 @@ package net.bdew.lib.data -import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlotContainer, DataSlotVal, UpdateKind} import net.minecraft.nbt.NBTTagCompound -case class DataSlotBoolean(name: String, parent: TileDataSlots, default: Boolean = false) extends DataSlotVal[Boolean] { +case class DataSlotBoolean(name: String, parent: DataSlotContainer, default: Boolean = false) extends DataSlotVal[Boolean] { var value = default def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setBoolean(name, value) def load(t: NBTTagCompound, kind: UpdateKind.Value) = value = t.getBoolean(name) diff --git a/src/net/bdew/lib/data/DataSlotDirection.scala b/src/net/bdew/lib/data/DataSlotDirection.scala index 5b324ba..48b7863 100644 --- a/src/net/bdew/lib/data/DataSlotDirection.scala +++ b/src/net/bdew/lib/data/DataSlotDirection.scala @@ -9,11 +9,11 @@ package net.bdew.lib.data -import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlotContainer, DataSlotVal, UpdateKind} import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.common.util.ForgeDirection -case class DataSlotDirection(name: String, parent: TileDataSlots) extends DataSlotVal[ForgeDirection] { +case class DataSlotDirection(name: String, parent: DataSlotContainer) extends DataSlotVal[ForgeDirection] { var value = ForgeDirection.UP def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setByte(name, value.ordinal().toByte) def load(t: NBTTagCompound, kind: UpdateKind.Value) = value = ForgeDirection.getOrientation(t.getByte(name)) diff --git a/src/net/bdew/lib/data/DataSlotDouble.scala b/src/net/bdew/lib/data/DataSlotDouble.scala index df52446..e86026b 100644 --- a/src/net/bdew/lib/data/DataSlotDouble.scala +++ b/src/net/bdew/lib/data/DataSlotDouble.scala @@ -9,10 +9,10 @@ package net.bdew.lib.data -import net.bdew.lib.data.base.{DataSlotNumeric, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlotContainer, DataSlotNumeric, UpdateKind} import net.minecraft.nbt.NBTTagCompound -case class DataSlotDouble(name: String, parent: TileDataSlots, default: Double = 0) extends DataSlotNumeric[Double](default) { +case class DataSlotDouble(name: String, parent: DataSlotContainer, default: Double = 0) extends DataSlotNumeric[Double](default) { def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setDouble(name, value) def load(t: NBTTagCompound, kind: UpdateKind.Value) = value = t.getDouble(name) } diff --git a/src/net/bdew/lib/data/DataSlotFloat.scala b/src/net/bdew/lib/data/DataSlotFloat.scala index 975e5dd..0ec2a14 100644 --- a/src/net/bdew/lib/data/DataSlotFloat.scala +++ b/src/net/bdew/lib/data/DataSlotFloat.scala @@ -9,10 +9,10 @@ package net.bdew.lib.data -import net.bdew.lib.data.base.{DataSlotNumeric, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlotContainer, DataSlotNumeric, UpdateKind} import net.minecraft.nbt.NBTTagCompound -case class DataSlotFloat(name: String, parent: TileDataSlots, default: Float = 0) extends DataSlotNumeric[Float](default) { +case class DataSlotFloat(name: String, parent: DataSlotContainer, default: Float = 0) extends DataSlotNumeric[Float](default) { def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setFloat(name, value) def load(t: NBTTagCompound, kind: UpdateKind.Value) = value = t.getFloat(name) } diff --git a/src/net/bdew/lib/data/DataSlotFluidOption.scala b/src/net/bdew/lib/data/DataSlotFluidOption.scala index 6d4ab2b..018b01f 100644 --- a/src/net/bdew/lib/data/DataSlotFluidOption.scala +++ b/src/net/bdew/lib/data/DataSlotFluidOption.scala @@ -9,11 +9,11 @@ package net.bdew.lib.data -import net.bdew.lib.data.base.{TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlotContainer, UpdateKind} import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.fluids.{Fluid, FluidRegistry} -case class DataSlotFluidOption(name: String, parent: TileDataSlots) extends DataSlotOption[Fluid] { +case class DataSlotFluidOption(name: String, parent: DataSlotContainer) extends DataSlotOption[Fluid] { setUpdate(UpdateKind.SAVE, UpdateKind.GUI) override def save(t: NBTTagCompound, kind: UpdateKind.Value) { diff --git a/src/net/bdew/lib/data/DataSlotGameProfile.scala b/src/net/bdew/lib/data/DataSlotGameProfile.scala index c06def9..2cd48df 100644 --- a/src/net/bdew/lib/data/DataSlotGameProfile.scala +++ b/src/net/bdew/lib/data/DataSlotGameProfile.scala @@ -12,11 +12,11 @@ package net.bdew.lib.data import java.util.UUID import com.mojang.authlib.GameProfile -import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlotContainer, DataSlotVal, UpdateKind} import net.minecraft.nbt.NBTTagCompound import org.apache.commons.lang3.StringUtils -case class DataSlotGameProfile(name: String, parent: TileDataSlots) extends DataSlotVal[GameProfile] { +case class DataSlotGameProfile(name: String, parent: DataSlotContainer) extends DataSlotVal[GameProfile] { override var value: GameProfile = null override def load(t: NBTTagCompound, kind: UpdateKind.Value) = { diff --git a/src/net/bdew/lib/data/DataSlotInt.scala b/src/net/bdew/lib/data/DataSlotInt.scala index cf41635..ee36ad9 100644 --- a/src/net/bdew/lib/data/DataSlotInt.scala +++ b/src/net/bdew/lib/data/DataSlotInt.scala @@ -9,10 +9,10 @@ package net.bdew.lib.data -import net.bdew.lib.data.base.{DataSlotNumeric, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlotContainer, DataSlotNumeric, UpdateKind} import net.minecraft.nbt.NBTTagCompound -case class DataSlotInt(name: String, parent: TileDataSlots, default: Int = 0) extends DataSlotNumeric[Int](default) { +case class DataSlotInt(name: String, parent: DataSlotContainer, default: Int = 0) extends DataSlotNumeric[Int](default) { def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setInteger(name, value) def load(t: NBTTagCompound, kind: UpdateKind.Value) = value = t.getInteger(name) } diff --git a/src/net/bdew/lib/data/DataSlotInventory.scala b/src/net/bdew/lib/data/DataSlotInventory.scala index 2346388..bd5054a 100644 --- a/src/net/bdew/lib/data/DataSlotInventory.scala +++ b/src/net/bdew/lib/data/DataSlotInventory.scala @@ -10,12 +10,12 @@ package net.bdew.lib.data import net.bdew.lib.Misc -import net.bdew.lib.data.base.{DataSlot, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlot, DataSlotContainer, UpdateKind} import net.bdew.lib.tile.inventory.BaseInventory import net.minecraft.item.ItemStack import net.minecraft.nbt.{NBTTagCompound, NBTTagList} -case class DataSlotInventory(name: String, parent: TileDataSlots, size: Int) extends DataSlot with BaseInventory { +case class DataSlotInventory(name: String, parent: DataSlotContainer, size: Int) extends DataSlot with BaseInventory { setUpdate(UpdateKind.SAVE) override def getSizeInventory = size diff --git a/src/net/bdew/lib/data/DataSlotItemStack.scala b/src/net/bdew/lib/data/DataSlotItemStack.scala index f18997a..6e11a40 100644 --- a/src/net/bdew/lib/data/DataSlotItemStack.scala +++ b/src/net/bdew/lib/data/DataSlotItemStack.scala @@ -9,11 +9,11 @@ package net.bdew.lib.data -import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlotContainer, DataSlotVal, UpdateKind} import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound -case class DataSlotItemStack(name: String, parent: TileDataSlots) extends DataSlotVal[ItemStack] { +case class DataSlotItemStack(name: String, parent: DataSlotContainer) extends DataSlotVal[ItemStack] { var value: ItemStack = null override def update(v: ItemStack) = { diff --git a/src/net/bdew/lib/data/DataSlotMovingAverage.scala b/src/net/bdew/lib/data/DataSlotMovingAverage.scala index 41ddcd2..ef41db9 100644 --- a/src/net/bdew/lib/data/DataSlotMovingAverage.scala +++ b/src/net/bdew/lib/data/DataSlotMovingAverage.scala @@ -11,12 +11,12 @@ package net.bdew.lib.data import java.io.{ByteArrayInputStream, ByteArrayOutputStream, DataInputStream, DataOutputStream} -import net.bdew.lib.data.base.{DataSlot, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlot, DataSlotContainer, UpdateKind} import net.minecraft.nbt.NBTTagCompound import scala.collection.mutable -case class DataSlotMovingAverage(name: String, parent: TileDataSlots, size: Int) extends DataSlot { +case class DataSlotMovingAverage(name: String, parent: DataSlotContainer, size: Int) extends DataSlot { val values = mutable.Queue.empty[Double] var average: Double = 0 diff --git a/src/net/bdew/lib/data/DataSlotString.scala b/src/net/bdew/lib/data/DataSlotString.scala index 34d7116..cd372d4 100644 --- a/src/net/bdew/lib/data/DataSlotString.scala +++ b/src/net/bdew/lib/data/DataSlotString.scala @@ -9,10 +9,10 @@ package net.bdew.lib.data -import net.bdew.lib.data.base.{DataSlotVal, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlotContainer, DataSlotVal, UpdateKind} import net.minecraft.nbt.NBTTagCompound -case class DataSlotString(name: String, parent: TileDataSlots, default: String = null) extends DataSlotVal[String] { +case class DataSlotString(name: String, parent: DataSlotContainer, default: String = null) extends DataSlotVal[String] { var value: String = default def save(t: NBTTagCompound, kind: UpdateKind.Value) = if (value != null) t.setString(name, value) def load(t: NBTTagCompound, kind: UpdateKind.Value) = value = if (t.hasKey(name)) t.getString(name) else null diff --git a/src/net/bdew/lib/data/DataSlotTank.scala b/src/net/bdew/lib/data/DataSlotTank.scala index de3ad93..3928cda 100644 --- a/src/net/bdew/lib/data/DataSlotTank.scala +++ b/src/net/bdew/lib/data/DataSlotTank.scala @@ -9,14 +9,14 @@ package net.bdew.lib.data -import net.bdew.lib.data.base.{DataSlot, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlot, DataSlotContainer, UpdateKind} import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.fluids.{FluidStack, FluidTank, IFluidTank} abstract class DataSlotTankBase(sz: Int) extends FluidTank(sz) with IFluidTank with DataSlot { var oldStack: FluidStack = null - parent.serverTick.listen(checkUpdate) + parent.onServerTick(checkUpdate) updateKind = Set(UpdateKind.GUI, UpdateKind.SAVE) @@ -67,9 +67,9 @@ abstract class DataSlotTankBase(sz: Int) extends FluidTank(sz) with IFluidTank w super.fill(resource, false) } -case class DataSlotTank(name: String, parent: TileDataSlots, size: Int) extends DataSlotTankBase(size) +case class DataSlotTank(name: String, parent: DataSlotContainer, size: Int) extends DataSlotTankBase(size) -case class DataSlotTankRestricted(name: String, parent: TileDataSlots, var size: Int, fluidID: Int) extends DataSlotTankBase(size) { +case class DataSlotTankRestricted(name: String, parent: DataSlotContainer, var size: Int, fluidID: Int) extends DataSlotTankBase(size) { def fill(amount: Int, doFill: Boolean) = super.fill(new FluidStack(fluidID, amount), doFill) override def fill(resource: FluidStack, doFill: Boolean): Int = { diff --git a/src/net/bdew/lib/data/base/DataSlot.scala b/src/net/bdew/lib/data/base/DataSlot.scala index 1253b00..e03f220 100644 --- a/src/net/bdew/lib/data/base/DataSlot.scala +++ b/src/net/bdew/lib/data/base/DataSlot.scala @@ -19,7 +19,7 @@ trait DataSlot { * Tile Entity that owns this slot * Accessed in constructor, so should be in parameters or a lazy val, otherwise will crash */ - val parent: TileDataSlots + val parent: DataSlotContainer /** * Unique name diff --git a/src/net/bdew/lib/data/base/DataSlotContainer.scala b/src/net/bdew/lib/data/base/DataSlotContainer.scala new file mode 100644 index 0000000..91e12e4 --- /dev/null +++ b/src/net/bdew/lib/data/base/DataSlotContainer.scala @@ -0,0 +1,75 @@ +/* + * Copyright (c) bdew, 2013 - 2014 + * https://github.com/bdew/bdlib + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://bdew.net/minecraft-mod-public-license/ + */ + +package net.bdew.lib.data.base + +import net.minecraft.nbt.NBTTagCompound +import net.minecraft.world.World + +import scala.collection.mutable + +/** + * Base Trait for objects that can contain Data Slots, this allows implementing them on things that aren't TEs + */ +trait DataSlotContainer { + def getWorldObj: World + + /** + * Called when a dataslot value changes + */ + def dataSlotChanged(slot: DataSlot): Unit + + /** + * Register a function to run on every server tick + */ + def onServerTick(f: () => Unit): Unit + + /** + * List of dataslots in this container + */ + val dataSlots = mutable.HashMap.empty[String, DataSlot] + + /** + * The value of getTotalWorldTime when the last change happened + */ + var lastChange = 0L + + /** + * The value of getTotalWorldTime when the last GUI packet was sent happened + */ + var lastGuiPacket = 0L + + final val TRACE = false + + def doSave(kind: UpdateKind.Value, t: NBTTagCompound) { + if (kind == UpdateKind.GUI) + t.setLong("BDLib_TS", getWorldObj.getTotalWorldTime) + for ((n, s) <- dataSlots if s.updateKind.contains(kind)) { + s.save(t, kind) + if (TRACE) printf("%s: %s S=> %s\n".format(kind, n, t.getTag(n))) + } + } + + def doLoad(kind: UpdateKind.Value, t: NBTTagCompound) { + if (kind == UpdateKind.GUI) { + val ts = t.getLong("BDLib_TS") + if (ts > lastGuiPacket) { + lastGuiPacket = ts + } else { + return + } + } + for ((n, s) <- dataSlots if s.updateKind.contains(kind)) { + if (TRACE) printf("%s: %s L<= %s\n".format(kind, n, t.getTag(n))) + s.load(t, kind) + } + } +} + + diff --git a/src/net/bdew/lib/data/base/TileDataSlots.scala b/src/net/bdew/lib/data/base/TileDataSlots.scala index 6b32756..15d950c 100644 --- a/src/net/bdew/lib/data/base/TileDataSlots.scala +++ b/src/net/bdew/lib/data/base/TileDataSlots.scala @@ -1,5 +1,5 @@ /* - * Copyright (c) bdew, 2013 - 2014 + * Copyright (c) bdew, 2013 - 2015 * https://github.com/bdew/bdlib * * This mod is distributed under the terms of the Minecraft Mod Public @@ -14,47 +14,19 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.network.Packet import net.minecraft.network.play.server.S35PacketUpdateTileEntity -import scala.collection.mutable - -trait TileDataSlots extends TileExtended { - val dataSlots = mutable.HashMap.empty[String, DataSlot] - var lastChange = 0L - var lastGuiPacket = 0L - - final val TRACE = false - - def doSave(kind: UpdateKind.Value, t: NBTTagCompound) { - if (kind == UpdateKind.GUI) - t.setLong("BDLib_TS", getWorldObj.getTotalWorldTime) - for ((n, s) <- dataSlots if s.updateKind.contains(kind)) { - s.save(t, kind) - if (TRACE) printf("%s: %s S=> %s\n".format(kind, n, t.getTag(n))) - } - } - - def doLoad(kind: UpdateKind.Value, t: NBTTagCompound) { - if (kind == UpdateKind.GUI) { - val ts = t.getLong("BDLib_TS") - if (ts > lastGuiPacket) { - lastGuiPacket = ts - } else { - return - } - } - for ((n, s) <- dataSlots if s.updateKind.contains(kind)) { - if (TRACE) printf("%s: %s L<= %s\n".format(kind, n, t.getTag(n))) - s.load(t, kind) - if (kind == UpdateKind.WORLD && s.updateKind.contains(UpdateKind.RENDER)) - getWorldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord) - } - } - +trait TileDataSlots extends TileExtended with DataSlotContainer { persistSave.listen(doSave(UpdateKind.SAVE, _)) persistLoad.listen(doLoad(UpdateKind.SAVE, _)) sendClientUpdate.listen(doSave(UpdateKind.WORLD, _)) - handleClientUpdate.listen(doLoad(UpdateKind.WORLD, _)) + handleClientUpdate.listen { tag => + doLoad(UpdateKind.WORLD, tag) + if (dataSlots.values.exists(_.updateKind.contains(UpdateKind.RENDER))) + getWorldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord) + } - def dataSlotChanged(slot: DataSlot) { + override def onServerTick(f: () => Unit) = serverTick.listen(f) + + override def dataSlotChanged(slot: DataSlot) = { if (getWorldObj != null) { if (slot.updateKind.contains(UpdateKind.GUI)) lastChange = getWorldObj.getTotalWorldTime @@ -68,7 +40,7 @@ trait TileDataSlots extends TileExtended { def getDataSlotPacket: Packet = { val tag = new NBTTagCompound() doSave(UpdateKind.GUI, tag) - return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, ACT_GUI, tag) + return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, ACT_GUI, tag) } override protected def extDataPacket(id: Int, data: NBTTagCompound) { diff --git a/src/net/bdew/lib/multiblock/data/DataSlotBlockFaceMap.scala b/src/net/bdew/lib/multiblock/data/DataSlotBlockFaceMap.scala index 418ef06..5b909c8 100644 --- a/src/net/bdew/lib/multiblock/data/DataSlotBlockFaceMap.scala +++ b/src/net/bdew/lib/multiblock/data/DataSlotBlockFaceMap.scala @@ -11,13 +11,13 @@ package net.bdew.lib.multiblock.data import net.bdew.lib.Misc import net.bdew.lib.block.BlockFace -import net.bdew.lib.data.base.{DataSlot, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlot, DataSlotContainer, UpdateKind} import net.minecraft.nbt.{NBTTagCompound, NBTTagIntArray, NBTTagList} import net.minecraftforge.common.util.ForgeDirection import scala.collection.mutable -case class DataSlotBlockFaceMap(name: String, parent: TileDataSlots) extends DataSlot { +case class DataSlotBlockFaceMap(name: String, parent: DataSlotContainer) extends DataSlot { val map = collection.mutable.Map.empty[BlockFace, Int] setUpdate(UpdateKind.SAVE, UpdateKind.WORLD) diff --git a/src/net/bdew/lib/multiblock/data/DataSlotOutputConfig.scala b/src/net/bdew/lib/multiblock/data/DataSlotOutputConfig.scala index a568fc2..9ce67bf 100644 --- a/src/net/bdew/lib/multiblock/data/DataSlotOutputConfig.scala +++ b/src/net/bdew/lib/multiblock/data/DataSlotOutputConfig.scala @@ -9,12 +9,12 @@ package net.bdew.lib.multiblock.data -import net.bdew.lib.data.base.{DataSlot, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlot, DataSlotContainer, UpdateKind} import net.minecraft.nbt.NBTTagCompound import scala.collection.mutable -case class DataSlotOutputConfig(name: String, parent: TileDataSlots, slots: Int) extends DataSlot { +case class DataSlotOutputConfig(name: String, parent: DataSlotContainer, slots: Int) extends DataSlot { val map = collection.mutable.Map.empty[Int, OutputConfig] setUpdate(UpdateKind.SAVE, UpdateKind.GUI) diff --git a/src/net/bdew/lib/multiblock/data/DataSlotPos.scala b/src/net/bdew/lib/multiblock/data/DataSlotPos.scala index e93d0bc..c2fce52 100644 --- a/src/net/bdew/lib/multiblock/data/DataSlotPos.scala +++ b/src/net/bdew/lib/multiblock/data/DataSlotPos.scala @@ -12,10 +12,10 @@ package net.bdew.lib.multiblock.data import net.bdew.lib.Misc import net.bdew.lib.block.BlockRef import net.bdew.lib.data.DataSlotOption -import net.bdew.lib.data.base.{TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlotContainer, UpdateKind} import net.minecraft.nbt.NBTTagCompound -case class DataSlotPos(name: String, parent: TileDataSlots) extends DataSlotOption[BlockRef] { +case class DataSlotPos(name: String, parent: DataSlotContainer) extends DataSlotOption[BlockRef] { setUpdate(UpdateKind.SAVE, UpdateKind.WORLD) def save(t: NBTTagCompound, kind: UpdateKind.Value) { diff --git a/src/net/bdew/lib/multiblock/data/DataSlotPosSet.scala b/src/net/bdew/lib/multiblock/data/DataSlotPosSet.scala index c248893..d2bf67f 100644 --- a/src/net/bdew/lib/multiblock/data/DataSlotPosSet.scala +++ b/src/net/bdew/lib/multiblock/data/DataSlotPosSet.scala @@ -11,12 +11,12 @@ package net.bdew.lib.multiblock.data import net.bdew.lib.Misc import net.bdew.lib.block.BlockRef -import net.bdew.lib.data.base.{DataSlot, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlot, DataSlotContainer, UpdateKind} import net.minecraft.nbt.{NBTTagCompound, NBTTagList} import scala.collection.mutable -case class DataSlotPosSet(name: String, parent: TileDataSlots) extends DataSlot { +case class DataSlotPosSet(name: String, parent: DataSlotContainer) extends DataSlot { val set = collection.mutable.Set.empty[BlockRef] setUpdate(UpdateKind.SAVE, UpdateKind.WORLD) diff --git a/src/net/bdew/lib/power/DataSlotPower.scala b/src/net/bdew/lib/power/DataSlotPower.scala index 01c6f17..e760936 100644 --- a/src/net/bdew/lib/power/DataSlotPower.scala +++ b/src/net/bdew/lib/power/DataSlotPower.scala @@ -10,11 +10,11 @@ package net.bdew.lib.power import net.bdew.lib.Misc -import net.bdew.lib.data.base.{DataSlot, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlot, DataSlotContainer, UpdateKind} import net.bdew.lib.machine.PoweredMachine import net.minecraft.nbt.NBTTagCompound -case class DataSlotPower(name: String, parent: TileDataSlots) extends DataSlot { +case class DataSlotPower(name: String, parent: DataSlotContainer) extends DataSlot { updateKind = Set(UpdateKind.GUI, UpdateKind.SAVE) var stored = 0F diff --git a/src/net/bdew/lib/resource/DataSlotResource.scala b/src/net/bdew/lib/resource/DataSlotResource.scala index dd07c1a..b806a2a 100644 --- a/src/net/bdew/lib/resource/DataSlotResource.scala +++ b/src/net/bdew/lib/resource/DataSlotResource.scala @@ -10,11 +10,11 @@ package net.bdew.lib.resource import net.bdew.lib.Misc -import net.bdew.lib.data.base.{DataSlot, TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlot, DataSlotContainer, UpdateKind} import net.minecraft.nbt.NBTTagCompound import net.minecraftforge.fluids.{FluidStack, FluidTankInfo} -class DataSlotResource(val name: String, val parent: TileDataSlots, initCapacity: Int) extends DataSlot { +class DataSlotResource(val name: String, val parent: DataSlotContainer, initCapacity: Int) extends DataSlot { var resource: Option[Resource] = None var amount = 0D var capacity = initCapacity diff --git a/src/net/bdew/lib/resource/DataSlotResourceKindOption.scala b/src/net/bdew/lib/resource/DataSlotResourceKindOption.scala index ba76e70..d341465 100644 --- a/src/net/bdew/lib/resource/DataSlotResourceKindOption.scala +++ b/src/net/bdew/lib/resource/DataSlotResourceKindOption.scala @@ -11,10 +11,10 @@ package net.bdew.lib.resource import net.bdew.lib.Misc import net.bdew.lib.data.DataSlotOption -import net.bdew.lib.data.base.{TileDataSlots, UpdateKind} +import net.bdew.lib.data.base.{DataSlotContainer, UpdateKind} import net.minecraft.nbt.NBTTagCompound -case class DataSlotResourceKindOption(name: String, parent: TileDataSlots) extends DataSlotOption[ResourceKind] { +case class DataSlotResourceKindOption(name: String, parent: DataSlotContainer) extends DataSlotOption[ResourceKind] { setUpdate(UpdateKind.SAVE, UpdateKind.GUI) override def save(t: NBTTagCompound, kind: UpdateKind.Value) {