Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support Folia (leaf's region threaded Paper fork)

This commit is contained in:
Nassim Jahnke 2023-03-10 12:20:02 +01:00
parent 2ee2819759
commit 7c9c602cec
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
22 changed files with 448 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java
View File

@ -63,7 +63,7 @@ public interface ViaAPI<T> {
* @return API version incremented with meaningful API changes
*/
default int apiVersion() {
return 18;
return 19;
}
/**

8
api/src/main/java/com/viaversion/viaversion/api/ViaManager.java
View File

@ -30,6 +30,7 @@ import com.viaversion.viaversion.api.platform.ViaPlatform;
import com.viaversion.viaversion.api.platform.ViaPlatformLoader;
import com.viaversion.viaversion.api.platform.providers.ViaProviders;
import com.viaversion.viaversion.api.protocol.ProtocolManager;
import com.viaversion.viaversion.api.scheduler.Scheduler;
import java.util.Set;
public interface ViaManager {
@ -83,6 +84,13 @@ public interface ViaManager {
*/
ViaPlatformLoader getLoader();
/**
* Returns the async task scheduler.
*
* @return async task scheduler
*/
Scheduler getScheduler();
/**
* If debug is enabled, packets and other otherwise suppressed warnings will be logged.
*

1
api/src/main/java/com/viaversion/viaversion/api/platform/PlatformTask.java
View File

@ -35,6 +35,7 @@ public interface PlatformTask<T> {
*
* @return platform based object, or null if not tracked/cancellable
*/
@Deprecated/*(forRemoval = true)*/
@Nullable T getObject();
/**

10
api/src/main/java/com/viaversion/viaversion/api/platform/ViaPlatform.java
View File

@ -86,6 +86,15 @@ public interface ViaPlatform<T> {
*/
PlatformTask runAsync(Runnable runnable);
/**
* Run a task async at a repeating interval.
*
* @param runnable The task to run
* @param ticks The interval to run it at
* @return The Task ID
*/
PlatformTask runRepeatingAsync(Runnable runnable, long ticks);
/**
* Run a task Sync
*
@ -106,7 +115,6 @@ public interface ViaPlatform<T> {
/**
* Run a task at a repeating interval.
* Initial interval is the same as repeat.
*
* @param runnable The task to run
* @param ticks The interval to run it at

59
api/src/main/java/com/viaversion/viaversion/api/scheduler/Scheduler.java Normal file
View File

@ -0,0 +1,59 @@
/*
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
* Copyright (C) 2023-2023 ViaVersion and contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.viaversion.viaversion.api.scheduler;
import java.util.concurrent.TimeUnit;
public interface Scheduler {
/**
* Executes the given runnable asynchronously.
*
* @param runnable runnable to execute
*/
Task execute(Runnable runnable);
/**
* Schedules the given runnable to be executed asynchronously after the given delay.
*
* @param runnable runnable to execute
* @param delay delay before execution
* @param timeUnit time unit of the delay
*/
Task schedule(Runnable runnable, long delay, TimeUnit timeUnit);
/**
* Schedules the given runnable to be executed asynchronously after a delay and then repeatedly with a period.
*
* @param runnable runnable to execute
* @param delay delay before execution
* @param period period between executions
* @param timeUnit time unit of the delay and period
*/
Task scheduleRepeating(Runnable runnable, long delay, long period, TimeUnit timeUnit);
/**
* Shuts down the scheduler and awaits task termination.
*/
void shutdown();
}

38
api/src/main/java/com/viaversion/viaversion/api/scheduler/Task.java Normal file
View File

@ -0,0 +1,38 @@
/*
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
* Copyright (C) 2023 ViaVersion and contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.viaversion.viaversion.api.scheduler;
public interface Task {
/**
* Returns the current status of the task.
*
* @return status of the task
*/
TaskStatus status();
/**
* Cancels the task. This will still let the current task finish if already running.
*/
void cancel();
}

