From 1da90af3f12a0838c94b2cea31182d95f3b04efb Mon Sep 17 00:00:00 2001 From: bdew Date: Tue, 23 Dec 2014 14:34:54 +0200 Subject: [PATCH] Added multiblock stuff for item output and slot selection --- .../data/OutputConfigFluidSlots.scala | 34 +++++++++++++++++++ .../multiblock/data/OutputConfigItems.scala | 32 +++++++++++++++++ .../bdew/lib/multiblock/data/SlotSet.scala | 28 +++++++++++++++ .../interact/CIFluidOutputSelect.scala | 21 ++++++++++++ .../multiblock/interact/CIItemOutput.scala | 18 ++++++++++ .../multiblock/network/MsgOutputCfgSlot.scala | 12 +++++++ 6 files changed, 145 insertions(+) create mode 100644 src/net/bdew/lib/multiblock/data/OutputConfigFluidSlots.scala create mode 100644 src/net/bdew/lib/multiblock/data/OutputConfigItems.scala create mode 100644 src/net/bdew/lib/multiblock/data/SlotSet.scala create mode 100644 src/net/bdew/lib/multiblock/interact/CIFluidOutputSelect.scala create mode 100644 src/net/bdew/lib/multiblock/interact/CIItemOutput.scala create mode 100644 src/net/bdew/lib/multiblock/network/MsgOutputCfgSlot.scala diff --git a/src/net/bdew/lib/multiblock/data/OutputConfigFluidSlots.scala b/src/net/bdew/lib/multiblock/data/OutputConfigFluidSlots.scala new file mode 100644 index 0000000..978cf86 --- /dev/null +++ b/src/net/bdew/lib/multiblock/data/OutputConfigFluidSlots.scala @@ -0,0 +1,34 @@ +/* + * 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.multiblock.data + +import net.bdew.lib.multiblock.network.MsgOutputCfg +import net.minecraft.nbt.NBTTagCompound + +trait OutputConfigSlots { + val slotsDef: SlotSet + var slot = slotsDef.default +} + +class OutputConfigFluidSlots(val slotsDef: SlotSet) extends OutputConfigFluid with OutputConfigSlots { + override def id = slotsDef.outputConfigId + override def read(t: NBTTagCompound) { + super.read(t) + slot = slotsDef.get(t.getString("slot")) + } + override def write(t: NBTTagCompound) { + super.write(t) + t.setString("slot", slot.id) + } + override def handleConfigPacket(m: MsgOutputCfg) = m match { + case MsgOutputCfgSlot(n, id) => slot = slotsDef.get(id) + case _ => super.handleConfigPacket(m) + } +} diff --git a/src/net/bdew/lib/multiblock/data/OutputConfigItems.scala b/src/net/bdew/lib/multiblock/data/OutputConfigItems.scala new file mode 100644 index 0000000..3e604f7 --- /dev/null +++ b/src/net/bdew/lib/multiblock/data/OutputConfigItems.scala @@ -0,0 +1,32 @@ +/* + * 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.multiblock.data + +import net.bdew.lib.multiblock.network.MsgOutputCfg +import net.minecraft.nbt.NBTTagCompound + +class OutputConfigItems extends OutputConfig with OutputConfigRSControllable { + override def id = "items" + var rsMode = RSMode.ALWAYS + + def read(t: NBTTagCompound) { + rsMode = RSMode(t.getInteger("rsMode")) + } + + def write(t: NBTTagCompound) { + t.setInteger("rsMode", rsMode.id) + } + + def handleConfigPacket(m: MsgOutputCfg) = m match { + case MsgOutputCfgRSMode(_, r) => rsMode = r + case _ => sys.error("Invalid output config packet %s to config %s".format(m, this)) + } + +} diff --git a/src/net/bdew/lib/multiblock/data/SlotSet.scala b/src/net/bdew/lib/multiblock/data/SlotSet.scala new file mode 100644 index 0000000..086f2c4 --- /dev/null +++ b/src/net/bdew/lib/multiblock/data/SlotSet.scala @@ -0,0 +1,28 @@ +/* + * 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.multiblock.data + +import net.bdew.lib.gui.Texture + +abstract class SlotSet(val outputConfigId: String) { + // outputConfigId should be registered in OutputConfigManager + + var slotMap = Map.empty[String, Slot] + + case class Slot(id: String, name: String, texture: Texture) { + slotMap += id -> this + def next = order(this) + } + + def default: Slot + val order: Map[Slot, Slot] + + def get(id: String) = slotMap(id) +} diff --git a/src/net/bdew/lib/multiblock/interact/CIFluidOutputSelect.scala b/src/net/bdew/lib/multiblock/interact/CIFluidOutputSelect.scala new file mode 100644 index 0000000..4f0e82c --- /dev/null +++ b/src/net/bdew/lib/multiblock/interact/CIFluidOutputSelect.scala @@ -0,0 +1,21 @@ +/* + * 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.multiblock.interact + +import net.minecraftforge.fluids.{Fluid, FluidStack, FluidTankInfo} + +trait CIFluidOutputSelect extends CIOutputFaces { + val outputSlotsDef: SlotSet + def outputFluid(slot: outputSlotsDef.Slot, resource: FluidStack, doDrain: Boolean): FluidStack + def outputFluid(slot: outputSlotsDef.Slot, amount: Int, doDrain: Boolean): FluidStack + def canOutputFluid(slot: outputSlotsDef.Slot, fluid: Fluid): Boolean + def getTankInfo: Array[FluidTankInfo] +} + diff --git a/src/net/bdew/lib/multiblock/interact/CIItemOutput.scala b/src/net/bdew/lib/multiblock/interact/CIItemOutput.scala new file mode 100644 index 0000000..314c628 --- /dev/null +++ b/src/net/bdew/lib/multiblock/interact/CIItemOutput.scala @@ -0,0 +1,18 @@ +/* + * 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.multiblock.interact + +import net.bdew.lib.multiblock.tile.TileController +import net.minecraft.inventory.IInventory + +trait CIItemOutput extends TileController { + def getItemOutputInventory: IInventory + def canOutputItemFromSlot(slot: Int): Boolean +} diff --git a/src/net/bdew/lib/multiblock/network/MsgOutputCfgSlot.scala b/src/net/bdew/lib/multiblock/network/MsgOutputCfgSlot.scala new file mode 100644 index 0000000..fc64b71 --- /dev/null +++ b/src/net/bdew/lib/multiblock/network/MsgOutputCfgSlot.scala @@ -0,0 +1,12 @@ +/* + * 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.multiblock.network + +case class MsgOutputCfgSlot(output: Int, slot: String) extends MsgOutputCfg