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

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

Browse Source 
Conflicts:
	src/main/scala/li/cil/oc/OpenComputers.scala
This commit is contained in:
Florian Nücke 2014-08-27 19:50:07 +02:00
commit 34bb02566e
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/application.conf
View File

@ -932,5 +932,13 @@ opencomputers {
# Logs information about malformed glyphs (i.e. glyphs that deviate in # Logs information about malformed glyphs (i.e. glyphs that deviate in
# width from what wcwidth says). # width from what wcwidth says).
logUnifontErrors: false logUnifontErrors: false
# Extract the native library with Lua into the system's temporary
# directory instead of the game directory (e.g. /tmp on Linux). The
# default is to extract into the game directory, to avoid issues when
# the temporary directory is mounted as noexec (meaning the lib cannot)
# be loaded. There is also less of a chance of conflicts when running
# multiple servers or server and client on the same machine.
nativeInTmpDir: false
} }
} }

7
src/main/scala/li/cil/oc/OpenComputers.scala
View File

@ -20,7 +20,7 @@ object OpenComputers {
final val Fingerprint = "@FINGERPRINT@" final val Fingerprint = "@FINGERPRINT@"
val log = LogManager.getLogger("OpenComputers") var log = LogManager.getLogger("OpenComputers")
@SidedProxy(clientSide = "li.cil.oc.client.Proxy", serverSide = "li.cil.oc.server.Proxy") @SidedProxy(clientSide = "li.cil.oc.client.Proxy", serverSide = "li.cil.oc.server.Proxy")
var proxy: Proxy = null var proxy: Proxy = null
@ -33,7 +33,10 @@ object OpenComputers {
// def invalidFingerprint(e: FMLFingerprintViolationEvent) = tampered = Some(e) // def invalidFingerprint(e: FMLFingerprintViolationEvent) = tampered = Some(e)
@EventHandler @EventHandler
def preInit(e: FMLPreInitializationEvent) = proxy.preInit(e) def preInit(e: FMLPreInitializationEvent) {
proxy.preInit(e)
log = e.getModLog
}
@EventHandler @EventHandler
def init(e: FMLInitializationEvent) = proxy.init(e) def init(e: FMLInitializationEvent) = proxy.init(e)

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

@ -230,6 +230,7 @@ class Settings(config: Config) {
val logUnifontErrors = config.getBoolean("debug.logUnifontErrors") val logUnifontErrors = config.getBoolean("debug.logUnifontErrors")
val alwaysTryNative = config.getBoolean("debug.alwaysTryNative") val alwaysTryNative = config.getBoolean("debug.alwaysTryNative")
val debugPersistence = config.getBoolean("debug.verbosePersistenceErrors") val debugPersistence = config.getBoolean("debug.verbosePersistenceErrors")
val nativeInTmpDir = config.getBoolean("debug.nativeInTmpDir")
} }
object Settings { object Settings {

10
src/main/scala/li/cil/oc/util/LuaStateFactory.scala
View File

@ -95,11 +95,15 @@ object LuaStateFactory {
return return
} }
val tmpLibFile = new File({ val tmpLibName = "OpenComputersMod-" + OpenComputers.Version + "-" + libraryName
val tmpBasePath = if (Settings.get.nativeInTmpDir) {
val path = System.getProperty("java.io.tmpdir") val path = System.getProperty("java.io.tmpdir")
if (path.endsWith("/") || path.endsWith("\\")) path if (path == null) ""
else if (path.endsWith("/") || path.endsWith("\\")) path
else path + "/" else path + "/"
} + "OpenComputersMod-" + OpenComputers.Version + "-" + libraryName) }
else ""
val tmpLibFile = new File(tmpBasePath + tmpLibName)
// If the file, already exists, make sure it's the same we need, if it's // If the file, already exists, make sure it's the same we need, if it's
// not disable use of the natives. // not disable use of the natives.