From d362b5015c176f95667fb544bb64b055430cfbdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sat, 19 Jul 2014 22:37:30 +0200 Subject: [PATCH] Added Mekanism to power converter tooltip and power mod availability check. Minor refactoring of variable names. Conflicts: src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala --- .../assets/opencomputers/lang/de_DE.lang | 9 ++++---- .../assets/opencomputers/lang/en_US.lang | 9 ++++---- .../assets/opencomputers/lang/fr_FR.lang | 9 ++++---- .../assets/opencomputers/lang/pt_PT.lang | 8 +++---- .../assets/opencomputers/lang/ru_RU.lang | 8 +++---- .../assets/opencomputers/lang/zh_CN.lang | 8 +++---- .../assets/opencomputers/lang/zh_TW.lang | 8 +++---- src/main/scala/li/cil/oc/Settings.scala | 23 ++++++++++--------- .../cil/oc/common/block/PowerConverter.scala | 11 +++++---- .../tileentity/traits/power/BuildCraft.scala | 4 ++-- .../traits/power/IndustrialCraft2.scala | 8 +++---- .../tileentity/traits/power/Mekanism.scala | 6 ++--- .../traits/power/ThermalExpansion.scala | 6 ++--- src/main/scala/li/cil/oc/util/mods/Mods.scala | 1 + 14 files changed, 63 insertions(+), 55 deletions(-) diff --git a/src/main/resources/assets/opencomputers/lang/de_DE.lang b/src/main/resources/assets/opencomputers/lang/de_DE.lang index 1e070abc5..9b02842bf 100644 --- a/src/main/resources/assets/opencomputers/lang/de_DE.lang +++ b/src/main/resources/assets/opencomputers/lang/de_DE.lang @@ -202,10 +202,11 @@ oc:tooltip.Memory=Braucht ein jeder Computer, um zu starten. Je mehr vorhanden, oc:tooltip.Microchip=Tritt auch unter dem Alias Integrierter Schaltkreis auf. Keine Ahnung, warum das auch mit Redstone klappt, aber es funktioniert. oc:tooltip.MotionSensor=Kann Bewegungen sich in der Nähe befindender Lebewesen erkennen. Benötigt eine klare Sichtlinie. oc:tooltip.NetworkCard=Erlaubt es Computern, die über mehrere Blöcke miteinander verbunden sind (z.B. Kabel), mittels Netzwerknachrichten zu kommunizieren. -oc:tooltip.PowerConverter.BC=§fBuildCraft MJ§7: §a%s:%s§7. -oc:tooltip.PowerConverter.IC2=§fIndustrialCraft² EU§7: §a%s:%s§7. -oc:tooltip.PowerConverter.TE=§fThermal Expansion RF§7: §a%s:%s§7. -oc:tooltip.PowerConverter.UE=§fUniversal Electricity Joules§7: §a%s:%s§7. +oc:tooltip.PowerConverter.BuildCraft=§fBuildCraft MJ§7: §a%s:%s§7. +oc:tooltip.PowerConverter.IndustrialCraft2=§fIndustrialCraft² EU§7: §a%s:%s§7. +oc:tooltip.PowerConverter.Mekanism=§fMekanism Joules§7: §a%s:%s§7. +oc:tooltip.PowerConverter.ThermalExpansion=§fThermal Expansion RF§7: §a%s:%s§7. +oc:tooltip.PowerConverter.UniversalElectricity=§fUniversal Electricity Joules§7: §a%s:%s§7. oc:tooltip.PowerConverter=Wandelt Strom anderer Mods in den internen Energietyp um. Umwandlungsverhältnisse: oc:tooltip.PowerDistributor=Verteilt Energie zwischen mehreren Netzwerken. Nützlich, um Energie mit einem Wandler auf mehrere Subnetze, die voneinander getrennt sein sollen, zu verteilen. oc:tooltip.PrintedCircuitBoard=Hierauf basieren alle Erweiterungskarten, Speicher und so weiter. diff --git a/src/main/resources/assets/opencomputers/lang/en_US.lang b/src/main/resources/assets/opencomputers/lang/en_US.lang index 52674e275..1e402f0b5 100644 --- a/src/main/resources/assets/opencomputers/lang/en_US.lang +++ b/src/main/resources/assets/opencomputers/lang/en_US.lang @@ -203,10 +203,11 @@ oc:tooltip.Memory=Required to get computers to run. The more you have, the more oc:tooltip.Microchip=The chip formerly known as Integrated Circuit. I have no idea why this works with redstone, but it does. oc:tooltip.MotionSensor=Can detect movement of nearby living beings. Requires clear line-of-sight. oc:tooltip.NetworkCard=Allows distant computers connected by other blocks (such as cable) to communicate by sending messages to each other. -oc:tooltip.PowerConverter.BC=§fBuildCraft MJ§7: §a%s:%s§7. -oc:tooltip.PowerConverter.IC2=§fIndustrialCraft² EU§7: §a%s:%s§7. -oc:tooltip.PowerConverter.TE=§fThermal Expansion RF§7: §a%s:%s§7. -oc:tooltip.PowerConverter.UE=§fUniversal Electricity Joules§7: §a%s:%s§7. +oc:tooltip.PowerConverter.BuildCraft=§fBuildCraft MJ§7: §a%s:%s§7. +oc:tooltip.PowerConverter.IndustrialCraft2=§fIndustrialCraft² EU§7: §a%s:%s§7. +oc:tooltip.PowerConverter.Mekanism=§fMekanism Joules§7: §a%s:%s§7. +oc:tooltip.PowerConverter.ThermalExpansion=§fThermal Expansion RF§7: §a%s:%s§7. +oc:tooltip.PowerConverter.UniversalElectricity=§fUniversal Electricity Joules§7: §a%s:%s§7. oc:tooltip.PowerConverter=Converts power from other mods to the internal energy type. Conversion rates: oc:tooltip.PowerDistributor=Distributes energy among different networks. This is useful for sharing power fed into your system from one converter among different sub-networks that should remain separate. oc:tooltip.PrintedCircuitBoard=The basic building block for expansion cards and memory and such. diff --git a/src/main/resources/assets/opencomputers/lang/fr_FR.lang b/src/main/resources/assets/opencomputers/lang/fr_FR.lang index 17130f531..a18bc3fee 100644 --- a/src/main/resources/assets/opencomputers/lang/fr_FR.lang +++ b/src/main/resources/assets/opencomputers/lang/fr_FR.lang @@ -104,10 +104,11 @@ oc:tooltip.Keyboard=Peut être attaché à un écran pour permettre la saisie. oc:tooltip.Memory=Requis pour faire fonctionner les ordinateurs. Plus vous en avez, plus complexes les programmes seront utilisables. oc:tooltip.Microchip=La puce anciennement circuit intégré. J'ai aucune idée du comment ça marche avec la redstone, mais ça marche. oc:tooltip.NetworkCard=Permet à des ordinateurs distants de communiquer en s'envoyant des messages. -oc:tooltip.PowerConverter.BC=§fBuildCraft MJ§7: §a%s:%s§7. -oc:tooltip.PowerConverter.IC2=§fIndustrialCraft² EU§7: §a%s:%s§7. -oc:tooltip.PowerConverter.TE=§fThermal Expansion RF§7: §a%s:%s§7. -oc:tooltip.PowerConverter.UE=§fUniversal Electricity Joules§7: §a%s:%s§7. +oc:tooltip.PowerConverter.BuildCraft=§fBuildCraft MJ§7: §a%s:%s§7. +oc:tooltip.PowerConverter.IndustrialCraft2=§fIndustrialCraft² EU§7: §a%s:%s§7. +oc:tooltip.PowerConverter.Mekanism=§fMekanism Joules§7: §a%s:%s§7. +oc:tooltip.PowerConverter.ThermalExpansion=§fThermal Expansion RF§7: §a%s:%s§7. +oc:tooltip.PowerConverter.UniversalElectricity=§fUniversal Electricity Joules§7: §a%s:%s§7. oc:tooltip.PowerConverter=Convertis l'énergie d'autres mods en l'énergie requise pour faire fonctionner les ordinateurs. oc:tooltip.PowerDistributor=Distribue l'énergie dans plusieurs réseaux. Utile pour partager cette énergie depuis un convertisseur vers différents sous-réseaux qui doivent rester séparés. oc:tooltip.PrintedCircuitBoard=Le composant basique pour les cartes, la mémoire, etc. diff --git a/src/main/resources/assets/opencomputers/lang/pt_PT.lang b/src/main/resources/assets/opencomputers/lang/pt_PT.lang index 03c05eaad..f92423db1 100644 --- a/src/main/resources/assets/opencomputers/lang/pt_PT.lang +++ b/src/main/resources/assets/opencomputers/lang/pt_PT.lang @@ -107,10 +107,10 @@ oc:tooltip.Keyboard=Pode ligar-se a um ecrã para permitir escrever através del oc:tooltip.Memory=Necessária para poder usar um computador. Quanta mais RAM tiveres, mais complexos são os programas que podes correr. oc:tooltip.Microchip=Um chip antes conhecido por Circuito Integrado. Não faço ideia como é que isto funciona com redstone, mas funciona. oc:tooltip.NetworkCard=Permite a computadores distantes ligados por blocos (tais como Cabos) comunicar enviando mensagens entre eles. -oc:tooltip.PowerConverter.BC=§fMJ de Buildcraft§7: §a%s:%s§7. -oc:tooltip.PowerConverter.IC2=§fEU de IndustrialCraft²§7: §a%s:%s§7. -oc:tooltip.PowerConverter.TE=§fRF de Thermal Expansion§7: §a%s:%s§7. -oc:tooltip.PowerConverter.UE=§fJoules de Universal Electricity§7: §a%s:%s§7. +oc:tooltip.PowerConverter.BuildCraft=§fMJ de Buildcraft§7: §a%s:%s§7. +oc:tooltip.PowerConverter.IndustrialCraft2=§fEU de IndustrialCraft²§7: §a%s:%s§7. +oc:tooltip.PowerConverter.ThermalExpansion=§fRF de Thermal Expansion§7: §a%s:%s§7. +oc:tooltip.PowerConverter.UniversalElectricity=§fJoules de Universal Electricity§7: §a%s:%s§7. oc:tooltip.PowerConverter=Converte energia de outros mods para o tipo de energia usado internamente. Taxas de conversão: oc:tooltip.PowerDistributor=Distribui energia entre diferentes redes. É util para alimentar várias redes separadas através de uma fonte de energia partilhada. oc:tooltip.PrintedCircuitBoard=O componente básico de placas de expansão, memórias e afins. diff --git a/src/main/resources/assets/opencomputers/lang/ru_RU.lang b/src/main/resources/assets/opencomputers/lang/ru_RU.lang index 7baf91d3e..557a1c7d6 100644 --- a/src/main/resources/assets/opencomputers/lang/ru_RU.lang +++ b/src/main/resources/assets/opencomputers/lang/ru_RU.lang @@ -196,10 +196,10 @@ oc:tooltip.Materials=Материалы: oc:tooltip.Memory=Необходима для запуска компьютера. Чем больше ОЗУ, тем более требовательные программы Вы можете запустить. oc:tooltip.Microchip=Чип, ранее известный как интегральная схема. Понятия не имею, как он работает с красным камнем, но он работает. oc:tooltip.NetworkCard=Позволяет соединить компьютеры, удалённые друг от друга, в сеть (к примеру, с помощью кабеля) для отправки сообщений между ними. -oc:tooltip.PowerConverter.BC=§fBuildCraft (мДж)§7: §a%s:%s§7. -oc:tooltip.PowerConverter.IC2=§fIndustrialCraft² (еЭ)§7: §a%s:%s§7. -oc:tooltip.PowerConverter.TE=§fThermal Expansion (РФ)§7: §a%s:%s§7. -oc:tooltip.PowerConverter.UE=§fUniversal Electricity (Дж)§7: §a%s:%s§7. +oc:tooltip.PowerConverter.BuildCraft=§fBuildCraft (мДж)§7: §a%s:%s§7. +oc:tooltip.PowerConverter.IndustrialCraft2=§fIndustrialCraft² (еЭ)§7: §a%s:%s§7. +oc:tooltip.PowerConverter.ThermalExpansion=§fThermal Expansion (РФ)§7: §a%s:%s§7. +oc:tooltip.PowerConverter.UniversalElectricity=§fUniversal Electricity (Дж)§7: §a%s:%s§7. oc:tooltip.PowerConverter=Преобразует энергию от других модов во внутренний тип энергии. Соотношение энергии: oc:tooltip.PowerDistributor=Передаёт энергию между различными сетями. Это полезно, когда требуется запитать несколько сетей, которые должны быть разделены, от одного преобразователя. oc:tooltip.PrintedCircuitBoard=Основной строительный блок для плат, памяти и прочего. diff --git a/src/main/resources/assets/opencomputers/lang/zh_CN.lang b/src/main/resources/assets/opencomputers/lang/zh_CN.lang index 39dd44864..9c5571702 100644 --- a/src/main/resources/assets/opencomputers/lang/zh_CN.lang +++ b/src/main/resources/assets/opencomputers/lang/zh_CN.lang @@ -96,10 +96,10 @@ oc:tooltip.Keyboard=可以连接屏幕,能够输入显示文本. oc:tooltip.Memory=电脑运行必备.[nl]内存越大,你就可以运行越复杂的程序. oc:tooltip.Microchip=通常也管这种芯片叫集成电路.[nl]我也不知道为啥能和红石一起运行,但事实如此啊. oc:tooltip.NetworkCard=允许通过其他方块(比如线缆)相连的远程计算机能够向彼此发送信息进行交互. -oc:tooltip.PowerConverter.BC=§f建筑模组minecraft焦耳(BC-MJ)§7: §a%s:%s§7. -oc:tooltip.PowerConverter.IC2=§f工业时代EU(IC²-EU)§7: §a%s:%s§7. -oc:tooltip.PowerConverter.TE=§f热能扩展RF(TE-RF)§7: §a%s:%s§7. -oc:tooltip.PowerConverter.UE=§f通用电力焦耳(UE-Joules§7): §a%s:%s§7. +oc:tooltip.PowerConverter.BuildCraft=§f建筑模组minecraft焦耳(BC-MJ)§7: §a%s:%s§7. +oc:tooltip.PowerConverter.IndustrialCraft2=§f工业时代EU(IC²-EU)§7: §a%s:%s§7. +oc:tooltip.PowerConverter.ThermalExpansion=§f热能扩展RF(TE-RF)§7: §a%s:%s§7. +oc:tooltip.PowerConverter.UniversalElectricity=§f通用电力焦耳(UE-Joules§7): §a%s:%s§7. oc:tooltip.PowerConverter=将其他模组的能量转化为本模组的内部能源形式.转换率: oc:tooltip.PowerDistributor=在不同网络中分配能量.[nl]用来通过包含多个理论上独立的子网络的转换器在系统中共享能量时很实用. oc:tooltip.PrintedCircuitBoard=扩展卡,内存等的基板. diff --git a/src/main/resources/assets/opencomputers/lang/zh_TW.lang b/src/main/resources/assets/opencomputers/lang/zh_TW.lang index 3865c8264..05051c72a 100644 --- a/src/main/resources/assets/opencomputers/lang/zh_TW.lang +++ b/src/main/resources/assets/opencomputers/lang/zh_TW.lang @@ -139,10 +139,10 @@ oc:tooltip.Keyboard=可以連接顯示器,能夠輸入顯示文本. oc:tooltip.Memory=電腦運行必備.[nl]記憶體越大,你就可以運行越復雜的程序. oc:tooltip.Microchip=通常也管這種芯片叫集成電路.[nl]我也不知道為啥能和紅石一起運行,但事實如此啊. oc:tooltip.NetworkCard=允許通過其他方塊(比如線纜)相連的遠程計算機能夠向彼此發送信息進行交互. -oc:tooltip.PowerConverter.BC=§f建筑模組minecraft焦耳(BC-MJ)§7: §a%s:%s§7. -oc:tooltip.PowerConverter.IC2=§f工業時代EU(IC²-EU)§7: §a%s:%s§7. -oc:tooltip.PowerConverter.TE=§f熱能擴展RF(TE-RF)§7: §a%s:%s§7. -oc:tooltip.PowerConverter.UE=§f通用電力焦耳(UE-Joules§7): §a%s:%s§7. +oc:tooltip.PowerConverter.BuildCraft=§f建筑模組minecraft焦耳(BC-MJ)§7: §a%s:%s§7. +oc:tooltip.PowerConverter.IndustrialCraft2=§f工業時代EU(IC²-EU)§7: §a%s:%s§7. +oc:tooltip.PowerConverter.ThermalExpansion=§f熱能擴展RF(TE-RF)§7: §a%s:%s§7. +oc:tooltip.PowerConverter.UniversalElectricity=§f通用電力焦耳(UE-Joules§7): §a%s:%s§7. oc:tooltip.PowerConverter=將其他模組的能量轉化為本模組的內部能源形式.轉換率: oc:tooltip.PowerDistributor=在不同網絡中分配能量.[nl]用來通過包含多個理論上獨立的子網絡的轉換器在系統中共享能量時很實用. oc:tooltip.PrintedCircuitBoard=擴展卡,記憶體等的基板. diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala index f727d5e67..dfc37f86b 100644 --- a/src/main/scala/li/cil/oc/Settings.scala +++ b/src/main/scala/li/cil/oc/Settings.scala @@ -124,6 +124,7 @@ class Settings(config: Config) { val ignorePower = pureIgnorePower || (!Mods.BuildCraftPower.isAvailable && !Mods.IndustrialCraft2.isAvailable && + !Mods.Mekanism.isAvailable && !Mods.ThermalExpansion.isAvailable && !Mods.UniversalElectricity.isAvailable) val tickFrequency = config.getDouble("power.tickFrequency") max 1 @@ -249,19 +250,19 @@ object Settings { // Power conversion values. These are the same values used by Universal // Electricity to provide global power support. - val valueBC = 500.0 - val valueIC2 = 200.0 - val valueMek = 2000.0 / 3.0 - val valueTE = 50.0 - val valueUE = 1.0 + val valueBuildCraft = 500.0 + val valueIndustrialCraft2 = 200.0 + val valueMekanism = 2000.0 / 3.0 + val valueThermalExpansion = 50.0 + val valueUniversalElectricity = 1.0 - val valueOC = valueBC + val valueInternal = valueBuildCraft - val ratioBC = valueBC / valueOC - val ratioIC2 = valueIC2 / valueOC - val ratioMek = valueMek / valueOC - val ratioTE = valueTE / valueOC - val ratioUE = valueUE / valueOC + val ratioBuildCraft = valueBuildCraft / valueInternal + val ratioIndustrialCraft2 = valueIndustrialCraft2 / valueInternal + val ratioMekanism = valueMekanism / valueInternal + val ratioThermalExpansion = valueThermalExpansion / valueInternal + val ratioUniversalElectricity = valueUniversalElectricity / valueInternal def basicScreenPixels = screenResolutionsByTier(0)._1 * screenResolutionsByTier(0)._2 diff --git a/src/main/scala/li/cil/oc/common/block/PowerConverter.scala b/src/main/scala/li/cil/oc/common/block/PowerConverter.scala index d9be52fb3..f6fd2f1c9 100644 --- a/src/main/scala/li/cil/oc/common/block/PowerConverter.scala +++ b/src/main/scala/li/cil/oc/common/block/PowerConverter.scala @@ -41,16 +41,19 @@ class PowerConverter(val parent: SimpleDelegator) extends SimpleDelegate { tooltip.addAll(Tooltip.get(unlocalizedName + "." + name, addExtension(a), addExtension(b))) } if (Mods.BuildCraftPower.isAvailable) { - addRatio("BC", Settings.ratioBC) + addRatio("BuildCraft", Settings.ratioBuildCraft) } if (Mods.IndustrialCraft2.isAvailable) { - addRatio("IC2", Settings.ratioIC2) + addRatio("IndustrialCraft2", Settings.ratioIndustrialCraft2) + } + if (Mods.Mekanism.isAvailable) { + addRatio("Mekanism", Settings.ratioMekanism) } if (Mods.ThermalExpansion.isAvailable) { - addRatio("TE", Settings.ratioTE) + addRatio("ThermalExpansion", Settings.ratioThermalExpansion) } if (Mods.UniversalElectricity.isAvailable) { - addRatio("UE", Settings.ratioUE) + addRatio("UniversalElectricity", Settings.ratioUniversalElectricity) } } diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala index 6229d0a34..5b62afa4f 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala @@ -18,10 +18,10 @@ trait BuildCraft extends Common with IPowerReceptor { super.updateEntity() if (useBuildCraftPower && world.getWorldTime % Settings.get.tickFrequency == 0) { for (side <- ForgeDirection.VALID_DIRECTIONS) { - val demand = (globalBufferSize(side) - globalBuffer(side)) / Settings.ratioBC + val demand = (globalBufferSize(side) - globalBuffer(side)) / Settings.ratioBuildCraft if (demand > 1) { val power = getPowerProvider.useEnergy(1, demand.toFloat, true) - tryChangeBuffer(side, power * Settings.ratioBC) + tryChangeBuffer(side, power * Settings.ratioBuildCraft) } } } diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala index 71d7e5a72..628eb1459 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala @@ -40,15 +40,15 @@ trait IndustrialCraft2 extends Common with IEnergySink { @Optional.Method(modid = Mods.IDs.IndustrialCraft2) def injectEnergyUnits(directionFrom: ForgeDirection, amount: Double): Double = { lastInjectedAmount = amount - var energy = amount * Settings.ratioIC2 + var energy = amount * Settings.ratioIndustrialCraft2 // Work around IC2 being uncooperative and always just passing 'unknown' along here. if (directionFrom == ForgeDirection.UNKNOWN) { for (side <- ForgeDirection.VALID_DIRECTIONS if energy > 0) { energy -= tryChangeBuffer(side, energy) } - energy / Settings.ratioIC2 + energy / Settings.ratioIndustrialCraft2 } - else amount - tryChangeBuffer(directionFrom, energy) / Settings.ratioIC2 + else amount - tryChangeBuffer(directionFrom, energy) / Settings.ratioIndustrialCraft2 } @Optional.Method(modid = Mods.IDs.IndustrialCraft2) @@ -65,7 +65,7 @@ trait IndustrialCraft2 extends Common with IEnergySink { val space = size - value force = force || (space > size / 2) space - }).max / Settings.ratioIC2 + }).max / Settings.ratioIndustrialCraft2 if (force || lastInjectedAmount <= 0 || demand >= lastInjectedAmount) demand else 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 b42ae0620..406ddc902 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 @@ -12,13 +12,13 @@ trait Mekanism extends Common with IStrictEnergyAcceptor { override def canReceiveEnergy(side: ForgeDirection) = canConnectPower(side) @Optional.Method(modid = Mods.IDs.Mekanism) - override def transferEnergyToAcceptor(side: ForgeDirection, amount: Double) = tryChangeBuffer(side, amount * Settings.ratioMek) / Settings.ratioMek + override def transferEnergyToAcceptor(side: ForgeDirection, amount: Double) = tryChangeBuffer(side, amount * Settings.ratioMekanism) / Settings.ratioMekanism @Optional.Method(modid = Mods.IDs.Mekanism) - override def getMaxEnergy = ForgeDirection.VALID_DIRECTIONS.map(globalBufferSize).max / Settings.ratioMek + override def getMaxEnergy = ForgeDirection.VALID_DIRECTIONS.map(globalBufferSize).max / Settings.ratioMekanism @Optional.Method(modid = Mods.IDs.Mekanism) - override def getEnergy = ForgeDirection.VALID_DIRECTIONS.map(globalBuffer).max / Settings.ratioMek + override def getEnergy = ForgeDirection.VALID_DIRECTIONS.map(globalBuffer).max / Settings.ratioMekanism @Optional.Method(modid = Mods.IDs.Mekanism) override def setEnergy(energy: Double) {} diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala index 893c2e033..69bff2ef6 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala @@ -13,13 +13,13 @@ trait ThermalExpansion extends Common with IEnergyHandler { @Optional.Method(modid = Mods.IDs.ThermalExpansion) def receiveEnergy(from: ForgeDirection, maxReceive: Int, simulate: Boolean) = - (tryChangeBuffer(from, maxReceive * Settings.ratioTE, !simulate) / Settings.ratioTE).toInt + (tryChangeBuffer(from, maxReceive * Settings.ratioThermalExpansion, !simulate) / Settings.ratioThermalExpansion).toInt @Optional.Method(modid = Mods.IDs.ThermalExpansion) - def getEnergyStored(from: ForgeDirection) = (globalBuffer(from) / Settings.ratioTE).toInt + def getEnergyStored(from: ForgeDirection) = (globalBuffer(from) / Settings.ratioThermalExpansion).toInt @Optional.Method(modid = Mods.IDs.ThermalExpansion) - def getMaxEnergyStored(from: ForgeDirection) = (globalBufferSize(from) / Settings.ratioTE).toInt + def getMaxEnergyStored(from: ForgeDirection) = (globalBufferSize(from) / Settings.ratioThermalExpansion).toInt @Optional.Method(modid = Mods.IDs.ThermalExpansion) def extractEnergy(from: ForgeDirection, maxExtract: Int, simulate: Boolean) = 0 diff --git a/src/main/scala/li/cil/oc/util/mods/Mods.scala b/src/main/scala/li/cil/oc/util/mods/Mods.scala index 5f6924ff6..bdc9608a6 100644 --- a/src/main/scala/li/cil/oc/util/mods/Mods.scala +++ b/src/main/scala/li/cil/oc/util/mods/Mods.scala @@ -45,6 +45,7 @@ object Mods { val ForgeMultipart = new SimpleMod(IDs.ForgeMultipart) val GregTech = new SimpleMod(IDs.GregTech) val IndustrialCraft2 = new SimpleMod(IDs.IndustrialCraft2) + val Mekanism = new SimpleMod(IDs.Mekanism) val MineFactoryReloaded = new SimpleMod(IDs.MineFactoryReloaded) val NotEnoughItems = new SimpleMod(IDs.NotEnoughItems) val PortalGun = new SimpleMod(IDs.PortalGun)