2.2.0-SNAPSHOT (#36)

* Set version to 2.2.0-SNAPSHOT

* Update paper-api to 1.21.4-R0.1-SNAPSHOT

* Use de.md5lukas:anvilgui

* Update Shadow to 8.3.5

* Update VanishChecker to 1.0.4

* Update CommandAPI to 9.7.0

* Update Gradle to 8.11.1

* Fix issues with annotations

* Remove deprecated method

* Update README.md

Author: FireML

README.md

@@ -26,7 +26,7 @@ Starting with Version 2.0.4-SNAPSHOT, versioning is handled like so:
         <dependency>
             <groupId>uk.firedev</groupId>
             <artifactId>DaisyLib</artifactId>
-            <version>2.1.0-SNAPSHOT</version>
+            <version>2.2.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -39,6 +39,6 @@ repositories {
 }
 
 dependencies {
-    compileOnly("uk.firedev:DaisyLib:2.1.0-SNAPSHOT")
+    compileOnly("uk.firedev:DaisyLib:2.2.0-SNAPSHOT")
 }
 ```

build.gradle.kts

@@ -19,6 +19,7 @@ repositories {
     maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
     maven("https://repo.minebench.de/")
     maven("https://repo.codemc.io/repository/maven-snapshots/")
+    maven("https://repo.md5lukas.de/public")
 }
 
 dependencies {
@@ -36,7 +37,7 @@ dependencies {
 }
 
 group = "uk.firedev"
-version = "2.1.0-SNAPSHOT"
+version = "2.2.0-SNAPSHOT"
 description = "A collection of classes for easier use of Paper's API"
 java.sourceCompatibility = JavaVersion.VERSION_21
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

gradlew.bat

@@ -3,22 +3,22 @@ rootProject.name = "DaisyLib"
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
-            library("paper-api", "io.papermc.paper:paper-api:1.21.3-R0.1-SNAPSHOT")
+            library("paper-api", "io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
 
             // Requires the remapping shenanigans to work - Compiled against an old Spigot version.
             library("inventorygui", "de.themoep:inventorygui:1.6.4-SNAPSHOT")
-            // Does not support MojMap
-            library("anvilgui", "net.wesjd:anvilgui:1.10.3-SNAPSHOT")
 
             library("universalscheduler", "com.github.Anon8281:UniversalScheduler:0.1.6")
             library("placeholderapi", "me.clip:placeholderapi:2.11.6")
             library("vault", "com.github.MilkBowl:VaultAPI:1.7.1")
-            library("commandapi", "dev.jorel:commandapi-bukkit-shade:9.6.1")
-            library("vanishchecker", "uk.firedev:VanishChecker:1.0.1")
+            library("commandapi", "dev.jorel:commandapi-bukkit-shade:9.7.0")
+            library("vanishchecker", "uk.firedev:VanishChecker:1.0.4")
             library("miniplaceholders", "io.github.miniplaceholders:miniplaceholders-api:2.2.3")
             library("boostedyaml", "dev.dejvokep:boosted-yaml:1.3.7")
+            // TODO update this to 2.0.1 after my PR is merged
+            library("anvilgui", "de.md5lukas:anvilgui:2.0.0")
 
-            plugin("shadow", "com.gradleup.shadow").version("8.3.3")
+            plugin("shadow", "com.gradleup.shadow").version("8.3.5")
             //plugin("paperweight", "io.papermc.paperweight.userdev").version("1.7.1")
             plugin("plugin-yml", "net.minecrell.plugin-yml.paper").version("0.6.0")
         }

settings.gradle.kts

@@ -156,14 +156,6 @@ public StringMessage parsePlaceholderAPI(@Nullable OfflinePlayer player) {
         return this;
     }
 
-    /**
-     * @deprecated Use {@link #parsePlaceholderAPI(OfflinePlayer)} instead. This method will be removed for version 2.2.0-SNAPSHOT.
-     */
-    @Deprecated(forRemoval = true)
-    public StringMessage parsePAPI(@Nullable OfflinePlayer player) {
-        return parsePlaceholderAPI(player);
-    }
-
     public StringMessage addPrefix(@NotNull String prefix) {
         this.message = prefix + this.message;
         return this;

src/main/java/uk/firedev/daisylib/message/string/StringMessage.java

@@ -91,7 +91,7 @@ public List<RequirementType> getRegisteredRequirementTypes() {
      * @param checkLogic The code to run when checking the requirements. The List<String> will be the provided values to check against.
      * @return Whether this type was registered or not
      */
-    public boolean registerRequirement(@NotNull String identifier, @NotNull String author, @NotNull Plugin plugin, @NotNull BiFunction<@NotNull RequirementData, @NotNull List<String>, @NotNull Boolean> checkLogic) {
+    public boolean registerRequirement(@NotNull String identifier, @NotNull String author, @NotNull Plugin plugin, @NotNull BiFunction<RequirementData, List<String>, Boolean> checkLogic) {
 
         return registerRequirement(new RequirementType() {
 

src/main/java/uk/firedev/daisylib/requirement/RequirementManager.java

@@ -92,7 +92,7 @@ public List<RewardType> getRegisteredRewardTypes() {
      * @param checkLogic The code to run when checking the reward. The String will be the provided value to check against.
      * @return Whether this type was registered or not
      */
-    public boolean registerRewardType(@NotNull String identifier, @NotNull String author, @NotNull Plugin plugin, @NotNull BiConsumer<@NotNull Player, @NotNull String> checkLogic) {
+    public boolean registerRewardType(@NotNull String identifier, @NotNull String author, @NotNull Plugin plugin, @NotNull BiConsumer<Player, String> checkLogic) {
 
         return registerRewardType(new RewardType() {
             @Override