Skip to content

Commit 73d0068

Browse files
Adrigamer2950Adrigamer2950
committedFeb 21, 2025
feat!: Rewritten Folia/Paper Scheduler
·
2.3.0
1 parent 27b34a1 commit 73d0068

File tree

12 files changed

+497
-88
lines changed

12 files changed

+497
-88
lines changed
 

‎build.gradle.kts

+17-7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:Suppress("VulnerableLibrariesLocal")
2+
13
import xyz.jpenilla.runtask.task.AbstractRun
24
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
35
import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
@@ -81,15 +83,20 @@ if (project.hasProperty("NEXUS_USERNAME") && project.hasProperty("NEXUS_PASSWORD
8183
}
8284
}
8385

86+
allprojects {
87+
repositories {
88+
mavenCentral()
89+
maven {
90+
name = "papermc-repo"
91+
url = uri("https://repo.papermc.io/repository/maven-public/")
92+
}
93+
}
94+
}
8495
repositories {
85-
mavenCentral()
8696
maven {
8797
name = "sonatype"
8898
url = uri("https://oss.sonatype.org/content/groups/public/")
8999
}
90-
maven {
91-
url = uri("https://repo.papermc.io/repository/maven-public/")
92-
}
93100
maven {
94101
name = "AlessioDP"
95102
url = uri("https://repo.alessiodp.com/releases")
@@ -100,9 +107,8 @@ dependencies {
100107
// JetBrains Annotations
101108
compileOnly(libs.jetbrains.annotations)
102109

103-
// Folia API
104-
//noinspection VulnerableLibrariesLocal
105-
compileOnly(libs.folia.api)
110+
// Paper API
111+
compileOnly(libs.paper.api)
106112

107113
// Lombok
108114
compileOnly(libs.lombok)
@@ -117,6 +123,9 @@ dependencies {
117123

118124
// Libby
119125
implementation(libs.libby)
126+
127+
// Folia module
128+
implementation(project(":folia"))
120129
}
121130

122131
val targetJavaVersion = 17
@@ -209,6 +218,7 @@ tasks.named<RunServer>("runServer").configure {
209218

210219
tasks.withType(AbstractRun::class) {
211220
javaLauncher = javaToolchains.launcherFor {
221+
@Suppress("UnstableApiUsage")
212222
vendor = JvmVendorSpec.JETBRAINS
213223
languageVersion = JavaLanguageVersion.of(targetJavaVersion)
214224
}

‎folia/build.gradle.kts

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
plugins {
2+
id("java")
3+
}
4+
5+
group = "me.adrigamer2950.adriapi"
6+
7+
dependencies {
8+
// JetBrains Annotations
9+
compileOnly(libs.jetbrains.annotations)
10+
11+
// Lombok
12+
compileOnly(libs.lombok)
13+
annotationProcessor(libs.lombok)
14+
15+
// Folia
16+
compileOnly(libs.folia.api)
17+
}

‎folia/src/main/java/me/adrigamer2950/adriapi/api/scheduler/Scheduler.java

+210
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,210 @@
1+
package me.adrigamer2950.adriapi.api.scheduler;
2+
3+
import me.adrigamer2950.adriapi.api.scheduler.folia.FoliaScheduler;
4+
import me.adrigamer2950.adriapi.api.scheduler.paper.PaperScheduler;
5+
import me.adrigamer2950.adriapi.api.scheduler.task.ScheduledTask;
6+
import org.bukkit.World;
7+
import org.bukkit.entity.Entity;
8+
import org.bukkit.plugin.Plugin;
9+
10+
public interface Scheduler {
11+
12+
/**
13+
* Creates a new {@link Scheduler} instance for the given plugin
14+
*
15+
* @param plugin The plugin to get the scheduler for
16+
* @return The scheduler instance
17+
*/
18+
static Scheduler get(Plugin plugin) {
19+
return get(plugin, false);
20+
}
21+
22+
/**
23+
* Creates a new {@link Scheduler} instance for the given plugin
24+
*
25+
* @param plugin The plugin to get the scheduler for
26+
* @param folia Whether to use the Folia scheduler
27+
* @return The scheduler instance
28+
*/
29+
static Scheduler get(Plugin plugin, boolean folia) {
30+
return folia ? new FoliaScheduler(plugin) : new PaperScheduler(plugin);
31+
}
32+
33+
/**
34+
* Runs a task on the next server tick
35+
*
36+
* @param runnable The task to run
37+
* @return The task
38+
*/
39+
ScheduledTask run(Runnable runnable);
40+
41+
/**
42+
* Runs a task after a delay
43+
*
44+
* @param runnable The task to run
45+
* @param delay The delay in ticks
46+
* @return The task
47+
*/
48+
ScheduledTask runLater(Runnable runnable, long delay);
49+
50+
/**
51+
* Runs a task repeatedly after a delay
52+
*
53+
* @param runnable The task to run
54+
* @param delay The delay in ticks
55+
* @param period The period in ticks
56+
* @return The task
57+
*/
58+
ScheduledTask runTimer(Runnable runnable, long delay, long period);
59+
60+
/**
61+
* Runs a task asynchronously
62+
*
63+
* @param runnable The task to run
64+
* @return The task
65+
*/
66+
ScheduledTask runAsync(Runnable runnable);
67+
68+
/**
69+
* Runs a task asynchronously after a delay
70+
* @param runnable The task to run
71+
* @param delay The delay in ticks
72+
* @return The task
73+
*/
74+
ScheduledTask runAsyncLater(Runnable runnable, long delay);
75+
76+
/**
77+
* Runs a task asynchronously repeatedly after a delay
78+
* @param runnable The task to run
79+
* @param delay The delay in ticks
80+
* @param period The period in ticks
81+
* @return The task
82+
*/
83+
ScheduledTask runAsyncTimer(Runnable runnable, long delay, long period);
84+
85+
/**
86+
* Runs a task on a specific entity
87+
* @param runnable The task to run
88+
* @param entity The entity to run the task on
89+
* @return The task
90+
*/
91+
ScheduledTask runOnEntity(Runnable runnable, Entity entity);
92+
93+
/**
94+
* Runs a task on a specific entity
95+
* @param runnable The task to run
96+
* @param entity The entity to run the task on
97+
* @param async Whether to run the task asynchronously (Doesn't do anything in Folia)
98+
* @return The task
99+
*/
100+
ScheduledTask runOnEntity(Runnable runnable, Entity entity, boolean async);
101+
102+
/**
103+
* Runs a task on a specific entity after a delay
104+
* @param runnable The task to run
105+
* @param entity The entity to run the task on
106+
* @param delay The delay in ticks
107+
* @return The task
108+
*/
109+
ScheduledTask runLaterOnEntity(Runnable runnable, Entity entity, long delay);
110+
111+
/**
112+
* Runs a task on a specific entity after a delay
113+
* @param runnable The task to run
114+
* @param entity The entity to run the task on
115+
* @param delay The delay in ticks
116+
* @param async Whether to run the task asynchronously (Doesn't do anything in Folia)
117+
* @return The task
118+
*/
119+
ScheduledTask runLaterOnEntity(Runnable runnable, Entity entity, long delay, boolean async);
120+
121+
/**
122+
* Runs a task on a specific entity repeatedly after a delay
123+
* @param runnable The task to run
124+
* @param entity The entity to run the task on
125+
* @param delay The delay in ticks
126+
* @param period The period in ticks
127+
* @return The task
128+
*/
129+
ScheduledTask runTimerOnEntity(Runnable runnable, Entity entity, long delay, long period);
130+
131+
/**
132+
* Runs a task on a specific entity repeatedly after a delay
133+
* @param runnable The task to run
134+
* @param entity The entity to run the task on
135+
* @param delay The delay in ticks
136+
* @param period The period in ticks
137+
* @param async Whether to run the task asynchronously (Doesn't do anything in Folia)
138+
* @return The task
139+
*/
140+
ScheduledTask runTimerOnEntity(Runnable runnable, Entity entity, long delay, long period, boolean async);
141+
142+
/**
143+
* Runs a task on a specific region
144+
* @param runnable The task to run
145+
* @param world The world the region is in
146+
* @param chunkX The X coordinate of the region
147+
* @param chunkZ The Z coordinate of the region
148+
* @return The task
149+
*/
150+
ScheduledTask runAtRegion(Runnable runnable, World world, int chunkX, int chunkZ);
151+
152+
/**
153+
* Runs a task on a specific region
154+
* @param runnable The task to run
155+
* @param world The world the region is in
156+
* @param chunkX The X coordinate of the region
157+
* @param chunkZ The Z coordinate of the region
158+
* @param async Whether to run the task asynchronously (Doesn't do anything in Folia)
159+
* @return The task
160+
*/
161+
ScheduledTask runAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, boolean async);
162+
163+
/**
164+
* Runs a task on a specific region after a delay
165+
* @param runnable The task to run
166+
* @param world The world the region is in
167+
* @param chunkX The X coordinate of the region
168+
* @param chunkZ The Z coordinate of the region
169+
* @param delay The delay in ticks
170+
* @return The task
171+
*/
172+
ScheduledTask runLaterAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, long delay);
173+
174+
/**
175+
* Runs a task on a specific region after a delay
176+
* @param runnable The task to run
177+
* @param world The world the region is in
178+
* @param chunkX The X coordinate of the region
179+
* @param chunkZ The Z coordinate of the region
180+
* @param delay The delay in ticks
181+
* @param async Whether to run the task asynchronously (Doesn't do anything in Folia)
182+
* @return The task
183+
*/
184+
ScheduledTask runLaterAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, long delay, boolean async);
185+
186+
/**
187+
* Runs a task on a specific region repeatedly after a delay
188+
* @param runnable The task to run
189+
* @param world The world the region is in
190+
* @param chunkX The X coordinate of the region
191+
* @param chunkZ The Z coordinate of the region
192+
* @param delay The delay in ticks
193+
* @param period The period in ticks
194+
* @return The task
195+
*/
196+
ScheduledTask runTimerAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, long delay, long period);
197+
198+
/**
199+
* Runs a task on a specific region repeatedly after a delay
200+
* @param runnable The task to run
201+
* @param world The world the region is in
202+
* @param chunkX The X coordinate of the region
203+
* @param chunkZ The Z coordinate of the region
204+
* @param delay The delay in ticks
205+
* @param period The period in ticks
206+
* @param async Whether to run the task asynchronously (Doesn't do anything in Folia)
207+
* @return The task
208+
*/
209+
ScheduledTask runTimerAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, long delay, long period, boolean async);
210+
}

