Skip to content

Commit 43606a9

Browse files
committed
Fix: Config comments and hopefully some more things
1 parent b8a6a13 commit 43606a9

File tree

5 files changed

+23
-508
lines changed

5 files changed

+23
-508
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Regardless, if is always best to stay on modern versions that are not riddled wi
6161

6262
## Missing Features
6363
Right now, this fork does not support the following features (that the original plugin *does* support):
64-
- [ ] Proxy support
64+
- [x] Proxy support - VERY EXPERIMENTAL SUPPORT WITH INTERACTIVECHAT PROXY
6565
- [ ] Image file previews from discord
6666

6767
## Built against Spigot

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

+18-17
Original file line numberDiff line numberDiff line change
@@ -184,19 +184,19 @@ public record DiscordCommandsPlayerInfo(
184184
public record DiscordCommandsPlayerOrder(
185185
@Comment(
186186
"""
187-
How should players be ordered in the playerlist?\
187+
How should players be ordered in the playerlist?\n
188188
189-
This list is applied from top to bottom.\
190-
If two players are tied in an ordering type,\
191-
the next one will be applied until the bottom.\
192-
If two players are still tied when all ordering types are exhausted,\
193-
the player's full tablist text component and (then) UUID string will be used to ensure consistent ordering.\
189+
This list is applied from top to bottom.\n
190+
If two players are tied in an ordering type,\n
191+
the next one will be applied until the bottom.\n
192+
If two players are still tied when all ordering types are exhausted,\n
193+
the player's full tablist text component and (then) UUID string will be used to ensure consistent ordering.\n
194194
195-
Available Ordering Types:\
196-
GROUP:<group,group...> (Permission group ordered by the provided ordering)\
197-
PLAYERNAME (Player names ordering from 0 to 9 then A to Z)\
198-
PLAYERNAME_REVERSE (Player names ordering from Z to A then 9 to 0)\
199-
PLACEHOLDER:<placeholder> (Placeholder ordering from small to large numbers then A to Z)\
195+
Available Ordering Types:\n
196+
GROUP:<group,group...> (Permission group ordered by the provided ordering)\n
197+
PLAYERNAME (Player names ordering from 0 to 9 then A to Z)\n
198+
PLAYERNAME_REVERSE (Player names ordering from Z to A then 9 to 0)\n
199+
PLACEHOLDER:<placeholder> (Placeholder ordering from small to large numbers then A to Z)\n
200200
PLACEHOLDER_REVERSE:<placeholder> (Placeholder ordering from Z to A then large to small numbers)"""
201201
) List<String> orderBy
202202
) {}
@@ -285,18 +285,19 @@ public record DiscordMention(
285285
) {}
286286

287287
public record ResourcesAlternateServerResourcePack(
288-
String URL,
289-
String Hash
288+
String url,
289+
String hash
290290
) {}
291291

292292
public record Resources(
293293
@Comment("Which language should be used in places like the item tooltip?\nVisit this page for all the languages that Minecraft offers:\nhttps://minecraft.fandom.com/wiki/Language") String language,
294294
@Comment("Apply the force unicode setting to languages and fonts") boolean forceUnicodeFont,
295295
@Comment("Put the server resource pack from server.properties\nat the top of the resource pack ordering list (if available).") boolean includeServerResourcePack,
296-
@Comment("""
297-
If you are using a custom content plugin such as ItemsAdder, you can configure it to set the server resource pack as that plugin's generated pack.\
298-
You can select which content-plugin's resource pack should be selected.\
299-
Possible Options: ItemsAdder, Nexo, Oraxen, None"""
296+
@Comment(
297+
"If you are using a custom content plugin such as ItemsAdder, you can configure it to set the server resource pack as that plugin's generated pack." +
298+
"You can select which content-plugin's resource pack should be selected." +
299+
"Possible Options: ItemsAdder, Nexo, Oraxen, None." +
300+
"Requires a server restart."
300301
)
301302
String serverResourcePackProvider,
302303
@Comment("Set this option if you want a separate URL as the server resource pack.\nIf the URL is empty, the URL and hash from server.properties will be used.\nIf the hash is empty but URL is not, the resource pack hash will not be checked") ResourcesAlternateServerResourcePack alternateServerResourcePack,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ public static void loadExtras() {
170170
}
171171

172172
public static ServerResourcePackDownloadResult downloadServerResourcePack(File packFolder) {
173-
String url = Config.i().getResources().alternateServerResourcePack().URL();
174-
String hash = Config.i().getResources().alternateServerResourcePack().Hash();
173+
String url = Config.i().getResources().alternateServerResourcePack().url();
174+
String hash = Config.i().getResources().alternateServerResourcePack().hash();
175175

176176
if (!Config.i().getResources().serverResourcePackProvider().equalsIgnoreCase("none")) {
177177
String fetchedPackURL = PackProviderUtils.getResourcePackURL();

0 commit comments

Comments
 (0)