From 0d71363160327e745170176ba05da71925a5ccaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Wed, 12 Mar 2014 03:59:26 +0100 Subject: [PATCH 1/2] removed accidental scala from prefab in api --- .../java/li/cil/oc/api/prefab/TileEntitySidedEnvironment.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/li/cil/oc/api/prefab/TileEntitySidedEnvironment.java b/src/main/java/li/cil/oc/api/prefab/TileEntitySidedEnvironment.java index 6fbaf2fd8..8e0024181 100644 --- a/src/main/java/li/cil/oc/api/prefab/TileEntitySidedEnvironment.java +++ b/src/main/java/li/cil/oc/api/prefab/TileEntitySidedEnvironment.java @@ -6,7 +6,6 @@ import li.cil.oc.api.network.SidedEnvironment; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import scala.Array; /** * TileEntities can implement the {@link li.cil.oc.api.network.SidedEnvironment} @@ -61,7 +60,7 @@ public abstract class TileEntitySidedEnvironment extends TileEntity implements S * */ protected TileEntitySidedEnvironment(final Node... nodes) { - Array.copy(nodes, 0, this.nodes, 0, Math.min(nodes.length, this.nodes.length)); + System.arraycopy(nodes, 0, this.nodes, 0, Math.min(nodes.length, this.nodes.length)); } // ----------------------------------------------------------------------- // From 8a8a5d6d8613c2d98343c5a214f4a59b2d8a2695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Wed, 12 Mar 2014 06:48:22 +0100 Subject: [PATCH 2/2] fixed comments in config getting duplicated when new settings were added (damn line endings...) --- src/main/scala/li/cil/oc/Settings.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala index b26891fa0..22a9e8635 100644 --- a/src/main/scala/li/cil/oc/Settings.scala +++ b/src/main/scala/li/cil/oc/Settings.scala @@ -6,6 +6,7 @@ import java.io._ import li.cil.oc.util.PackedColor import org.apache.commons.lang3.StringEscapeUtils import scala.collection.convert.WrapAsScala._ +import scala.io.Source class Settings(config: Config) { val itemId = config.getInt("ids.item") @@ -211,12 +212,12 @@ object Settings { // reportedly fixed the problem. val defaults = { val in = classOf[Settings].getResourceAsStream("/reference.conf") - val config = ConfigFactory.parseReader(new BufferedReader(new InputStreamReader(in))) + val config = Source.fromInputStream(in).mkString.replace("\r\n", "\n") in.close() - config + ConfigFactory.parseString(config) } try { - val config = ConfigFactory.parseFile(file).withFallback(defaults) + 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)