‎folia/src/main/java/me/adrigamer2950/adriapi/api/scheduler/folia/FoliaScheduler.java

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
package me.adrigamer2950.adriapi.api.scheduler.folia;
2+
3+
import lombok.RequiredArgsConstructor;
4+
import me.adrigamer2950.adriapi.api.scheduler.Scheduler;
5+
import me.adrigamer2950.adriapi.api.scheduler.task.ScheduledTask;
6+
import org.bukkit.Bukkit;
7+
import org.bukkit.World;
8+
import org.bukkit.entity.Entity;
9+
import org.bukkit.plugin.Plugin;
10+
11+
import java.util.concurrent.TimeUnit;
12+
13+
@RequiredArgsConstructor
14+
public class FoliaScheduler implements Scheduler {
15+
16+
private final Plugin plugin;
17+
18+
@Override
19+
public ScheduledTask run(Runnable runnable) {
20+
return new ScheduledTask(Bukkit.getGlobalRegionScheduler().run(plugin, t -> runnable.run()), plugin);
21+
}
22+
23+
@Override
24+
public ScheduledTask runLater(Runnable runnable, long delay) {
25+
return new ScheduledTask(Bukkit.getGlobalRegionScheduler().runDelayed(plugin, t -> runnable.run(), delay), plugin);
26+
}
27+
28+
@Override
29+
public ScheduledTask runTimer(Runnable runnable, long delay, long period) {
30+
return new ScheduledTask(Bukkit.getGlobalRegionScheduler().runAtFixedRate(plugin, t -> runnable.run(), delay, period), plugin);
31+
}
32+
33+
@Override
34+
public ScheduledTask runAsync(Runnable runnable) {
35+
return new ScheduledTask(Bukkit.getAsyncScheduler().runNow(plugin, t -> runnable.run()), plugin);
36+
}
37+
38+
@Override
39+
public ScheduledTask runAsyncLater(Runnable runnable, long delay) {
40+
return new ScheduledTask(Bukkit.getAsyncScheduler().runDelayed(plugin, t -> runnable.run(), delay / 20, TimeUnit.SECONDS), plugin);
41+
}
42+
43+
@Override
44+
public ScheduledTask runAsyncTimer(Runnable runnable, long delay, long period) {
45+
return new ScheduledTask(Bukkit.getAsyncScheduler().runAtFixedRate(plugin, t -> runnable.run(), delay / 20, period / 20, TimeUnit.SECONDS), plugin);
46+
}
47+
48+
@Override
49+
public ScheduledTask runOnEntity(Runnable runnable, Entity entity) {
50+
return new ScheduledTask(entity.getScheduler().run(plugin, t -> runnable.run(), null), plugin);
51+
}
52+
53+
@Override
54+
public ScheduledTask runOnEntity(Runnable runnable, Entity entity, boolean async) {
55+
return this.runOnEntity(runnable, entity);
56+
}
57+
58+
@Override
59+
public ScheduledTask runLaterOnEntity(Runnable runnable, Entity entity, long delay) {
60+
return new ScheduledTask(entity.getScheduler().runDelayed(plugin, t -> runnable.run(), null, delay), plugin);
61+
}
62+
63+
@Override
64+
public ScheduledTask runLaterOnEntity(Runnable runnable, Entity entity, long delay, boolean async) {
65+
return this.runLaterOnEntity(runnable, entity, delay);
66+
}
67+
68+
@Override
69+
public ScheduledTask runTimerOnEntity(Runnable runnable, Entity entity, long delay, long period) {
70+
return new ScheduledTask(entity.getScheduler().runAtFixedRate(plugin, t -> runnable.run(), null, delay, period), plugin);
71+
}
72+
73+
@Override
74+
public ScheduledTask runTimerOnEntity(Runnable runnable, Entity entity, long delay, long period, boolean async) {
75+
return this.runTimerOnEntity(runnable, entity, delay, period);
76+
}
77+
78+
@Override
79+
public ScheduledTask runAtRegion(Runnable runnable, World world, int chunkX, int chunkZ) {
80+
return new ScheduledTask(Bukkit.getRegionScheduler().run(plugin, world, chunkX, chunkZ, t -> runnable.run()), plugin);
81+
}
82+
83+
@Override
84+
public ScheduledTask runAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, boolean async) {
85+
return this.runAtRegion(runnable, world, chunkX, chunkZ);
86+
}
87+
88+
@Override
89+
public ScheduledTask runLaterAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, long delay) {
90+
return new ScheduledTask(Bukkit.getRegionScheduler().runDelayed(plugin, world, chunkX, chunkZ, t -> runnable.run(), delay), plugin);
91+
}
92+
93+
@Override
94+
public ScheduledTask runLaterAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, long delay, boolean async) {
95+
return this.runLaterAtRegion(runnable, world, chunkX, chunkZ, delay);
96+
}
97+
98+
@Override
99+
public ScheduledTask runTimerAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, long delay, long period) {
100+
return new ScheduledTask(Bukkit.getRegionScheduler().runAtFixedRate(plugin, world, chunkX, chunkZ, t -> runnable.run(), delay, period), plugin);
101+
}
102+
103+
@Override
104+
public ScheduledTask runTimerAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, long delay, long period, boolean async) {
105+
return this.runTimerAtRegion(runnable, world, chunkX, chunkZ, delay, period);
106+
}
107+
}

