Upstream/Folia
1
0
Fork 0
mirror of https://github.com/PaperMC/Folia.git synced 2024-11-28 13:05:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
46d3ab50b4
Folia/patches/api/0002-Region-scheduler-API.patch

45 lines
2.3 KiB
Diff
Raw Normal View History

Add some scheduling API
2023-03-04 22:13:23 +01:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 4 Mar 2023 12:48:43 -0800
Subject: [PATCH] Region scheduler API
Add global region scheduler This will allow plugins to safely execute commands or perform other global tick thread data modification.
2023-03-20 00:43:34 +01:00
Add both a location based scheduler, an entity based scheduler,
and a global region scheduler.
Add some scheduling API
2023-03-04 22:13:23 +01:00
Change entity scheduler API to use Runnables The generics pose a problem, and the parameter passed to the Consumer is not needed in API. Additionally, stop trying to cancel Bukkit scheduler tasks on plugin disable as the Bukkit scheduler does not work.
2023-03-06 21:57:29 +01:00
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
Update to latest paper 1.19
2023-06-08 00:32:55 +02:00
index fc2dae69165776d08274e34a69962cc70445f411..06149045a44148bf0af5f52952ff0092fe2c70cb 100644
Change entity scheduler API to use Runnables The generics pose a problem, and the parameter passed to the Consumer is not needed in API. Additionally, stop trying to cancel Bukkit scheduler tasks on plugin disable as the Bukkit scheduler does not work.
2023-03-06 21:57:29 +01:00
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
Update to 1.19.4 Patches applied, but not yet checked compile.
2023-03-23 14:55:09 +01:00
@@ -544,9 +544,9 @@ public final class SimplePluginManager implements PluginManager {
Change entity scheduler API to use Runnables The generics pose a problem, and the parameter passed to the Consumer is not needed in API. Additionally, stop trying to cancel Bukkit scheduler tasks on plugin disable as the Bukkit scheduler does not work.
2023-03-06 21:57:29 +01:00
}
try {
- server.getScheduler().cancelTasks(plugin);
New scheduler API Now, entity/global/location schedulers implement a generic run, runDelayed, and runAtFixedRate methods that provide a ScheduledTask value that can be used to interact with the scheduled task. Add also an async task scheduler that implements the same methods, except the delays/periods are in time and not ticks, as the scheduler is independent of the server tick process. Additionally, throw on some unimplemented APIs now.
2023-03-23 10:51:04 +01:00
+ server.getAsyncScheduler().cancelTasks(plugin); // Folia - new schedulers
Change entity scheduler API to use Runnables The generics pose a problem, and the parameter passed to the Consumer is not needed in API. Additionally, stop trying to cancel Bukkit scheduler tasks on plugin disable as the Bukkit scheduler does not work.
2023-03-06 21:57:29 +01:00
} catch (Throwable ex) {
New scheduler API Now, entity/global/location schedulers implement a generic run, runDelayed, and runAtFixedRate methods that provide a ScheduledTask value that can be used to interact with the scheduled task. Add also an async task scheduler that implements the same methods, except the delays/periods are in time and not ticks, as the scheduler is independent of the server tick process. Additionally, throw on some unimplemented APIs now.
2023-03-23 10:51:04 +01:00
- handlePluginException("Error occurred (in the plugin loader) while cancelling tasks for "
+ handlePluginException("Error occurred (in the plugin loader) while cancelling async tasks for " // Folia - new schedulers
Change entity scheduler API to use Runnables The generics pose a problem, and the parameter passed to the Consumer is not needed in API. Additionally, stop trying to cancel Bukkit scheduler tasks on plugin disable as the Bukkit scheduler does not work.
2023-03-06 21:57:29 +01:00
+ plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
New scheduler API Now, entity/global/location schedulers implement a generic run, runDelayed, and runAtFixedRate methods that provide a ScheduledTask value that can be used to interact with the scheduled task. Add also an async task scheduler that implements the same methods, except the delays/periods are in time and not ticks, as the scheduler is independent of the server tick process. Additionally, throw on some unimplemented APIs now.
2023-03-23 10:51:04 +01:00
}
Rebase fixups
2023-03-26 00:29:07 +01:00
diff --git a/src/main/java/org/bukkit/scheduler/BukkitScheduler.java b/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
Apply patches for 1.20.4 - Compile needs to be checked. - Behaviors around the new tick manager need to be designed and implemented. Chk update.txt for anything specific.
2023-12-17 00:32:48 +01:00
index 487b5ca23159b531475c3d650894be707b49914e..31b90d1c2259a8f200b0589909dbbfe4cc526989 100644
Rebase fixups
2023-03-26 00:29:07 +01:00
--- a/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
+++ b/src/main/java/org/bukkit/scheduler/BukkitScheduler.java
@@ -7,6 +7,15 @@ import java.util.function.Consumer;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
+// Folia start - add new schedulers
+/**
+ * @deprecated Use one of {@link io.papermc.paper.threadedregions.scheduler.RegionScheduler},
+ * {@link io.papermc.paper.threadedregions.scheduler.AsyncScheduler},
+ * {@link io.papermc.paper.threadedregions.scheduler.EntityScheduler},
+ * or {@link io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler}
+ */
+// Folia end - add new schedulers
+@Deprecated
public interface BukkitScheduler {
/**
Reference in New Issue Copy Permalink