39
api/src/main/java/com/viaversion/viaversion/api/scheduler/TaskStatus.java Normal file
View File

@ -0,0 +1,39 @@
/*
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
* Copyright (C) 2023 ViaVersion and contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package com.viaversion.viaversion.api.scheduler;
public enum TaskStatus {
/**
* The task has been scheduled but not yet started.
*/
SCHEDULED,
/**
* The task is currently running.
*/
RUNNING,
/**
* The task has finished running or has been cancelled.
*/
STOPPED
}

65
bukkit/src/main/java/com/viaversion/viaversion/ViaVersionPlugin.java
View File

@ -32,6 +32,8 @@ import com.viaversion.viaversion.bukkit.platform.BukkitViaConfig;
import com.viaversion.viaversion.bukkit.platform.BukkitViaInjector;
import com.viaversion.viaversion.bukkit.platform.BukkitViaLoader;
import com.viaversion.viaversion.bukkit.platform.BukkitViaTask;
import com.viaversion.viaversion.bukkit.platform.BukkitViaTaskTask;
import com.viaversion.viaversion.bukkit.platform.PaperViaInjector;
import com.viaversion.viaversion.dump.PluginInfo;
import com.viaversion.viaversion.unsupported.UnsupportedPlugin;
import com.viaversion.viaversion.unsupported.UnsupportedServerSoftware;
@ -41,19 +43,22 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform<Player> {
private static final boolean FOLIA = PaperViaInjector.hasClass("io.papermc.paper.threadedregions.RegionisedServer");
private static ViaVersionPlugin instance;
private final BukkitCommandHandler commandHandler;
private final BukkitViaConfig conf;
private final ViaAPI<Player> api = new BukkitViaAPI(this);
private final List<Runnable> queuedTasks = new ArrayList<>();
private final List<Runnable> asyncQueuedTasks = new ArrayList<>();
private boolean protocolSupport;
private boolean lateBind;
@ -91,25 +96,30 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform<Player>
@Override
public void onEnable() {
final ViaManagerImpl manager = (ViaManagerImpl) Via.getManager();
if (lateBind) {
getLogger().info("Registering protocol transformers and injecting...");
((ViaManagerImpl) Via.getManager()).init();
manager.init();
}
if (FOLIA) {
// Use Folia's RegionisedServerInitEvent to run code after the server has loaded
final Class<? extends Event> serverInitEventClass;
try {
//noinspection unchecked
serverInitEventClass = (Class<? extends Event>) Class.forName("io.papermc.paper.threadedregions.RegionisedServerInitEvent");
} catch (final ReflectiveOperationException e) {
throw new RuntimeException(e);
}
getServer().getPluginManager().registerEvent(serverInitEventClass, new Listener() {
}, EventPriority.HIGHEST, (listener, event) -> manager.onServerLoaded(), this);
} else {
manager.onServerLoaded();
}
getCommand("viaversion").setExecutor(commandHandler);
getCommand("viaversion").setTabCompleter(commandHandler);
// Run queued tasks
for (Runnable r : queuedTasks) {
Bukkit.getScheduler().runTask(this, r);
}
queuedTasks.clear();
// Run async queued tasks
for (Runnable r : asyncQueuedTasks) {
Bukkit.getScheduler().runTaskAsynchronously(this, r);
}
asyncQueuedTasks.clear();
}
@Override
@ -134,22 +144,27 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform<Player>
@Override
public PlatformTask runAsync(Runnable runnable) {
if (isPluginEnabled()) {
return new BukkitViaTask(getServer().getScheduler().runTaskAsynchronously(this, runnable));
} else {
asyncQueuedTasks.add(runnable);
return new BukkitViaTask(null);
if (FOLIA) {
return new BukkitViaTaskTask(Via.getManager().getScheduler().execute(runnable));
}
return new BukkitViaTask(getServer().getScheduler().runTaskAsynchronously(this, runnable));
}
@Override
public PlatformTask runRepeatingAsync(final Runnable runnable, final long ticks) {
if (FOLIA) {
return new BukkitViaTaskTask(Via.getManager().getScheduler().schedule(runnable, ticks * 50, TimeUnit.MILLISECONDS));
}
return new BukkitViaTask(getServer().getScheduler().runTaskTimerAsynchronously(this, runnable, 0, ticks));
}
@Override
public PlatformTask runSync(Runnable runnable) {
if (isPluginEnabled()) {
return new BukkitViaTask(getServer().getScheduler().runTask(this, runnable));
} else {
queuedTasks.add(runnable);
return new BukkitViaTask(null);
if (FOLIA) {
// We just need to make sure everything put here is actually thread safe; currently, this is the case, at least on Folia
return runAsync(runnable);
}
return new BukkitViaTask(getServer().getScheduler().runTask(this, runnable));
}
@Override

40
bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaTaskTask.java Normal file
View File

@ -0,0 +1,40 @@
/*
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
* Copyright (C) 2016-2023 ViaVersion and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.viaversion.viaversion.bukkit.platform;
import com.viaversion.viaversion.api.platform.PlatformTask;
import com.viaversion.viaversion.api.scheduler.Task;
import org.checkerframework.checker.nullness.qual.Nullable;
public class BukkitViaTaskTask implements PlatformTask<Task> {
private final Task task;
public BukkitViaTaskTask(final Task task) {
this.task = task;
}
@Override
public @Nullable Task getObject() {
return task;
}
@Override
public void cancel() {
task.cancel();
}
}

2
bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/PaperViaInjector.java
View File

@ -71,7 +71,7 @@ public final class PaperViaInjector {
return hasClass("com.destroystokyo.paper.PaperConfig$PacketLimit") || hasClass("io.papermc.paper.configuration.GlobalConfiguration$PacketLimiter");
}
private static boolean hasClass(final String className) {
public static boolean hasClass(final String className) {
try {
Class.forName(className);
return true;

1
bukkit/src/main/resources/plugin.yml
View File

@ -4,6 +4,7 @@ authors: [ _MylesC, creeper123123321, Gerrygames, kennytv, Matsv ]
version: ${version}
description: ${description}
api-version: 1.13
folia-supported: true
loadbefore: [ ProtocolLib, ProxyPipe, SpigotLib, SkinRestorer ]
softdepend: [ ProtocolSupport, PacketListenerApi ]
commands:

11
bungee/src/main/java/com/viaversion/viaversion/BungeePlugin.java
View File

@ -85,7 +85,9 @@ public class BungeePlugin extends Plugin implements ViaServerProxyPlatform<Proxi
@Override
public void onEnable() {
((ViaManagerImpl) Via.getManager()).init();
final ViaManagerImpl manager = (ViaManagerImpl) Via.getManager();
manager.init();
manager.onServerLoaded();
}
@Override
@ -113,6 +115,11 @@ public class BungeePlugin extends Plugin implements ViaServerProxyPlatform<Proxi
return new BungeeViaTask(getProxy().getScheduler().runAsync(this, runnable));
}
@Override
public PlatformTask runRepeatingAsync(final Runnable runnable, final long ticks) {
return new BungeeViaTask(getProxy().getScheduler().schedule(this, runnable, 0, ticks * 50, TimeUnit.MILLISECONDS));
}
@Override
public PlatformTask runSync(Runnable runnable) {
return runAsync(runnable);
@ -125,7 +132,7 @@ public class BungeePlugin extends Plugin implements ViaServerProxyPlatform<Proxi
@Override
public PlatformTask runRepeatingSync(Runnable runnable, long ticks) {
return new BungeeViaTask(getProxy().getScheduler().schedule(this, runnable, 0, ticks * 50, TimeUnit.MILLISECONDS));
return runRepeatingAsync(runnable, ticks);
}
@Override

26
common/src/main/java/com/viaversion/viaversion/ViaManagerImpl.java
View File

@ -30,6 +30,7 @@ import com.viaversion.viaversion.api.platform.providers.ViaProviders;
import com.viaversion.viaversion.api.protocol.ProtocolManager;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import com.viaversion.viaversion.api.protocol.version.ServerProtocolVersion;
import com.viaversion.viaversion.api.scheduler.Scheduler;
import com.viaversion.viaversion.commands.ViaCommandHandler;
import com.viaversion.viaversion.connection.ConnectionManagerImpl;
import com.viaversion.viaversion.debug.DebugHandlerImpl;
@ -38,6 +39,7 @@ import com.viaversion.viaversion.protocol.ServerProtocolVersionRange;
import com.viaversion.viaversion.protocol.ServerProtocolVersionSingleton;
import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.TabCompleteThread;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.ViaIdleThread;
import com.viaversion.viaversion.scheduler.TaskScheduler;
import com.viaversion.viaversion.update.UpdateUtil;
import it.unimi.dsi.fastutil.ints.IntSortedSet;
import java.util.ArrayList;
@ -53,6 +55,7 @@ public class ViaManagerImpl implements ViaManager {
private final ConnectionManager connectionManager = new ConnectionManagerImpl();
private final DebugHandler debugHandler = new DebugHandlerImpl();
private final ViaProviders providers = new ViaProviders();
private final Scheduler scheduler = new TaskScheduler();
private final ViaPlatform<?> platform;
private final ViaInjector injector;
private final ViaCommandHandler commandHandler;
@ -77,10 +80,6 @@ public class ViaManagerImpl implements ViaManager {
// Reload?
platform.onReload();
}
// Check for updates
if (platform.getConf().isCheckForUpdates()) {
UpdateUtil.sendUpdateMessage();
}
// Load supported protocol versions if we can
if (!injector.lateProtocolVersionSetting()) {
@ -106,12 +105,14 @@ public class ViaManagerImpl implements ViaManager {
listener.run();
}
enableListeners = null;
// If successful
platform.runSync(this::onServerLoaded);
}
public void onServerLoaded() {
// Check for updates
if (platform.getConf().isCheckForUpdates()) {
UpdateUtil.sendUpdateMessage();
}
if (!protocolManager.getServerProtocolVersion().isKnown()) {
// Try again
loadServerProtocol();
@ -154,7 +155,7 @@ public class ViaManagerImpl implements ViaManager {
// Load Platform
loader.load();
// Common tasks
mappingLoadingTask = Via.getPlatform().runRepeatingSync(() -> {
mappingLoadingTask = Via.getPlatform().runRepeatingAsync(() -> {
if (protocolManager.checkForMappingCompletion() && mappingLoadingTask != null) {
mappingLoadingTask.cancel();
mappingLoadingTask = null;
@ -205,11 +206,11 @@ public class ViaManagerImpl implements ViaManager {
e.printStackTrace();
}
// Unload
loader.unload();
scheduler.shutdown();
}
private final void checkJavaVersion() { // Stolen from Paper
private void checkJavaVersion() { // Stolen from Paper
String javaVersion = System.getProperty("java.version");
Matcher matcher = Pattern.compile("(?:1\\.)?(\\d+)").matcher(javaVersion);
if (!matcher.find()) {
@ -299,6 +300,11 @@ public class ViaManagerImpl implements ViaManager {
return loader;
}
@Override
public Scheduler getScheduler() {
return scheduler;
}
/**
* Returns a mutable set of self-added subplatform version strings.
* This set is expanded by the subplatform itself (e.g. ViaBackwards), and may not contain all running ones.

2
common/src/main/java/com/viaversion/viaversion/protocol/ProtocolManagerImpl.java
View File

@ -508,7 +508,7 @@ public class ProtocolManagerImpl implements ProtocolManager {
registerList.clear();
}
private void shutdownLoaderExecutor() {
public void shutdownLoaderExecutor() {
Preconditions.checkArgument(!mappingsLoaded);
// If this log message is missing, something is wrong

45
common/src/main/java/com/viaversion/viaversion/scheduler/ScheduledTask.java Normal file
View File

@ -0,0 +1,45 @@
/*
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
* Copyright (C) 2023 ViaVersion and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.viaversion.viaversion.scheduler;
import com.viaversion.viaversion.api.scheduler.Task;
import com.viaversion.viaversion.api.scheduler.TaskStatus;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
public final class ScheduledTask implements Task {
private final ScheduledFuture<?> future;
public ScheduledTask(final ScheduledFuture<?> future) {
this.future = future;
}
@Override
public TaskStatus status() {
if (future.getDelay(TimeUnit.MILLISECONDS) > 0) {
return TaskStatus.SCHEDULED;
}
return future.isDone() ? TaskStatus.STOPPED : TaskStatus.RUNNING;
}
@Override
public void cancel() {
future.cancel(false);
}
}

41
common/src/main/java/com/viaversion/viaversion/scheduler/SubmittedTask.java Normal file
View File

@ -0,0 +1,41 @@
/*
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
* Copyright (C) 2023 ViaVersion and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.viaversion.viaversion.scheduler;
import com.viaversion.viaversion.api.scheduler.Task;
import com.viaversion.viaversion.api.scheduler.TaskStatus;
import java.util.concurrent.Future;
public final class SubmittedTask implements Task {
private final Future<?> future;
public SubmittedTask(final Future<?> future) {
this.future = future;
}
@Override
public TaskStatus status() {
return future.isDone() ? TaskStatus.STOPPED : TaskStatus.RUNNING;
}
@Override
public void cancel() {
future.cancel(false);
}
}

63
common/src/main/java/com/viaversion/viaversion/scheduler/TaskScheduler.java Normal file
View File

@ -0,0 +1,63 @@
/*
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
* Copyright (C) 2023 ViaVersion and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.viaversion.viaversion.scheduler;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.viaversion.viaversion.api.scheduler.Scheduler;
import com.viaversion.viaversion.api.scheduler.Task;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
public final class TaskScheduler implements Scheduler {
private final ExecutorService executorService = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setNameFormat("Via Async Task %d").build());
private final ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(
0,
new ThreadFactoryBuilder().setNameFormat("Via Async Scheduler %d").build()
);
@Override
public Task execute(final Runnable runnable) {
return new SubmittedTask(executorService.submit(runnable));
}
@Override
public Task schedule(final Runnable runnable, final long delay, final TimeUnit timeUnit) {
return new ScheduledTask(scheduledExecutorService.schedule(runnable, delay, timeUnit));
}
@Override
public Task scheduleRepeating(final Runnable runnable, final long delay, final long period, final TimeUnit timeUnit) {
return new ScheduledTask(scheduledExecutorService.scheduleAtFixedRate(runnable, delay, period, timeUnit));
}
@Override
public void shutdown() {
executorService.shutdown();
scheduledExecutorService.shutdown();
try {
executorService.awaitTermination(2, TimeUnit.SECONDS);
scheduledExecutorService.awaitTermination(2, TimeUnit.SECONDS);
} catch (final InterruptedException e) {
e.printStackTrace();
}
}
}

2
common/src/main/java/com/viaversion/viaversion/update/UpdateUtil.java
View File

@ -30,7 +30,7 @@ import java.util.Locale;
import java.util.UUID;
import org.checkerframework.checker.nullness.qual.Nullable;
public class UpdateUtil {
public final class UpdateUtil {
private static final String PREFIX = "§a§l[ViaVersion] §a";
private static final String URL = "https://api.spiget.org/v2/resources/";

5
common/src/test/java/com/viaversion/viaversion/common/dummy/TestPlatform.java
View File

@ -60,6 +60,11 @@ public final class TestPlatform implements ViaPlatform {
return null;
}
@Override
public PlatformTask runRepeatingAsync(final Runnable runnable, final long ticks) {
return null;
}
@Override
public PlatformTask runSync(Runnable runnable) {
return null;

17
sponge/src/main/java/com/viaversion/viaversion/SpongePlugin.java
View File

@ -53,6 +53,7 @@ import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.lifecycle.ConstructPluginEvent;
import org.spongepowered.api.event.lifecycle.StartedEngineEvent;
import org.spongepowered.api.event.lifecycle.StartingEngineEvent;
import org.spongepowered.api.event.lifecycle.StoppingEngineEvent;
import org.spongepowered.api.scheduler.Task;
@ -102,7 +103,15 @@ public class SpongePlugin implements ViaPlatform<Player> {
public void onServerStart(StartingEngineEvent<Server> event) {
// Can't use the command register event for raw commands...
Sponge.server().commandManager().registrar(Command.Raw.class).get().register(container, (Command.Raw) Via.getManager().getCommandHandler(), "viaversion", "viaver", "vvsponge");
((ViaManagerImpl) Via.getManager()).init();
final ViaManagerImpl manager = (ViaManagerImpl) Via.getManager();
manager.init();
}
@Listener
public void onServerStarted(StartedEngineEvent<Server> event) {
final ViaManagerImpl manager = (ViaManagerImpl) Via.getManager();
manager.onServerLoaded();
}
@Listener
@ -131,6 +140,12 @@ public class SpongePlugin implements ViaPlatform<Player> {
return new SpongeViaTask(game.asyncScheduler().submit(task));
}
@Override
public PlatformTask runRepeatingAsync(final Runnable runnable, final long ticks) {
final Task task = Task.builder().plugin(container).execute(runnable).interval(Ticks.of(ticks)).build();
return new SpongeViaTask(game.asyncScheduler().submit(task));
}
@Override
public PlatformTask runSync(Runnable runnable) {
final Task task = Task.builder().plugin(container).execute(runnable).build();

19
velocity/src/main/java/com/viaversion/viaversion/VelocityPlugin.java
View File

@ -108,7 +108,9 @@ public class VelocityPlugin implements ViaServerProxyPlatform<Player> {
@Subscribe(order = PostOrder.LAST)
public void onProxyLateInit(ProxyInitializeEvent e) {
((ViaManagerImpl) Via.getManager()).init();
final ViaManagerImpl manager = (ViaManagerImpl) Via.getManager();
manager.init();
manager.onServerLoaded();
}
@Override
@ -138,6 +140,15 @@ public class VelocityPlugin implements ViaServerProxyPlatform<Player> {
return runSync(runnable);
}
@Override
public PlatformTask runRepeatingAsync(final Runnable runnable, final long ticks) {
return new VelocityViaTask(
PROXY.getScheduler()
.buildTask(this, runnable)
.repeat(ticks * 50, TimeUnit.MILLISECONDS).schedule()
);
}
@Override
public PlatformTask runSync(Runnable runnable) {
return runSync(runnable, 0L);
@ -154,11 +165,7 @@ public class VelocityPlugin implements ViaServerProxyPlatform<Player> {
@Override
public PlatformTask runRepeatingSync(Runnable runnable, long ticks) {
return new VelocityViaTask(
PROXY.getScheduler()
.buildTask(this, runnable)
.repeat(ticks * 50, TimeUnit.MILLISECONDS).schedule()
);
return runRepeatingAsync(runnable, ticks);
}
@Override

2
velocity/src/main/java/com/viaversion/viaversion/velocity/platform/VelocityViaLoader.java
View File

@ -50,7 +50,7 @@ public class VelocityViaLoader implements ViaPlatformLoader {
int pingInterval = ((VelocityViaConfig) Via.getPlatform().getConf()).getVelocityPingInterval();
if (pingInterval > 0) {
Via.getPlatform().runRepeatingSync(
Via.getPlatform().runRepeatingAsync(
() -> Via.proxyPlatform().protocolDetectorService().probeAllServers(),
pingInterval * 20L);
}