diff --git a/.idea/scopes/lib.xml b/.idea/scopes/lib.xml
index 9ef6479..389b774 100644
--- a/.idea/scopes/lib.xml
+++ b/.idea/scopes/lib.xml
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file
diff --git a/.idea/scopes/main.xml b/.idea/scopes/main.xml
index 6397915..731fb81 100644
--- a/.idea/scopes/main.xml
+++ b/.idea/scopes/main.xml
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 7481eca..2bcdd25 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,25 +5,21 @@ buildscript {
repositories {
mavenCentral()
mavenLocal()
- maven {
- name = "bdew"
- url = "http://jenkins.bdew.net/maven"
- }
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
}
dependencies {
- classpath 'net.bdew.minecraftforge.gradle:forgegradle:1.0.4'
+ classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
}
}
apply plugin: 'forge'
apply plugin: 'scala'
-version = "0.9.4"
-ext.bdlibver = "0.9.2.6"
+version = "0.9.5"
+ext.bdlibver = "0.9.3.8"
ext.versuffix = "mc164"
if (project.hasProperty('buildnum')) {
@@ -43,7 +39,6 @@ minecraft {
replace("GENDUSTRY_VER", project.version)
}
-
repositories {
mavenCentral()
maven {
diff --git a/resources/assets/gendustry/gendustry-tuning.cfg b/resources/assets/gendustry/gendustry-tuning.cfg
index 6367eda..e9486ac 100644
--- a/resources/assets/gendustry/gendustry-tuning.cfg
+++ b/resources/assets/gendustry/gendustry-tuning.cfg
@@ -38,6 +38,7 @@
cfg Machines {
cfg MutagenProducer {
+ Enabled = Yes
MaxReceivedEnergy = 500
PowerUseRate = 0.0005
MjPerItem = 100000
@@ -48,6 +49,7 @@ cfg Machines {
}
cfg Mutatron {
+ Enabled = Yes
MaxReceivedEnergy = 500
PowerUseRate = 0.001
MjPerItem = 20000
@@ -65,6 +67,7 @@ cfg Machines {
}
cfg Sampler {
+ Enabled = Yes
MaxReceivedEnergy = 500
PowerUseRate = 0.001
MjPerItem = 20000
@@ -75,6 +78,7 @@ cfg Machines {
}
cfg Imprinter {
+ Enabled = Yes
MaxReceivedEnergy = 500
PowerUseRate = 0.0005
MjPerItem = 80000
@@ -87,6 +91,7 @@ cfg Machines {
}
cfg IndustrialApiary {
+ Enabled = Yes
MaxReceivedEnergy = 100
MaxStoredEnergy = 10000
ActivationEnergy = 0
@@ -97,6 +102,7 @@ cfg Machines {
cfg Items {
cfg IndustrialGrafter {
+ Enabled = Yes
Charges = 200 // Number of blocks that a fully charged grafter can break
MjPerCharge = 500 // Cost of a single broken block in MJ
AOE = 2 // Radius from the central block, 1 = 3x3x3, 2 = 5x5x5 and so on
diff --git a/src/net/bdew/gendustry/Gendustry.scala b/src/net/bdew/gendustry/Gendustry.scala
index e9dc4c9..0ac1ccc 100644
--- a/src/net/bdew/gendustry/Gendustry.scala
+++ b/src/net/bdew/gendustry/Gendustry.scala
@@ -11,7 +11,6 @@ package net.bdew.gendustry
import java.util.logging.Logger
import net.bdew.gendustry.config._
-import net.minecraftforge.common.Configuration
import cpw.mods.fml.common.Mod
import cpw.mods.fml.common.Mod.EventHandler
import cpw.mods.fml.common.event.FMLInitializationEvent
@@ -44,15 +43,7 @@ object Gendustry {
PowerProxy.logModVersions()
configDir = event.getModConfigurationDirectory
TuningLoader.load("tuning")
- val config: Configuration = Config.load(event.getSuggestedConfigurationFile)
- try {
- Ids.init(config)
- Blocks.load(config)
- Machines.load(config)
- Items.load(config)
- } finally {
- config.save()
- }
+ Config.load(event.getSuggestedConfigurationFile)
}
@EventHandler
diff --git a/src/net/bdew/gendustry/config/Blocks.scala b/src/net/bdew/gendustry/config/Blocks.scala
index 1ce611b..6abbc9d 100644
--- a/src/net/bdew/gendustry/config/Blocks.scala
+++ b/src/net/bdew/gendustry/config/Blocks.scala
@@ -10,29 +10,16 @@
package net.bdew.gendustry.config
import cpw.mods.fml.common.registry.GameRegistry
-import net.bdew.gendustry.machines.mproducer.BlockMutagenProducer
-import net.bdew.gendustry.machines.mutatron.BlockMutatron
import net.bdew.gendustry.mutagen.BlockMutagen
-import net.bdew.gendustry.mutagen.FluidMutagen
import net.bdew.gendustry.test.PowerEmitterBlock
import net.bdew.gendustry.test.PowerEmitterTile
-import net.minecraftforge.common.Configuration
+import net.bdew.lib.config.BlockManager
+import net.bdew.gendustry.Gendustry
-object Blocks {
- var mutagenFluid: FluidMutagen = null
- var mutagen: BlockMutagen = null
- var mutagenProducer: BlockMutagenProducer = null
- var mutatron: BlockMutatron = null
- var testPowerEmitter: PowerEmitterBlock = null
-
- def load(cfg: Configuration) {
- mutagenFluid = new FluidMutagen
-
- mutagen = new BlockMutagen(cfg.getBlock("Mutagen", Ids.blockIds.next()).getInt)
- GameRegistry.registerBlock(mutagen, "Mutagen")
-
- testPowerEmitter = new PowerEmitterBlock(cfg.getBlock("Test Power Emitter", Ids.blockIds.next()).getInt)
- GameRegistry.registerBlock(testPowerEmitter, "PowerEmitterBlock")
- GameRegistry.registerTileEntity(classOf[PowerEmitterTile], "PowerEmitterBlock")
- }
+object Blocks extends BlockManager(Config.IDs) {
+ var mutagen = regBlockCls(classOf[BlockMutagen], "Mutagen")
+ var testPowerEmitter = new PowerEmitterBlock(ids.getBlockId("Test Power Emitter"))
+ GameRegistry.registerBlock(testPowerEmitter, "PowerEmitterBlock")
+ GameRegistry.registerTileEntity(classOf[PowerEmitterTile], "PowerEmitterBlock")
+ Gendustry.logInfo("Blocks loaded")
}
\ No newline at end of file
diff --git a/src/net/bdew/gendustry/config/Config.scala b/src/net/bdew/gendustry/config/Config.scala
index ab5cc20..7564eb3 100644
--- a/src/net/bdew/gendustry/config/Config.scala
+++ b/src/net/bdew/gendustry/config/Config.scala
@@ -11,17 +11,29 @@ package net.bdew.gendustry.config
import net.minecraftforge.common.Configuration
import java.io.File
+import net.bdew.lib.config.IdManager
+import net.bdew.gendustry.mutagen.FluidMutagen
object Config {
var neiAddSamples = false
+ var IDs: IdManager = null
+ var
+ mutagenFluid = new FluidMutagen
- def load(cfg: File): Configuration = {
+ def load(cfg: File) {
val c = new Configuration(cfg)
c.load()
- c.addCustomCategoryComment("machines enabled", "Disabling a machine will remove it's block registration, loading any world will remove the blocks permanently")
- neiAddSamples = c.get("NEI", "Add samples", true).getBoolean(false)
+ try {
+ neiAddSamples = c.get("NEI", "Add samples", true).getBoolean(false)
+ IDs = new IdManager(c, 15000, 3500)
+ Fluids.load()
+ Blocks.load()
+ Items.load()
+ Machines.load()
+ } finally {
+ c.save()
+ }
- return c
}
}
\ No newline at end of file
diff --git a/src/net/bdew/gendustry/config/Fluids.scala b/src/net/bdew/gendustry/config/Fluids.scala
new file mode 100644
index 0000000..5589b1e
--- /dev/null
+++ b/src/net/bdew/gendustry/config/Fluids.scala
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) bdew, 2013
+ * https://github.com/bdew/gendustry
+ *
+ * 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/gendustry/master/MMPL-1.0.txt
+ */
+
+package net.bdew.gendustry.config
+
+import net.bdew.lib.config.FluidManager
+import net.bdew.gendustry.mutagen.FluidMutagen
+import net.bdew.gendustry.Gendustry
+
+object Fluids extends FluidManager(Config.IDs) {
+ val mutagen: FluidMutagen = regFluid(new FluidMutagen)
+ Gendustry.logInfo("Fluids loaded")
+}
diff --git a/src/net/bdew/gendustry/config/Ids.scala b/src/net/bdew/gendustry/config/Ids.scala
deleted file mode 100644
index 186db7f..0000000
--- a/src/net/bdew/gendustry/config/Ids.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) bdew, 2013
- * https://github.com/bdew/gendustry
- *
- * 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/gendustry/master/MMPL-1.0.txt
- */
-
-package net.bdew.gendustry.config
-
-import net.minecraft.block.Block
-import net.minecraft.item.Item
-import net.minecraftforge.common.Configuration
-
-object Ids {
-
- class MyIter(start: Int, check: Array[_], offset: Int = 0) {
- var now = start
- def next(): Int = {
- while (check(now + offset) != null) now += 1
- return now
- }
- }
-
- val blockIds = new MyIter(3500, Block.blocksList)
- val itemIds = new MyIter(15000, Item.itemsList, 256)
-
- def init(cfg: Configuration) {
- // figure out what's the max id we already use, because forge is stupid
- // ignore ids in the top slots as they were probably assigned to resolve conflicts
- import scala.collection.JavaConverters._
-
- val maxBlock = (cfg.getCategory(Configuration.CATEGORY_BLOCK).values().asScala.map(_.getInt).filter(_ < Block.blocksList.length - 100) ++ Seq(0)).max + 1
- val maxItem = (cfg.getCategory(Configuration.CATEGORY_ITEM).values().asScala.map(_.getInt).filter(_ < Item.itemsList.length - 1000) ++ Seq(0)).max + 1
-
- if (maxBlock > blockIds.now) blockIds.now = maxBlock
- if (maxItem > itemIds.now) itemIds.now = maxItem
- }
-}
diff --git a/src/net/bdew/gendustry/config/Items.scala b/src/net/bdew/gendustry/config/Items.scala
index dedac25..75abb1b 100644
--- a/src/net/bdew/gendustry/config/Items.scala
+++ b/src/net/bdew/gendustry/config/Items.scala
@@ -15,59 +15,38 @@ import net.bdew.gendustry.mutagen.ItemMutagenBucket
import net.bdew.gendustry.mutagen.ItemMutagenCan
import net.minecraft.item.Item
import net.minecraft.item.ItemStack
-import net.minecraftforge.common.Configuration
import net.minecraftforge.fluids.FluidContainerRegistry
-import net.bdew.gendustry.items.{IndustrialGrafter, GeneTemplate, GeneSample, SimpleItem}
+import net.bdew.gendustry.items.{IndustrialGrafter, GeneTemplate, GeneSample}
import net.bdew.gendustry.machines.apiary.upgrades.ItemApiaryUpgrade
+import net.bdew.lib.config.ItemManager
+import net.bdew.gendustry.Gendustry
-object Items {
- var mutagenBucket: ItemMutagenBucket = null
- var mutagenCan: ItemMutagenCan = null
- var labware: SimpleItem = null
- var waste: SimpleItem = null
- var geneSample: GeneSample = null
- var geneSampleBlank: SimpleItem = null
- var geneTemplate: GeneTemplate = null
- var upgradeItem: ItemApiaryUpgrade = null
- var grafter: IndustrialGrafter = null
+object Items extends ItemManager(Config.IDs) {
- def regSimpleItem(cfg: Configuration, name: String): SimpleItem =
- regItem(new SimpleItem(cfg.getItem(name, Ids.itemIds.next()).getInt, name), name)
+ val mutagenBucket = regItemCls(classOf[ItemMutagenBucket], "MutagenBucket")
+ val mutagenCan = regItemCls(classOf[ItemMutagenCan], "MutagenCan")
- def regItem[T <: SimpleItem](item: T): T = regItem(item, item.name)
+ FluidContainerRegistry.registerFluidContainer(Fluids.mutagen, new ItemStack(mutagenBucket), new ItemStack(Item.bucketEmpty))
+ FluidContainerRegistry.registerFluidContainer(Fluids.mutagen, new ItemStack(mutagenCan), ItemInterface.getItem("canEmpty"))
- def regItem[T <: Item](item: T, name: String, addStack: Boolean = true): T = {
- GameRegistry.registerItem(item, name)
- if (addStack)
- GameRegistry.registerCustomItemStack(name, new ItemStack(item))
- return item
- }
+ val geneSample = regItem(new GeneSample(ids.getItemId("GeneSample")))
+ val geneTemplate = regItem(new GeneTemplate(ids.getItemId("GeneTemplate")))
- def load(cfg: Configuration) {
- mutagenBucket = regItem(new ItemMutagenBucket(cfg.getItem("MutagenBucket", Ids.itemIds.next()).getInt), "MutagenBucket")
- mutagenCan = regItem(new ItemMutagenCan(cfg.getItem("MutagenCan", Ids.itemIds.next()).getInt), "MutagenCan")
+ val upgradeItem = regItemCls(classOf[ItemApiaryUpgrade], "ApiaryUpgrade")
- FluidContainerRegistry.registerFluidContainer(Blocks.mutagenFluid, new ItemStack(mutagenBucket), new ItemStack(Item.bucketEmpty))
- FluidContainerRegistry.registerFluidContainer(Blocks.mutagenFluid, new ItemStack(mutagenCan), ItemInterface.getItem("canEmpty"))
+ val grafter = regItemCls(classOf[IndustrialGrafter], "IndustrialGrafter", false)
+ GameRegistry.registerCustomItemStack("IndustrialGrafter", grafter.stackWithCharge(0))
- geneSample = regItem(new GeneSample(cfg.getItem("GeneSample", Ids.itemIds.next()).getInt))
- geneTemplate = regItem(new GeneTemplate(cfg.getItem("GeneTemplate", Ids.itemIds.next()).getInt))
+ regSimpleItem("MutagenTank")
+ regSimpleItem("BeeReceptacle")
+ regSimpleItem("PowerModule")
+ regSimpleItem("GeneticsProcessor")
+ regSimpleItem("UpgradeFrame")
+ regSimpleItem("ClimateModule")
- upgradeItem = regItem(new ItemApiaryUpgrade(cfg.getItem("ApiaryUpgrade", Ids.itemIds.next()).getInt), "ApiaryUpgrade")
+ val labware = regSimpleItem("Labware")
+ val waste = regSimpleItem("Waste")
+ val geneSampleBlank = regSimpleItem("GeneSampleBlank")
- grafter = regItem(new IndustrialGrafter(cfg.getItem("IndustrialGrafter", Ids.itemIds.next()).getInt), "IndustrialGrafter", false)
- GameRegistry.registerCustomItemStack("IndustrialGrafter", grafter.stackWithCharge(0))
-
- regSimpleItem(cfg, "MutagenTank")
- regSimpleItem(cfg, "BeeReceptacle")
- regSimpleItem(cfg, "PowerModule")
- regSimpleItem(cfg, "GeneticsProcessor")
- regSimpleItem(cfg, "UpgradeFrame")
- regSimpleItem(cfg, "ClimateModule")
-
- labware = regSimpleItem(cfg, "Labware")
- waste = regSimpleItem(cfg, "Waste")
- geneSampleBlank = regSimpleItem(cfg, "GeneSampleBlank")
-
- }
+ Gendustry.logInfo("Items loaded")
}
\ No newline at end of file
diff --git a/src/net/bdew/gendustry/config/Machines.scala b/src/net/bdew/gendustry/config/Machines.scala
index 8779c52..8eb51d3 100644
--- a/src/net/bdew/gendustry/config/Machines.scala
+++ b/src/net/bdew/gendustry/config/Machines.scala
@@ -9,25 +9,20 @@
package net.bdew.gendustry.config
-import net.minecraftforge.common.Configuration
import net.bdew.gendustry.machines.mproducer.MachineMutagenProducer
import net.bdew.gendustry.machines.mutatron.MachineMutatron
import net.bdew.gendustry.machines.apiary.MachineApiary
import net.bdew.gendustry.machines.imprinter.MachineImprinter
import net.bdew.gendustry.machines.sampler.MachineSampler
+import net.bdew.lib.config.MachineManager
+import net.bdew.gendustry.Gendustry
-object Machines {
- var mutagenProducer: MachineMutagenProducer = null
- var mutatron: MachineMutatron = null
- var apiary: MachineApiary = null
- var imprinter: MachineImprinter = null
- var sampler: MachineSampler = null
+object Machines extends MachineManager(Config.IDs, Tuning.getSection("Machines")) {
+ val mutagenProducer = registerMachine(new MachineMutagenProducer)
+ val mutatron = registerMachine(new MachineMutatron)
+ val apiary = registerMachine(new MachineApiary)
+ val imprinter = registerMachine(new MachineImprinter)
+ val sampler = registerMachine(new MachineSampler)
- def load(cfg: Configuration) {
- mutagenProducer = new MachineMutagenProducer(cfg)
- mutatron = new MachineMutatron(cfg)
- apiary = new MachineApiary(cfg)
- imprinter = new MachineImprinter(cfg)
- sampler = new MachineSampler(cfg)
- }
+ Gendustry.logInfo("Machines loaded")
}
diff --git a/src/net/bdew/gendustry/gui/WidgetMJGauge.scala b/src/net/bdew/gendustry/gui/WidgetMJGauge.scala
deleted file mode 100644
index 646f434..0000000
--- a/src/net/bdew/gendustry/gui/WidgetMJGauge.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) bdew, 2013
- * https://github.com/bdew/gendustry
- *
- * 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/gendustry/master/MMPL-1.0.txt
- */
-
-package net.bdew.gendustry.gui
-
-import net.bdew.lib.gui.{Point, TextureLocation, Rect}
-import scala.collection.mutable
-import java.text.DecimalFormat
-import net.bdew.gendustry.power.DataSlotPower
-import net.minecraft.client.Minecraft
-import net.bdew.lib.gui.widgets.Widget
-
-class WidgetMJGauge(val rect: Rect, texture: TextureLocation, dslot: DataSlotPower) extends Widget {
- val formater = new DecimalFormat("#,###")
-
- override def draw() {
- Minecraft.getMinecraft.renderEngine.bindTexture(texture.resource)
- val fill = (dslot.stored / dslot.capacity * rect.h).round
- parent.drawTexturedModalRect(rect.x, rect.y + rect.h - fill, texture.x, texture.y + rect.h - fill, rect.w, fill)
- }
-
- override def handleTooltip(p: Point, tip: mutable.MutableList[String]) = tip += formater.format(dslot.stored) + "/" + formater.format(dslot.capacity) + " MJ"
-}
diff --git a/src/net/bdew/gendustry/items/GeneSample.scala b/src/net/bdew/gendustry/items/GeneSample.scala
index 46f339b..572199e 100644
--- a/src/net/bdew/gendustry/items/GeneSample.scala
+++ b/src/net/bdew/gendustry/items/GeneSample.scala
@@ -16,6 +16,7 @@ import java.util
import net.bdew.lib.Misc
import net.bdew.gendustry.forestry.GeneSampleInfo
import net.bdew.gendustry.config.Items
+import net.bdew.lib.items.SimpleItem
class GeneSample(id: Int) extends SimpleItem(id, "GeneSample") {
diff --git a/src/net/bdew/gendustry/items/GeneTemplate.scala b/src/net/bdew/gendustry/items/GeneTemplate.scala
index 6e2c5f0..17d2288 100644
--- a/src/net/bdew/gendustry/items/GeneTemplate.scala
+++ b/src/net/bdew/gendustry/items/GeneTemplate.scala
@@ -17,15 +17,13 @@ import net.minecraft.entity.player.EntityPlayer
import java.util
import cpw.mods.fml.common.registry.GameRegistry
import forestry.api.genetics.{ISpeciesRoot, AlleleManager}
+import net.bdew.lib.items.SimpleItem
class GeneTemplate(id: Int) extends SimpleItem(id, "GeneTemplate") {
setMaxStackSize(1)
GameRegistry.addRecipe(new GeneRecipe)
- override def getUnlocalizedName: String = super.getUnlocalizedName
- override def getUnlocalizedName(par1ItemStack: ItemStack): String = super.getUnlocalizedName
-
def getSpecies(stack: ItemStack): ISpeciesRoot =
if (stack.hasTagCompound) AlleleManager.alleleRegistry.getSpeciesRoot(stack.getTagCompound.getString("species")) else null
diff --git a/src/net/bdew/gendustry/items/SimpleItem.scala b/src/net/bdew/gendustry/items/SimpleItem.scala
deleted file mode 100644
index c812f58..0000000
--- a/src/net/bdew/gendustry/items/SimpleItem.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) bdew, 2013
- * https://github.com/bdew/gendustry
- *
- * 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/gendustry/master/MMPL-1.0.txt
- */
-
-package net.bdew.gendustry.items
-
-import net.minecraft.item.Item
-import net.bdew.gendustry.Gendustry
-import net.minecraft.client.renderer.texture.IconRegister
-import cpw.mods.fml.relauncher.{Side, SideOnly}
-
-class SimpleItem(id: Int, val name: String) extends Item(id) {
- setUnlocalizedName(Gendustry.modId + "." + name)
-
- @SideOnly(Side.CLIENT)
- override def registerIcons(reg: IconRegister) {
- itemIcon = reg.registerIcon(Gendustry.modId + ":" + name.toLowerCase)
- }
-}
diff --git a/src/net/bdew/gendustry/machines/Machine.scala b/src/net/bdew/gendustry/machines/Machine.scala
deleted file mode 100644
index d490552..0000000
--- a/src/net/bdew/gendustry/machines/Machine.scala
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) bdew, 2013
- * https://github.com/bdew/gendustry
- *
- * 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/gendustry/master/MMPL-1.0.txt
- */
-
-package net.bdew.gendustry.machines
-
-import net.minecraft.tileentity.TileEntity
-import cpw.mods.fml.common.registry.GameRegistry
-import net.bdew.gendustry.Gendustry
-import net.minecraft.block.Block
-import net.minecraftforge.common.Configuration
-import net.bdew.lib.block.HasTE
-import net.bdew.gendustry.config.{Tuning, Ids}
-import net.minecraft.item.ItemStack
-
-abstract class Machine(cfg: Configuration, val name: String) {
- lazy val tuning = Tuning.getSection("Machines").getSection(name)
-
- def registerBlock(block: Block) {
- GameRegistry.registerBlock(block, name)
- GameRegistry.registerCustomItemStack(name, new ItemStack(block))
- if (block.isInstanceOf[HasTE[_]]) {
- registerTE(block.asInstanceOf[HasTE[_]].TEClass)
- }
- }
-
- def registerTE(teClass: Class[_ <: TileEntity]) {
- GameRegistry.registerTileEntity(teClass, "%s.%s".format(Gendustry.modId, name))
- }
-
- def getBlockId = cfg.getBlock(name, Ids.blockIds.next()).getInt
-}
diff --git a/src/net/bdew/gendustry/machines/PoweredMachine.scala b/src/net/bdew/gendustry/machines/PoweredMachine.scala
deleted file mode 100644
index 6101231..0000000
--- a/src/net/bdew/gendustry/machines/PoweredMachine.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) bdew, 2013
- * https://github.com/bdew/gendustry
- *
- * 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/gendustry/master/MMPL-1.0.txt
- */
-
-package net.bdew.gendustry.machines
-
-import net.minecraftforge.common.Configuration
-
-abstract class PoweredMachine(cfg: Configuration, name: String) extends Machine(cfg, name) {
- lazy val maxReceivedEnergy = tuning.getFloat("MaxReceivedEnergy")
- lazy val activationEnergy = tuning.getFloat("ActivationEnergy")
- lazy val maxStoredEnergy = tuning.getFloat("MaxStoredEnergy")
-}
diff --git a/src/net/bdew/gendustry/machines/ProcessorMachine.scala b/src/net/bdew/gendustry/machines/ProcessorMachine.scala
deleted file mode 100644
index 7d17e2f..0000000
--- a/src/net/bdew/gendustry/machines/ProcessorMachine.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) bdew, 2013
- * https://github.com/bdew/gendustry
- *
- * 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/gendustry/master/MMPL-1.0.txt
- */
-
-package net.bdew.gendustry.machines
-
-import net.minecraftforge.common.Configuration
-
-abstract class ProcessorMachine(cfg: Configuration, name: String) extends PoweredMachine(cfg, name) {
- lazy val mjPerItem = tuning.getFloat("MjPerItem")
- lazy val powerUseRate = tuning.getFloat("PowerUseRate")
-}
diff --git a/src/net/bdew/gendustry/machines/TileBaseProcessor.scala b/src/net/bdew/gendustry/machines/TileBaseProcessor.scala
deleted file mode 100644
index 50e3390..0000000
--- a/src/net/bdew/gendustry/machines/TileBaseProcessor.scala
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) bdew, 2013
- * https://github.com/bdew/gendustry
- *
- * 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/gendustry/master/MMPL-1.0.txt
- */
-
-package net.bdew.gendustry.machines
-
-import net.bdew.lib.tile.TileExtended
-import net.bdew.lib.data.base.{UpdateKind, TileDataSlots}
-import net.bdew.lib.tile.inventory.{BreakableInventoryTile, SidedInventory, PersistentInventoryTile}
-import net.bdew.gendustry.power.{TilePowered, DataSlotPower}
-import buildcraft.api.power.PowerHandler.Type
-import net.bdew.lib.data.DataSlotFloat
-
-abstract class TileBaseProcessor extends TileExtended
-with TileDataSlots
-with PersistentInventoryTile
-with BreakableInventoryTile
-with SidedInventory
-with TilePowered {
- def cfg: ProcessorMachine
- val power = DataSlotPower("power", this, Type.MACHINE)
- val progress = DataSlotFloat("progress", this).setUpdate(UpdateKind.SAVE, UpdateKind.GUI)
-
- configurePower(cfg)
-
- override def tickServer() {
- if (power.stored > cfg.activationEnergy) {
-
- if (!isWorking)
- if (tryStart())
- progress := 0
-
- if (isWorking) {
-
- if ((progress < 1) && (power.stored > cfg.activationEnergy)) {
- val maxConsume = Math.min(Math.max(cfg.powerUseRate * power.stored, cfg.activationEnergy), cfg.mjPerItem * (1 - progress))
- val consumed = power.extract(maxConsume, false)
- progress += consumed / cfg.mjPerItem
- }
-
- if (progress >= 1) {
- if (tryFinish())
- progress := 0
- }
- }
- }
- }
-
- /**
- * Return true when an operation is in progress
- */
- def isWorking: Boolean
-
- /**
- * Try starting a new operation, return true if succesful
- */
- def tryStart(): Boolean
-
- /**
- * Perform output when operation is done, return true if succesful
- */
- def tryFinish(): Boolean
-}
diff --git a/src/net/bdew/gendustry/machines/TileItemProcessor.scala b/src/net/bdew/gendustry/machines/TileItemProcessor.scala
deleted file mode 100644
index 131b92d..0000000
--- a/src/net/bdew/gendustry/machines/TileItemProcessor.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) bdew, 2013
- * https://github.com/bdew/gendustry
- *
- * 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/gendustry/master/MMPL-1.0.txt
- */
-
-package net.bdew.gendustry.machines
-
-import net.bdew.lib.data.DataSlotItemStack
-import net.bdew.lib.data.base.UpdateKind
-import net.bdew.lib.items.ItemUtils
-
-abstract class TileItemProcessor extends TileBaseProcessor {
- val output = DataSlotItemStack("output", this).setUpdate(UpdateKind.SAVE)
- val outputSlots: Seq[Int]
-
- def isWorking = output :!= null
-
- def tryFinish(): Boolean = {
- output := ItemUtils.addStackToSlots(output, this, outputSlots, false)
- return output :== null
- }
-}
diff --git a/src/net/bdew/gendustry/machines/apiary/GuiApiary.scala b/src/net/bdew/gendustry/machines/apiary/GuiApiary.scala
index ff27f0d..a4ed60a 100644
--- a/src/net/bdew/gendustry/machines/apiary/GuiApiary.scala
+++ b/src/net/bdew/gendustry/machines/apiary/GuiApiary.scala
@@ -14,15 +14,16 @@ import net.minecraft.entity.player.EntityPlayer
import net.minecraft.util.ResourceLocation
import net.bdew.lib.gui.{Rect, BaseScreen}
import net.bdew.lib.gui.widgets.WidgetLabel
-import net.bdew.gendustry.gui.{WidgetMJGauge, Textures}
+import net.bdew.gendustry.gui.Textures
import net.bdew.lib.Misc
+import net.bdew.lib.power.WidgetPowerGauge
class GuiApiary(val te: TileApiary, player: EntityPlayer) extends BaseScreen(new ContainerApiary(te, player), 176, 166) {
val texture = new ResourceLocation(Gendustry.modId + ":textures/gui/apiary.png")
override def initGui() {
super.initGui()
addWidget(new WidgetError(155, 5, te))
- addWidget(new WidgetMJGauge(new Rect(8, 19, 16, 58), Textures.powerFill, te.power))
+ addWidget(new WidgetPowerGauge(new Rect(8, 19, 16, 58), Textures.powerFill, te.power))
addWidget(new WidgetApiaryProgress(new Rect(69, 22, 36, 15), te.guiBreeding, te.guiProgress))
addWidget(new WidgetLabel(Misc.toLocal("tile.gendustry.apiary.name"), 8, 6, 4210752))
}
diff --git a/src/net/bdew/gendustry/machines/apiary/MachineApiary.scala b/src/net/bdew/gendustry/machines/apiary/MachineApiary.scala
index 65ccadb..6f9805c 100644
--- a/src/net/bdew/gendustry/machines/apiary/MachineApiary.scala
+++ b/src/net/bdew/gendustry/machines/apiary/MachineApiary.scala
@@ -9,26 +9,19 @@
package net.bdew.gendustry.machines.apiary
-import net.bdew.gendustry.machines.PoweredMachine
import net.minecraft.tileentity.TileEntity
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.inventory.Container
import net.minecraft.client.gui.inventory.GuiContainer
-import net.minecraftforge.common.Configuration
import net.bdew.gendustry.gui.GuiProvider
import cpw.mods.fml.relauncher.{Side, SideOnly}
+import net.bdew.lib.machine.{Machine, PoweredMachine}
-class MachineApiary(cfg: Configuration) extends PoweredMachine(cfg, "IndustrialApiary") with GuiProvider {
- var block: BlockApiary = null
- lazy val guiId = 3
+class MachineApiary extends Machine("IndustrialApiary", new BlockApiary(_)) with GuiProvider with PoweredMachine {
+ def guiId = 3
lazy val baseMjPerTick = tuning.getInt("BaseMjPerTick")
- if (cfg.get("Machines Enabled", name, true).getBoolean(true)) {
- block = new BlockApiary(getBlockId)
- registerBlock(block)
- }
-
@SideOnly(Side.CLIENT)
def getGui(te: TileEntity, player: EntityPlayer): GuiContainer = new GuiApiary(te.asInstanceOf[TileApiary], player)
def getContainer(te: TileEntity, player: EntityPlayer): Container = new ContainerApiary(te.asInstanceOf[TileApiary], player)
diff --git a/src/net/bdew/gendustry/machines/apiary/TileApiary.scala b/src/net/bdew/gendustry/machines/apiary/TileApiary.scala
index a44e6a2..6f12bf5 100644
--- a/src/net/bdew/gendustry/machines/apiary/TileApiary.scala
+++ b/src/net/bdew/gendustry/machines/apiary/TileApiary.scala
@@ -19,7 +19,6 @@ import forestry.api.core.{EnumHumidity, EnumTemperature}
import net.bdew.lib.Misc
import forestry.api.arboriculture.EnumGermlingType
import net.bdew.lib.tile.TileExtended
-import buildcraft.api.power.PowerHandler.Type
import net.bdew.gendustry.config.Machines
import net.bdew.lib.items.ItemUtils
import net.bdew.gendustry.api.{ApiaryModifiers, IApiaryUpgrade}
@@ -30,7 +29,8 @@ import net.bdew.lib.data.DataSlotFloat
import net.bdew.lib.data.DataSlotInt
import net.bdew.lib.data.DataSlotString
import net.bdew.lib.data.DataSlotBoolean
-import net.bdew.gendustry.power.{TilePowered, DataSlotPower}
+import net.bdew.gendustry.power.TilePowered
+import net.bdew.lib.power.DataSlotPower
class TileApiary extends TileExtended
with TileDataSlots
@@ -50,7 +50,7 @@ with IBeeHousing {
val logic = beeRoot.createBeekeepingLogic(this)
lazy val cfg = Machines.apiary
- val power = DataSlotPower("power", this, Type.MACHINE)
+ val power = DataSlotPower("power", this)
val errorState = DataSlotInt("error", this).setUpdate(UpdateKind.GUI, UpdateKind.SAVE, UpdateKind.WORLD)
val owner = DataSlotString("owner", this, "").setUpdate(UpdateKind.SAVE)
val guiProgress = DataSlotFloat("progress", this)
diff --git a/src/net/bdew/gendustry/machines/imprinter/GuiImprinter.scala b/src/net/bdew/gendustry/machines/imprinter/GuiImprinter.scala
index 20093aa..43e8b43 100644
--- a/src/net/bdew/gendustry/machines/imprinter/GuiImprinter.scala
+++ b/src/net/bdew/gendustry/machines/imprinter/GuiImprinter.scala
@@ -10,19 +10,20 @@
package net.bdew.gendustry.machines.imprinter
import net.bdew.gendustry.Gendustry
-import net.bdew.gendustry.gui.{WidgetProgressBarNEI, WidgetMJGauge, Textures}
+import net.bdew.gendustry.gui.{WidgetProgressBarNEI, Textures}
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.util.ResourceLocation
import net.bdew.lib.gui.{Rect, BaseScreen}
-import net.bdew.lib.gui.widgets.{WidgetLabel, WidgetProgressBar}
+import net.bdew.lib.gui.widgets.WidgetLabel
import net.bdew.lib.Misc
+import net.bdew.lib.power.WidgetPowerGauge
class GuiImprinter(val te: TileImprinter, player: EntityPlayer) extends BaseScreen(new ContainerImprinter(te, player), 176, 166) {
val texture: ResourceLocation = new ResourceLocation(Gendustry.modId + ":textures/gui/imprinter.png")
override def initGui() {
super.initGui()
addWidget(new WidgetProgressBarNEI(new Rect(63, 49, 66, 15), Textures.whiteProgress(66), te.progress, "Imprinter"))
- addWidget(new WidgetMJGauge(new Rect(8, 19, 16, 58), Textures.powerFill, te.power))
+ addWidget(new WidgetPowerGauge(new Rect(8, 19, 16, 58), Textures.powerFill, te.power))
addWidget(new WidgetLabel(Misc.toLocal("tile.gendustry.imprinter.name"), 8, 6, 4210752))
}
}
\ No newline at end of file
diff --git a/src/net/bdew/gendustry/machines/imprinter/MachineImprinter.scala b/src/net/bdew/gendustry/machines/imprinter/MachineImprinter.scala
index d8710e2..c023801 100644
--- a/src/net/bdew/gendustry/machines/imprinter/MachineImprinter.scala
+++ b/src/net/bdew/gendustry/machines/imprinter/MachineImprinter.scala
@@ -9,28 +9,21 @@
package net.bdew.gendustry.machines.imprinter
-import net.bdew.gendustry.machines.ProcessorMachine
import net.minecraft.tileentity.TileEntity
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.inventory.Container
import net.minecraft.client.gui.inventory.GuiContainer
-import net.minecraftforge.common.Configuration
import net.bdew.gendustry.gui.GuiProvider
import cpw.mods.fml.relauncher.{Side, SideOnly}
+import net.bdew.lib.machine.{Machine, ProcessorMachine}
-class MachineImprinter(cfg: Configuration) extends ProcessorMachine(cfg, "Imprinter") with GuiProvider {
- var block: BlockImprinter = null
- lazy val guiId = 4
+class MachineImprinter extends Machine("Imprinter", new BlockImprinter(_)) with GuiProvider with ProcessorMachine {
+ def guiId = 4
lazy val labwareConsumeChance = tuning.getInt("LabwareConsumeChance")
lazy val deathChanceNatural = tuning.getInt("DeathChanceNatural")
lazy val deathChanceArtificial = tuning.getInt("DeathChanceArtificial")
- if (cfg.get("Machines Enabled", name, true).getBoolean(true)) {
- block = new BlockImprinter(getBlockId)
- registerBlock(block)
- }
-
@SideOnly(Side.CLIENT)
def getGui(te: TileEntity, player: EntityPlayer): GuiContainer = new GuiImprinter(te.asInstanceOf[TileImprinter], player)
def getContainer(te: TileEntity, player: EntityPlayer): Container = new ContainerImprinter(te.asInstanceOf[TileImprinter], player)
diff --git a/src/net/bdew/gendustry/machines/imprinter/TileImprinter.scala b/src/net/bdew/gendustry/machines/imprinter/TileImprinter.scala
index 376e809..203de4c 100644
--- a/src/net/bdew/gendustry/machines/imprinter/TileImprinter.scala
+++ b/src/net/bdew/gendustry/machines/imprinter/TileImprinter.scala
@@ -12,12 +12,13 @@ package net.bdew.gendustry.machines.imprinter
import net.bdew.gendustry.config.{Items, Machines}
import net.minecraft.item.ItemStack
import forestry.api.genetics.AlleleManager
-import net.bdew.gendustry.machines.TileItemProcessor
import net.minecraft.nbt.NBTTagCompound
import forestry.api.apiculture.{EnumBeeType, IBeeRoot, IBee}
import scala.util.Random
+import net.bdew.lib.power.TileItemProcessor
+import net.bdew.gendustry.power.TilePowered
-class TileImprinter extends TileItemProcessor {
+class TileImprinter extends TileItemProcessor with TilePowered {
lazy val cfg = Machines.imprinter
val outputSlots = Seq(3)
def getSizeInventory = 4
diff --git a/src/net/bdew/gendustry/machines/mproducer/GuiMutagenProducer.scala b/src/net/bdew/gendustry/machines/mproducer/GuiMutagenProducer.scala
index c6f57ab..046723c 100644
--- a/src/net/bdew/gendustry/machines/mproducer/GuiMutagenProducer.scala
+++ b/src/net/bdew/gendustry/machines/mproducer/GuiMutagenProducer.scala
@@ -15,14 +15,15 @@ import net.minecraft.util.ResourceLocation
import net.bdew.lib.gui.{Rect, BaseScreen}
import net.bdew.lib.gui.widgets.{WidgetLabel, WidgetFluidGauge}
import net.bdew.lib.Misc
-import net.bdew.gendustry.gui.{WidgetProgressBarNEI, WidgetMJGauge, Textures}
+import net.bdew.gendustry.gui.{WidgetProgressBarNEI, Textures}
+import net.bdew.lib.power.WidgetPowerGauge
class GuiMutagenProducer(val te: TileMutagenProducer, player: EntityPlayer) extends BaseScreen(new ContainerMutagenProducer(te, player), 176, 166) {
val texture = new ResourceLocation(Gendustry.modId + ":textures/gui/mutagenproducer.png")
override def initGui() {
super.initGui()
addWidget(new WidgetProgressBarNEI(new Rect(79, 41, 53, 15), Textures.greenProgress(53), te.progress, "MutagenProducer"))
- addWidget(new WidgetMJGauge(new Rect(8, 19, 16, 58), Textures.powerFill, te.power))
+ addWidget(new WidgetPowerGauge(new Rect(8, 19, 16, 58), Textures.powerFill, te.power))
addWidget(new WidgetFluidGauge(new Rect(152, 19, 16, 58), Textures.tankOverlay, te.tank))
addWidget(new WidgetLabel(Misc.toLocal("tile.gendustry.mutagen.producer.name"), 8, 6, 4210752))
}
diff --git a/src/net/bdew/gendustry/machines/mproducer/MachineMutagenProducer.scala b/src/net/bdew/gendustry/machines/mproducer/MachineMutagenProducer.scala
index b2a4f2e..ac172ba 100644
--- a/src/net/bdew/gendustry/machines/mproducer/MachineMutagenProducer.scala
+++ b/src/net/bdew/gendustry/machines/mproducer/MachineMutagenProducer.scala
@@ -9,27 +9,18 @@
package net.bdew.gendustry.machines.mproducer
-import net.bdew.gendustry.machines.ProcessorMachine
import net.minecraft.tileentity.TileEntity
import net.minecraft.entity.player.EntityPlayer
-import net.minecraft.inventory.Container
-import net.minecraft.client.gui.inventory.GuiContainer
-import net.minecraftforge.common.Configuration
import net.bdew.gendustry.gui.GuiProvider
import cpw.mods.fml.relauncher.{SideOnly, Side}
+import net.bdew.lib.machine.{Machine, ProcessorMachine}
-class MachineMutagenProducer(cfg: Configuration) extends ProcessorMachine(cfg, "MutagenProducer") with GuiProvider {
- var block: BlockMutagenProducer = null
- lazy val guiId = 1
+class MachineMutagenProducer extends Machine("MutagenProducer", new BlockMutagenProducer(_)) with GuiProvider with ProcessorMachine {
+ def guiId = 1
lazy val tankSize = tuning.getInt("TankSize")
- if (cfg.get("Machines Enabled", name, true).getBoolean(true)) {
- block = new BlockMutagenProducer(getBlockId)
- registerBlock(block)
- }
-
@SideOnly(Side.CLIENT)
- def getGui(te: TileEntity, player: EntityPlayer): GuiContainer = new GuiMutagenProducer(te.asInstanceOf[TileMutagenProducer], player)
- def getContainer(te: TileEntity, player: EntityPlayer): Container = new ContainerMutagenProducer(te.asInstanceOf[TileMutagenProducer], player)
+ def getGui(te: TileEntity, player: EntityPlayer) = new GuiMutagenProducer(te.asInstanceOf[TileMutagenProducer], player)
+ def getContainer(te: TileEntity, player: EntityPlayer) = new ContainerMutagenProducer(te.asInstanceOf[TileMutagenProducer], player)
}
diff --git a/src/net/bdew/gendustry/machines/mproducer/TileMutagenProducer.scala b/src/net/bdew/gendustry/machines/mproducer/TileMutagenProducer.scala
index 92d6cf3..abd5765 100644
--- a/src/net/bdew/gendustry/machines/mproducer/TileMutagenProducer.scala
+++ b/src/net/bdew/gendustry/machines/mproducer/TileMutagenProducer.scala
@@ -9,7 +9,7 @@
package net.bdew.gendustry.machines.mproducer
-import net.bdew.gendustry.config.{Blocks, Machines}
+import net.bdew.gendustry.config.{Fluids, Machines}
import net.bdew.gendustry.mutagen.MutagenRegistry
import net.minecraft.item.ItemStack
import net.minecraft.tileentity.TileEntity
@@ -18,12 +18,13 @@ import net.minecraftforge.fluids._
import net.bdew.lib.data._
import net.bdew.lib.tile.ExposeTank
import net.bdew.lib.data.base.UpdateKind
-import net.bdew.gendustry.machines.TileBaseProcessor
+import net.bdew.lib.power.TileBaseProcessor
+import net.bdew.gendustry.power.TilePowered
-class TileMutagenProducer extends TileBaseProcessor with ExposeTank {
+class TileMutagenProducer extends TileBaseProcessor with TilePowered with ExposeTank {
lazy val cfg = Machines.mutagenProducer
- val tank = DataSlotTankRestricted("tank", this, cfg.tankSize, Blocks.mutagenFluid.getID).setUpdate(UpdateKind.GUI, UpdateKind.SAVE)
+ val tank = DataSlotTankRestricted("tank", this, cfg.tankSize, Fluids.mutagen.getID).setUpdate(UpdateKind.GUI, UpdateKind.SAVE)
val output = DataSlotInt("output", this).setUpdate(UpdateKind.SAVE)
def getSizeInventory = 1
diff --git a/src/net/bdew/gendustry/machines/mutatron/GuiMutatron.scala b/src/net/bdew/gendustry/machines/mutatron/GuiMutatron.scala
index 4a7676c..45cf3ec 100644
--- a/src/net/bdew/gendustry/machines/mutatron/GuiMutatron.scala
+++ b/src/net/bdew/gendustry/machines/mutatron/GuiMutatron.scala
@@ -10,19 +10,20 @@
package net.bdew.gendustry.machines.mutatron
import net.bdew.gendustry.Gendustry
-import net.bdew.gendustry.gui.{WidgetProgressBarNEI, WidgetMJGauge, Textures}
+import net.bdew.gendustry.gui.{WidgetProgressBarNEI, Textures}
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.util.ResourceLocation
import net.bdew.lib.gui.{Rect, BaseScreen}
import net.bdew.lib.gui.widgets.{WidgetLabel, WidgetFluidGauge}
import net.bdew.lib.Misc
+import net.bdew.lib.power.WidgetPowerGauge
class GuiMutatron(val te: TileMutatron, player: EntityPlayer) extends BaseScreen(new ContainerMutatron(te, player), 176, 166) {
val texture: ResourceLocation = new ResourceLocation(Gendustry.modId + ":textures/gui/mutatron.png")
override def initGui() {
super.initGui()
addWidget(new WidgetProgressBarNEI(new Rect(89, 41, 40, 15), Textures.greenProgress(40), te.progress, "Mutatron"))
- addWidget(new WidgetMJGauge(new Rect(8, 19, 16, 58), Textures.powerFill, te.power))
+ addWidget(new WidgetPowerGauge(new Rect(8, 19, 16, 58), Textures.powerFill, te.power))
addWidget(new WidgetFluidGauge(new Rect(32, 19, 16, 58), Textures.tankOverlay, te.tank))
addWidget(new WidgetLabel(Misc.toLocal("tile.gendustry.mutatron.name"), 8, 6, 4210752))
}
diff --git a/src/net/bdew/gendustry/machines/mutatron/MachineMutatron.scala b/src/net/bdew/gendustry/machines/mutatron/MachineMutatron.scala
index 82293e8..2e00116 100644
--- a/src/net/bdew/gendustry/machines/mutatron/MachineMutatron.scala
+++ b/src/net/bdew/gendustry/machines/mutatron/MachineMutatron.scala
@@ -9,18 +9,16 @@
package net.bdew.gendustry.machines.mutatron
-import net.bdew.gendustry.machines.ProcessorMachine
import net.minecraft.tileentity.TileEntity
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.inventory.Container
import net.minecraft.client.gui.inventory.GuiContainer
-import net.minecraftforge.common.Configuration
import net.bdew.gendustry.gui.GuiProvider
import cpw.mods.fml.relauncher.{Side, SideOnly}
+import net.bdew.lib.machine.{Machine, ProcessorMachine}
-class MachineMutatron(cfg: Configuration) extends ProcessorMachine(cfg, "Mutatron") with GuiProvider {
- var block: BlockMutatron = null
- lazy val guiId = 2
+class MachineMutatron extends Machine("Mutatron", new BlockMutatron(_)) with GuiProvider with ProcessorMachine {
+ def guiId = 2
lazy val tankSize = tuning.getInt("TankSize")
lazy val mutagenPerItem = tuning.getInt("MutagenPerItem")
@@ -29,11 +27,6 @@ class MachineMutatron(cfg: Configuration) extends ProcessorMachine(cfg, "Mutatro
lazy val deathChanceArtificial = tuning.getFloat("DeathChanceArtificial")
lazy val secretChance = tuning.getFloat("SecretMutationChance")
- if (cfg.get("Machines Enabled", name, true).getBoolean(true)) {
- block = new BlockMutatron(getBlockId)
- registerBlock(block)
- }
-
@SideOnly(Side.CLIENT)
def getGui(te: TileEntity, player: EntityPlayer): GuiContainer = new GuiMutatron(te.asInstanceOf[TileMutatron], player)
def getContainer(te: TileEntity, player: EntityPlayer): Container = new ContainerMutatron(te.asInstanceOf[TileMutatron], player)
diff --git a/src/net/bdew/gendustry/machines/mutatron/TileMutatron.scala b/src/net/bdew/gendustry/machines/mutatron/TileMutatron.scala
index 6fe69b5..0f1f0dc 100644
--- a/src/net/bdew/gendustry/machines/mutatron/TileMutatron.scala
+++ b/src/net/bdew/gendustry/machines/mutatron/TileMutatron.scala
@@ -9,19 +9,20 @@
package net.bdew.gendustry.machines.mutatron
-import net.bdew.gendustry.config.{Items, Machines, Blocks}
+import net.bdew.gendustry.config.{Fluids, Items, Machines}
import net.minecraft.item.ItemStack
import net.minecraftforge.common.ForgeDirection
import net.minecraftforge.fluids._
import net.bdew.lib.data.DataSlotTankRestricted
import net.bdew.lib.tile.ExposeTank
-import net.bdew.gendustry.machines.TileItemProcessor
+import net.bdew.lib.power.TileItemProcessor
+import net.bdew.gendustry.power.TilePowered
-class TileMutatron extends TileItemProcessor with ExposeTank {
+class TileMutatron extends TileItemProcessor with TilePowered with ExposeTank {
lazy val cfg = Machines.mutatron
val outputSlots = Seq(2)
- val tank = DataSlotTankRestricted("tank", this, cfg.tankSize, Blocks.mutagenFluid.getID)
+ val tank = DataSlotTankRestricted("tank", this, cfg.tankSize, Fluids.mutagen.getID)
def getSizeInventory = 4
diff --git a/src/net/bdew/gendustry/machines/sampler/GuiSampler.scala b/src/net/bdew/gendustry/machines/sampler/GuiSampler.scala
index f036bd9..c7d8e81 100644
--- a/src/net/bdew/gendustry/machines/sampler/GuiSampler.scala
+++ b/src/net/bdew/gendustry/machines/sampler/GuiSampler.scala
@@ -10,19 +10,20 @@
package net.bdew.gendustry.machines.sampler
import net.bdew.gendustry.Gendustry
-import net.bdew.gendustry.gui.{WidgetProgressBarNEI, WidgetMJGauge, Textures}
+import net.bdew.gendustry.gui.{WidgetProgressBarNEI, Textures}
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.util.ResourceLocation
import net.bdew.lib.gui.{Rect, BaseScreen}
import net.bdew.lib.gui.widgets.WidgetLabel
import net.bdew.lib.Misc
+import net.bdew.lib.power.WidgetPowerGauge
class GuiSampler(val te: TileSampler, player: EntityPlayer) extends BaseScreen(new ContainerSampler(te, player), 176, 166) {
val texture: ResourceLocation = new ResourceLocation(Gendustry.modId + ":textures/gui/sampler.png")
override def initGui() {
super.initGui()
addWidget(new WidgetProgressBarNEI(new Rect(63, 49, 66, 15), Textures.whiteProgress(66), te.progress, "Sampler"))
- addWidget(new WidgetMJGauge(new Rect(8, 19, 16, 58), Textures.powerFill, te.power))
+ addWidget(new WidgetPowerGauge(new Rect(8, 19, 16, 58), Textures.powerFill, te.power))
addWidget(new WidgetLabel(Misc.toLocal("tile.gendustry.sampler.name"), 8, 6, 4210752))
}
}
\ No newline at end of file
diff --git a/src/net/bdew/gendustry/machines/sampler/MachineSampler.scala b/src/net/bdew/gendustry/machines/sampler/MachineSampler.scala
index f7bc28c..9ab9a5d 100644
--- a/src/net/bdew/gendustry/machines/sampler/MachineSampler.scala
+++ b/src/net/bdew/gendustry/machines/sampler/MachineSampler.scala
@@ -9,26 +9,19 @@
package net.bdew.gendustry.machines.sampler
-import net.bdew.gendustry.machines.ProcessorMachine
import net.minecraft.tileentity.TileEntity
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.inventory.Container
import net.minecraft.client.gui.inventory.GuiContainer
-import net.minecraftforge.common.Configuration
import net.bdew.gendustry.gui.GuiProvider
import cpw.mods.fml.relauncher.{Side, SideOnly}
+import net.bdew.lib.machine.{Machine, ProcessorMachine}
-class MachineSampler(cfg: Configuration) extends ProcessorMachine(cfg, "Sampler") with GuiProvider {
- var block: BlockSampler = null
- lazy val guiId = 5
+class MachineSampler extends Machine("Sampler", new BlockSampler(_)) with GuiProvider with ProcessorMachine {
+ def guiId = 5
lazy val labwareConsumeChance = tuning.getInt("LabwareConsumeChance")
- if (cfg.get("Machines Enabled", name, true).getBoolean(true)) {
- block = new BlockSampler(getBlockId)
- registerBlock(block)
- }
-
@SideOnly(Side.CLIENT)
def getGui(te: TileEntity, player: EntityPlayer): GuiContainer = new GuiSampler(te.asInstanceOf[TileSampler], player)
def getContainer(te: TileEntity, player: EntityPlayer): Container = new ContainerSampler(te.asInstanceOf[TileSampler], player)
diff --git a/src/net/bdew/gendustry/machines/sampler/TileSampler.scala b/src/net/bdew/gendustry/machines/sampler/TileSampler.scala
index 785fd27..2038045 100644
--- a/src/net/bdew/gendustry/machines/sampler/TileSampler.scala
+++ b/src/net/bdew/gendustry/machines/sampler/TileSampler.scala
@@ -12,11 +12,12 @@ package net.bdew.gendustry.machines.sampler
import net.bdew.gendustry.config.{Items, Machines}
import net.minecraft.item.ItemStack
import forestry.api.genetics.AlleleManager
-import net.bdew.gendustry.machines.TileItemProcessor
import scala.util.Random
import net.bdew.gendustry.forestry.GeneSampleInfo
+import net.bdew.lib.power.TileItemProcessor
+import net.bdew.gendustry.power.TilePowered
-class TileSampler extends TileItemProcessor {
+class TileSampler extends TileItemProcessor with TilePowered {
lazy val cfg = Machines.imprinter
val outputSlots = Seq(3)
diff --git a/src/net/bdew/gendustry/mutagen/BlockMutagen.scala b/src/net/bdew/gendustry/mutagen/BlockMutagen.scala
index 81bb681..e3d65d4 100644
--- a/src/net/bdew/gendustry/mutagen/BlockMutagen.scala
+++ b/src/net/bdew/gendustry/mutagen/BlockMutagen.scala
@@ -12,8 +12,7 @@ package net.bdew.gendustry.mutagen
import cpw.mods.fml.relauncher.Side
import cpw.mods.fml.relauncher.SideOnly
import net.bdew.gendustry.Gendustry
-import net.bdew.gendustry.config.Blocks
-import net.bdew.gendustry.config.Items
+import net.bdew.gendustry.config.{Fluids, Items}
import net.minecraft.block.material.Material
import net.minecraft.client.renderer.texture.IconRegister
import net.minecraft.item.ItemStack
@@ -26,11 +25,11 @@ import net.minecraftforge.event.ForgeSubscribe
import net.minecraftforge.event.entity.player.FillBucketEvent
import net.minecraftforge.fluids.BlockFluidClassic
-class BlockMutagen(id: Int) extends BlockFluidClassic(id, Blocks.mutagenFluid, Material.water) {
+class BlockMutagen(id: Int) extends BlockFluidClassic(id, Fluids.mutagen, Material.water) {
protected var stillIcon: Icon = null
protected var flowingIcon: Icon = null
- Blocks.mutagenFluid.setBlockID(id)
+ Fluids.mutagen.setBlockID(id)
setUnlocalizedName(Gendustry.modId + ".mutagen")
MinecraftForge.EVENT_BUS.register(this)
@@ -62,6 +61,6 @@ class BlockMutagen(id: Int) extends BlockFluidClassic(id, Blocks.mutagenFluid, M
override def registerIcons(register: IconRegister) {
stillIcon = register.registerIcon(Gendustry.modId + ":mutagen/still")
flowingIcon = register.registerIcon(Gendustry.modId + ":mutagen/flowing")
- Blocks.mutagenFluid.setIcons(stillIcon, flowingIcon)
+ Fluids.mutagen.setIcons(stillIcon, flowingIcon)
}
}
\ No newline at end of file
diff --git a/src/net/bdew/gendustry/mutagen/FluidMutagen.scala b/src/net/bdew/gendustry/mutagen/FluidMutagen.scala
index ddf3ecb..5f30af6 100644
--- a/src/net/bdew/gendustry/mutagen/FluidMutagen.scala
+++ b/src/net/bdew/gendustry/mutagen/FluidMutagen.scala
@@ -10,11 +10,9 @@
package net.bdew.gendustry.mutagen
import net.minecraftforge.fluids.Fluid
-import net.minecraftforge.fluids.FluidRegistry
class FluidMutagen extends Fluid("Mutagen") {
setDensity(1000)
setViscosity(1000)
setUnlocalizedName("gendustry.mutagen")
- FluidRegistry.registerFluid(this)
}
\ No newline at end of file
diff --git a/src/net/bdew/gendustry/nei/MutagenProducerHandler.scala b/src/net/bdew/gendustry/nei/MutagenProducerHandler.scala
index be49386..90d715d 100644
--- a/src/net/bdew/gendustry/nei/MutagenProducerHandler.scala
+++ b/src/net/bdew/gendustry/nei/MutagenProducerHandler.scala
@@ -11,7 +11,7 @@ package net.bdew.gendustry.nei
import net.bdew.gendustry.Gendustry
import net.bdew.lib.gui.{Rect, Point}
-import net.bdew.gendustry.config.{Blocks, Machines}
+import net.bdew.gendustry.config.{Fluids, Blocks, Machines}
import net.minecraft.item.ItemStack
import net.minecraftforge.fluids.FluidStack
import net.bdew.gendustry.mutagen.MutagenRegistry
@@ -32,7 +32,7 @@ class MutagenProducerHandler extends BaseRecipeHandler {
val inPositioned = position(in, 44, 41)
val getResult = null
- components :+= new FluidComponent(mutagenRect, new FluidStack(Blocks.mutagenFluid, out), Machines.mutagenProducer.tankSize)
+ components :+= new FluidComponent(mutagenRect, new FluidStack(Fluids.mutagen, out), Machines.mutagenProducer.tankSize)
components :+= new PowerComponent(mjRect, Machines.mutagenProducer.mjPerItem, Machines.mutagenProducer.maxStoredEnergy)
override def getOtherStacks = List(inPositioned)
@@ -51,7 +51,7 @@ class MutagenProducerHandler extends BaseRecipeHandler {
override def loadCraftingRecipes(outputId: String, results: AnyRef*): Unit = {
Some(outputId, results) collect {
- case ("liquid", Seq(x: FluidStack)) if x.fluidID == Blocks.mutagenFluid.getID => addAllRecipes()
+ case ("liquid", Seq(x: FluidStack)) if x.fluidID == Fluids.mutagen.getID => addAllRecipes()
case ("item", Seq(x: ItemStack)) if x.itemID == Blocks.mutagen.blockID => addAllRecipes()
case ("MutagenProducer", _) => addAllRecipes()
}
diff --git a/src/net/bdew/gendustry/nei/MutatronHandler.scala b/src/net/bdew/gendustry/nei/MutatronHandler.scala
index d2e3032..364662f 100644
--- a/src/net/bdew/gendustry/nei/MutatronHandler.scala
+++ b/src/net/bdew/gendustry/nei/MutatronHandler.scala
@@ -10,7 +10,7 @@
package net.bdew.gendustry.nei
import net.bdew.lib.gui.{Rect, Point}
-import net.bdew.gendustry.config.{Items, Blocks, Machines}
+import net.bdew.gendustry.config.{Fluids, Items, Blocks, Machines}
import net.minecraftforge.fluids.FluidStack
import net.bdew.gendustry.nei.helpers.{PowerComponent, FluidComponent}
import forestry.api.genetics.{AlleleManager, ISpeciesRoot, IMutation}
@@ -37,7 +37,7 @@ class MutatronHandler extends BaseRecipeHandler {
val in2 = position(getRecipeStack(1, mutation), 60, 53)
val labware = position(new ItemStack(Items.labware), 98, 17)
- components :+= new FluidComponent(mutagenRect, new FluidStack(Blocks.mutagenFluid, Machines.mutatron.mutagenPerItem), Machines.mutatron.tankSize)
+ components :+= new FluidComponent(mutagenRect, new FluidStack(Fluids.mutagen, Machines.mutatron.mutagenPerItem), Machines.mutatron.tankSize)
components :+= new PowerComponent(mjRect, Machines.mutatron.mjPerItem, Machines.mutatron.maxStoredEnergy)
override def getOtherStacks = List(in1, in2, labware)
@@ -76,7 +76,7 @@ class MutatronHandler extends BaseRecipeHandler {
override def loadUsageRecipes(outputId: String, results: AnyRef*): Unit = {
Some(outputId, results) collect {
- case ("liquid", Seq(x: FluidStack)) if x.fluidID == Blocks.mutagenFluid.getID => addAllRecipes()
+ case ("liquid", Seq(x: FluidStack)) if x.fluidID == Fluids.mutagen.getID => addAllRecipes()
case ("item", Seq(x: ItemStack)) if x.itemID == Blocks.mutagen.blockID => addAllRecipes()
case ("item", Seq(x: ItemStack)) if x.itemID == Items.labware.itemID => addAllRecipes()
case ("item", Seq(x: ItemStack)) =>
diff --git a/src/net/bdew/gendustry/power/DataSlotPower.scala b/src/net/bdew/gendustry/power/DataSlotPower.scala
deleted file mode 100644
index 95cae9c..0000000
--- a/src/net/bdew/gendustry/power/DataSlotPower.scala
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) bdew, 2013
- * https://github.com/bdew/gendustry
- *
- * 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/gendustry/master/MMPL-1.0.txt
- */
-
-package net.bdew.gendustry.power
-
-import net.minecraft.nbt.NBTTagCompound
-import buildcraft.api.power.PowerHandler
-import net.bdew.lib.data.base.{TileDataSlots, UpdateKind, DataSlot}
-import net.bdew.gendustry.machines.PoweredMachine
-import net.bdew.lib.Misc
-import net.bdew.gendustry.Gendustry
-
-case class DataSlotPower(name: String, parent: TileDataSlots, kind: PowerHandler.Type) extends DataSlot {
- updateKind = Set(UpdateKind.GUI, UpdateKind.SAVE)
-
- var stored = 0F
- var capacity = 0F
- var maxReceive = 0F
-
- def inject(v: Float, simulate: Boolean): Float = {
- val canAdd = Misc.clamp(v, 0F, Misc.min(capacity - stored, maxReceive))
- if ((canAdd > 0) && !simulate) {
- stored += canAdd
- parent.dataSlotChanged(this)
- }
- return canAdd
- }
-
- def extract(v: Float, simulate: Boolean): Float = {
- val canExtract = Misc.clamp(v, 0F, stored)
- if ((canExtract > 0) && !simulate) {
- stored -= canExtract
- parent.dataSlotChanged(this)
- }
- return canExtract
- }
-
- def configure(cfg: PoweredMachine) {
- capacity = cfg.maxStoredEnergy
- maxReceive = cfg.maxReceivedEnergy
- }
-
- def save(t: NBTTagCompound, kind: UpdateKind.Value) {
- val tag = new NBTTagCompound()
- tag.setFloat("stored", stored)
- if (kind == UpdateKind.GUI)
- tag.setFloat("capacity", capacity)
- t.setCompoundTag(name, tag)
- }
-
- def load(t: NBTTagCompound, kind: UpdateKind.Value) {
- if (t.hasKey(name)) {
- val tag = t.getCompoundTag(name)
- if (kind == UpdateKind.SAVE && tag.hasKey("storedEnergy")) {
- stored = tag.getFloat("storedEnergy")
- Gendustry.logInfo("Importing energy from old save: %f MJ", stored)
- } else {
- stored = tag.getFloat("stored")
- }
- if (kind == UpdateKind.GUI)
- capacity = tag.getFloat("capacity")
- }
- }
-}
-
-
diff --git a/src/net/bdew/gendustry/power/ItemPowered.scala b/src/net/bdew/gendustry/power/ItemPowered.scala
index 51548c9..916709e 100644
--- a/src/net/bdew/gendustry/power/ItemPowered.scala
+++ b/src/net/bdew/gendustry/power/ItemPowered.scala
@@ -9,43 +9,6 @@
package net.bdew.gendustry.power
-import net.minecraft.item.{ItemStack, Item}
-import net.bdew.lib.Misc
-import net.minecraft.nbt.NBTTagCompound
-import net.minecraft.entity.EntityLivingBase
-
-trait ItemPoweredBase extends Item {
- def maxCharge: Int
- def mjPerCharge: Int
-
- def getCharge(stack: ItemStack): Int = {
- if (!stack.hasTagCompound) setCharge(stack, 0)
- return Misc.clamp(stack.getTagCompound.getInteger("charge"), 0, maxCharge)
- }
-
- def useCharge(stack: ItemStack, uses: Int = 1, player: EntityLivingBase) {
- setCharge(stack, Misc.clamp(getCharge(stack) - uses * mjPerCharge, 0, maxCharge))
- }
-
- def hasCharges(stack: ItemStack) = getCharge(stack) >= mjPerCharge
-
- def setCharge(stack: ItemStack, charge: Int) {
- if (!stack.hasTagCompound) stack.setTagCompound(new NBTTagCompound())
- stack.getTagCompound.setInteger("charge", charge)
- updateDamage(stack)
- }
-
- def updateDamage(stack: ItemStack) {
- setDamage(stack, Misc.clamp((100 * (1 - getCharge(stack).toFloat / maxCharge)).round, 1, 100))
- }
-
- def stackWithCharge(charge: Int): ItemStack = {
- val n = new ItemStack(this)
- setCharge(n, charge)
- return n
- }
-
- override def setDamage(stack: ItemStack, damage: Int) = super.setDamage(stack, Misc.clamp(damage, 1, 100))
-}
+import net.bdew.lib.power.ItemPoweredBase
trait ItemPowered extends ItemPoweredBase with ItemPoweredRF with ItemPoweredEU
diff --git a/src/net/bdew/gendustry/power/ItemPoweredEU.scala b/src/net/bdew/gendustry/power/ItemPoweredEU.scala
index 74dc568..3b9262d 100644
--- a/src/net/bdew/gendustry/power/ItemPoweredEU.scala
+++ b/src/net/bdew/gendustry/power/ItemPoweredEU.scala
@@ -9,13 +9,13 @@
package net.bdew.gendustry.power
-import ic2.api.item.{ElectricItem, IElectricItemManager, ISpecialElectricItem}
+import ic2.api.item.{ElectricItem, ISpecialElectricItem}
import net.minecraft.item.ItemStack
import net.bdew.gendustry.config.Tuning
import net.minecraft.entity.EntityLivingBase
import net.bdew.gendustry.compat.PowerProxy
-import net.bdew.lib.Misc
import cpw.mods.fml.common.Optional
+import net.bdew.lib.power.ItemPoweredBase
@Optional.Interface(modid = PowerProxy.IC2_MOD_ID, iface = "ic2.api.energy.tile.ISpecialElectricItem")
trait ItemPoweredEU extends ItemPoweredBase with ISpecialElectricItem {
@@ -37,26 +37,3 @@ trait ItemPoweredEU extends ItemPoweredBase with ISpecialElectricItem {
def getManager(itemStack: ItemStack) = manager
}
-class ItemPoweredEUManager(item: ItemPoweredEU) extends IElectricItemManager {
- private lazy val ratio = Tuning.getSection("Power").getFloat("EU_MJ_Ratio")
-
- def charge(itemStack: ItemStack, amount: Int, tier: Int, ignoreTransferLimit: Boolean, simulate: Boolean): Int = {
- val charge = item.getCharge(itemStack)
- val canCharge = Misc.clamp(item.maxCharge.toFloat - charge, 0F, amount / ratio).floor.toInt
- if (!simulate) item.setCharge(itemStack, charge + canCharge)
- return (canCharge * ratio).round
- }
-
- def discharge(itemStack: ItemStack, amount: Int, tier: Int, ignoreTransferLimit: Boolean, simulate: Boolean) = 0
- def getCharge(itemStack: ItemStack) = (item.getCharge(itemStack) * ratio).round.toInt
-
- def use(itemStack: ItemStack, amount: Int, entity: EntityLivingBase) =
- ElectricItem.rawManager.use(itemStack, amount, entity)
-
- def canUse(itemStack: ItemStack, amount: Int) =
- ElectricItem.rawManager.canUse(itemStack, amount)
- def chargeFromArmor(itemStack: ItemStack, entity: EntityLivingBase) =
- ElectricItem.rawManager.chargeFromArmor(itemStack, entity)
- def getToolTip(itemStack: ItemStack) =
- ElectricItem.rawManager.getToolTip(itemStack)
-}
\ No newline at end of file
diff --git a/src/net/bdew/gendustry/power/ItemPoweredEUManager.scala b/src/net/bdew/gendustry/power/ItemPoweredEUManager.scala
new file mode 100644
index 0000000..b301052
--- /dev/null
+++ b/src/net/bdew/gendustry/power/ItemPoweredEUManager.scala
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) bdew, 2013
+ * https://github.com/bdew/gendustry
+ *
+ * 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/gendustry/master/MMPL-1.0.txt
+ */
+
+package net.bdew.gendustry.power
+
+import ic2.api.item.{ElectricItem, IElectricItemManager}
+import net.bdew.gendustry.config.Tuning
+import net.minecraft.item.ItemStack
+import net.bdew.lib.Misc
+import net.minecraft.entity.EntityLivingBase
+
+class ItemPoweredEUManager(item: ItemPoweredEU) extends IElectricItemManager {
+ private lazy val ratio = Tuning.getSection("Power").getFloat("EU_MJ_Ratio")
+
+ def charge(itemStack: ItemStack, amount: Int, tier: Int, ignoreTransferLimit: Boolean, simulate: Boolean): Int = {
+ val charge = item.getCharge(itemStack)
+ val canCharge = Misc.clamp(item.maxCharge.toFloat - charge, 0F, amount / ratio).floor.toInt
+ if (!simulate) item.setCharge(itemStack, charge + canCharge)
+ return (canCharge * ratio).round
+ }
+
+ def discharge(itemStack: ItemStack, amount: Int, tier: Int, ignoreTransferLimit: Boolean, simulate: Boolean) = 0
+ def getCharge(itemStack: ItemStack) = (item.getCharge(itemStack) * ratio).round
+
+ def use(itemStack: ItemStack, amount: Int, entity: EntityLivingBase) =
+ ElectricItem.rawManager.use(itemStack, amount, entity)
+
+ def canUse(itemStack: ItemStack, amount: Int) =
+ ElectricItem.rawManager.canUse(itemStack, amount)
+ def chargeFromArmor(itemStack: ItemStack, entity: EntityLivingBase) =
+ ElectricItem.rawManager.chargeFromArmor(itemStack, entity)
+ def getToolTip(itemStack: ItemStack) =
+ ElectricItem.rawManager.getToolTip(itemStack)
+}
diff --git a/src/net/bdew/gendustry/power/ItemPoweredRF.scala b/src/net/bdew/gendustry/power/ItemPoweredRF.scala
index 68bfb5d..68e1d35 100644
--- a/src/net/bdew/gendustry/power/ItemPoweredRF.scala
+++ b/src/net/bdew/gendustry/power/ItemPoweredRF.scala
@@ -15,6 +15,7 @@ import cofh.api.energy.IEnergyContainerItem
import net.minecraft.item.ItemStack
import net.bdew.lib.Misc
import net.bdew.gendustry.config.Tuning
+import net.bdew.lib.power.ItemPoweredBase
@Optional.Interface(modid = PowerProxy.TE_MOD_ID, iface = "cofh.api.energy.IEnergyContainerItem")
trait ItemPoweredRF extends ItemPoweredBase with IEnergyContainerItem {
diff --git a/src/net/bdew/gendustry/power/TilePowered.scala b/src/net/bdew/gendustry/power/TilePowered.scala
index 34d6106..5cfa783 100644
--- a/src/net/bdew/gendustry/power/TilePowered.scala
+++ b/src/net/bdew/gendustry/power/TilePowered.scala
@@ -9,12 +9,6 @@
package net.bdew.gendustry.power
-import net.bdew.lib.tile.TileExtended
-import net.bdew.gendustry.machines.PoweredMachine
-
-trait TilePoweredBase extends TileExtended {
- def power: DataSlotPower
- def configurePower(cfg: PoweredMachine) = power.configure(cfg)
-}
+import net.bdew.lib.power.TilePoweredBase
trait TilePowered extends TilePoweredBase with TilePoweredMJ with TilePoweredRF with TilePoweredEU
diff --git a/src/net/bdew/gendustry/power/TilePoweredEU.scala b/src/net/bdew/gendustry/power/TilePoweredEU.scala
index 57ab45a..4a79487 100644
--- a/src/net/bdew/gendustry/power/TilePoweredEU.scala
+++ b/src/net/bdew/gendustry/power/TilePoweredEU.scala
@@ -16,6 +16,7 @@ import ic2.api.energy.tile.IEnergySink
import net.bdew.gendustry.config.Tuning
import net.minecraft.tileentity.TileEntity
import cpw.mods.fml.common.Optional
+import net.bdew.lib.power.TilePoweredBase
@Optional.Interface(modid = PowerProxy.IC2_MOD_ID, iface = "ic2.api.energy.tile.IEnergySink")
trait TilePoweredEU extends TilePoweredBase with IEnergySink {
diff --git a/src/net/bdew/gendustry/power/TilePoweredMJ.scala b/src/net/bdew/gendustry/power/TilePoweredMJ.scala
index 043bf91..cb3af00 100644
--- a/src/net/bdew/gendustry/power/TilePoweredMJ.scala
+++ b/src/net/bdew/gendustry/power/TilePoweredMJ.scala
@@ -10,11 +10,12 @@
package net.bdew.gendustry.power
import buildcraft.api.power.{PowerHandler, IPowerReceptor}
-import net.bdew.gendustry.machines.PoweredMachine
import net.minecraftforge.common.ForgeDirection
import cpw.mods.fml.common.Optional
import net.bdew.gendustry.compat.PowerProxy
import net.bdew.gendustry.config.Tuning
+import net.bdew.lib.machine.PoweredMachine
+import net.bdew.lib.power.TilePoweredBase
@Optional.Interface(modid = PowerProxy.BC_MOD_ID, iface = "buildcraft.api.power.IPowerReceptor")
trait TilePoweredMJ extends TilePoweredBase with IPowerReceptor {
diff --git a/src/net/bdew/gendustry/power/TilePoweredRF.scala b/src/net/bdew/gendustry/power/TilePoweredRF.scala
index 6c81436..ec29299 100644
--- a/src/net/bdew/gendustry/power/TilePoweredRF.scala
+++ b/src/net/bdew/gendustry/power/TilePoweredRF.scala
@@ -14,6 +14,7 @@ import net.minecraftforge.common.ForgeDirection
import net.bdew.gendustry.config.Tuning
import cpw.mods.fml.common.Optional
import net.bdew.gendustry.compat.PowerProxy
+import net.bdew.lib.power.TilePoweredBase
@Optional.Interface(modid = PowerProxy.TE_MOD_ID, iface = "cofh.api.energy.IEnergyHandler")
trait TilePoweredRF extends TilePoweredBase with IEnergyHandler {