Skip to content

Commit eceb468

Browse files
committed
Merge remote-tracking branch 'origin/threadssssssssss' into dev
2 parents ad3ab2b + a84931c commit eceb468

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/main/java/glowredman/defaultserverlist/Config.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class Config {
4141
* spotless:on
4242
*/
4343

44-
public static void init(File configDir) {
44+
static synchronized void init(File configDir) {
4545

4646
// Setup
4747
File configFile = new File(configDir, "defaultserverlist.cfg");
@@ -98,6 +98,8 @@ public static void init(File configDir) {
9898
// Fetch servers from the specified remote location.
9999
if (useURL) {
100100
try {
101+
LoadingPlugin.LOGGER.info("Attempting to load servers from remote location...");
102+
101103
// servers that are currently at the remote location
102104
Map<String, String> remoteDefaultServers = gson.fromJson(
103105
IOUtils.toString(new URL(url), StandardCharsets.UTF_8),
@@ -106,6 +108,8 @@ public static void init(File configDir) {
106108
private static final long serialVersionUID = -1786059589535074931L;
107109
}.getType());
108110

111+
LoadingPlugin.LOGGER.info("Successfully fetched {} servers from {}", remoteDefaultServers.size(), url);
112+
109113
if (allowModifications) {
110114
// servers that were added to the remote location since the last time the list was fetched
111115
Map<String, String> diff = new LinkedHashMap<>();
@@ -168,7 +172,7 @@ private static Map<String, String> toMap(String[] array) {
168172
return map;
169173
}
170174

171-
public static void saveServers(String[] servers) {
175+
public static synchronized void saveServers(String[] servers) {
172176
setStringList("servers", servers);
173177
config.save();
174178
}

src/main/java/glowredman/defaultserverlist/ModContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ public boolean registerBus(EventBus bus, LoadController controller) {
5454

5555
@Subscribe
5656
public void preInit(FMLPreInitializationEvent event) {
57-
Config.init(event.getModConfigurationDirectory());
57+
new Thread(() -> Config.init(event.getModConfigurationDirectory()), "DSL Config Thread").start();;
5858
}
5959
}

0 commit comments

Comments
 (0)