diff --git a/src/net/bdew/lib/multiblock/data/OutputConfig.scala b/src/net/bdew/lib/multiblock/data/OutputConfig.scala index 165f09e..c56062e 100644 --- a/src/net/bdew/lib/multiblock/data/OutputConfig.scala +++ b/src/net/bdew/lib/multiblock/data/OutputConfig.scala @@ -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 diff --git a/src/net/bdew/lib/multiblock/data/OutputCfgFluid.scala b/src/net/bdew/lib/multiblock/data/OutputConfigFluid.scala similarity index 88% rename from src/net/bdew/lib/multiblock/data/OutputCfgFluid.scala rename to src/net/bdew/lib/multiblock/data/OutputConfigFluid.scala index f87216d..f9d4b0a 100644 --- a/src/net/bdew/lib/multiblock/data/OutputCfgFluid.scala +++ b/src/net/bdew/lib/multiblock/data/OutputConfigFluid.scala @@ -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)) } } diff --git a/src/net/bdew/lib/multiblock/data/OutputConfigPower.scala b/src/net/bdew/lib/multiblock/data/OutputConfigPower.scala index cd08330..5cfa88e 100644 --- a/src/net/bdew/lib/multiblock/data/OutputConfigPower.scala +++ b/src/net/bdew/lib/multiblock/data/OutputConfigPower.scala @@ -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)) } } diff --git a/src/net/bdew/lib/multiblock/data/OutputConfigRSMode.scala b/src/net/bdew/lib/multiblock/data/OutputConfigRSMode.scala new file mode 100644 index 0000000..9a6a3f0 --- /dev/null +++ b/src/net/bdew/lib/multiblock/data/OutputConfigRSMode.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.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 +} \ No newline at end of file diff --git a/src/net/bdew/lib/multiblock/interact/MIOutput.scala b/src/net/bdew/lib/multiblock/interact/MIOutput.scala index ae5691b..fc43ee7 100644 --- a/src/net/bdew/lib/multiblock/interact/MIOutput.scala +++ b/src/net/bdew/lib/multiblock/interact/MIOutput.scala @@ -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