‎folia/src/main/java/me/adrigamer2950/adriapi/api/scheduler/paper/PaperScheduler.java

+105
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
package me.adrigamer2950.adriapi.api.scheduler.paper;
2+
3+
import lombok.RequiredArgsConstructor;
4+
import me.adrigamer2950.adriapi.api.scheduler.Scheduler;
5+
import me.adrigamer2950.adriapi.api.scheduler.task.ScheduledTask;
6+
import org.bukkit.Bukkit;
7+
import org.bukkit.World;
8+
import org.bukkit.entity.Entity;
9+
import org.bukkit.plugin.Plugin;
10+
11+
@RequiredArgsConstructor
12+
public class PaperScheduler implements Scheduler {
13+
14+
private final Plugin plugin;
15+
16+
@Override
17+
public ScheduledTask run(Runnable runnable) {
18+
return new ScheduledTask(Bukkit.getScheduler().runTask(plugin, runnable), plugin);
19+
}
20+
21+
@Override
22+
public ScheduledTask runLater(Runnable runnable, long delay) {
23+
return new ScheduledTask(Bukkit.getScheduler().runTaskLater(plugin, runnable, delay), plugin);
24+
}
25+
26+
@Override
27+
public ScheduledTask runTimer(Runnable runnable, long delay, long period) {
28+
return new ScheduledTask(Bukkit.getScheduler().runTaskTimer(plugin, runnable, delay, period), plugin);
29+
}
30+
31+
@Override
32+
public ScheduledTask runAsync(Runnable runnable) {
33+
return new ScheduledTask(Bukkit.getScheduler().runTaskAsynchronously(plugin, runnable), plugin);
34+
}
35+
36+
@Override
37+
public ScheduledTask runAsyncLater(Runnable runnable, long delay) {
38+
return new ScheduledTask(Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, runnable, delay), plugin);
39+
}
40+
41+
@Override
42+
public ScheduledTask runAsyncTimer(Runnable runnable, long delay, long period) {
43+
return new ScheduledTask(Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, runnable, delay, period), plugin);
44+
}
45+
46+
@Override
47+
public ScheduledTask runOnEntity(Runnable runnable, Entity entity) {
48+
return runOnEntity(runnable, entity, false);
49+
}
50+
51+
@Override
52+
public ScheduledTask runOnEntity(Runnable runnable, Entity entity, boolean async) {
53+
return async ? runAsync(runnable) : run(runnable);
54+
}
55+
56+
@Override
57+
public ScheduledTask runLaterOnEntity(Runnable runnable, Entity entity, long delay) {
58+
return runLaterOnEntity(runnable, entity, delay, false);
59+
}
60+
61+
@Override
62+
public ScheduledTask runLaterOnEntity(Runnable runnable, Entity entity, long delay, boolean async) {
63+
return async ? runAsync(runnable) : run(runnable);
64+
}
65+
66+
@Override
67+
public ScheduledTask runTimerOnEntity(Runnable runnable, Entity entity, long delay, long period) {
68+
return runTimerOnEntity(runnable, entity, delay, period, false);
69+
}
70+
71+
@Override
72+
public ScheduledTask runTimerOnEntity(Runnable runnable, Entity entity, long delay, long period, boolean async) {
73+
return async ? runAsync(runnable) : run(runnable);
74+
}
75+
76+
@Override
77+
public ScheduledTask runAtRegion(Runnable runnable, World world, int chunkX, int chunkZ) {
78+
return runAtRegion(runnable, world, chunkX, chunkZ, false);
79+
}
80+
81+
@Override
82+
public ScheduledTask runAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, boolean async) {
83+
return async ? runAsync(runnable) : run(runnable);
84+
}
85+
86+
@Override
87+
public ScheduledTask runLaterAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, long delay) {
88+
return runLaterAtRegion(runnable, world, chunkX, chunkZ, delay, false);
89+
}
90+
91+
@Override
92+
public ScheduledTask runLaterAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, long delay, boolean async) {
93+
return async ? runAsyncLater(runnable, delay) : runLater(runnable, delay);
94+
}
95+
96+
@Override
97+
public ScheduledTask runTimerAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, long delay, long period) {
98+
return runTimerAtRegion(runnable, world, chunkX, chunkZ, delay, period, false);
99+
}
100+
101+
@Override
102+
public ScheduledTask runTimerAtRegion(Runnable runnable, World world, int chunkX, int chunkZ, long delay, long period, boolean async) {
103+
return async ? runAsyncTimer(runnable, delay, period) : runTimer(runnable, delay, period);
104+
}
105+
}

