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

Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7

Browse Source
This commit is contained in:
Florian Nücke 2014-03-17 13:31:53 +01:00
commit 5319d5f0ea
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package li.cil.oc
import com.typesafe.config.{ConfigRenderOptions, Config, ConfigFactory} import com.typesafe.config.{ConfigRenderOptions, Config, ConfigFactory}
import cpw.mods.fml.common.{ModAPIManager, Loader} import cpw.mods.fml.common.{ModAPIManager, Loader}
import java.io._ import java.io._
import java.util.logging.Level
import li.cil.oc.util.PackedColor import li.cil.oc.util.PackedColor
import org.apache.commons.lang3.StringEscapeUtils import org.apache.commons.lang3.StringEscapeUtils
import scala.collection.convert.WrapAsScala._ import scala.collection.convert.WrapAsScala._
@ -211,10 +212,22 @@ object Settings {
in.close() in.close()
ConfigFactory.parseString(config) ConfigFactory.parseString(config)
} }
val config =
try {
val plain = Source.fromFile(file).mkString.replace("\r\n", "\n")
val config = ConfigFactory.parseString(plain).withFallback(defaults)
settings = new Settings(config.getConfig("opencomputers"))
config
}
catch {
case e: Throwable =>
if (file.exists()) {
OpenComputers.log.log(Level.WARNING, "Failed loading config, using defaults.", e)
}
settings = new Settings(defaults.getConfig("opencomputers"))
defaults
}
try { try {
val config = ConfigFactory.parseString(Source.fromFile(file).mkString.replace("\r\n", "\n")).withFallback(defaults)
settings = new Settings(config.getConfig("opencomputers"))
val renderSettings = ConfigRenderOptions.defaults.setJson(false).setOriginComments(false) val renderSettings = ConfigRenderOptions.defaults.setJson(false).setOriginComments(false)
val nl = sys.props("line.separator") val nl = sys.props("line.separator")
val nle = StringEscapeUtils.escapeJava(nl) val nle = StringEscapeUtils.escapeJava(nl)
@ -230,8 +243,7 @@ object Settings {
} }
catch { catch {
case e: Throwable => case e: Throwable =>
OpenComputers.log.warning("Failed loading config, using defaults. The reason was: " + e.getMessage) OpenComputers.log.log(Level.WARNING, "Failed saving config.", e)
settings = new Settings(defaults.getConfig("opencomputers"))
} }
} }
} }

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

@ -4,7 +4,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent
import java.io import java.io
import java.util.logging.Level import java.util.logging.Level
import li.cil.oc.{OpenComputers, Settings} import li.cil.oc.{OpenComputers, Settings}
import net.minecraft.world.{World, ChunkCoordIntPair} import net.minecraft.world.ChunkCoordIntPair
import net.minecraftforge.common.DimensionManager import net.minecraftforge.common.DimensionManager
import net.minecraftforge.event.world.{ChunkDataEvent, WorldEvent} import net.minecraftforge.event.world.{ChunkDataEvent, WorldEvent}
import scala.collection.mutable import scala.collection.mutable