Skip to content

Commit 4f12582

Browse files
committed
moved async worker to public package
1 parent acd210f commit 4f12582

File tree

5 files changed

+24
-13
lines changed

5 files changed

+24
-13
lines changed

src/main/java/com/falsepattern/lib/internal/FalsePatternLib.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,6 @@ public class FalsePatternLib {
5252
@Getter private static final boolean developerEnvironment =
5353
(boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
5454

55-
@Getter
56-
private static final ExecutorService asyncWorker = Executors.newSingleThreadExecutor((runnable) -> {
57-
Thread thread = new Thread(runnable);
58-
thread.setDaemon(true);
59-
thread.setName(Tags.MODNAME + " Async Worker");
60-
return thread;
61-
});
62-
6355
@SidedProxy(clientSide = Tags.GROUPNAME + ".internal.proxy.ClientProxy", serverSide = Tags.GROUPNAME + ".internal.proxy.CommonProxy")
6456
private static CommonProxy proxy;
6557

src/main/java/com/falsepattern/lib/internal/proxy/ClientProxy.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.falsepattern.lib.internal.FalsePatternLib;
44
import com.falsepattern.lib.text.FormattedText;
5+
import com.falsepattern.lib.util.Async;
56
import cpw.mods.fml.common.Loader;
67
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
78
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@@ -33,7 +34,7 @@ public void preInit(FMLPreInitializationEvent e) {
3334
@Override
3435
public void postInit(FMLPostInitializationEvent e) {
3536
super.postInit(e);
36-
chatFuture = FalsePatternLib.getAsyncWorker().submit(() -> {
37+
chatFuture = Async.asyncWorker.submit(() -> {
3738
long start = System.nanoTime();
3839
val updates = updatesFuture.get();
3940
if (updates == null || updates.size() == 0) return null;

src/main/java/com/falsepattern/lib/internal/proxy/CommonProxy.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.falsepattern.lib.internal.Tags;
88
import com.falsepattern.lib.updates.ModUpdateInfo;
99
import com.falsepattern.lib.updates.UpdateChecker;
10+
import com.falsepattern.lib.util.Async;
1011
import cpw.mods.fml.common.event.FMLConstructionEvent;
1112
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
1213
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@@ -35,7 +36,7 @@ public void preInit(FMLPreInitializationEvent e) {
3536
if (LibraryConfig.ENABLE_UPDATE_CHECKER) {
3637
FalsePatternLib.getLog().info("Launching asynchronous update check.");
3738
val updateCheckFuture = UpdateChecker.fetchUpdatesAsync("https://falsepattern.com/mc/versions.json");
38-
updatesFuture = FalsePatternLib.getAsyncWorker().submit(() -> {
39+
updatesFuture = Async.asyncWorker.submit(() -> {
3940
if (!updateCheckFuture.isCancelled()) {
4041
try {
4142
var updates = updateCheckFuture.get();

src/main/java/com/falsepattern/lib/updates/UpdateChecker.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.falsepattern.lib.internal.Internet;
99
import com.falsepattern.lib.internal.LibraryConfig;
1010
import com.falsepattern.lib.internal.Tags;
11+
import com.falsepattern.lib.util.Async;
1112
import cpw.mods.fml.common.Loader;
1213
import lombok.val;
1314

@@ -18,8 +19,6 @@
1819
import java.util.ArrayList;
1920
import java.util.Collections;
2021
import java.util.List;
21-
import java.util.concurrent.ExecutorService;
22-
import java.util.concurrent.Executors;
2322
import java.util.concurrent.Future;
2423
import java.util.concurrent.atomic.AtomicInteger;
2524
import java.util.concurrent.atomic.AtomicReference;
@@ -34,7 +33,7 @@ public class UpdateChecker {
3433
* @return A future that will contain the update info about mods that were both available on the URL and installed
3534
*/
3635
public static Future<List<ModUpdateInfo>> fetchUpdatesAsync(String url) {
37-
return FalsePatternLib.getAsyncWorker().submit(() -> fetchUpdates(url));
36+
return Async.asyncWorker.submit(() -> fetchUpdates(url));
3837
}
3938

4039
/**
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.falsepattern.lib.util;
2+
3+
import com.falsepattern.lib.StableAPI;
4+
import com.falsepattern.lib.internal.Tags;
5+
import lombok.Getter;
6+
7+
import java.util.concurrent.ExecutorService;
8+
import java.util.concurrent.Executors;
9+
10+
@StableAPI(since = "0.8.0")
11+
public class Async {
12+
public static final ExecutorService asyncWorker = Executors.newSingleThreadExecutor((runnable) -> {
13+
Thread thread = new Thread(runnable);
14+
thread.setDaemon(true);
15+
thread.setName(Tags.MODNAME + " Async Worker");
16+
return thread;
17+
});
18+
}

0 commit comments

Comments
 (0)