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

fixes ignorePower setting being ignored when turning on computers

Browse Source
This commit is contained in:
Florian Nücke 2013-12-28 12:46:37 +01:00
parent e96a167720
commit 13124a76be
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
li/cil/oc/OpenComputers.scala
View File

@ -13,7 +13,7 @@ import li.cil.oc.client.{PacketHandler => ClientPacketHandler}
import li.cil.oc.common.Proxy
import li.cil.oc.server.{PacketHandler => ServerPacketHandler}
@Mod(modid = "OpenComputers", name = "OpenComputers", version = "1.0.5",
@Mod(modid = "OpenComputers", name = "OpenComputers", version = "1.0.5a",
dependencies = "required-after:Forge@[9.11.1.940,);after:BuildCraft|Energy;after:ComputerCraft;after:IC2;after:MineFactoryReloaded;after:RedLogic;after:ThermalExpansion",
modLanguage = "scala")
@NetworkMod(clientSideRequired = true, serverSideRequired = false,

2
li/cil/oc/server/component/Computer.scala
View File

@ -109,7 +109,7 @@ class Computer(val owner: tileentity.Computer) extends ManagedComponent with Con
def start() = state.synchronized(state.top match {
case Computer.State.Stopped =>
if (owner.installedMemory > 0) {
if (node.globalBuffer > cost) {
if (Settings.get.ignorePower || node.globalBuffer > cost) {
init() && {
switchTo(Computer.State.Starting)
timeStarted = owner.world.getWorldTime

6
li/cil/oc/util/LuaStateFactory.scala
View File

@ -12,6 +12,7 @@ import li.cil.oc.{OpenComputers, Settings}
import org.lwjgl.LWJGLUtil
import scala.util.Random
import scala.util.control.Breaks._
import org.apache.commons.lang3.SystemUtils
/**
* Factory singleton used to spawn new LuaState instances.
@ -82,6 +83,11 @@ object LuaStateFactory {
isWindows = extension == ".dll"
val libPath = "/assets/" + Settings.resourceDomain + "/lib/"
if (isWindows && SystemUtils.IS_OS_WINDOWS_XP) {
OpenComputers.log.warning("Sorry, but Windows XP isn't supported. I very much recommend upgrading your Windows, anyway, since Microsoft will stop supporting it in April 2014.")
break()
}
val tmpPath = {
val path = System.getProperty("java.io.tmpdir")
if (path.endsWith("/") || path.endsWith("\\")) path

2
mcmod.info
View File

@ -2,7 +2,7 @@
{
"modid": "OpenComputers",
"name": "OpenComputers",
"version": "1.0.5",
"version": "1.0.5a",
"credits" : "Inspired by a couple of other mods, most notably ComputerCraft.",
"authors": ["Florian 'Sangar' Nücke", "Johannes 'Lord Joda' Lohrer"],
"description": "This mod adds modular computers and robots that can be programmed in Lua.",