Allow to use plotsquared with Paper-Folia #4009
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package com.plotsquared.bukkit.util; | ||
|
|
||
| public final class FoliaSupport { | ||
| private FoliaSupport() { | ||
|
|
||
| } | ||
|
|
||
| private static final boolean IS_FOLIA; | ||
|
|
||
| private static final Class<?> TICK_THREAD_CLASS; | ||
| static { | ||
| boolean isFolia = false; | ||
| try { | ||
| // Assume API is present | ||
| Class.forName("io.papermc.paper.threadedregions.scheduler.EntityScheduler"); | ||
| isFolia = true; | ||
| } catch (Exception ignored) { | ||
|
|
||
| } | ||
| IS_FOLIA = isFolia; | ||
| Class<?> tickThreadClass = String.class; // thread will never be instance of String | ||
| if (IS_FOLIA) { | ||
| try { | ||
| tickThreadClass = Class.forName("io.papermc.paper.util.TickThread"); | ||
| } catch (ClassNotFoundException e) { | ||
| throw new AssertionError(e); | ||
| } | ||
| } | ||
| TICK_THREAD_CLASS = tickThreadClass; | ||
| } | ||
|
|
||
| public static boolean isFolia() { | ||
| return IS_FOLIA; | ||
| } | ||
|
|
||
| public static boolean isTickThread() { | ||
|
|
||
| return TICK_THREAD_CLASS.isInstance(Thread.currentThread()); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| package com.plotsquared.bukkit.util.task; | ||
|
|
||
| import com.plotsquared.core.util.task.PlotSquaredTask; | ||
| import io.papermc.paper.threadedregions.scheduler.ScheduledTask; | ||
| import org.bukkit.Bukkit; | ||
| import org.bukkit.plugin.java.JavaPlugin; | ||
| import org.checkerframework.checker.nullness.qual.NonNull; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| public final class FoliaPlotSquaredTask implements PlotSquaredTask { | ||
|
|
||
| @NonNull | ||
| private final Runnable runnable; | ||
| @NotNull | ||
| private final JavaPlugin javaPlugin; | ||
|
|
||
| private ScheduledTask task; | ||
|
|
||
| public FoliaPlotSquaredTask(final @NonNull Runnable runnable, final JavaPlugin javaPlugin) { | ||
| this.runnable = runnable; | ||
| this.javaPlugin = javaPlugin; | ||
| } | ||
|
|
||
| @Override | ||
| public void runTask() { | ||
| this.task = Bukkit.getGlobalRegionScheduler().run(javaPlugin, scheduledTask -> this.runnable.run()); | ||
| } | ||
|
|
||
| public void runTaskLater(long delay) { | ||
| this.task = Bukkit.getGlobalRegionScheduler().runDelayed(javaPlugin, scheduledTask -> this.runnable.run(), delay); | ||
| } | ||
|
|
||
| public void runTaskLaterAsynchronously(long delay) { | ||
| this.task = Bukkit.getAsyncScheduler().runDelayed(javaPlugin, scheduledTask -> this.runnable.run(), delay, TimeUnit.MILLISECONDS); | ||
| } | ||
|
|
||
| public void runTaskAsynchronously() { | ||
| this.task = Bukkit.getAsyncScheduler().runNow(javaPlugin, scheduledTask -> this.runnable.run()); | ||
| } | ||
|
|
||
| public void runTaskTimerAsynchronously(long delay, long period) { | ||
| this.task = Bukkit.getAsyncScheduler().runAtFixedRate(javaPlugin, scheduledTask -> this.runnable.run(), delay, period, TimeUnit.MILLISECONDS); | ||
| } | ||
|
|
||
| public void runTaskTimer(long delay, long period) { | ||
| this.task = Bukkit.getGlobalRegionScheduler().runAtFixedRate(javaPlugin, scheduledTask -> this.runnable.run(), delay, period); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isCancelled() { | ||
| return this.task.isCancelled(); | ||
| } | ||
|
|
||
| @Override | ||
| public void cancel() { | ||
| this.task.cancel(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't look right to me. The bukkit module has to stick to Paper for compatibility and compiling reasons.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When i allow both. The the API support for folia will break in IJ
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But this breaks compatibility with Spigot and Paper.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay. Let me check that how we can handle it