AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 11:48:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adjusted backport of Mekanism support for 1.6.

Browse Source
This commit is contained in:
Florian Nücke 2014-07-21 18:37:05 +02:00
parent d362b5015c
commit a3c7653558
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/java/mekanism/api/energy/ICableOutputter.java
View File

@ -1,6 +1,6 @@
package mekanism.api.energy;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.common.ForgeDirection;
/**
* Implement this if your TileEntity is capable of outputting energy to cables, overriding Mekanism's default implementation.

2
src/api/java/mekanism/api/energy/IEnergizedItem.java
View File

@ -55,5 +55,5 @@ public interface IEnergizedItem
* Returns whether or not this item contains metadata-specific subtypes instead of using metadata for damage display.
* @return if the item contains metadata-specific subtypes
*/
public boolean isMetadataSpecific(ItemStack itemStack);
public boolean isMetadataSpecific();
}

2
src/api/java/mekanism/api/energy/IStrictEnergyAcceptor.java
View File

@ -1,6 +1,6 @@
package mekanism.api.energy;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.common.ForgeDirection;
/**
* Implement this if your TileEntity can accept energy at a floating-point double value from Universal Cables.

2
src/main/scala/li/cil/oc/Settings.scala
View File

@ -252,7 +252,7 @@ object Settings {
// Electricity to provide global power support.
val valueBuildCraft = 500.0
val valueIndustrialCraft2 = 200.0
val valueMekanism = 2000.0 / 3.0
val valueMekanism = 250.0 / 9.0
val valueThermalExpansion = 50.0
val valueUniversalElectricity = 1.0

2
src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala
View File

@ -4,7 +4,7 @@ import cpw.mods.fml.common.Optional
import li.cil.oc.Settings
import li.cil.oc.util.mods.Mods
import mekanism.api.energy.IStrictEnergyAcceptor
import net.minecraftforge.common.util.ForgeDirection
import net.minecraftforge.common.ForgeDirection
@Optional.Interface(iface = "mekanism.api.energy.IStrictEnergyAcceptor", modid = Mods.IDs.Mekanism)
trait Mekanism extends Common with IStrictEnergyAcceptor {

6
src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
View File

@ -16,13 +16,13 @@ trait UniversalElectricity extends Common with IEnergyInterface with IEnergyCont
@Optional.Method(modid = Mods.IDs.UniversalElectricity)
override def onReceiveEnergy(from: ForgeDirection, receive: Long, doReceive: Boolean) =
(tryChangeBuffer(from, receive * Settings.ratioUE, doReceive) / Settings.ratioUE).toLong
(tryChangeBuffer(from, receive * Settings.ratioUniversalElectricity, doReceive) / Settings.ratioUniversalElectricity).toLong
@Optional.Method(modid = Mods.IDs.UniversalElectricity)
override def getEnergy(from: ForgeDirection) = (globalBuffer(from) / Settings.ratioUE).toLong
override def getEnergy(from: ForgeDirection) = (globalBuffer(from) / Settings.ratioUniversalElectricity).toLong
@Optional.Method(modid = Mods.IDs.UniversalElectricity)
override def getEnergyCapacity(from: ForgeDirection) = (globalBufferSize(from) / Settings.ratioUE).toLong
override def getEnergyCapacity(from: ForgeDirection) = (globalBufferSize(from) / Settings.ratioUniversalElectricity).toLong
@Optional.Method(modid = Mods.IDs.UniversalElectricity)
override def onExtractEnergy(from: ForgeDirection, extract: Long, doExtract: Boolean) = 0