Compare commits

..

12 Commits

Author SHA1 Message Date
PiggyPiglet
7247cbb9f7 2.11.8 dev 2025-11-03 16:58:54 +08:00
PiggyPiglet
9ed7a7ae56 Merge remote-tracking branch 'origin/master' 2025-11-03 16:56:42 +08:00
PiggyPiglet
9a356ceecf 2.11.7 2025-11-03 16:56:35 +08:00
Funnycube
e0ac7b1c66 Remove BuiltByBit link from README
Removed BuiltByBit link from the README.
2025-11-03 19:45:47 +11:00
PiggyPiglet
82230d8156 2.11.8 dev 2025-11-03 16:19:54 +08:00
PiggyPiglet
cda55f20aa fix javadoc build 2025-11-03 16:17:48 +08:00
PiggyPiglet
0df7a01fd8 Update NMS Version 2025-11-03 16:15:34 +08:00
PiggyPiglet
b49668ddee 2.11.7 Update 2025-11-03 16:07:19 +08:00
Funnycube
f14b081f0b Add modrinth 2025-08-15 17:06:52 +10:00
PiggyPiglet
b51fbf4e13 Fix jenkins build
disableAutoTargetJvm in gradle
2025-07-03 13:40:53 +08:00
PiggyPiglet
e48b6fe702 Update NMSVersion enum 2025-07-01 20:44:21 +08:00
PiggyPiglet
984f944daf Merge pull request #1127 from PlaceholderAPI/folia
Merge UniversalScheduler (Folia Support) #980
2025-07-01 20:24:13 +08:00
4 changed files with 24 additions and 17 deletions

View File

@@ -8,7 +8,7 @@
[discord]: https://helpch.at/discord
[spigot]: https://www.spigotmc.org/resources/6245/
[hangar]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
[bbb]: https://builtbybit.com/resources/placeholderapi.24306
[modrinth]: https://modrinth.com/plugin/placeholderapi
[Expansions cloud]: https://api.extendedclip.com/home
[placeholder list]: https://helpch.at/placeholders
[statistics]: https://bstats.org/plugin/bukkit/PlaceholderAPI
@@ -50,5 +50,5 @@ If you would like to create your own Placeholder Expansion for PlaceholderAPI, t
- [Placeholder List]
- [Spigot Page][spigot]
- [Hangar Page][hangar]
- [BuiltByBit Page][bbb]
- [Modrinth Page][modrinth]
- [Plugin Statistics][statistics]

View File

