Skip to content

Commit 419572c

Browse files
committed
Fix: Config initialisation & process additionalRGBFormats before creating unknownReplaceItem
1 parent 96c8539 commit 419572c

File tree

5 files changed

+20
-19
lines changed

5 files changed

+20
-19
lines changed

abstraction/src/main/java/com/loohp/multichatdiscordsrvaddon/config/Config.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
@Configuration
2121
public class Config {
2222

23-
private static final YamlConfigurationProperties properties = YamlConfigurationProperties.newBuilder()
24-
.setNameFormatter(NameFormatters.IDENTITY)
23+
private static final YamlConfigurationProperties properties = ConfigLib.BUKKIT_DEFAULT_PROPERTIES.toBuilder()
24+
.setNameFormatter(NameFormatters.LOWER_KEBAB_CASE)
2525
.charset(StandardCharsets.UTF_8)
2626
.build();
2727

@@ -763,14 +763,16 @@ public static Config i() {
763763
}
764764

765765
public void saveConfig() {
766-
YamlConfigurations.save(new File(cachedDataFolder, "config.yml").toPath(), Config.class, this);
766+
YamlConfigurations.save(new File(cachedDataFolder, "config.yml").toPath(), Config.class, this, properties);
767767
}
768768

769769
public static void saveConfig(File dataFolder) {
770-
YamlConfigurations.save(new File(dataFolder, "config.yml").toPath(), Config.class, new Config());
770+
cachedDataFolder = dataFolder;
771+
YamlConfigurations.save(new File(dataFolder, "config.yml").toPath(), Config.class, new Config(), properties);
771772
}
772773

773774
public void reload(File dataFolder) {
775+
cachedDataFolder = dataFolder;
774776
instance = YamlConfigurations.load(new File(dataFolder, "config.yml").toPath(), Config.class, properties);
775777
}
776778
}

common/pom.xml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@
114114
<pattern>com.loohp.blockmodelrenderer</pattern>
115115
<shadedPattern>com.loohp.multichatdiscordsrvaddon.libs.com.loohp.blockmodelrenderer</shadedPattern>
116116
</relocation>
117-
<relocation>
118-
<pattern>me.lucko.jarrelocator</pattern>
119-
<shadedPattern>com.loohp.multichatdiscordsrvaddon.libs.me.lucko.jarrelocator</shadedPattern>
120-
</relocation>
121117
<relocation>
122118
<pattern>com.ibm.icu</pattern>
123119
<shadedPattern>com.loohp.multichatdiscordsrvaddon.libs.com.ibm.icu</shadedPattern>
@@ -437,7 +433,7 @@
437433
<groupId>me.lucko</groupId>
438434
<artifactId>jar-relocator</artifactId>
439435
<version>1.7</version>
440-
<scope>compile</scope>
436+
<scope>provided</scope>
441437
</dependency>
442438
<dependency>
443439
<groupId>org.incendo</groupId>
@@ -583,5 +579,12 @@
583579
<version>8.5.15</version>
584580
<scope>provided</scope>
585581
</dependency>
582+
583+
<dependency>
584+
<groupId>net.kyori</groupId>
585+
<artifactId>adventure-text-minimessage</artifactId>
586+
<version>4.18.0</version>
587+
<scope>provided</scope>
588+
</dependency>
586589
</dependencies>
587590
</project>

common/src/main/java/com/loohp/multichatdiscordsrvaddon/MultiChatDiscordSrvAddon.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,8 @@ public void processConfigs() {
337337
resourceOrder.add(pack);
338338
}
339339

340+
additionalRGBFormats = Config.i().getSettings().formattingTags().additionalRGBFormats().stream().map(Pattern::compile).collect(Collectors.toList());
341+
340342
try {
341343
ItemStack unknown = new ItemStack(Material.valueOf(Config.i().getSettings().unknownItem().replaceItem().toUpperCase()));
342344
ItemMeta meta = unknown.getItemMeta();
@@ -354,8 +356,6 @@ public void processConfigs() {
354356
this.unknownReplaceItem = unknown;
355357
}
356358

357-
additionalRGBFormats = Config.i().getSettings().formattingTags().additionalRGBFormats().stream().map(each -> Pattern.compile(each)).collect(Collectors.toList());
358-
359359
LanguageUtils.loadTranslations(Config.i().getResources().language());
360360

361361
Pattern itemPlaceholderPattern = Pattern.compile(Config.i().getPlaceholders().item());

common/src/main/resources/plugin.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@ libraries:
4040
- org.checkerframework:checker:3.48.4
4141
- com.intellij:forms_rt:7.0.3
4242
- com.googlecode.json-simple:json-simple:1.1.1
43-
- de.exlll:configlib-yaml:4.5.0
44-
- it.unimi.dsi:fastutil:8.5.15
43+
- de.exlll:configlib-paper:4.5.0
44+
- it.unimi.dsi:fastutil:8.5.15
45+
- me.lucko:jar-relocator:1.7

pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
<groupId>net.kyori</groupId>
131131
<artifactId>adventure-text-minimessage</artifactId>
132132
<version>4.18.0</version>
133+
<scope>provided</scope>
133134
</dependency>
134135
<dependency>
135136
<groupId>us.dynmap</groupId>
@@ -155,12 +156,6 @@
155156
<version>4.3.4</version>
156157
<scope>provided</scope>
157158
</dependency>
158-
<dependency>
159-
<groupId>de.exlll</groupId>
160-
<artifactId>configlib-yaml</artifactId>
161-
<version>4.5.0</version>
162-
<scope>provided</scope>
163-
</dependency>
164159
<dependency>
165160
<groupId>de.exlll</groupId>
166161
<artifactId>configlib-paper</artifactId>

0 commit comments

Comments
 (0)