diff --git a/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java b/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java index 1d33d37c2..dd373e40b 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java +++ b/api/src/main/java/com/viaversion/viaversion/api/data/MappingDataBase.java @@ -68,7 +68,9 @@ public class MappingDataBase implements MappingData { @Override public void load() { - getLogger().info("Loading " + oldVersion + " -> " + newVersion + " mappings..."); + if (Via.getManager().isDebug()) { + getLogger().info("Loading " + oldVersion + " -> " + newVersion + " mappings..."); + } JsonObject diffmapping = hasDiffFile ? loadDiffFile() : null; JsonObject oldMappings = MappingDataLoader.loadData("mapping-" + oldVersion + ".json", true); JsonObject newMappings = MappingDataLoader.loadData("mapping-" + newVersion + ".json", true); diff --git a/bukkit/src/main/java/com/viaversion/viaversion/ViaVersionPlugin.java b/bukkit/src/main/java/com/viaversion/viaversion/ViaVersionPlugin.java index db64e088f..82c96b665 100644 --- a/bukkit/src/main/java/com/viaversion/viaversion/ViaVersionPlugin.java +++ b/bukkit/src/main/java/com/viaversion/viaversion/ViaVersionPlugin.java @@ -87,9 +87,11 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform protocolSupport = Bukkit.getPluginManager().getPlugin("ProtocolSupport") != null; lateBind = !((BukkitViaInjector) Via.getManager().getInjector()).isBinded(); - getLogger().info("ViaVersion " + getDescription().getVersion() + " is now loaded" + (lateBind ? ", waiting for boot. (late-bind)" : ", injecting!")); if (!lateBind) { + getLogger().info("ViaVersion " + getDescription().getVersion() + " is now loaded. Registering protocol transformers and injecting..."); ((ViaManagerImpl) Via.getManager()).init(); + } else { + getLogger().info("ViaVersion " + getDescription().getVersion() + " is now loaded. Waiting for boot (late-bind)."); } } @@ -105,6 +107,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform @Override public void onEnable() { if (lateBind) { + getLogger().info("Registering protocol transformers and injecting..."); ((ViaManagerImpl) Via.getManager()).init(); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java index 691f3a28c..427f1f977 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java +++ b/common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java @@ -126,7 +126,7 @@ public class ProtocolManagerImpl implements ProtocolManager { public ProtocolManagerImpl() { ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("Via-Mappingloader-%d").build(); - mappingLoaderExecutor = new ThreadPoolExecutor(5, 16, 45L, TimeUnit.SECONDS, new SynchronousQueue<>(), threadFactory); + mappingLoaderExecutor = new ThreadPoolExecutor(12, Integer.MAX_VALUE, 30L, TimeUnit.SECONDS, new SynchronousQueue<>(), threadFactory); mappingLoaderExecutor.allowCoreThreadTimeOut(true); } @@ -434,7 +434,9 @@ public class ProtocolManagerImpl implements ProtocolManager { public boolean checkForMappingCompletion() { mappingLoaderLock.readLock().lock(); try { - if (mappingsLoaded) return false; + if (mappingsLoaded) { + return false; + } for (CompletableFuture future : mappingLoaderFutures.values()) { // Return if any future hasn't completed yet