diff --git a/build.gradle.kts b/build.gradle.kts index e41b1e5..3054b29 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -70,6 +70,9 @@ allprojects { shadowJar { archiveClassifier.set("") + + relocate("com.convallyria.languagy", "net.islandearth.rpgregions.libs.languagy") + relocate("io.papermc.lib", "net.islandearth.rpgregions.libs.paperlib") } build { diff --git a/modern/build.gradle.kts b/modern/build.gradle.kts index 9de4927..c2e2a2a 100644 --- a/modern/build.gradle.kts +++ b/modern/build.gradle.kts @@ -18,7 +18,6 @@ dependencies { compileOnly(":GriefPrevention") // griefprevention if (ultraRegionsSupport) compileOnly(":UltraRegions") // ultraregions - compileOnly("org.jetbrains:annotations:23.0.0") - compileOnly(project(":api")) - compileOnly(project(":rpgregions")) + compileOnly(project(":api", "shadow")) + compileOnly(project(":rpgregions", "shadow")) } \ No newline at end of file diff --git a/modern/src/main/java/net/islandearth/rpgregions/api/integrations/griefprevention/GriefPreventionIntegration.java b/modern/src/main/java/net/islandearth/rpgregions/api/integrations/griefprevention/GriefPreventionIntegration.java index 7a6344b..3c7e378 100644 --- a/modern/src/main/java/net/islandearth/rpgregions/api/integrations/griefprevention/GriefPreventionIntegration.java +++ b/modern/src/main/java/net/islandearth/rpgregions/api/integrations/griefprevention/GriefPreventionIntegration.java @@ -11,8 +11,8 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerMoveEvent; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.ArrayList; import java.util.HashSet; @@ -70,7 +70,7 @@ public class GriefPreventionIntegration implements IntegrationManager { } @Override - public @NotNull List getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) { + public @NonNull List getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) { List points = new ArrayList<>(); Claim claim = GriefPrevention.instance.dataStore.getClaimAt(regionLocation, false, null); if (regionId != null && !String.valueOf(claim.getID()).equals(regionId)) { diff --git a/modern/src/main/java/net/islandearth/rpgregions/api/integrations/residence/ResidenceIntegration.java b/modern/src/main/java/net/islandearth/rpgregions/api/integrations/residence/ResidenceIntegration.java index 063374e..5b9ac66 100644 --- a/modern/src/main/java/net/islandearth/rpgregions/api/integrations/residence/ResidenceIntegration.java +++ b/modern/src/main/java/net/islandearth/rpgregions/api/integrations/residence/ResidenceIntegration.java @@ -11,8 +11,8 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerMoveEvent; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.ArrayList; import java.util.List; @@ -62,7 +62,7 @@ public class ResidenceIntegration implements IntegrationManager { } @Override - public @NotNull List getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) { + public @NonNull List getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) { return new ArrayList<>(); } } diff --git a/modern/src/main/java/net/islandearth/rpgregions/api/integrations/ultraregions/UltraRegionsIntegration.java b/modern/src/main/java/net/islandearth/rpgregions/api/integrations/ultraregions/UltraRegionsIntegration.java index 054ba36..52a758c 100644 --- a/modern/src/main/java/net/islandearth/rpgregions/api/integrations/ultraregions/UltraRegionsIntegration.java +++ b/modern/src/main/java/net/islandearth/rpgregions/api/integrations/ultraregions/UltraRegionsIntegration.java @@ -14,8 +14,8 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerMoveEvent; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.ArrayList; import java.util.HashSet; @@ -89,7 +89,7 @@ public class UltraRegionsIntegration implements IntegrationManager { } @Override - public @NotNull List getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) { + public @NonNull List getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) { List points = new ArrayList<>(); for (Region region : getProtectedRegions(regionLocation)) { if (regionId != null && !region.getName().equals(regionId)) { diff --git a/modern/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardIntegration.java b/modern/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardIntegration.java index b76c41f..94a526f 100644 --- a/modern/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardIntegration.java +++ b/modern/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardIntegration.java @@ -14,8 +14,8 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerMoveEvent; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; import java.util.ArrayList; import java.util.List; @@ -106,7 +106,7 @@ public class WorldGuardIntegration implements IntegrationManager { } @Override - @NotNull + @NonNull public List getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) { List points = new ArrayList<>(); for (ProtectedRegion protectedRegion : getProtectedRegions(regionLocation)) { diff --git a/rpgregions/build.gradle.kts b/rpgregions/build.gradle.kts index a3b647d..b7d0af8 100644 --- a/rpgregions/build.gradle.kts +++ b/rpgregions/build.gradle.kts @@ -54,13 +54,12 @@ tasks { } shadowJar { - relocate("com.convallyria.languagy", "net.islandearth.rpgregions.libs.languagy") + minimize() relocate("co.aikar.commands", "net.islandearth.rpgregions.libs.acf") relocate("co.aikar.locales", "net.islandearth.rpgregions.libs.acf.locales") relocate("co.aikar.idb", "net.islandearth.rpgregions.libs.idb") relocate("com.github.stefvanschie.inventoryframework", "net.islandearth.rpgregions.libs.inventoryframework") relocate("org.bstats", "net.islandearth.rpgregions.libs.bstats") - relocate("io.papermc.lib", "net.islandearth.rpgregions.libs.paperlib") relocate("net.wesjd", "net.islandearth.rpgregions.libs.anvilgui") } } \ No newline at end of file