From 55200608c13ac6d99ed35b779f187832cf1126c7 Mon Sep 17 00:00:00 2001 From: Sn0wStorm Date: Mon, 2 Dec 2019 15:56:30 +0100 Subject: [PATCH] Language Updater: Put new lines at the end --- pom.xml | 4 ++-- resources/plugin.yml | 2 +- src/com/dre/brewery/Barrel.java | 2 +- src/com/dre/brewery/Brew.java | 4 +++- src/com/dre/brewery/P.java | 8 +++++-- .../dre/brewery/filedata/ConfigUpdater.java | 24 ++++++++++++------- .../dre/brewery/filedata/LanguageReader.java | 11 ++++----- 7 files changed, 33 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index fd2ea62..3e214a7 100644 --- a/pom.xml +++ b/pom.xml @@ -3,8 +3,8 @@ 4.0.0 com.dre - brewery - 1.8.2 + Brewery + 1.8.3 Brewery diff --git a/resources/plugin.yml b/resources/plugin.yml index 116b6a4..312b86c 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -1,5 +1,5 @@ name: Brewery -version: 1.8.2 +version: 1.8.3 main: com.dre.brewery.P softdepend: [LWC, LogBlock, WorldGuard, GriefPrevention, Vault, Citadel] authors: [Milan Albrecht, Frank Baumann, ProgrammerDan, Daniel Saukel] diff --git a/src/com/dre/brewery/Barrel.java b/src/com/dre/brewery/Barrel.java index caf3314..e94a680 100644 --- a/src/com/dre/brewery/Barrel.java +++ b/src/com/dre/brewery/Barrel.java @@ -37,7 +37,7 @@ import java.util.Map; public class Barrel implements InventoryHolder { public static List barrels = new ArrayList<>(); - private static int check = 0; + private static int check = 0; // Which Barrel was last checked private final Block spigot; private final BarrelBody body; // The Blocks that make up a Barrel in the World diff --git a/src/com/dre/brewery/Brew.java b/src/com/dre/brewery/Brew.java index 4dbacd7..429d9dc 100644 --- a/src/com/dre/brewery/Brew.java +++ b/src/com/dre/brewery/Brew.java @@ -137,7 +137,6 @@ public class Brew implements Cloneable { item.setItemMeta(meta); } else if (brew != null && brew.needsSave) { // Brew needs saving from a previous format - P.p.debugLog("Brew needs saving from previous format"); if (P.useNBT) { new BrewLore(brew, (PotionMeta) meta).removeLoreData(); P.p.debugLog("removed Data from Lore"); @@ -823,13 +822,16 @@ public class Brew implements Cloneable { XORUnscrambleStream.SuccessType successType = unscrambler.getSuccessType(); if (successType == XORUnscrambleStream.SuccessType.PREV_SEED) { + P.p.debugLog("Converting Brew from previous Seed"); brew.setNeedsSave(true); } else if (BConfig.enableEncode != (successType == XORUnscrambleStream.SuccessType.MAIN_SEED)) { // We have either enabled encode and the data was not encoded or the other way round + P.p.debugLog("Converting Brew to new encode setting"); brew.setNeedsSave(true); } else if (P.useNBT && itemLoadStream instanceof Base91DecoderStream) { // We are on a version that supports nbt but the data is still in the lore of the item // Just save it again so that it gets saved to nbt + P.p.debugLog("Converting Brew to NBT"); brew.setNeedsSave(true); } return brew; diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java index 26ccc6f..e3020f5 100644 --- a/src/com/dre/brewery/P.java +++ b/src/com/dre/brewery/P.java @@ -13,6 +13,7 @@ import com.dre.brewery.recipe.BRecipe; import com.dre.brewery.utility.BUtil; import com.dre.brewery.utility.LegacyUtil; import org.apache.commons.lang.math.NumberUtils; +import org.bstats.bukkit.Metrics; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -22,6 +23,9 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.event.HandlerList; import org.bukkit.plugin.java.JavaPlugin; +import java.util.HashMap; +import java.util.Map; + public class P extends JavaPlugin { public static P p; public static boolean debug; @@ -220,7 +224,7 @@ public class P extends JavaPlugin { } private void setupMetrics() { - /*try { + try { Metrics metrics = new Metrics(this); metrics.addCustomChart(new Metrics.SingleLineChart("drunk_players", BPlayer::numDrunkPlayers)); metrics.addCustomChart(new Metrics.SingleLineChart("brews_in_existence", () -> brewsCreated)); @@ -321,7 +325,7 @@ public class P extends JavaPlugin { })); } catch (Throwable e) { e.printStackTrace(); - }*/ + } } public void metricsForCreate(boolean byCmd) { diff --git a/src/com/dre/brewery/filedata/ConfigUpdater.java b/src/com/dre/brewery/filedata/ConfigUpdater.java index 2e955fd..d4fbba7 100644 --- a/src/com/dre/brewery/filedata/ConfigUpdater.java +++ b/src/com/dre/brewery/filedata/ConfigUpdater.java @@ -1297,9 +1297,11 @@ public class ConfigUpdater { "enableEncode: false", "encodeKey: 0"); - addLinesAt(new String[] {"autosave:", "version:"}, 1, "", - "# Debug Nachrichten im Log anzeigen [false]", - "debug: false"); + if (indexOfStart("debug:") == -1) { + addLinesAt(new String[]{"autosave:", "version:"}, 1, "", + "# Debug Nachrichten im Log anzeigen [false]", + "debug: false"); + } index = indexOfStart("oldMat:") + 1; if (index == 0) { @@ -1396,9 +1398,11 @@ public class ConfigUpdater { "enableEncode: false", "encodeKey: 0"); - addLinesAt(new String[] {"autosave:", "version:"}, 1, "", - "# Show debug messages in log [false]", - "debug: false"); + if (indexOfStart("debug:") == -1) { + addLinesAt(new String[]{"autosave:", "version:"}, 1, "", + "# Show debug messages in log [false]", + "debug: false"); + } index = indexOfStart("oldMat:") + 1; if (index == 0) { @@ -1495,9 +1499,11 @@ public class ConfigUpdater { "enableEncode: false", "encodeKey: 0"); - addLinesAt(new String[] {"autosave:", "version:"}, 1, "", - "# Show debug messages in log [false]", - "debug: false"); + if (indexOfStart("debug:") == -1) { + addLinesAt(new String[]{"autosave:", "version:"}, 1, "", + "# Show debug messages in log [false]", + "debug: false"); + } index = indexOfStart("oldMat:") + 1; if (index == 0) { diff --git a/src/com/dre/brewery/filedata/LanguageReader.java b/src/com/dre/brewery/filedata/LanguageReader.java index 2b2655b..2f5e2a7 100644 --- a/src/com/dre/brewery/filedata/LanguageReader.java +++ b/src/com/dre/brewery/filedata/LanguageReader.java @@ -38,7 +38,6 @@ public class LanguageReader { private void check(String defaultPath) { FileConfiguration defaults = null; ConfigUpdater updater = null; - int i = 0; String line; InputStream resource = P.p.getResource(defaultPath); if (resource == null) return; @@ -46,18 +45,18 @@ public class LanguageReader { while ((line = reader.readLine()) != null) { int index = line.indexOf(':'); if (index != -1) { - line = line.substring(0, index); - if (!entries.containsKey(line)) { + String key = line.substring(0, index); + if (!entries.containsKey(key)) { if (defaults == null) { defaults = new YamlConfiguration(); defaults.load(new BufferedReader(new InputStreamReader(Objects.requireNonNull(P.p.getResource(defaultPath))))); updater = new ConfigUpdater(file); + updater.appendLines("", "# Updated"); } - entries.put(line, defaults.getString(line)); - updater.addLines(i, line + ": '" + entries.get(line) + "'"); + entries.put(key, defaults.getString(key)); + updater.appendLines(line); } } - i++; } if (updater != null) { createBackup();