‎folia/src/main/java/me/adrigamer2950/adriapi/api/scheduler/task/ScheduledTask.java

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package me.adrigamer2950.adriapi.api.scheduler.task;
2+
3+
import lombok.Getter;
4+
import lombok.RequiredArgsConstructor;
5+
import org.bukkit.plugin.Plugin;
6+
import org.bukkit.scheduler.BukkitTask;
7+
8+
@RequiredArgsConstructor
9+
public final class ScheduledTask {
10+
11+
private boolean cancelled = false;
12+
private final Object task;
13+
14+
@Getter
15+
private final Plugin owner;
16+
17+
/**
18+
* Cancels this task
19+
* @throws IllegalStateException If the task is already cancelled
20+
*/
21+
public void cancel() {
22+
if (cancelled) {
23+
throw new IllegalStateException("Task is already cancelled");
24+
}
25+
26+
if (task instanceof BukkitTask) {
27+
((BukkitTask) task).cancel();
28+
} else if (task instanceof io.papermc.paper.threadedregions.scheduler.ScheduledTask) {
29+
((io.papermc.paper.threadedregions.scheduler.ScheduledTask) task).cancel();
30+
}
31+
32+
cancelled = true;
33+
}
34+
}

‎gradle/libs.versions.toml

+2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ run-server = "2.3.1"
99
adventure-platform-bukkit = "4.3.4"
1010
libby = "1.3.1"
1111
shadow = "8.1.1"
12+
paper-api = "1.18.2-R0.1-SNAPSHOT"
1213

