diff --git a/build.gradle.kts b/build.gradle.kts index 5384158..ed2718b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,7 @@ val branch = if (!travisBranch.isNullOrBlank()) travisBranch else try { "unknown" } -version = "0.2.11-SNAPSHOT+" + try { +version = "0.2.12-SNAPSHOT+" + try { gitVersion() + "-" + branch } catch (e: Exception) { "unknown" diff --git a/src/main/java/com/github/creeper123123321/viafabric/ViaFabric.java b/src/main/java/com/github/creeper123123321/viafabric/ViaFabric.java index da84254..0c7df3c 100644 --- a/src/main/java/com/github/creeper123123321/viafabric/ViaFabric.java +++ b/src/main/java/com/github/creeper123123321/viafabric/ViaFabric.java @@ -50,6 +50,7 @@ import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.data.MappingDataLoader; import us.myles.ViaVersion.api.protocol.ProtocolRegistry; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; @@ -59,12 +60,14 @@ public class ViaFabric implements ModInitializer { public static final Logger JLOGGER = new JLoggerToLog4j(LogManager.getLogger("ViaFabric")); public static final ExecutorService ASYNC_EXECUTOR; public static final EventLoop EVENT_LOOP; + public static CompletableFuture INIT_FUTURE = new CompletableFuture<>(); public static VRConfig config; static { ThreadFactory factory = new ThreadFactoryBuilder().setDaemon(true).setNameFormat("ViaFabric-%d").build(); ASYNC_EXECUTOR = Executors.newFixedThreadPool(8, factory); EVENT_LOOP = new DefaultEventLoop(factory); + EVENT_LOOP.submit(INIT_FUTURE::join); // https://github.com/ViaVersion/ViaFabric/issues/53 ugly workaround code but works tm } public static String getVersion() { @@ -112,6 +115,8 @@ public class ViaFabric implements ModInitializer { config = new VRConfig(FabricLoader.getInstance().getConfigDirectory().toPath().resolve("ViaFabric") .resolve("viafabric.yml").toFile()); + + INIT_FUTURE.complete(null); } private void registerCommandsV1() {