Initial preparations for changes in The Great Convergence

Cervator · Oct 20, 2013 · 7fd4c76 · 7fd4c76
1 parent 7bbb1b9
commit 7fd4c76
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ Terasology Launcher - ChangeLog
 * Gradle update (1.4 -> 1.8)
 * Added java source code check tool 'PMD'
 * Cancel game download
+* Changes TerasologyMulti to a legacy option for pre-multiplayer
+    * STABLE : TerasologyLegacy (legacy, pre-multiplayer)
 
 
 ## 1.0.0 (2013-07-22)

diff --git a/src/main/java/org/terasology/launcher/util/DirectoryUtils.java b/src/main/java/org/terasology/launcher/util/DirectoryUtils.java
@@ -52,6 +52,7 @@ public static boolean containsGameData(final File gameInstallationPath) {
             return false;
         }
 
+        // TODO: Might need to add "saves" here?
         final File[] files = gameInstallationPath.listFiles();
         if ((files != null) && (files.length > 0)) {
             for (File child : files) {

diff --git a/src/main/java/org/terasology/launcher/util/DownloadUtils.java b/src/main/java/org/terasology/launcher/util/DownloadUtils.java
@@ -43,6 +43,7 @@ public final class DownloadUtils {
 
     public static final String TERASOLOGY_LAUNCHER_NIGHTLY_JOB_NAME = "TerasologyLauncherNightly";
 
+    // TODO: This changes in the restructure (facades/PC/build/distributions/). Yet stays the same in stable/legacy. Wait or support both?
     public static final String FILE_TERASOLOGY_GAME_ZIP = "distributions/Terasology.zip";
     public static final String FILE_TERASOLOGY_LAUNCHER_ZIP = "distributions/TerasologyLauncher.zip";
     private static final String FILE_TERASOLOGY_GAME_VERSION_INFO =

diff --git a/src/main/java/org/terasology/launcher/version/GameJob.java b/src/main/java/org/terasology/launcher/version/GameJob.java
@@ -24,7 +24,7 @@ public enum GameJob {
     Terasology("develop", 245, 9, false, "NIGHTLY",
         "infoHeader1_Terasology", "settings_game_buildType_Terasology"),
 
-    TerasologyMulti("multiplayer", 1, 9, false, "NIGHTLY",
+    TerasologyLegacy("legacy", 1, 9, false, "STABLE",
         "infoHeader1_TerasologyMulti", "settings_game_buildType_TerasologyMulti");
 
     private final String gitBranch;

diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_de.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_de.properties
@@ -56,7 +56,7 @@ message_update_launcher=Eine neue Launcher-Version ist verf\u00fcgbar.\nDas Inst
 message_update_launcher_title=Launcher-Aktualisierung verf\u00fcgbar\!
 settings_cancel=Abbrechen
 settings_game_buildType_Terasology=Entwicklungsversionen
-settings_game_buildType_TerasologyMulti=Entwicklungsversionen (MultiPlayer)
+settings_game_buildType_TerasologyMulti=Stabile Versionen (Legacy)
 settings_game_buildType_TerasologyStable=Stabile Versionen
 settings_game_buildVersion=Version
 settings_game_buildVersion_installed=installiert

diff --git a/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_en.properties b/src/main/resources/org/terasology/launcher/bundle/LabelsBundle_en.properties
@@ -56,7 +56,7 @@ message_update_launcher=A launcher update is available.\nThe installation direct
 message_update_launcher_title=Launcher update available\!
 settings_cancel=Cancel
 settings_game_buildType_Terasology=Development versions
-settings_game_buildType_TerasologyMulti=Development versions (multiplayer)
+settings_game_buildType_TerasologyMulti=Stable versions (legacy)
 settings_game_buildType_TerasologyStable=Stable versions
 settings_game_buildVersion=Version
 settings_game_buildVersion_installed=installed

diff --git a/src/main/resources/org/terasology/launcher/bundle/MessageBundle_de.properties b/src/main/resources/org/terasology/launcher/bundle/MessageBundle_de.properties
@@ -1,6 +1,6 @@
 confirmDeleteGame_withData=Das Verzeichnis enth\u00e4lt Spieldaten. Wollen Sie das Verzeichnis trotzdem l\u00f6schen?\n{0}
 confirmDeleteGame_withoutData=Wollen Sie das Verzeichnis l\u00f6schen?\n{0}
 infoHeader1_Terasology={4,choice,0\#Entwicklungsversion|1\#Neuste Entwicklungsversion}
-infoHeader1_TerasologyMulti={4,choice,0\#Entwicklungsversion (MultiPlayer)|1\#Neuste Entwicklungsversion (MultiPlayer)}
+infoHeader1_TerasologyMulti={4,choice,0\#Stabile Version (Legacy)|1\#Stabile Version (Vor MultiPlayer)}
 infoHeader1_TerasologyStable={4,choice,0\#Stabile Version|1\#Neuste stabile Version}
 infoHeader2=\#{3} {7} {8} {5,choice,0\#|1\#- installiert}
diff --git a/src/main/resources/org/terasology/launcher/bundle/MessageBundle_en.properties b/src/main/resources/org/terasology/launcher/bundle/MessageBundle_en.properties
@@ -1,6 +1,6 @@
 confirmDeleteGame_withData=Game directory contains data. Do you want to delete the directory anyway?\n{0}
 confirmDeleteGame_withoutData=Do you want to delete the directory?\n{0}
 infoHeader1_Terasology={4,choice,0\#Development version|1\#Latest development version}
-infoHeader1_TerasologyMulti={4,choice,0\#Development version (multiplayer)|1\#Latest development version (multiplayer)}
+infoHeader1_TerasologyMulti={4,choice,0\#Stable version (legacy)|1\#Legacy version (pre-multiplayer)}
 infoHeader1_TerasologyStable={4,choice,0\#Stable Version|1\#Latest stable version}
 infoHeader2=\#{3} {7} {8} {5,choice,0\#|1\#- installed}