diff --git a/src/api/java/mekanism/api/energy/ICableOutputter.java b/src/api/java/mekanism/api/energy/ICableOutputter.java index 015379c03..8228040ca 100644 --- a/src/api/java/mekanism/api/energy/ICableOutputter.java +++ b/src/api/java/mekanism/api/energy/ICableOutputter.java @@ -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. diff --git a/src/api/java/mekanism/api/energy/IEnergizedItem.java b/src/api/java/mekanism/api/energy/IEnergizedItem.java index b67254597..5b784de70 100644 --- a/src/api/java/mekanism/api/energy/IEnergizedItem.java +++ b/src/api/java/mekanism/api/energy/IEnergizedItem.java @@ -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(); } diff --git a/src/api/java/mekanism/api/energy/IStrictEnergyAcceptor.java b/src/api/java/mekanism/api/energy/IStrictEnergyAcceptor.java index 53edc68e6..deb550df2 100644 --- a/src/api/java/mekanism/api/energy/IStrictEnergyAcceptor.java +++ b/src/api/java/mekanism/api/energy/IStrictEnergyAcceptor.java @@ -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. diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala index dfc37f86b..c985a5811 100644 --- a/src/main/scala/li/cil/oc/Settings.scala +++ b/src/main/scala/li/cil/oc/Settings.scala @@ -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 diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala index 406ddc902..a2f29585b 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala @@ -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 { diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala index 1cad630ad..58f100e30 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala @@ -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