@@ -8,7 +8,7 @@ plugins {
}
group = "me.clip"
version = "2.11.7-DEV-${System.getProperty("BUILD_NUMBER")}"
version = "2.11.8-DEV-${System.getProperty("BUILD_NUMBER")}"
description = "An awesome placeholder provider!"
@@ -45,6 +45,8 @@ java {
withJavadocJar()
withSourcesJar()
disableAutoTargetJvm()
}
license {

View File

@@ -51,7 +51,12 @@ public enum NMSVersion {
SPIGOT_1_20_R2("v1_20_R2"),
SPIGOT_1_20_R3("v1_20_R3"),
SPIGOT_1_20_R4("v1_20_R4"),
SPIGOT_1_21_R1("v1_21_R1");
SPIGOT_1_21_R1("v1_21_R1"),
SPIGOT_1_21_R2("V1_21_R2"),
SPIGOT_1_21_R3("V1_21_R3"),
SPIGOT_1_21_R4("V1_21_R4"),
SPIGOT_1_21_R5("V1_21_R5"),
SPIGOT_1_21_R6("V1_21_R6");
private final String version;

View File

@@ -37,7 +37,7 @@ public interface TaskScheduler {
/**
* <b>Folia</b>: Returns whether the current thread is ticking the global region <br>
* <b>Paper & Bukkit</b>: Returns {@link org.bukkit.Server#isPrimaryThread}
* <b>Paper and Bukkit</b>: Returns {@link org.bukkit.Server#isPrimaryThread}
*/
boolean isGlobalThread();
@@ -49,7 +49,7 @@ public interface TaskScheduler {
}
/**
* <b>Folia & Paper</b>: Returns whether the current thread is ticking a region and that the region
* <b>Folia and Paper</b>: Returns whether the current thread is ticking a region and that the region
* being ticked owns the specified entity. Note that this function is the only appropriate method of
* checking for ownership of an entity, as retrieving the entity's location is undefined unless the
* entity is owned by the current region
@@ -61,7 +61,7 @@ public interface TaskScheduler {
boolean isEntityThread(Entity entity);
/**
* <b>Folia & Paper</b>: Returns whether the current thread is ticking a region and that the region
* <b>Folia and Paper</b>: Returns whether the current thread is ticking a region and that the region
* being ticked owns the chunk at the specified world and block position as included in the specified location
* <p>
* <b>Bukkit</b>: returns {@link org.bukkit.Server#isPrimaryThread}
@@ -72,7 +72,7 @@ public interface TaskScheduler {
/**
* Schedules a task to be executed on the next tick <br>
* <b>Folia & Paper</b>: ...on the global region <br>
* <b>Folia and Paper</b>: ...on the global region <br>
* <b>Bukkit</b>: ...on the main thread
*
* @param runnable The task to execute
@@ -81,7 +81,7 @@ public interface TaskScheduler {
/**
* Schedules a task to be executed after the specified delay in ticks <br>
* <b>Folia & Paper</b>: ...on the global region <br>
* <b>Folia and Paper</b>: ...on the global region <br>
* <b>Bukkit</b>: ...on the main thread
*
* @param runnable The task to execute
@@ -91,7 +91,7 @@ public interface TaskScheduler {
/**
* Schedules a repeating task to be executed after the initial delay with the specified period <br>
* <b>Folia & Paper</b>: ...on the global region <br>
* <b>Folia and Paper</b>: ...on the global region <br>
* <b>Bukkit</b>: ...on the main thread
*
* @param runnable The task to execute
@@ -125,7 +125,7 @@ public interface TaskScheduler {
}
/**
* <b>Folia & Paper</b>: Schedules a task to be executed on the region which owns the location on the next tick
* <b>Folia and Paper</b>: Schedules a task to be executed on the region which owns the location on the next tick
* <p>
* <b>Bukkit</b>: same as {@link #runTask(Runnable)}
*
@@ -137,7 +137,7 @@ public interface TaskScheduler {
}
/**
* <b>Folia & Paper</b>: Schedules a task to be executed on the region which owns the location after the
* <b>Folia and Paper</b>: Schedules a task to be executed on the region which owns the location after the
* specified delay in ticks
* <p>
* <b>Bukkit</b>: same as {@link #runTaskLater(Runnable, long)}
@@ -151,7 +151,7 @@ public interface TaskScheduler {
}
/**
* <b>Folia & Paper</b>: Schedules a repeating task to be executed on the region which owns the location
* <b>Folia and Paper</b>: Schedules a repeating task to be executed on the region which owns the location
* after the initial delay with the specified period
* <p>
* <b>Bukkit</b>: same as {@link #runTaskTimer(Runnable, long, long)}
@@ -190,7 +190,7 @@ public interface TaskScheduler {
}
/**
* <b>Folia & Paper</b>: Schedules a task to be executed on the region which owns the location
* <b>Folia and Paper</b>: Schedules a task to be executed on the region which owns the location
* of given entity on the next tick
* <p>
* <b>Bukkit</b>: same as {@link #runTask(Runnable)}
@@ -203,7 +203,7 @@ public interface TaskScheduler {
}
/**
* <b>Folia & Paper</b>: Schedules a task to be executed on the region which owns the location
* <b>Folia and Paper</b>: Schedules a task to be executed on the region which owns the location
* of given entity after the specified delay in ticks
* <p>
* <b>Bukkit</b>: same as {@link #runTaskLater(Runnable, long)}
@@ -217,7 +217,7 @@ public interface TaskScheduler {
}
/**
* <b>Folia & Paper</b>: Schedules a repeating task to be executed on the region which owns the
* <b>Folia and Paper</b>: Schedules a repeating task to be executed on the region which owns the
* location of given entity after the initial delay with the specified period
* <p>
* <b>Bukkit</b>: same as {@link #runTaskTimer(Runnable, long, long)}
@@ -285,7 +285,7 @@ public interface TaskScheduler {
/**
* Calls a method on the main thread and returns a Future object. This task will be executed
* by the main(Bukkit)/global(Folia&Paper) server thread.
* by the main(Bukkit)/global(FoliaandPaper) server thread.
* <p>
* Note: The Future.get() methods must NOT be called from the main thread.
* <p>