From 82328d10ec356a6ab2fc547b46b03a09b34b23f9 Mon Sep 17 00:00:00 2001 From: bdew Date: Thu, 14 Aug 2014 15:13:31 +0300 Subject: [PATCH] Aded multiblock system (moved from DCM) --- src/net/bdew/lib/BdLib.scala | 2 + src/net/bdew/lib/config/BlockManager.scala | 2 +- .../lib/gui/widgets/WidgetButtonIcon.scala | 45 +++++++++ src/net/bdew/lib/multiblock/MachineCore.scala | 24 +++++ .../lib/multiblock/ResourceProvider.scala | 36 ++++++++ src/net/bdew/lib/multiblock/Tools.scala | 51 +++++++++++ .../multiblock/block/BlockController.scala | 44 +++++++++ .../lib/multiblock/block/BlockModule.scala | 69 ++++++++++++++ .../lib/multiblock/block/BlockOutput.scala | 43 +++++++++ .../data/DataSlotBlockFaceMap.scala | 47 ++++++++++ .../data/DataSlotOutputConfig.scala | 58 ++++++++++++ .../lib/multiblock/data/DataSlotPos.scala | 31 +++++++ .../lib/multiblock/data/DataSlotPosSet.scala | 42 +++++++++ .../lib/multiblock/data/OutputConfig.scala | 26 ++++++ .../multiblock/data/OutputConfigPower.scala | 44 +++++++++ src/net/bdew/lib/multiblock/data/RSMode.scala | 17 ++++ .../bdew/lib/multiblock/gui/WidgetInfo.scala | 28 ++++++ .../lib/multiblock/gui/WidgetOutputIcon.scala | 52 +++++++++++ .../lib/multiblock/gui/WidgetOutputs.scala | 34 +++++++ .../multiblock/gui/WidgetPowerOutput.scala | 50 ++++++++++ .../multiblock/interact/CIFluidInput.scala | 19 ++++ .../multiblock/interact/CIOutputFaces.scala | 71 +++++++++++++++ .../multiblock/interact/CIPowerProducer.scala | 14 +++ .../interact/ContainerOutputFaces.scala | 16 ++++ .../lib/multiblock/interact/MIOutput.scala | 19 ++++ .../lib/multiblock/network/MsgOutputCfg.scala | 16 ++++ .../lib/multiblock/network/NetHandler.scala | 23 +++++ .../lib/multiblock/tile/TileController.scala | 91 +++++++++++++++++++ .../multiblock/tile/TileControllerGui.scala | 31 +++++++ .../bdew/lib/multiblock/tile/TileModule.scala | 56 ++++++++++++ .../bdew/lib/multiblock/tile/TileOutput.scala | 63 +++++++++++++ 31 files changed, 1163 insertions(+), 1 deletion(-) create mode 100644 src/net/bdew/lib/gui/widgets/WidgetButtonIcon.scala create mode 100644 src/net/bdew/lib/multiblock/MachineCore.scala create mode 100644 src/net/bdew/lib/multiblock/ResourceProvider.scala create mode 100644 src/net/bdew/lib/multiblock/Tools.scala create mode 100644 src/net/bdew/lib/multiblock/block/BlockController.scala create mode 100644 src/net/bdew/lib/multiblock/block/BlockModule.scala create mode 100644 src/net/bdew/lib/multiblock/block/BlockOutput.scala create mode 100644 src/net/bdew/lib/multiblock/data/DataSlotBlockFaceMap.scala create mode 100644 src/net/bdew/lib/multiblock/data/DataSlotOutputConfig.scala create mode 100644 src/net/bdew/lib/multiblock/data/DataSlotPos.scala create mode 100644 src/net/bdew/lib/multiblock/data/DataSlotPosSet.scala create mode 100644 src/net/bdew/lib/multiblock/data/OutputConfig.scala create mode 100644 src/net/bdew/lib/multiblock/data/OutputConfigPower.scala create mode 100644 src/net/bdew/lib/multiblock/data/RSMode.scala create mode 100644 src/net/bdew/lib/multiblock/gui/WidgetInfo.scala create mode 100644 src/net/bdew/lib/multiblock/gui/WidgetOutputIcon.scala create mode 100644 src/net/bdew/lib/multiblock/gui/WidgetOutputs.scala create mode 100644 src/net/bdew/lib/multiblock/gui/WidgetPowerOutput.scala create mode 100644 src/net/bdew/lib/multiblock/interact/CIFluidInput.scala create mode 100644 src/net/bdew/lib/multiblock/interact/CIOutputFaces.scala create mode 100644 src/net/bdew/lib/multiblock/interact/CIPowerProducer.scala create mode 100644 src/net/bdew/lib/multiblock/interact/ContainerOutputFaces.scala create mode 100644 src/net/bdew/lib/multiblock/interact/MIOutput.scala create mode 100644 src/net/bdew/lib/multiblock/network/MsgOutputCfg.scala create mode 100644 src/net/bdew/lib/multiblock/network/NetHandler.scala create mode 100644 src/net/bdew/lib/multiblock/tile/TileController.scala create mode 100644 src/net/bdew/lib/multiblock/tile/TileControllerGui.scala create mode 100644 src/net/bdew/lib/multiblock/tile/TileModule.scala create mode 100644 src/net/bdew/lib/multiblock/tile/TileOutput.scala diff --git a/src/net/bdew/lib/BdLib.scala b/src/net/bdew/lib/BdLib.scala index 5aeb254..1cb5186 100644 --- a/src/net/bdew/lib/BdLib.scala +++ b/src/net/bdew/lib/BdLib.scala @@ -12,6 +12,7 @@ package net.bdew.lib import cpw.mods.fml.common.Mod import cpw.mods.fml.common.Mod.EventHandler import cpw.mods.fml.common.event.{FMLPreInitializationEvent, FMLServerStartingEvent} +import net.bdew.lib.multiblock.network.NetHandler import net.minecraft.command.CommandHandler import org.apache.logging.log4j.Logger @@ -29,6 +30,7 @@ object BdLib { def preInit(ev: FMLPreInitializationEvent) { log = ev.getModLog log.info("bdlib BDLIB_VER loaded") + NetHandler.init() } @EventHandler diff --git a/src/net/bdew/lib/config/BlockManager.scala b/src/net/bdew/lib/config/BlockManager.scala index b97baa5..36d5522 100644 --- a/src/net/bdew/lib/config/BlockManager.scala +++ b/src/net/bdew/lib/config/BlockManager.scala @@ -11,7 +11,7 @@ package net.bdew.lib.config import cpw.mods.fml.common.registry.GameRegistry import net.bdew.lib.Misc -import net.bdew.lib.block.{NamedBlock, HasTE, SimpleBlock} +import net.bdew.lib.block.{HasTE, NamedBlock} import net.minecraft.block.Block import net.minecraft.creativetab.CreativeTabs import net.minecraft.item.ItemStack diff --git a/src/net/bdew/lib/gui/widgets/WidgetButtonIcon.scala b/src/net/bdew/lib/gui/widgets/WidgetButtonIcon.scala new file mode 100644 index 0000000..31e9424 --- /dev/null +++ b/src/net/bdew/lib/gui/widgets/WidgetButtonIcon.scala @@ -0,0 +1,45 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.gui.widgets + +import net.bdew.lib.gui.{Point, Rect, Texture} +import net.minecraft.client.Minecraft +import net.minecraft.client.audio.PositionedSoundRecord +import net.minecraft.util.ResourceLocation + +import scala.collection.mutable + +class WidgetButtonIcon(p: Point, clicked: WidgetButtonIcon => Unit, baseTex: Texture, hoverTex: Texture) extends Widget { + val rect = new Rect(p, 16, 16) + val iconRect = new Rect(p +(1, 1), 14, 14) + + var icon: Texture = null + var hover: String = null + + override def draw(mouse: Point) { + if (rect.contains(mouse)) + parent.drawTexture(rect, hoverTex) + else + parent.drawTexture(rect, baseTex) + + if (icon != null) + parent.drawTexture(iconRect, icon) + } + + override def handleTooltip(p: Point, tip: mutable.MutableList[String]) { + if (hover != null && hover > "") + tip += hover + } + + override def mouseClicked(p: Point, button: Int) { + Minecraft.getMinecraft.getSoundHandler.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)) + clicked(this) + } +} diff --git a/src/net/bdew/lib/multiblock/MachineCore.scala b/src/net/bdew/lib/multiblock/MachineCore.scala new file mode 100644 index 0000000..9618057 --- /dev/null +++ b/src/net/bdew/lib/multiblock/MachineCore.scala @@ -0,0 +1,24 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock + +import net.bdew.lib.recipes.gencfg.{ConfigSection, EntryDouble} + +trait MachineCore { + var tuning: ConfigSection + + def cfgSectionToMap(name: String) = tuning.getSection(name).map({ + case (n, EntryDouble(v)) => n -> v.toInt + case (n, x) => sys.error("Invalid config value in section %s%s.%s = %s".format(tuning.pfx, name, n, x)) + }).toMap + + lazy val modules = cfgSectionToMap("Modules") + lazy val required = cfgSectionToMap("Required") +} diff --git a/src/net/bdew/lib/multiblock/ResourceProvider.scala b/src/net/bdew/lib/multiblock/ResourceProvider.scala new file mode 100644 index 0000000..f20e63c --- /dev/null +++ b/src/net/bdew/lib/multiblock/ResourceProvider.scala @@ -0,0 +1,36 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock + +import net.bdew.lib.gui.{Color, Texture} +import net.minecraft.util.IIcon + +trait ResourceProvider { + // Icons for rendering, *must* be on block spritesheet + def edge: IIcon + def disabled: IIcon + def output: IIcon + def arrowTop: IIcon + def arrowRight: IIcon + def arrowBottom: IIcon + def arrowLeft: IIcon + + // Textures for GUI stuff + def btBase: Texture + def btHover: Texture + def btRsOn: Texture + def btRsOff: Texture + def btEnabled: Texture + def btDisabled: Texture + + val outputColors: Map[Int, Color] + val unlocalizedOutputName: Map[Int, String] + def getModuleName(s: String): String +} diff --git a/src/net/bdew/lib/multiblock/Tools.scala b/src/net/bdew/lib/multiblock/Tools.scala new file mode 100644 index 0000000..566d310 --- /dev/null +++ b/src/net/bdew/lib/multiblock/Tools.scala @@ -0,0 +1,51 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock + +import net.bdew.lib.block.BlockRef +import net.bdew.lib.multiblock.tile.{TileController, TileModule} +import net.minecraft.world.World + +import scala.collection.mutable + +object Tools { + def canConnect(world: World, core: BlockRef, kind: String): Boolean = { + val t = core.getTile[TileController](world).getOrElse(return false) + t.getNumOfMoudules(kind) < t.cfg.modules.getOrElse(kind, return false) + } + + def findConnections(world: World, start: BlockRef, kind: String) = + (start.neighbours.values flatMap { case pos => + (pos.tile(world) flatMap { + case t: TileModule => t.connected.cval + case t: TileController => Some(pos) + case _ => None + }) filter (x => canConnect(world, x, kind)) + }).toList.distinct + + def getAdjancedConnected(w: World, core: BlockRef, pos: BlockRef, seen: mutable.Set[BlockRef]) = + pos.neighbours.values + .filterNot(seen.contains) + .flatMap(_.getTile[TileModule](w)) + .filter(x => x.connected.contains(core)) + .map(_.mypos) + + def findReachableModules(world: World, core: BlockRef): Set[BlockRef] = { + val seen = mutable.Set.empty[BlockRef] + val queue = mutable.Queue.empty[BlockRef] + queue ++= getAdjancedConnected(world, core, core, seen) + while (queue.size > 0) { + val current = queue.dequeue() + seen.add(current) + queue ++= getAdjancedConnected(world, core, current, seen) + } + return seen.toSet + } +} diff --git a/src/net/bdew/lib/multiblock/block/BlockController.scala b/src/net/bdew/lib/multiblock/block/BlockController.scala new file mode 100644 index 0000000..f27aad7 --- /dev/null +++ b/src/net/bdew/lib/multiblock/block/BlockController.scala @@ -0,0 +1,44 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.block + +import net.bdew.lib.block.{BlockRef, HasTE} +import net.bdew.lib.multiblock.ResourceProvider +import net.bdew.lib.multiblock.tile.TileController +import net.bdew.lib.render.connected.ConnectedTextureBlock +import net.minecraft.block.Block +import net.minecraft.block.material.Material +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.world.{IBlockAccess, World} + +abstract class BlockController[T <: TileController](val name: String, material: Material, val TEClass: Class[T]) + extends Block(material) with HasTE[T] with ConnectedTextureBlock { + + def resources: ResourceProvider + + override def edgeIcon = resources.edge + + override def breakBlock(world: World, x: Int, y: Int, z: Int, block: Block, meta: Int) { + getTE(world, x, y, z).onBreak() + super.breakBlock(world, x, y, z, block, meta) + } + + override def canConnect(world: IBlockAccess, origin: BlockRef, target: BlockRef) = + getTE(world, origin).modules.contains(target) + + override def onBlockActivated(world: World, x: Int, y: Int, z: Int, player: EntityPlayer, meta: Int, xoffs: Float, yoffs: Float, zoffs: Float): Boolean = { + if (player.isSneaking) return false + if (world.isRemote) return true + getTE(world, x, y, z).onClick(player) + return true + } +} + + diff --git a/src/net/bdew/lib/multiblock/block/BlockModule.scala b/src/net/bdew/lib/multiblock/block/BlockModule.scala new file mode 100644 index 0000000..d194158 --- /dev/null +++ b/src/net/bdew/lib/multiblock/block/BlockModule.scala @@ -0,0 +1,69 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.block + +import net.bdew.lib.block.{BlockRef, HasTE} +import net.bdew.lib.multiblock.tile.TileModule +import net.bdew.lib.multiblock.{ResourceProvider, Tools} +import net.bdew.lib.render.connected.ConnectedTextureBlock +import net.minecraft.block.Block +import net.minecraft.block.material.Material +import net.minecraft.entity.EntityLivingBase +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.item.ItemStack +import net.minecraft.util.ChatComponentTranslation +import net.minecraft.world.{IBlockAccess, World} + +abstract class BlockModule[T <: TileModule](val name: String, val kind: String, material: Material, val TEClass: Class[T]) + extends Block(material) with HasTE[T] with ConnectedTextureBlock { + + def resources: ResourceProvider + + override def edgeIcon = resources.edge + + override def canPlaceBlockAt(world: World, x: Int, y: Int, z: Int): Boolean = + Tools.findConnections(world, BlockRef(x, y, z), kind).size <= 1 + + override def onBlockPlacedBy(world: World, x: Int, y: Int, z: Int, player: EntityLivingBase, stack: ItemStack) { + getTE(world, x, y, z).tryConnect() + } + + override def onNeighborBlockChange(world: World, x: Int, y: Int, z: Int, block: Block) { + getTE(world, x, y, z).tryConnect() + } + + override def breakBlock(world: World, x: Int, y: Int, z: Int, block: Block, meta: Int) { + getTE(world, x, y, z).onBreak() + super.breakBlock(world, x, y, z, block, meta) + } + + override def canConnect(world: IBlockAccess, origin: BlockRef, target: BlockRef) = { + val me = getTE(world, origin) + me.connected.contains(target) || + (target.getTile[TileModule](world) exists { other => + me.getCore.isDefined && other.getCore == me.getCore + }) + } + + override def onBlockActivated(world: World, x: Int, y: Int, z: Int, player: EntityPlayer, meta: Int, xoffs: Float, yoffs: Float, zoffs: Float): Boolean = { + if (player.isSneaking) return false + if (world.isRemote) return true + val te = getTE(world, x, y, z) + (for { + p <- te.connected.cval + bl <- p.block(world) + } yield { + bl.onBlockActivated(world, p.x, p.y, p.z, player, meta, 0, 0, 0) + }) getOrElse { + player.addChatMessage(new ChatComponentTranslation("bdlib.multiblock.notconnected")) + } + true + } +} diff --git a/src/net/bdew/lib/multiblock/block/BlockOutput.scala b/src/net/bdew/lib/multiblock/block/BlockOutput.scala new file mode 100644 index 0000000..0ec5a83 --- /dev/null +++ b/src/net/bdew/lib/multiblock/block/BlockOutput.scala @@ -0,0 +1,43 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.block + +import net.bdew.lib.block.{BlockFace, BlockRef} +import net.bdew.lib.multiblock.tile.TileOutput +import net.bdew.lib.render.connected.{BlockAdditionalRender, ConnectedHelper, FaceOverlay} +import net.minecraft.world.IBlockAccess +import net.minecraftforge.common.util.ForgeDirection + +trait BlockOutput[T <: TileOutput] extends BlockModule[T] with BlockAdditionalRender { + def getAdjancedFaces(face: ForgeDirection, bp: BlockRef) = { + val sides = ConnectedHelper.faceAdjanced(face) + Seq( + (BlockFace(bp, sides.top), resources.arrowTop), + (BlockFace(bp, sides.right), resources.arrowRight), + (BlockFace(bp, sides.bottom), resources.arrowBottom), + (BlockFace(bp, sides.left), resources.arrowLeft) + ) + } + + def getFaceOverlays(world: IBlockAccess, x: Int, y: Int, z: Int, face: ForgeDirection): List[FaceOverlay] = { + var result = List.empty[FaceOverlay] + Option(getTE(world, x, y, z)) flatMap (_.getCore) map { core => + val bf = BlockFace(x, y, z, face) + if (core.outputFaces.contains(bf)) + result :+= FaceOverlay(resources.output, resources.outputColors(core.outputFaces(bf))) + for ((bf, icon) <- getAdjancedFaces(face, bf.origin)) { + if (core.outputFaces.contains(bf)) + result :+= FaceOverlay(icon, resources.outputColors(core.outputFaces(bf))) + } + } + return result + } + +} diff --git a/src/net/bdew/lib/multiblock/data/DataSlotBlockFaceMap.scala b/src/net/bdew/lib/multiblock/data/DataSlotBlockFaceMap.scala new file mode 100644 index 0000000..1ef84a4 --- /dev/null +++ b/src/net/bdew/lib/multiblock/data/DataSlotBlockFaceMap.scala @@ -0,0 +1,47 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +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.minecraft.nbt.{NBTTagCompound, NBTTagIntArray, NBTTagList} +import net.minecraftforge.common.util.ForgeDirection + +case class DataSlotBlockFaceMap(name: String, parent: TileDataSlots) extends DataSlot { + val map = collection.mutable.Map.empty[BlockFace, Int] + + setUpdate(UpdateKind.SAVE, UpdateKind.WORLD) + + def inverted = map.map(_.swap) + + def ent2arr(x: (BlockFace, Int)) = Array(x._2, x._1.x, x._1.y, x._1.z, x._1.face.ordinal()) + def arr2ent(x: Array[Int]) = BlockFace(x(1), x(2), x(3), ForgeDirection.values()(x(4))) -> x(0) + + def save(t: NBTTagCompound, kind: UpdateKind.Value) { + val lst = new NBTTagList() + for (x <- map) lst.appendTag(new NBTTagIntArray(ent2arr(x))) + t.setTag(name, lst) + } + + def load(t: NBTTagCompound, kind: UpdateKind.Value) { + map.clear() + map ++= Misc.iterNbtIntArray(t, name) map arr2ent + } + + def updated() = parent.dataSlotChanged(this) +} + +object DataSlotBlockFaceMap { + + import scala.language.implicitConversions + + implicit def dsbfm2map(v: DataSlotBlockFaceMap) = v.map +} diff --git a/src/net/bdew/lib/multiblock/data/DataSlotOutputConfig.scala b/src/net/bdew/lib/multiblock/data/DataSlotOutputConfig.scala new file mode 100644 index 0000000..3613058 --- /dev/null +++ b/src/net/bdew/lib/multiblock/data/DataSlotOutputConfig.scala @@ -0,0 +1,58 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.data + +import net.bdew.lib.data.base.{DataSlot, TileDataSlots, UpdateKind} +import net.minecraft.nbt.NBTTagCompound + +case class DataSlotOutputConfig(name: String, parent: TileDataSlots, slots: Int) extends DataSlot { + val map = collection.mutable.Map.empty[Int, OutputConfig] + + setUpdate(UpdateKind.SAVE, UpdateKind.GUI) + + def inverted = map.map(_.swap) + + def save(t: NBTTagCompound, kind: UpdateKind.Value) { + for ((n, x) <- map) { + val tmp = new NBTTagCompound() + x.write(tmp) + val kind = x match { + case _: OutputConfigPower => "power" + case _ => sys.error("Unknown output config kind: " + x) + } + tmp.setString("kind", kind) + t.setTag(name + "_" + n, tmp) + } + } + + def load(t: NBTTagCompound, kind: UpdateKind.Value) { + map.clear() + for (i <- 0 until slots) { + if (t.hasKey(name + "_" + i)) { + val cfg = t.getCompoundTag(name + "_" + i) + val cfgObj = cfg.getString("kind") match { + case "power" => new OutputConfigPower + case x => new OutputConfigInvalid + } + cfgObj.read(cfg) + map += i -> cfgObj + } + } + } + + def updated() = parent.dataSlotChanged(this) +} + +object DataSlotOutputConfig { + + import scala.language.implicitConversions + + implicit def dsbfm2map(v: DataSlotOutputConfig) = v.map +} diff --git a/src/net/bdew/lib/multiblock/data/DataSlotPos.scala b/src/net/bdew/lib/multiblock/data/DataSlotPos.scala new file mode 100644 index 0000000..810c4ca --- /dev/null +++ b/src/net/bdew/lib/multiblock/data/DataSlotPos.scala @@ -0,0 +1,31 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +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.minecraft.nbt.NBTTagCompound + +case class DataSlotPos(name: String, parent: TileDataSlots) extends DataSlotOption[BlockRef] { + setUpdate(UpdateKind.SAVE, UpdateKind.WORLD) + + def save(t: NBTTagCompound, kind: UpdateKind.Value) { + cval map (x => t.setTag(name, Misc.applyMutator(x.writeToNBT, new NBTTagCompound))) + } + + def load(t: NBTTagCompound, kind: UpdateKind.Value) { + cval = if (t.hasKey(name)) + Some(BlockRef.fromNBT(t.getCompoundTag(name))) + else + None + } +} diff --git a/src/net/bdew/lib/multiblock/data/DataSlotPosSet.scala b/src/net/bdew/lib/multiblock/data/DataSlotPosSet.scala new file mode 100644 index 0000000..45f2dfa --- /dev/null +++ b/src/net/bdew/lib/multiblock/data/DataSlotPosSet.scala @@ -0,0 +1,42 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +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.minecraft.nbt.{NBTTagCompound, NBTTagList} + +case class DataSlotPosSet(name: String, parent: TileDataSlots) extends DataSlot { + val set = collection.mutable.Set.empty[BlockRef] + + setUpdate(UpdateKind.SAVE, UpdateKind.WORLD) + + def save(t: NBTTagCompound, kind: UpdateKind.Value) { + val lst = new NBTTagList() + for (x <- set) lst.appendTag(Misc.applyMutator(x.writeToNBT, new NBTTagCompound)) + t.setTag(name, lst) + } + + def load(t: NBTTagCompound, kind: UpdateKind.Value) { + set.clear() + set ++= Misc.iterNbtCompoundList(t, name) map BlockRef.fromNBT + } + + def updated() = parent.dataSlotChanged(this) + +} + +object DataSlotPosSet { + + import scala.language.implicitConversions + + implicit def dsps2set(v: DataSlotPosSet) = v.set +} diff --git a/src/net/bdew/lib/multiblock/data/OutputConfig.scala b/src/net/bdew/lib/multiblock/data/OutputConfig.scala new file mode 100644 index 0000000..c56062e --- /dev/null +++ b/src/net/bdew/lib/multiblock/data/OutputConfig.scala @@ -0,0 +1,26 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.data + +import net.bdew.lib.multiblock.network.MsgOutputCfg +import net.minecraft.nbt.NBTTagCompound +import sun.reflect.generics.reflectiveObjects.NotImplementedException + +abstract class OutputConfig { + def read(t: NBTTagCompound) + def write(t: NBTTagCompound) + def handleConfigPacket(m: MsgOutputCfg) +} + +class OutputConfigInvalid extends OutputConfig { + def read(t: NBTTagCompound) {} + def write(t: NBTTagCompound) = throw new NotImplementedException + def handleConfigPacket(m: MsgOutputCfg) = throw new NotImplementedException +} diff --git a/src/net/bdew/lib/multiblock/data/OutputConfigPower.scala b/src/net/bdew/lib/multiblock/data/OutputConfigPower.scala new file mode 100644 index 0000000..4910aec --- /dev/null +++ b/src/net/bdew/lib/multiblock/data/OutputConfigPower.scala @@ -0,0 +1,44 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.data + +import net.bdew.lib.multiblock.network.MsgOutputCfg +import net.minecraft.nbt.NBTTagCompound + +case class MsgOutputCfgPower(output: Int, rsMode: RSMode.Value) extends MsgOutputCfg + +class OutputConfigPower extends OutputConfig { + var avg = 0.0 + var rsMode = RSMode.ALWAYS + var unit = "MJ" + + final val decay = 0.5 + + def updateAvg(v: Double) { + avg = avg * decay + (1 - decay) * v + } + + def read(t: NBTTagCompound) { + avg = t.getDouble("avg") + rsMode = RSMode(t.getInteger("rsMode")) + unit = t.getString("unit") + } + + def write(t: NBTTagCompound) { + t.setDouble("avg", avg) + t.setInteger("rsMode", rsMode.id) + t.setString("unit", unit) + } + + def handleConfigPacket(m: MsgOutputCfg) = m match { + case MsgOutputCfgPower(_, 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/RSMode.scala b/src/net/bdew/lib/multiblock/data/RSMode.scala new file mode 100644 index 0000000..8e37a21 --- /dev/null +++ b/src/net/bdew/lib/multiblock/data/RSMode.scala @@ -0,0 +1,17 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.data + +object RSMode extends Enumeration { + val ALWAYS = Value(0, "ALWAYS") + val RS_ON = Value(1, "RS_ON") + val RS_OFF = Value(2, "RS_OFF") + val NEVER = Value(3, "NEVER") +} diff --git a/src/net/bdew/lib/multiblock/gui/WidgetInfo.scala b/src/net/bdew/lib/multiblock/gui/WidgetInfo.scala new file mode 100644 index 0000000..04a8e2e --- /dev/null +++ b/src/net/bdew/lib/multiblock/gui/WidgetInfo.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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.gui + +import net.bdew.lib.gui.widgets.Widget +import net.bdew.lib.gui.{Color, Point, Rect, Texture} + +import scala.collection.mutable + +class WidgetInfo(val rect: Rect, icon: Texture, text: => String, tooltip: => String) extends Widget { + final val iconRect = Rect(1, 1, 8, 8) + + override def handleTooltip(p: Point, tip: mutable.MutableList[String]) { + if (iconRect.contains(p) && tooltip != null) tip += tooltip + } + + override def draw(mouse: Point) { + parent.drawTexture(iconRect + rect.origin, icon) + parent.drawText(text, rect.origin +(12, 1), Color.darkgray, false) + } +} diff --git a/src/net/bdew/lib/multiblock/gui/WidgetOutputIcon.scala b/src/net/bdew/lib/multiblock/gui/WidgetOutputIcon.scala new file mode 100644 index 0000000..1f06403 --- /dev/null +++ b/src/net/bdew/lib/multiblock/gui/WidgetOutputIcon.scala @@ -0,0 +1,52 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.gui + +import net.bdew.lib.Misc +import net.bdew.lib.gui.widgets.Widget +import net.bdew.lib.gui.{Point, Rect, Texture} +import net.bdew.lib.multiblock.interact.CIOutputFaces +import net.bdew.lib.render.connected.BlockAdditionalRender + +import scala.collection.mutable + +class WidgetOutputIcon(p: Point, te: CIOutputFaces, output: Int) extends Widget { + val rect = new Rect(p, 16, 16) + + override def draw(mouse: Point) { + val faces = te.outputFaces.inverted + if (faces.isDefinedAt(output)) { + val bf = faces(output) + bf.origin.block(te.getWorldObj) map { block => + parent.drawTexture(rect, Texture(Texture.BLOCKS, block.getIcon(te.getWorldObj, bf.origin.x, bf.origin.y, bf.origin.z, bf.face.ordinal()))) + if (block.isInstanceOf[BlockAdditionalRender]) { + for (over <- block.asInstanceOf[BlockAdditionalRender].getFaceOverlays(te.getWorldObj, bf.origin.x, bf.origin.y, bf.origin.z, bf.face)) + parent.drawTexture(rect, Texture(Texture.BLOCKS, over.icon), over.color) + } + } + } else { + parent.drawTexture(rect, Texture(Texture.BLOCKS, te.resources.disabled), te.resources.outputColors(output)) + } + } + + override def handleTooltip(p: Point, tip: mutable.MutableList[String]) { + val faces = te.outputFaces.inverted + tip += Misc.toLocal(te.resources.unlocalizedOutputName(output)) + if (faces.isDefinedAt(output)) { + val bf = faces(output) + bf.origin.block(te.getWorldObj) map { block => + tip += block.getLocalizedName + tip += "%d, %d, %d - %s".format(bf.x, bf.y, bf.z, Misc.toLocal("bdlib.multiblock.face." + bf.face.toString.toLowerCase)) + } + } else { + tip += Misc.toLocal("bdlib.multiblock.disabled") + } + } +} diff --git a/src/net/bdew/lib/multiblock/gui/WidgetOutputs.scala b/src/net/bdew/lib/multiblock/gui/WidgetOutputs.scala new file mode 100644 index 0000000..9fd668f --- /dev/null +++ b/src/net/bdew/lib/multiblock/gui/WidgetOutputs.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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.gui + +import net.bdew.lib.gui.widgets.{WidgetMultipane, WidgetSubcontainer} +import net.bdew.lib.gui.{Rect, _} +import net.bdew.lib.multiblock.data.OutputConfigPower +import net.bdew.lib.multiblock.interact.CIOutputFaces + +class WidgetOutputs(p: Point, te: CIOutputFaces, rows: Int) extends WidgetSubcontainer(new Rect(p, 92, 19 * rows)) { + for (i <- 0 until rows) + add(new WidgetOutputRow(Point(0, 19 * i), te, i)) +} + +class WidgetOutputDisplay extends WidgetSubcontainer(Rect(20, 0, 72, 18)) + +class WidgetOutputRow(p: Point, te: CIOutputFaces, output: Int) extends WidgetMultipane(new Rect(p, 92, 18)) { + add(new WidgetOutputIcon(Point(1, 1), te, output)) + val emptyPane = addPane(new WidgetSubcontainer(rect)) + val powerPane = addPane(new WidgetPowerOutput(te, output)) + + def getActivePane = + te.outputConfig.get(output) match { + case Some(x: OutputConfigPower) => powerPane + case _ => emptyPane + } +} \ No newline at end of file diff --git a/src/net/bdew/lib/multiblock/gui/WidgetPowerOutput.scala b/src/net/bdew/lib/multiblock/gui/WidgetPowerOutput.scala new file mode 100644 index 0000000..ea092db --- /dev/null +++ b/src/net/bdew/lib/multiblock/gui/WidgetPowerOutput.scala @@ -0,0 +1,50 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.gui + +import java.text.DecimalFormat + +import net.bdew.lib.Misc +import net.bdew.lib.gui.widgets.{WidgetButtonIcon, WidgetDynLabel} +import net.bdew.lib.gui.{Color, Point} +import net.bdew.lib.multiblock.data.{MsgOutputCfgPower, OutputConfigPower, RSMode} +import net.bdew.lib.multiblock.interact.CIOutputFaces +import net.bdew.lib.multiblock.network.NetHandler + +class WidgetPowerOutput(te: CIOutputFaces, output: Int) extends WidgetOutputDisplay { + def cfg = te.outputConfig(output).asInstanceOf[OutputConfigPower] + val dec = new DecimalFormat("#,##0") + val bt = add(new WidgetButtonIcon(Point(56, 1), clicked, te.resources.btBase, te.resources.btHover)) + add(new WidgetDynLabel("%s %s/t".format(dec.format(cfg.avg), cfg.unit), 1, 5, Color.darkgray)) + + val icons = Map( + RSMode.ALWAYS -> te.resources.btEnabled, + RSMode.NEVER -> te.resources.btDisabled, + RSMode.RS_ON -> te.resources.btRsOn, + RSMode.RS_OFF -> te.resources.btRsOff + ) + + val next = Map( + RSMode.ALWAYS -> RSMode.RS_ON, + RSMode.RS_ON -> RSMode.RS_OFF, + RSMode.RS_OFF -> RSMode.NEVER, + RSMode.NEVER -> RSMode.ALWAYS + ) + + override def draw(mouse: Point) { + bt.icon = icons(cfg.rsMode) + bt.hover = Misc.toLocal("bdlib.rsmode." + cfg.rsMode.toString.toLowerCase) + super.draw(mouse) + } + + def clicked(b: WidgetButtonIcon) { + NetHandler.sendToServer(MsgOutputCfgPower(output, next(cfg.rsMode))) + } +} diff --git a/src/net/bdew/lib/multiblock/interact/CIFluidInput.scala b/src/net/bdew/lib/multiblock/interact/CIFluidInput.scala new file mode 100644 index 0000000..b05a22a --- /dev/null +++ b/src/net/bdew/lib/multiblock/interact/CIFluidInput.scala @@ -0,0 +1,19 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.interact + +import net.bdew.lib.multiblock.tile.TileController +import net.minecraftforge.fluids.{Fluid, FluidStack, FluidTankInfo} + +trait CIFluidInput extends TileController { + def inputFluid(resource: FluidStack, doFill: Boolean): Int + def canInputFluid(fluid: Fluid): Boolean + def getTankInfo: Array[FluidTankInfo] +} diff --git a/src/net/bdew/lib/multiblock/interact/CIOutputFaces.scala b/src/net/bdew/lib/multiblock/interact/CIOutputFaces.scala new file mode 100644 index 0000000..af8db6f --- /dev/null +++ b/src/net/bdew/lib/multiblock/interact/CIOutputFaces.scala @@ -0,0 +1,71 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.interact + +import net.bdew.lib.block.{BlockFace, BlockRef} +import net.bdew.lib.multiblock.data._ +import net.bdew.lib.multiblock.tile.{TileController, TileModule} +import net.minecraft.util.ChatComponentTranslation +import net.minecraftforge.common.util.ForgeDirection + +trait CIOutputFaces extends TileController { + val maxOutputs: Int + + val outputFaces = new DataSlotBlockFaceMap("outputs", this) + val outputConfig = new DataSlotOutputConfig("cfg", this, maxOutputs) + + def newOutput(bp: BlockRef, face: ForgeDirection, cfg: OutputConfig): Int = { + val bf = BlockFace(bp, face) + if (outputFaces.contains(bf)) { + println("Adding already registered output??? " + bf.toString) + return outputFaces(bf) + } + val rv = outputFaces.inverted + for (i <- 0 until maxOutputs if !rv.contains(i)) { + outputFaces += (bf -> i) + outputConfig += i -> cfg + outputFaces.updated() + return i + } + val pl = getWorldObj.getClosestPlayer(bf.x, bf.y, bf.z, 10) + if (pl != null) pl.addChatMessage(new ChatComponentTranslation("bdlib.multiblock.toomanyoutputs")) + return -1 + } + + serverTick.listen(doOutputs) + + override def moduleRemoved(module: TileModule) { + for ((bf, n) <- outputFaces if bf.origin == module.mypos) { + outputFaces -= bf + outputConfig -= n + } + outputFaces.updated() + outputConfig.updated() + super.moduleRemoved(module) + } + + def doOutputs() { + for ((x, n) <- outputFaces) { + val t = x.origin.getTile[MIOutput](getWorldObj) + if (t.isDefined) { + if (!outputConfig.isDefinedAt(n) || outputConfig(n).isInstanceOf[OutputConfigInvalid]) + outputConfig(n) = t.get.makeCfgObject(x.face) + t.get.doOutput(x.face, outputConfig(n)) + } + } + } + + def removeOutput(bp: BlockRef, face: ForgeDirection) { + val bf = BlockFace(bp, face) + outputConfig -= outputFaces(bf) + outputFaces -= bf + outputFaces.updated() + } +} diff --git a/src/net/bdew/lib/multiblock/interact/CIPowerProducer.scala b/src/net/bdew/lib/multiblock/interact/CIPowerProducer.scala new file mode 100644 index 0000000..fa1bafe --- /dev/null +++ b/src/net/bdew/lib/multiblock/interact/CIPowerProducer.scala @@ -0,0 +1,14 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.interact + +trait CIPowerProducer extends CIOutputFaces { + def extract(v: Float, simulate: Boolean): Float +} diff --git a/src/net/bdew/lib/multiblock/interact/ContainerOutputFaces.scala b/src/net/bdew/lib/multiblock/interact/ContainerOutputFaces.scala new file mode 100644 index 0000000..a9a6945 --- /dev/null +++ b/src/net/bdew/lib/multiblock/interact/ContainerOutputFaces.scala @@ -0,0 +1,16 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.interact + +import net.minecraft.inventory.Container + +trait ContainerOutputFaces extends Container { + def te: CIOutputFaces +} diff --git a/src/net/bdew/lib/multiblock/interact/MIOutput.scala b/src/net/bdew/lib/multiblock/interact/MIOutput.scala new file mode 100644 index 0000000..153a479 --- /dev/null +++ b/src/net/bdew/lib/multiblock/interact/MIOutput.scala @@ -0,0 +1,19 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.interact + +import net.bdew.lib.multiblock.data.OutputConfig +import net.bdew.lib.multiblock.tile.TileModule +import net.minecraftforge.common.util.ForgeDirection + +trait MIOutput extends TileModule { + def doOutput(face: ForgeDirection, cfg: OutputConfig) + def makeCfgObject(face: ForgeDirection): OutputConfig +} diff --git a/src/net/bdew/lib/multiblock/network/MsgOutputCfg.scala b/src/net/bdew/lib/multiblock/network/MsgOutputCfg.scala new file mode 100644 index 0000000..745c720 --- /dev/null +++ b/src/net/bdew/lib/multiblock/network/MsgOutputCfg.scala @@ -0,0 +1,16 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.network + +import net.bdew.lib.network.Message + +abstract class MsgOutputCfg extends Message { + val output: Int +} diff --git a/src/net/bdew/lib/multiblock/network/NetHandler.scala b/src/net/bdew/lib/multiblock/network/NetHandler.scala new file mode 100644 index 0000000..acb63d2 --- /dev/null +++ b/src/net/bdew/lib/multiblock/network/NetHandler.scala @@ -0,0 +1,23 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.network + +import net.bdew.lib.multiblock.interact.ContainerOutputFaces +import net.bdew.lib.network.NetChannel +import net.minecraft.entity.player.EntityPlayerMP + +object NetHandler extends NetChannel("bdew.multiblock") { + regServerHandler { + case (msg: MsgOutputCfg, p: EntityPlayerMP) => + val te = p.openContainer.asInstanceOf[ContainerOutputFaces].te + te.outputConfig(msg.output).handleConfigPacket(msg) + te.outputConfig.updated() + } +} diff --git a/src/net/bdew/lib/multiblock/tile/TileController.scala b/src/net/bdew/lib/multiblock/tile/TileController.scala new file mode 100644 index 0000000..cbedf94 --- /dev/null +++ b/src/net/bdew/lib/multiblock/tile/TileController.scala @@ -0,0 +1,91 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.tile + +import net.bdew.lib.BdLib +import net.bdew.lib.block.BlockRef +import net.bdew.lib.data.base.{TileDataSlots, UpdateKind} +import net.bdew.lib.multiblock.block.BlockModule +import net.bdew.lib.multiblock.data.DataSlotPosSet +import net.bdew.lib.multiblock.{MachineCore, ResourceProvider, Tools} +import net.minecraft.entity.player.EntityPlayer + +trait TileController extends TileDataSlots { + val modules = new DataSlotPosSet("modules", this).setUpdate(UpdateKind.WORLD, UpdateKind.SAVE, UpdateKind.RENDER) + + def resources: ResourceProvider + def cfg: MachineCore + + var acceptNewModules = true + var revalidateOnNextTick = true + var modulesChanged = true + + lazy val mypos = BlockRef(xCoord, yCoord, zCoord) + + def getNumOfMoudules(kind: String) = modules.map(_.getTile[TileModule](getWorldObj)).flatten.count(_.kind == kind) + + def onModulesChanged() + def onClick(player: EntityPlayer) + + def moduleConnected(module: TileModule): Boolean = { + if (acceptNewModules) { + modules.add(BlockRef(module.xCoord, module.yCoord, module.zCoord)) + getWorldObj.markBlockForUpdate(xCoord, yCoord, zCoord) + modulesChanged = true + return true + } else false + } + + def moduleRemoved(module: TileModule) { + modules.remove(BlockRef(module.xCoord, module.yCoord, module.zCoord)) + getWorldObj.markBlockForUpdate(xCoord, yCoord, zCoord) + revalidateOnNextTick = true + modulesChanged = true + } + + def onBreak() { + acceptNewModules = false + for (x <- modules.flatMap(_.getTile[TileModule](getWorldObj))) + x.coreRemoved() + modules.clear() + } + + def validateModules() { + modules.filter(x => { + !x.getTile[TileModule](getWorldObj).isDefined || !x.getBlock[BlockModule[TileModule]](getWorldObj).isDefined + }).foreach(x => { + BdLib.logWarn("Block at %s is not a valid module, removing from machine %s at %d,%d,%d", x, this.getClass.getSimpleName, xCoord, yCoord, zCoord) + modules.remove(x) + }) + val reachable = Tools.findReachableModules(getWorldObj, mypos) + val toremove = modules.filterNot(reachable.contains).flatMap(_.getTile[TileModule](getWorldObj)) + acceptNewModules = false + toremove.foreach(moduleRemoved) + toremove.foreach(_.coreRemoved()) + acceptNewModules = true + modulesChanged = true + modules.map(x => + (x.getBlock[BlockModule[TileModule]](getWorldObj).orNull, x.getTile[TileModule](getWorldObj).orNull) + ).filter({ case (a, b) => a.kind != b.kind }).foreach({ case (a, b) => sys.error("Type mismatch between Block/Tile Block=%s(%s) Tile=%s(%s)".format(a.kind, a, b.kind, b)) }) + } + + serverTick.listen(() => { + if (revalidateOnNextTick) { + revalidateOnNextTick = false + validateModules() + } + if (modulesChanged) { + modulesChanged = false + onModulesChanged() + lastChange = getWorldObj.getTotalWorldTime + getWorldObj.markBlockForUpdate(xCoord, yCoord, zCoord) + } + }) +} diff --git a/src/net/bdew/lib/multiblock/tile/TileControllerGui.scala b/src/net/bdew/lib/multiblock/tile/TileControllerGui.scala new file mode 100644 index 0000000..47f1f7a --- /dev/null +++ b/src/net/bdew/lib/multiblock/tile/TileControllerGui.scala @@ -0,0 +1,31 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.tile + +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.util.{ChatComponentTranslation, ChatStyle, EnumChatFormatting} + +abstract class TileControllerGui extends TileController { + def openGui(player: EntityPlayer) + + def onClick(player: EntityPlayer) = { + val missing = cfg.required.filter({ case (mod, cnt) => getNumOfMoudules(mod) < cnt }) + if (missing.size > 0) { + player.addChatMessage(new ChatComponentTranslation("bdlib.multiblock.incomplete") + .setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))) + for ((mod, cnt) <- missing) + player.addChatMessage( + new ChatComponentTranslation("- %s %s", Integer.valueOf(cnt), + new ChatComponentTranslation(resources.getModuleName(mod))) + .setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))) + } else openGui(player) + } + +} diff --git a/src/net/bdew/lib/multiblock/tile/TileModule.scala b/src/net/bdew/lib/multiblock/tile/TileModule.scala new file mode 100644 index 0000000..cb9a2f3 --- /dev/null +++ b/src/net/bdew/lib/multiblock/tile/TileModule.scala @@ -0,0 +1,56 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.tile + +import net.bdew.lib.block.BlockRef +import net.bdew.lib.data.base.{TileDataSlots, UpdateKind} +import net.bdew.lib.multiblock.Tools +import net.bdew.lib.multiblock.data.DataSlotPos + +import scala.reflect.ClassTag + +trait TileModule extends TileDataSlots { + val kind: String + val connected = new DataSlotPos("connected", this).setUpdate(UpdateKind.WORLD, UpdateKind.SAVE, UpdateKind.RENDER) + + def getCoreAs[T: ClassTag] = connected flatMap (_.getTile[TileController with T](getWorldObj)) + def getCore = connected flatMap (_.getTile[TileController](getWorldObj)) + + lazy val mypos = BlockRef(xCoord, yCoord, zCoord) + + def connect(target: TileController) { + if (target.moduleConnected(this)) { + connected.set(target.mypos) + getWorldObj.markBlockForUpdate(xCoord, yCoord, zCoord) + getWorldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType) + } + } + + def coreRemoved() { + connected.unset() + getWorldObj.markBlockForUpdate(xCoord, yCoord, zCoord) + getWorldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType) + } + + def onBreak() { + getCore map (_.moduleRemoved(this)) + } + + def tryConnect() { + if (getCore.isEmpty) { + for { + conn <- Tools.findConnections(getWorldObj, mypos, kind).headOption + core <- conn.getTile[TileController](getWorldObj) + } { + connect(core) + } + } + } +} diff --git a/src/net/bdew/lib/multiblock/tile/TileOutput.scala b/src/net/bdew/lib/multiblock/tile/TileOutput.scala new file mode 100644 index 0000000..de609cb --- /dev/null +++ b/src/net/bdew/lib/multiblock/tile/TileOutput.scala @@ -0,0 +1,63 @@ +/* + * 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 + * https://raw.github.com/bdew/bdlib/master/MMPL-1.0.txt + */ + +package net.bdew.lib.multiblock.tile + +import net.bdew.lib.multiblock.data.{OutputConfigPower, RSMode} +import net.bdew.lib.multiblock.interact.{CIOutputFaces, MIOutput} +import net.minecraftforge.common.util.ForgeDirection + +abstract class TileOutput extends TileModule with MIOutput { + val unit: String + + override def getCore = getCoreAs[CIOutputFaces] + + def checkCanOutput(cfg: OutputConfigPower): Boolean = { + if (cfg.rsMode == RSMode.ALWAYS) return true + if (cfg.rsMode == RSMode.NEVER) return false + return worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord) ^ (cfg.rsMode == RSMode.RS_OFF) + } + + def makeCfgObject(face: ForgeDirection) = { + val cfg = new OutputConfigPower + cfg.unit = unit + cfg + } + + var rescanFaces = false + + serverTick.listen(() => { + if (rescanFaces) { + rescanFaces = false + doRescanFaces() + } + }) + + override def tryConnect() { + super.tryConnect() + if (connected.isDefined) rescanFaces = true + } + + def canConnectoToFace(d: ForgeDirection): Boolean + + def onConnectionsChanged(added: Set[ForgeDirection], removed: Set[ForgeDirection]) {} + + def doRescanFaces() { + getCore map { core => + val connections = ForgeDirection.VALID_DIRECTIONS.filter(canConnectoToFace).toSet + val known = core.outputFaces.filter(_._1.origin == mypos).map(_._1.face).toSet + val toAdd = connections -- known + val toRemove = known -- connections + toRemove.foreach(x => core.removeOutput(mypos, x)) + toAdd.foreach(x => core.newOutput(mypos, x, makeCfgObject(x))) + if (toAdd.size > 0 || toRemove.size > 0) + onConnectionsChanged(toAdd, toRemove) + } + } +}