From f736a6e331270b0cad8e1babccc05f9f466f2a22 Mon Sep 17 00:00:00 2001 From: Daniel Saukel Date: Fri, 21 Sep 2018 22:10:07 +0200 Subject: [PATCH] Load 1.13 configs in 1.13+ and 1.12 configs in 1.12- --- resources/config/v12/de/config.yml | 2 +- resources/config/v12/en/config.yml | 2 +- resources/config/v12/fr/config.yml | 2 +- resources/config/v12/it/config.yml | 2 +- resources/config/v13/de/config.yml | 2 +- resources/config/v13/en/config.yml | 2 +- resources/config/v13/fr/config.yml | 2 +- resources/config/v13/it/config.yml | 2 +- src/com/dre/brewery/P.java | 6 +++--- src/com/dre/brewery/filedata/ConfigUpdater.java | 6 +++++- 10 files changed, 16 insertions(+), 12 deletions(-) diff --git a/resources/config/v12/de/config.yml b/resources/config/v12/de/config.yml index 06b6768..54183f2 100644 --- a/resources/config/v12/de/config.yml +++ b/resources/config/v12/de/config.yml @@ -65,7 +65,7 @@ updateCheck: true autosave: 3 # Config Version -version: '1.5' +version: '1.6' # -- Rezepte für Getränke -- diff --git a/resources/config/v12/en/config.yml b/resources/config/v12/en/config.yml index 2460954..47dec75 100644 --- a/resources/config/v12/en/config.yml +++ b/resources/config/v12/en/config.yml @@ -62,7 +62,7 @@ updateCheck: true autosave: 3 # Config Version -version: '1.5' +version: '1.6' # -- Recipes for Potions -- diff --git a/resources/config/v12/fr/config.yml b/resources/config/v12/fr/config.yml index e9d83d7..9353ccb 100644 --- a/resources/config/v12/fr/config.yml +++ b/resources/config/v12/fr/config.yml @@ -62,7 +62,7 @@ updateCheck: true autosave: 3 # Version de configuration -version: '1.5' +version: '1.6' # -- Recette pour les boissons -- diff --git a/resources/config/v12/it/config.yml b/resources/config/v12/it/config.yml index 591a76b..d168625 100644 --- a/resources/config/v12/it/config.yml +++ b/resources/config/v12/it/config.yml @@ -62,7 +62,7 @@ updateCheck: true autosave: 3 # Versione del config -version: '1.5' +version: '1.6' # -- Ricette per pozioni -- diff --git a/resources/config/v13/de/config.yml b/resources/config/v13/de/config.yml index 908dbf2..edd0e11 100644 --- a/resources/config/v13/de/config.yml +++ b/resources/config/v13/de/config.yml @@ -65,7 +65,7 @@ updateCheck: true autosave: 3 # Config Version -version: '1.5' +version: '1.6' # -- Rezepte für Getränke -- diff --git a/resources/config/v13/en/config.yml b/resources/config/v13/en/config.yml index a7acf83..d931e10 100644 --- a/resources/config/v13/en/config.yml +++ b/resources/config/v13/en/config.yml @@ -62,7 +62,7 @@ updateCheck: true autosave: 3 # Config Version -version: '1.5' +version: '1.6' # -- Recipes for Potions -- diff --git a/resources/config/v13/fr/config.yml b/resources/config/v13/fr/config.yml index b798885..3ffb606 100644 --- a/resources/config/v13/fr/config.yml +++ b/resources/config/v13/fr/config.yml @@ -62,7 +62,7 @@ updateCheck: true autosave: 3 # Version de configuration -version: '1.5' +version: '1.6' # -- Recette pour les boissons -- diff --git a/resources/config/v13/it/config.yml b/resources/config/v13/it/config.yml index b207098..972b72e 100644 --- a/resources/config/v13/it/config.yml +++ b/resources/config/v13/it/config.yml @@ -62,7 +62,7 @@ updateCheck: true autosave: 3 # Versione del config -version: '1.5' +version: '1.6' # -- Ricette per pozioni -- diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java index 9c3de8d..be60092 100644 --- a/src/com/dre/brewery/P.java +++ b/src/com/dre/brewery/P.java @@ -37,7 +37,7 @@ import org.bukkit.plugin.java.JavaPlugin; public class P extends JavaPlugin { public static P p; - public static final String configVersion = "1.5"; + public static final String configVersion = "1.6"; public static boolean debug; public static boolean useUUID; public static boolean use1_9; @@ -606,7 +606,7 @@ public class P extends JavaPlugin { if (!cfg.exists()) { errorLog("No config.yml found, creating default file! You may want to choose a config according to your language!"); errorLog("You can find them in plugins/Brewery/configs/"); - InputStream defconf = getResource("config/en/config.yml"); + InputStream defconf = getResource("config/" + (use1_13 ? "v13/" : "v12/") + "en/config.yml"); if (defconf == null) { errorLog("default config file not found, your jarfile may be corrupt. Disabling Brewery!"); return false; @@ -633,7 +633,7 @@ public class P extends JavaPlugin { for (String l : new String[] {"de", "en", "fr", "it"}) { File lfold = new File(configs, l); try { - saveFile(getResource("config/" + l + "/config.yml"), lfold, "config.yml", overwrite); + saveFile(getResource("config/" + (use1_13 ? "v13/" : "v12/") + l + "/config.yml"), lfold, "config.yml", overwrite); saveFile(getResource("languages/" + l + ".yml"), languages, l + ".yml", false); // Never overwrite languages for now } catch (IOException e) { e.printStackTrace(); diff --git a/src/com/dre/brewery/filedata/ConfigUpdater.java b/src/com/dre/brewery/filedata/ConfigUpdater.java index c168846..6cb8ebb 100644 --- a/src/com/dre/brewery/filedata/ConfigUpdater.java +++ b/src/com/dre/brewery/filedata/ConfigUpdater.java @@ -144,7 +144,11 @@ public class ConfigUpdater { fromVersion = "1.5"; } - if (!fromVersion.equals("1.5")) { + if (fromVersion.equals("1.5")) { + fromVersion = "1.6"; + } + + if (!fromVersion.equals("1.6")) { P.p.log(P.p.languageReader.get("Error_ConfigUpdate", fromVersion)); return; }