From 167189c06497fafb61475bce7d2a991ca15a5250 Mon Sep 17 00:00:00 2001 From: CmdrKittens <52665651+CmdrKittens@users.noreply.github.com> Date: Thu, 9 Apr 2020 00:30:07 -0400 Subject: [PATCH] Apply customizations to config lib --- .../lib/com/typesafe/config/impl/SimpleConfigList.java | 8 ++++++++ .../lib/com/typesafe/config/impl/SimpleConfigObject.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/SimpleConfigList.java b/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/SimpleConfigList.java index 5007d9c..f467081 100644 --- a/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/SimpleConfigList.java +++ b/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/SimpleConfigList.java @@ -209,7 +209,9 @@ final class SimpleConfigList extends AbstractConfigValue implements ConfigList, sb.append("["); if (options.getFormatted()) sb.append('\n'); + int count = 0; for (AbstractConfigValue v : value) { + count++; if (options.getOriginComments()) { String[] lines = v.origin().description().split("\n"); for (String l : lines) { @@ -222,6 +224,12 @@ final class SimpleConfigList extends AbstractConfigValue implements ConfigList, } } if (options.getComments()) { + if (count > 1) { + sb.append('\n'); + if (!v.origin().comments().isEmpty()) { + sb.append('\n'); + } + } for (String comment : v.origin().comments()) { indent(sb, indent + 1, options); sb.append("# "); diff --git a/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/SimpleConfigObject.java b/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/SimpleConfigObject.java index 0e79c76..381d940 100644 --- a/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/SimpleConfigObject.java +++ b/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/SimpleConfigObject.java @@ -481,7 +481,9 @@ final class SimpleConfigObject extends AbstractConfigObject implements Serializa int separatorCount = 0; String[] keys = keySet().toArray(new String[size()]); Arrays.sort(keys, new RenderComparator()); + int count = 0; for (String k : keys) { + count++; AbstractConfigValue v; v = value.get(k); @@ -497,6 +499,12 @@ final class SimpleConfigObject extends AbstractConfigObject implements Serializa } } if (options.getComments()) { + if (count > 1) { + sb.append('\n'); + if (!v.origin().comments().isEmpty()) { + sb.append('\n'); + } + } for (String comment : v.origin().comments()) { indent(sb, innerIndent, options); sb.append("#");