Removed some very old config and block/item name patches. When directly upgrading from versions that old, stuff would break anyway.

This commit is contained in:
Florian Nücke 2015-02-03 21:24:19 +01:00
parent 82ab190544
commit 38bd133d1e
2 changed files with 4 additions and 41 deletions

View File

@ -395,31 +395,6 @@ object Settings {
} }
private val configPatches = Array( 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. // Upgrading to version 1.4.7, reduce default geolyzer noise.
VersionRange.createFromVersionSpec("[0.0, 1.4.7)") -> Array( VersionRange.createFromVersionSpec("[0.0, 1.4.7)") -> Array(
"misc.geolyzerNoise" "misc.geolyzerNoise"

View File

@ -95,24 +95,12 @@ class Proxy {
// explicit like this, because it makes it a) clearer, b) easier to // explicit like this, because it makes it a) clearer, b) easier to
// extend, in case that should ever be needed. // extend, in case that should ever be needed.
private val blockRenames = Map( // Example usage: OpenComputers.ID + ":rack" -> "serverRack"
OpenComputers.ID + ":" + Settings.namespace + "simple" -> "simple", private val blockRenames = Map[String, String](
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"
) )
private val itemRenames = Map( // Example usage: OpenComputers.ID + ":tabletCase" -> "tabletCase1"
OpenComputers.ID + ":" + Settings.namespace + "item" -> "item", private val itemRenames = Map[String, String](
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.
OpenComputers.ID + ":microcontrollerCase" -> "microcontrollerCase1", OpenComputers.ID + ":microcontrollerCase" -> "microcontrollerCase1",
OpenComputers.ID + ":droneCase" -> "droneCase1", OpenComputers.ID + ":droneCase" -> "droneCase1",
OpenComputers.ID + ":tabletCase" -> "tabletCase1" OpenComputers.ID + ":tabletCase" -> "tabletCase1"