diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala index a74041a5b..868fada16 100644 --- a/src/main/scala/li/cil/oc/Settings.scala +++ b/src/main/scala/li/cil/oc/Settings.scala @@ -395,31 +395,6 @@ object Settings { } private val configPatches = Array( - // Upgrading to version 1.3, increased lower bounds for default RAM sizes - // and reworked the way black- and whitelisting works (IP based). - VersionRange.createFromVersionSpec("[0.0,1.3-alpha)") -> Array( - "computer.ramSizes", - "internet.blacklist", - "internet.whitelist" - ), - // Upgrading to version 1.3.3, default power consumption of chunk loader - // reduced as discussed in #447. - VersionRange.createFromVersionSpec("[1.3.0,1.3.3)") -> Array( - "power.cost.chunkloaderCost" - ), - // Upgrading to version 1.3.4+, computer.debug category was moved to top - // level debug category for more flexibility and some other settings merged - // into that new category. - VersionRange.createFromVersionSpec("1.3.3") -> Array( - "computer.debug", - "misc.alwaysTryNative", - "misc.verbosePersistenceErrors" - ), - // Upgrading to version 1.3.5, added forgotten check for item stack, - // inspection, patch to true to avoid stuff suddenly breaking. - VersionRange.createFromVersionSpec("1.3.4") -> Array( - "misc.allowItemStackInspection" - ), // Upgrading to version 1.4.7, reduce default geolyzer noise. VersionRange.createFromVersionSpec("[0.0, 1.4.7)") -> Array( "misc.geolyzerNoise" diff --git a/src/main/scala/li/cil/oc/common/Proxy.scala b/src/main/scala/li/cil/oc/common/Proxy.scala index a7bcf8d49..fa3b8e787 100644 --- a/src/main/scala/li/cil/oc/common/Proxy.scala +++ b/src/main/scala/li/cil/oc/common/Proxy.scala @@ -95,24 +95,12 @@ class Proxy { // explicit like this, because it makes it a) clearer, b) easier to // extend, in case that should ever be needed. - private val blockRenames = Map( - OpenComputers.ID + ":" + Settings.namespace + "simple" -> "simple", - OpenComputers.ID + ":" + Settings.namespace + "simple_redstone" -> "simple_redstone", - OpenComputers.ID + ":" + Settings.namespace + "special" -> "special", - OpenComputers.ID + ":" + Settings.namespace + "special_redstone" -> "special_redstone", - OpenComputers.ID + ":" + Settings.namespace + "keyboard" -> "keyboard", - OpenComputers.ID + ":rack" -> "serverRack" + // Example usage: OpenComputers.ID + ":rack" -> "serverRack" + private val blockRenames = Map[String, String]( ) - private val itemRenames = Map( - OpenComputers.ID + ":" + Settings.namespace + "item" -> "item", - OpenComputers.ID + ":" + Settings.namespace + "simple" -> "simple", - OpenComputers.ID + ":" + Settings.namespace + "simple_redstone" -> "simple_redstone", - OpenComputers.ID + ":" + Settings.namespace + "special" -> "special", - OpenComputers.ID + ":" + Settings.namespace + "special_redstone" -> "special_redstone", - OpenComputers.ID + ":" + Settings.namespace + "keyboard" -> "keyboard", - OpenComputers.ID + ":rack" -> "serverRack", - OpenComputers.ID + ":appengTunnel" -> "", // Avoid breaking worlds for people that used the dev builds. + // Example usage: OpenComputers.ID + ":tabletCase" -> "tabletCase1" + private val itemRenames = Map[String, String]( OpenComputers.ID + ":microcontrollerCase" -> "microcontrollerCase1", OpenComputers.ID + ":droneCase" -> "droneCase1", OpenComputers.ID + ":tabletCase" -> "tabletCase1"