More work on sensor system

This commit is contained in:
bdew committed 2015-03-22 16:14:29 +02:00
1 parent 399abf1054
commit d3952b69d0
16 files changed
+228 -109

No files matched your search

@@ -10,6 +10,7 @@
package net.bdew.lib.render
import cpw.mods.fml.common.eventhandler.SubscribeEvent
import net.bdew.lib.Misc
import net.bdew.lib.gui.{IconWrapper, Texture}
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.util.IIcon
@@ -21,6 +22,13 @@ import net.minecraftforge.common.MinecraftForge
* @param kind 0=Blocks / 1=Items
*/
class IconPreloader(kind: Int) {
lazy val map = {
(for {
method <- getClass.getMethods if method.getParameterTypes.length == 0 && classOf[TextureLoc].isAssignableFrom(method.getReturnType)
value <- Misc.asInstanceOpt(method.invoke(this), classOf[TextureLoc])
} yield method.getName -> value).toMap
}
var icons = Set.empty[TextureLoc]
val sheet = kind match {
@@ -11,11 +11,11 @@ package net.bdew.lib.sensors
import net.bdew.lib.Misc
import net.bdew.lib.data.base.{DataSlotVal, UpdateKind}
import net.bdew.lib.sensors.multiblock.TileSensorModule
import net.bdew.lib.sensors.multiblock.TileRedstoneSensorModule
import net.minecraft.nbt.NBTTagCompound
case class DataSlotSensor(name: String, parent: TileSensorModule, default: SensorType) extends DataSlotVal[SensorPair] {
override var value: SensorPair = SensorPair(default, default.defaultParameter)
case class DataSlotSensor[T, R](registry: SensorSystem[T, R], name: String, parent: TileRedstoneSensorModule, default: GenericSensorType[T, R]) extends DataSlotVal[SensorPair[T, R]] {
override var value = SensorPair(default, default.defaultParameter)
setUpdate(UpdateKind.SAVE, UpdateKind.GUI)
@@ -27,7 +27,7 @@ case class DataSlotSensor(name: String, parent: TileSensorModule, default: Senso
}
override def load(t: NBTTagCompound, kind: UpdateKind.Value) = {
value = SensorRegistry.get(t.getCompoundTag(name).getString("uid"))
value = registry.get(t.getCompoundTag(name).getString("uid"))
.map(x => SensorPair(x, x.loadParameter(t.getCompoundTag(name))))
.getOrElse(SensorPair(default, default.defaultParameter))
}
@@ -11,13 +11,16 @@ package net.bdew.lib.sensors
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.lib.Misc
import net.bdew.lib.gui.Texture
import net.bdew.lib.gui.{Color, Texture}
trait SensorParameter {
abstract class GenericSensorParameter(system: SensorSystem[_, _]) {
val uid: String
def localizedName = Misc.toLocal("bdew.sensor.param." + uid)
def localizedName = Misc.toLocal(system.localizationPrefix + ".param." + uid)
@SideOnly(Side.CLIENT)
def texture: Texture
@SideOnly(Side.CLIENT)
def textureColor = Color.white
}
@@ -0,0 +1,37 @@
/*
* Copyright (c) bdew, 2013 - 2015
* 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.sensors
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.lib.Misc
import net.bdew.lib.gui.{Color, Texture}
import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound
abstract class GenericSensorType[-T, +R](system: SensorSystem[T, R]) {
def uid: String
system.register(this)
def localizedName = Misc.toLocal(system.localizationPrefix + "." + uid)
def defaultParameter: GenericSensorParameter
def paramClicked(current: GenericSensorParameter, item: ItemStack, button: Int, mod: Int): GenericSensorParameter
def saveParameter(p: GenericSensorParameter, tag: NBTTagCompound)
def loadParameter(tag: NBTTagCompound): GenericSensorParameter
def getResult(param: GenericSensorParameter, obj: T): R
@SideOnly(Side.CLIENT)
def texture: Texture
@SideOnly(Side.CLIENT)
def textureColor = Color.white
}
+3 -1
View File
@@ -9,4 +9,6 @@
package net.bdew.lib.sensors
case class SensorPair(sensor: SensorType, param: SensorParameter)
case class SensorPair[-T, +R](sensor: GenericSensorType[T, R], param: GenericSensorParameter) {
def getResult(obj: T) = sensor.getResult(param, obj)
}
@@ -0,0 +1,70 @@
/*
* Copyright (c) bdew, 2013 - 2015
* 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.sensors
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.lib.gui.Texture
import net.bdew.lib.{BdLib, Misc}
import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound
abstract class SensorSystem[T, R](defaultResult: R) {
val map = collection.mutable.Map.empty[String, GenericSensorType[T, R]]
def get(uid: String) = map.get(uid)
def register[Z <: GenericSensorType[T, R]](s: Z): Z = {
if (map.isDefinedAt(s.uid))
sys.error("Duplicate sensor ID: %s (%s / %s)".format(s.uid, map(s.uid), s))
map += s.uid -> s
s
}
@SideOnly(Side.CLIENT)
def disabledTexture: Texture
def localizationPrefix: String
abstract class SensorType extends GenericSensorType(this)
abstract class SimpleSensor extends SimpleGenericSensor(this)
abstract class SensorParameter extends GenericSensorParameter(this)
object DisabledParameter extends SensorParameter {
override val uid = "disabled"
@SideOnly(Side.CLIENT)
override val texture = disabledTexture
}
object DisabledSensor extends SensorType {
override def uid = "disabled"
override def defaultParameter = DisabledParameter
override def loadParameter(tag: NBTTagCompound) = DisabledParameter
override def saveParameter(p: GenericSensorParameter, tag: NBTTagCompound) = {}
override def getResult(param: GenericSensorParameter, obj: T) = defaultResult
override def paramClicked(current: GenericSensorParameter, item: ItemStack, button: Int, mod: Int) = DisabledParameter
@SideOnly(Side.CLIENT)
override val texture = disabledTexture
}
object DisabledSensorPair extends SensorPair(DisabledSensor, DisabledParameter)
def init(): Unit = {
BdLib.logDebug("Initialized sensor system %s for mod %s", this.getClass.getName, Misc.getActiveModId)
}
}
-33
View File
@@ -1,33 +0,0 @@
/*
* Copyright (c) bdew, 2013 - 2015
* 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.sensors
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.lib.Misc
import net.bdew.lib.gui.Texture
import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.tileentity.TileEntity
abstract class SensorType {
def uid: String
def localizedName = Misc.toLocal("bdew.sensor." + uid)
def defaultParameter: SensorParameter
def paramClicked(current: SensorParameter, item: ItemStack, button: Int, mod: Int): SensorParameter
def saveParameter(p: SensorParameter, tag: NBTTagCompound)
def loadParameter(tag: NBTTagCompound): SensorParameter
def isActive(param: SensorParameter, te: TileEntity): Boolean
@SideOnly(Side.CLIENT)
def texture: Texture
}
@@ -13,14 +13,14 @@ import net.bdew.lib.Misc
import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound
abstract class SimpleSensor extends SensorType {
def parameters: IndexedSeq[SensorParameter]
abstract class SimpleGenericSensor[-T, +R](system: SensorSystem[T, R]) extends GenericSensorType[T, R](system) {
def parameters: IndexedSeq[GenericSensorParameter]
override lazy val defaultParameter = parameters.headOption.getOrElse(InvalidParameter)
override lazy val defaultParameter = parameters.headOption.getOrElse(system.DisabledParameter)
lazy val parameterMap = (parameters map (x => x.uid -> x)).toMap
override def paramClicked(current: SensorParameter, item: ItemStack, button: Int, mod: Int) =
override def paramClicked(current: GenericSensorParameter, item: ItemStack, button: Int, mod: Int) =
if (item == null && button == 0 && mod == 0)
Misc.nextInSeq(parameters, current)
else if (item == null && button == 1 && mod == 0)
@@ -28,6 +28,7 @@ abstract class SimpleSensor extends SensorType {
else
current
override def saveParameter(p: SensorParameter, tag: NBTTagCompound) = tag.setString("param", p.uid)
override def loadParameter(tag: NBTTagCompound) = parameterMap.getOrElse(tag.getString("param"), InvalidParameter)
override def saveParameter(p: GenericSensorParameter, tag: NBTTagCompound) = tag.setString("param", p.uid)
override def loadParameter(tag: NBTTagCompound) = parameterMap.getOrElse(tag.getString("param"), system.DisabledParameter)
}
@@ -13,7 +13,7 @@ import net.bdew.lib.gui.SlotClickable
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.inventory.{IInventory, Slot}
class SlotSensorParameter(inv: IInventory, index: Int, x: Int, y: Int, ds: DataSlotSensor) extends Slot(inv, index, x, y) with SlotClickable {
class SlotSensorParameter[T, R](inv: IInventory, index: Int, x: Int, y: Int, ds: DataSlotSensor[T, R]) extends Slot(inv, index, x, y) with SlotClickable {
override def onClick(button: Int, mods: Int, player: EntityPlayer) = {
val newParam = ds.sensor.paramClicked(ds.param, player.inventory.getItemStack, button, mods)
ds := ds.value.copy(param = newParam)
@@ -14,7 +14,7 @@ import net.bdew.lib.gui.SlotClickable
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.inventory.{IInventory, Slot}
class SlotSensorType(inv: IInventory, index: Int, x: Int, y: Int, ds: DataSlotSensor, types: => Seq[SensorType]) extends Slot(inv, index, x, y) with SlotClickable {
class SlotSensorType[T, R](inv: IInventory, index: Int, x: Int, y: Int, ds: DataSlotSensor[T, R], types: => Seq[GenericSensorType[T, R]]) extends Slot(inv, index, x, y) with SlotClickable {
override def onClick(button: Int, mods: Int, player: EntityPlayer) = {
if (mods == 0 && (button == 0 || button == 1) && types.size > 0 && player.inventory.getItemStack == null) {
val newSensor =
@@ -10,8 +10,9 @@
package net.bdew.lib.sensors.multiblock
import net.bdew.lib.multiblock.tile.TileController
import net.bdew.lib.sensors.SensorType
import net.bdew.lib.sensors.GenericSensorType
import net.minecraft.tileentity.TileEntity
trait CISensors extends TileController {
def sensorTypes: Seq[SensorType]
trait CIRedstoneSensors extends TileController {
def sensorTypes: Seq[GenericSensorType[TileEntity, Boolean]]
}
@@ -11,8 +11,9 @@ package net.bdew.lib.sensors.multiblock
import net.bdew.lib.multiblock.tile.TileModule
import net.bdew.lib.sensors.DataSlotSensor
import net.minecraft.tileentity.TileEntity
abstract class TileSensorModule extends TileModule {
def config: DataSlotSensor
override def getCore = getCoreAs[CISensors]
abstract class TileRedstoneSensorModule extends TileModule {
def config: DataSlotSensor[TileEntity, Boolean]
override def getCore = getCoreAs[CIRedstoneSensors]
}
-54
View File
@@ -1,54 +0,0 @@
/*
* Copyright (c) bdew, 2013 - 2015
* 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.sensors
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.lib.Client
import net.bdew.lib.gui.{IconWrapper, Texture}
import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.tileentity.TileEntity
object SensorRegistry {
val map = collection.mutable.Map.empty[String, SensorType]
def get(uid: String) = map.get(uid)
def register[T <: SensorType](s: T): T = {
if (map.isDefinedAt(s.uid))
sys.error("Duplicate sensor ID: %s (%s / %s)".format(s.uid, map(s.uid), s))
map += s.uid -> s
s
}
register(InvalidSensor)
}
object InvalidParameter extends SensorParameter {
override val uid = "invalid"
@SideOnly(Side.CLIENT)
override lazy val texture = new IconWrapper(Texture.BLOCKS, Client.blockMissingIcon)
}
object InvalidSensor extends SensorType {
override def uid = "invalid"
override def defaultParameter = InvalidParameter
override def loadParameter(tag: NBTTagCompound) = InvalidParameter
override def saveParameter(p: SensorParameter, tag: NBTTagCompound) = {}
override def isActive(param: SensorParameter, te: TileEntity) = false
override def paramClicked(current: SensorParameter, item: ItemStack, button: Int, mod: Int) = InvalidParameter
@SideOnly(Side.CLIENT)
override lazy val texture = new IconWrapper(Texture.BLOCKS, Client.blockMissingIcon)
}
object InvalidSensorPair extends SensorPair(InvalidSensor, InvalidParameter)
@@ -0,0 +1,36 @@
/*
* Copyright (c) bdew, 2013 - 2015
* 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.sensors.widgets
import net.bdew.lib.Misc
import net.bdew.lib.gui._
import net.bdew.lib.gui.widgets.Widget
import net.minecraft.init.Blocks
import scala.collection.mutable
class WidgetSensorBooleanResult(val p: Point, state: => Boolean, stringPrefix: String) extends Widget {
val rsOn = new IconWrapper(Texture.BLOCKS, Blocks.redstone_torch.getIcon(0, 0))
val rsOff = new IconWrapper(Texture.BLOCKS, Blocks.unlit_redstone_torch.getIcon(0, 0))
override val rect = new Rect(p, 16, 16)
override def handleTooltip(p: Point, tip: mutable.MutableList[String]) =
if (state)
tip += Misc.toLocal(stringPrefix + ".on")
else
tip += Misc.toLocal(stringPrefix + ".off")
override def draw(mouse: Point) =
if (state)
parent.drawTexture(rect, rsOn)
else
parent.drawTexture(rect, rsOff)
}
@@ -0,0 +1,22 @@
/*
* Copyright (c) bdew, 2013 - 2015
* 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.sensors.widgets
import net.bdew.lib.gui._
import net.bdew.lib.gui.widgets.Widget
import net.bdew.lib.sensors.GenericSensorParameter
import scala.collection.mutable
class WidgetSensorParam(val p: Point, param: => GenericSensorParameter) extends Widget {
override val rect = new Rect(p, 16, 16)
override def handleTooltip(p: Point, tip: mutable.MutableList[String]) = tip += param.localizedName
override def draw(mouse: Point) = parent.drawTexture(rect, param.texture, param.textureColor)
}
@@ -0,0 +1,25 @@
/*
* Copyright (c) bdew, 2013 - 2015
* 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.sensors.widgets
import net.bdew.lib.gui._
import net.bdew.lib.gui.widgets.Widget
import net.bdew.lib.sensors.GenericSensorType
import scala.collection.mutable
class WidgetSensorType[T, R](val p: Point, sensor: => GenericSensorType[T, R]) extends Widget {
override val rect = new Rect(p, 16, 16)
override def handleTooltip(p: Point, tip: mutable.MutableList[String]) = tip += sensor.localizedName
override def draw(mouse: Point) = parent.drawTexture(rect, sensor.texture, sensor.textureColor)
}