mirror of
https://github.com/GTNewHorizons/gendustry.git
synced 2026-11-18 11:29:26 +00:00
Build against BC 6.2.0 and Forestry 3.2.0, nuked MJ code
This commit is contained in:
1 parent
3e118e8703
commit
a7d2d99c24
6 files changed
+6
-81
No files matched your search
+3
-3
@@ -22,7 +22,7 @@ buildscript {
|
||||
apply plugin: 'scala'
|
||||
apply plugin: 'forge'
|
||||
|
||||
version = "1.4.1"
|
||||
version = "1.4.2"
|
||||
ext.bdlibver = "1.5.1.32"
|
||||
ext.versuffix = "mc1710"
|
||||
ext.apiVer = version
|
||||
@@ -68,9 +68,9 @@ dependencies {
|
||||
compile "codechicken:NotEnoughItems:1.7.10-1.0.3.56:dev"
|
||||
compile "codechicken:CodeChickenLib:1.7.10-1.1.1.104:dev"
|
||||
compile "codechicken:CodeChickenCore:1.7.10-1.0.3.26:dev"
|
||||
compile "com.mod-buildcraft:buildcraft:6.1.5:dev"
|
||||
compile "com.mod-buildcraft:buildcraft:6.2.0:dev"
|
||||
compile "net.industrial-craft:industrialcraft-2:2.2.650-experimental:api"
|
||||
compile "net.sengir.forestry:forestry_1.7.10:3.1.1.4:api"
|
||||
compile "net.sengir.forestry:forestry_1.7.10:3.2.0.5:api"
|
||||
compile "mcp.mobius.waila:Waila:1.5.5_1.7.10"
|
||||
compile "net.bdew.thirdparty:CoFHLib:R1.0.1:api"
|
||||
}
|
||||
|
||||
@@ -153,20 +153,6 @@ cfg Power {
|
||||
SinkTier = 2
|
||||
}
|
||||
|
||||
cfg BC {
|
||||
Enabled = Y
|
||||
|
||||
// Defines the raio between Max and Min recieved power
|
||||
// Should be reasonably high to prevent small update spam
|
||||
MinReceivedEnergyDivisor = 10
|
||||
|
||||
// Power loss from internal buffer, will loose on average PowerLoss/PowerLossInterval MJ/tick
|
||||
// Cannot be set below 0.01, this is enforced by BC API
|
||||
// Applies to the intermediate MJ buffer only
|
||||
PowerLoss = 1
|
||||
PowerLossInterval = 100
|
||||
}
|
||||
|
||||
cfg RF {
|
||||
Enabled = Y
|
||||
}
|
||||
|
||||
@@ -17,11 +17,9 @@ import net.bdew.gendustry.config.Tuning
|
||||
|
||||
object PowerProxy {
|
||||
final val IC2_MOD_ID = "IC2"
|
||||
final val BC_MOD_ID = "BuildCraftAPI|power"
|
||||
final val TE_MOD_ID = "CoFHAPI"
|
||||
|
||||
lazy val EUEnabled = Tuning.getSection("Power").getSection("EU").getBoolean("Enabled")
|
||||
lazy val MJEnabled = Tuning.getSection("Power").getSection("BC").getBoolean("Enabled")
|
||||
lazy val RFEnabled = Tuning.getSection("Power").getSection("RF").getBoolean("Enabled")
|
||||
|
||||
lazy val lookup: collection.Map[String, ModContainer] = {
|
||||
@@ -35,7 +33,6 @@ object PowerProxy {
|
||||
nameLookup.asScala
|
||||
}
|
||||
|
||||
lazy val haveBC = haveModVersion(BC_MOD_ID)
|
||||
lazy val haveIC2 = haveModVersion(IC2_MOD_ID)
|
||||
lazy val haveTE = haveModVersion(TE_MOD_ID)
|
||||
|
||||
@@ -47,14 +44,12 @@ object PowerProxy {
|
||||
}
|
||||
|
||||
def logModVersions() {
|
||||
if (!haveBC && !haveIC2 && !haveTE) {
|
||||
if (!haveIC2 && !haveTE) {
|
||||
Gendustry.logWarn("No useable energy system detected")
|
||||
Gendustry.logWarn("This mod requires at least one of the following mods to function properly:")
|
||||
Gendustry.logWarn("* BuildCraft 4.2.0+ or any mod that properly bundles the BC API")
|
||||
Gendustry.logWarn("* CoFHCore (or any mod that includes the API)")
|
||||
Gendustry.logWarn("* IC2 Experimental")
|
||||
Gendustry.logWarn("* CoFHCore (Thermal Expansion)")
|
||||
}
|
||||
Gendustry.logInfo("BC API Version: %s", getModVersion(BC_MOD_ID))
|
||||
Gendustry.logInfo("IC2 Version: %s", getModVersion(IC2_MOD_ID))
|
||||
Gendustry.logInfo("RF API Version: %s", getModVersion(TE_MOD_ID))
|
||||
}
|
||||
|
||||
@@ -12,7 +12,6 @@ package net.bdew.gendustry.misc
|
||||
import forestry.api.genetics._
|
||||
import net.bdew.gendustry.Gendustry
|
||||
import net.bdew.gendustry.forestry.GeneSampleInfo
|
||||
import net.bdew.lib.Misc
|
||||
|
||||
object GeneticsCache {
|
||||
|
||||
|
||||
@@ -11,4 +11,4 @@ package net.bdew.gendustry.power
|
||||
|
||||
import net.bdew.lib.power.TilePoweredBase
|
||||
|
||||
trait TilePowered extends TilePoweredBase with TilePoweredMJ with TilePoweredRF with TilePoweredEU
|
||||
trait TilePowered extends TilePoweredBase with TilePoweredRF with TilePoweredEU
|
||||
@@ -1,55 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) bdew, 2013 - 2014
|
||||
* 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 buildcraft.api.power.{IPowerReceptor, PowerHandler}
|
||||
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
|
||||
import net.minecraftforge.common.util.ForgeDirection
|
||||
|
||||
@Optional.Interface(modid = PowerProxy.BC_MOD_ID, iface = "buildcraft.api.power.IPowerReceptor")
|
||||
trait TilePoweredMJ extends TilePoweredBase with IPowerReceptor {
|
||||
lazy val powerHandler = new PowerHandler(this, PowerHandler.Type.MACHINE)
|
||||
|
||||
def doWork(workProvider: PowerHandler) {}
|
||||
|
||||
def getPowerReceiver(side: ForgeDirection) = if (PowerProxy.MJEnabled) powerHandler.getPowerReceiver else null
|
||||
|
||||
def getWorld = getWorldObj
|
||||
|
||||
if (PowerProxy.haveBC) {
|
||||
serverTick.listen(() => {
|
||||
if (power.stored < power.capacity && powerHandler.getEnergyStored > 0) {
|
||||
// this is needed because perdition is stupid and can get applied after getEnergyStored and ninja-reduce the value >.>
|
||||
val canSend = powerHandler.useEnergy(0, power.capacity - power.stored, false)
|
||||
val transferred = power.inject(canSend.toFloat, false)
|
||||
powerHandler.useEnergy(transferred, transferred, true)
|
||||
}
|
||||
})
|
||||
|
||||
persistSave.listen(t => powerHandler.writeToNBT(t, "bcPower"))
|
||||
persistLoad.listen(t => if (t.hasKey("bcPower")) powerHandler.readFromNBT(t, "bcPower"))
|
||||
}
|
||||
|
||||
override def configurePower(cfg: PoweredMachine) {
|
||||
super.configurePower(cfg)
|
||||
if (PowerProxy.haveBC) {
|
||||
val tune = Tuning.getSection("Power").getSection("BC")
|
||||
val minReceivedEnergy = cfg.maxReceivedEnergy / tune.getFloat("MinReceivedEnergyDivisor")
|
||||
val powerLoss = tune.getInt("PowerLoss")
|
||||
val powerLossInterval = tune.getInt("PowerLossInterval")
|
||||
powerHandler.configure(minReceivedEnergy, cfg.maxReceivedEnergy, cfg.activationEnergy, cfg.maxReceivedEnergy * 10)
|
||||
powerHandler.configurePowerPerdition(powerLoss, powerLossInterval)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user