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

Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Browse Source
This commit is contained in:
Florian Nücke 2014-07-19 22:36:22 +02:00
commit 0a53a47197
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
View File

@ -1,7 +1,6 @@
package li.cil.oc.common.asm
import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions
import li.cil.oc.common.asm.template.SimpleComponentImpl
import li.cil.oc.util.mods.Mods
import net.minecraft.launchwrapper.{IClassTransformer, LaunchClassLoader}
@ -12,7 +11,6 @@ import org.objectweb.asm.{ClassReader, ClassWriter, Opcodes}
import scala.collection.convert.WrapAsJava._
import scala.collection.convert.WrapAsScala._
@TransformerExclusions(Array("li.cil.oc.common.asm"))
class ClassTransformer extends IClassTransformer {
val loader = classOf[ClassTransformer].getClassLoader.asInstanceOf[LaunchClassLoader]

3
src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala
View File

@ -3,8 +3,11 @@ package li.cil.oc.common.launch
import java.util
import cpw.mods.fml.relauncher.IFMLLoadingPlugin
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.{MCVersion, TransformerExclusions}
import li.cil.oc.common.asm.ClassTransformer
@TransformerExclusions(Array("li.cil.oc.common.asm"))
@MCVersion("1.6.4")
class TransformerLoader extends IFMLLoadingPlugin {
override def getAccessTransformerClass = null

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

@ -18,7 +18,7 @@ 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)
val demand = (globalBufferSize(side) - globalBuffer(side)) / Settings.ratioBC
if (demand > 1) {
val power = getPowerProvider.useEnergy(1, demand.toFloat, true)
tryChangeBuffer(side, power * Settings.ratioBC)