1314
[libraries]
15+
paper-api = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper-api" }
1416
folia-api = { group = "dev.folia", name = "folia-api", version.ref = "folia-api" }
1517
lombok = { group = "org.projectlombok", name = "lombok", version.ref = "lombok" }
1618
jansi = { group = "org.fusesource.jansi", name = "jansi", version.ref = "jansi" }

‎settings.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ plugins {
33
}
44

55
rootProject.name = "AdriAPI"
6+
7+
include("folia")

‎src/main/java/me/adrigamer2950/adriapi/AdriAPI.java

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
@ApiStatus.Internal
1616
public final class AdriAPI extends APIPlugin {
1717

18-
@SuppressWarnings("deprecation")
1918
@Override
2019
public void onPreLoad() {
2120
List<Component> l = List.of(

‎src/main/java/me/adrigamer2950/adriapi/api/APIPlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import lombok.NonNull;
55
import me.adrigamer2950.adriapi.api.command.Command;
66
import me.adrigamer2950.adriapi.api.command.manager.CommandManager;
7-
import me.adrigamer2950.adriapi.api.folia.Scheduler;
7+
import me.adrigamer2950.adriapi.api.scheduler.Scheduler;
88
import me.adrigamer2950.adriapi.api.library.manager.LibraryManager;
99
import me.adrigamer2950.adriapi.api.logger.APILogger;
1010
import me.adrigamer2950.adriapi.api.util.ServerType;
@@ -58,7 +58,7 @@ private void loadHooks() {
5858
this.commandManager = new CommandManager<>(this);
5959

6060
this.getLogger().debug("&6Loading Scheduler...");
61-
this.scheduler = new Scheduler(this);
61+
this.scheduler = Scheduler.get(this, this.getServerType().equals(ServerType.FOLIA));
6262

6363
if (this.getBStatsServiceId() != 0) {
6464
this.getLogger().debug("&6Loading bStats hook...");

‎src/main/java/me/adrigamer2950/adriapi/api/command/manager/CommandManager.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public static CommandManager<? extends APIPlugin> getManager(Plugin plugin) {
5050
/**
5151
* @param pl The plugin
5252
*/
53-
@SuppressWarnings("deprecation")
5453
public CommandManager(T pl) {
5554
if (getManager(pl) != null) {
5655
throw new DuplicatedManagerException(
@@ -84,7 +83,7 @@ public void registerCommand(Command<? extends APIPlugin> command) {
8483
CommandMap commandMap = command.getPlugin().getServer().getCommandMap();
8584

8685
if (commandMap.getCommand(command.getName()) == null) {
87-
commandMap.register(command.getPlugin().getPluginMeta().getName(), command);
86+
commandMap.register(command.getPlugin().getDescription().getName(), command);
8887
} else {
8988
PluginCommand plCmd = command.getPlugin().getServer().getPluginCommand(command.getName());
9089
if (plCmd == null || plCmd.getPlugin() != command.getPlugin()) {
@@ -101,7 +100,6 @@ public void registerCommand(Command<? extends APIPlugin> command) {
101100
CommandLoadedEvent event = new CommandLoadedEvent(command, plugin);
102101
Bukkit.getPluginManager().callEvent(event);
103102

104-
//noinspection deprecation
105103
LOGGER.debug(
106104
String.format("Command '%s' for plugin %s v%s has been successfully loaded", command.getName(), command.getPlugin().getName(), command.getPlugin().getDescription().getVersion())
107105
);

‎src/main/java/me/adrigamer2950/adriapi/api/folia/Scheduler.java

-75
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.