big-duckie/omega-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixes multi-line comments breaking

Browse Source
This commit is contained in:
adrianoy
2021-07-28 03:38:36 -03:00
parent 48f5962f57
commit 3da79e7860
2 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
omega-config-base/src/main/java/draylar/omegaconfig/OmegaConfig.java
+17 -3
View File
@@ -123,11 +123,25 @@ public class OmegaConfig {
// Check if we should insert comment // Check if we should insert comment
for (Map.Entry<String, String> entry : keyToComments.entrySet()) { for (Map.Entry<String, String> entry : keyToComments.entrySet()) {
String key = entry.getKey();
String comment = entry.getValue(); String comment = entry.getValue();
if (at.trim().startsWith(String.format("\"%s\"", key))) { if (at.trim().startsWith(String.format("\"%s\"", entry.getKey()))) {
insertions.put(i + insertions.size(), String.format("%s//%s", getStartingWhitespace(at), comment)); if (comment.contains("\n")) {
String[] comments = comment.split("\n");
StringBuilder builder = new StringBuilder();
for (int j = 0; j < comments.length; j++) {
builder.append(String.format("%s//%s", getStartingWhitespace(at), comments[j]));
if (j != comments.length - 1) {
builder.append("\n");
}
}
comment = builder.toString();
} else {
comment = String.format("%s//%s", getStartingWhitespace(at), comment);
}
insertions.put(i + insertions.size(), comment);
break; break;
} }
} }
src/testmod/java/draylar/omegatest/config/StructuresConfigTest.java
+10 -10
View File
@@ -13,16 +13,16 @@ public class StructuresConfigTest implements Config {
@Comment(""" @Comment("""
Welcome to Mo'Structures Config! Welcome to Mo'Structures Config!
//
// Here, you can turn off structures, change their chance, and also change their salt. Here, you can turn off structures, change their chance, and also change their salt.
//
// To turn off a structure, simply go to the corresponding entry and set `activated` to false. To turn off a structure, simply go to the corresponding entry and set `activated` to false.
//
// Mo' Structures uses the vanilla structure spawning system. That is- Mo' Structures uses the vanilla structure spawning system. That is-
// - Seperation is the minimum chunks between structures - Seperation is the minimum chunks between structures
// - Spacing is the average chunks between structures - Spacing is the average chunks between structures
//
// Salt is a special field that gives structures unique spawning positions. DO NOT TOUCH IT, ONLY ADVANCED TROUBLESHOOTING! Salt is a special field that gives structures unique spawning positions. DO NOT TOUCH IT, ONLY ADVANCED TROUBLESHOOTING!
""") """)
public final Map<String, StructureConfigEntry> structureConfigEntries = new HashMap<>(17); public final Map<String, StructureConfigEntry> structureConfigEntries = new HashMap<>(17);