MsgOutputCfgPower/Fluid (That only had RS configuration) replaced by MsgOutputCfgRSMode

This commit is contained in:
bdew committed 2014-09-16 09:43:13 +03:00
1 parent 5a9aedb4d5
commit cd833163af
5 files changed
+20 -11

No files matched your search

@@ -19,10 +19,6 @@ abstract class OutputConfig {
def handleConfigPacket(m: MsgOutputCfg)
}
trait OutputConfigRSControllable extends OutputConfig {
var rsMode: RSMode.Value
}
class OutputConfigInvalid extends OutputConfig {
def read(t: NBTTagCompound) {}
def write(t: NBTTagCompound) = throw new NotImplementedException
@@ -12,8 +12,6 @@ package net.bdew.lib.multiblock.data
import net.bdew.lib.multiblock.network.MsgOutputCfg
import net.minecraft.nbt.NBTTagCompound
case class MsgOutputCfgFluid(output: Int, rsMode: RSMode.Value) extends MsgOutputCfg
class OutputConfigFluid extends OutputConfig with OutputConfigRSControllable {
var avg = 0.0
var rsMode = RSMode.ALWAYS
@@ -35,7 +33,7 @@ class OutputConfigFluid extends OutputConfig with OutputConfigRSControllable {
}
def handleConfigPacket(m: MsgOutputCfg) = m match {
case MsgOutputCfgFluid(_, r) => rsMode = r
case MsgOutputCfgRSMode(_, r) => rsMode = r
case _ => sys.error("Invalid output config packet %s to config %s".format(m, this))
}
}
@@ -12,8 +12,6 @@ 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(var unit: String = "MJ") extends OutputConfig with OutputConfigRSControllable {
var avg = 0.0
var rsMode = RSMode.ALWAYS
@@ -37,7 +35,7 @@ class OutputConfigPower(var unit: String = "MJ") extends OutputConfig with Outpu
}
def handleConfigPacket(m: MsgOutputCfg) = m match {
case MsgOutputCfgPower(_, r) => rsMode = r
case MsgOutputCfgRSMode(_, r) => rsMode = r
case _ => sys.error("Invalid output config packet %s to config %s".format(m, this))
}
}
@@ -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.data
import net.bdew.lib.multiblock.network.MsgOutputCfg
case class MsgOutputCfgRSMode(output: Int, rsMode: RSMode.Value) extends MsgOutputCfg
trait OutputConfigRSControllable extends OutputConfig {
var rsMode: RSMode.Value
}
@@ -9,7 +9,6 @@
package net.bdew.lib.multiblock.interact
import net.bdew.lib.BdLib
import net.bdew.lib.multiblock.data.OutputConfig
import net.bdew.lib.multiblock.tile.TileModule
import net.minecraftforge.common.util.ForgeDirection