diff --git a/build.gradle b/build.gradle index b90a1b73e..030578842 100755 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ loadProperties() version = version_major + '.' + version_minor + '.' + version_patch + '.' + getBuildNumber() group= "net.sengir.forestry" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "forestry_" + mcversion +archivesBaseName = "forestry-allpower_" + mcversion ext.dirDest = './build/dist' ext.dirLang = "./lang" @@ -64,16 +64,21 @@ repositories { name = "ic2" url = "http://maven.ic2.player.to/" } + maven { + name = "bdew" + url = "http://jenkins.bdew.net/maven" + } } configurations { - buildcraft - compile.extendsFrom buildcraft + apis + compile.extendsFrom apis } dependencies { - compile 'net.industrial-craft:industrialcraft-2:2.2.575-experimental:api' - buildcraft 'com.mod-buildcraft:buildcraft:6.0.17:dev' + apis 'net.industrial-craft:industrialcraft-2:2.2.575-experimental:api' + apis 'com.mod-buildcraft:buildcraft:6.0.17:dev' + apis "net.bdew.thirdparty:CoFHLib:R1.0.1:api" } processResources { @@ -174,7 +179,7 @@ jar { archiveName = "main.jar" from { - configurations.buildcraft.collect { + configurations.apis.collect { it.isDirectory() ? it : zipTree(it).matching { include '**/api/**' } @@ -252,7 +257,7 @@ task devJar ( type: Zip, dependsOn: devJarSigned ) { } from { - configurations.buildcraft.collect { + configurations.apis.collect { it.isDirectory() ? it : zipTree(it).matching { include '**/api/**' } diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index a063fe370..8f1348cde 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -112,6 +112,10 @@ public class Config { public static HashMap hints = new HashMap(); public static boolean disableEnergyStat = false; + // Power rations + public static double MJ_RF_Ratio = 10; + public static double MJ_EU_Ratio = 2.5; + @SuppressWarnings({ "all" }) public static void load() { @@ -262,6 +266,9 @@ public class Config { property.Comment = "set to false to prevent Forestry's user from autooping."; Config.fakeUserAutoop = Boolean.parseBoolean(property.Value); + Config.MJ_RF_Ratio = Double.parseDouble(config.get("MJ_RF_Ratio", CATEGORY_COMMON, 10F).Value); + Config.MJ_EU_Ratio = Double.parseDouble(config.get("MJ_EU_Ratio", CATEGORY_COMMON, 2.5F).Value); + registerClimates(); ForestryTrigger.initialize(); diff --git a/src/main/java/forestry/core/gadgets/TilePowered.java b/src/main/java/forestry/core/gadgets/TilePowered.java index 999e3bfbe..31ec48f05 100755 --- a/src/main/java/forestry/core/gadgets/TilePowered.java +++ b/src/main/java/forestry/core/gadgets/TilePowered.java @@ -10,9 +10,16 @@ ******************************************************************************/ package forestry.core.gadgets; +import cofh.api.energy.IEnergyHandler; +import forestry.core.config.Config; +import ic2.api.energy.event.EnergyTileLoadEvent; +import ic2.api.energy.event.EnergyTileUnloadEvent; +import ic2.api.energy.tile.IEnergySink; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; @@ -31,7 +38,7 @@ import forestry.core.proxy.Proxies; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.ForestryTank; -public abstract class TilePowered extends TileBase implements IPowerHandler, IRenderableMachine { +public abstract class TilePowered extends TileBase implements IPowerHandler, IRenderableMachine, IEnergySink, IEnergyHandler { public static int WORK_CYCLES = 4; @@ -118,6 +125,11 @@ public abstract class TilePowered extends TileBase implements IPowerHandler, IRe if (worldObj.isRemote) return; + if (!ic2registered) { + MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this)); + ic2registered = true; + } + if (workCounter >= WORK_CYCLES && worldObj.getTotalWorldTime() % 5 == 0) { if (workCycle()) workCounter = 0; @@ -136,20 +148,6 @@ public abstract class TilePowered extends TileBase implements IPowerHandler, IRe workCounter++; } - /* - // Hard limit to 4 cycles / second. - if (worldObj.getTotalWorldTime() % 5 * 10 != 0) - return; - - PluginBuildCraft.instance.invokeUseEnergyMethod(powerHandler, powerHandler.getActivationEnergy(), powerHandler.getActivationEnergy(), false); - - // Do not consume energy if the boiler didn't do any work. - if (!workCycle()) - return; - - // Use up energy since we did some work. - PluginBuildCraft.instance.invokeUseEnergyMethod(powerHandler, powerHandler.getActivationEnergy(), powerHandler.getActivationEnergy(), true); - */ } public abstract boolean workCycle(); @@ -210,4 +208,77 @@ public abstract class TilePowered extends TileBase implements IPowerHandler, IRe public EnumTankLevel getSecondaryLevel() { return EnumTankLevel.EMPTY; } + + // ======= RF SUPPORT =========== + + @Override + public int receiveEnergy(ForgeDirection forgeDirection, int i, boolean b) { + if (b) + return (int) Math.round(Math.min(powerHandler.getPowerReceiver().powerRequest() * Config.MJ_RF_Ratio, i)); + else + return (int) Math.round(powerHandler.getPowerReceiver().receiveEnergy( + Type.PIPE, i / Config.MJ_RF_Ratio, forgeDirection) * Config.MJ_RF_Ratio); + } + + @Override + public int extractEnergy(ForgeDirection forgeDirection, int i, boolean b) { + return 0; + } + + @Override + public int getEnergyStored(ForgeDirection forgeDirection) { + return (int) Math.round(powerHandler.getEnergyStored() * Config.MJ_RF_Ratio); + } + + @Override + public int getMaxEnergyStored(ForgeDirection forgeDirection) { + return (int) Math.round(powerHandler.getMaxEnergyStored() * Config.MJ_RF_Ratio); + } + + @Override + public boolean canConnectEnergy(ForgeDirection forgeDirection) { + return true; + } + + // ======== EU SUPPORT ============ + + private boolean ic2registered = false; + + @Override + public void invalidate() { + if (ic2registered) { + MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this)); + ic2registered = false; + } + super.invalidate(); + } + + @Override + public void onChunkUnload() { + if (ic2registered) { + MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this)); + ic2registered = false; + } + super.onChunkUnload(); + } + + @Override + public double getDemandedEnergy() { + return powerHandler.getPowerReceiver().powerRequest() * Config.MJ_EU_Ratio; + } + + @Override + public int getSinkTier() { + return 2; + } + + @Override + public double injectEnergy(ForgeDirection forgeDirection, double v, double v2) { + return (v - powerHandler.getPowerReceiver().receiveEnergy(Type.PIPE, v / Config.MJ_EU_Ratio, forgeDirection)) * Config.MJ_EU_Ratio; + } + + @Override + public boolean acceptsEnergyFrom(TileEntity tileEntity, ForgeDirection forgeDirection) { + return true; + } }