Repo-Mirror/rpgregions-2
9
0
Fork 0
mirror of https://gitlab.com/SamB440/rpgregions-2.git synced 2025-12-28 11:19:24 +00:00
Code Issues Releases Activity

Fix gradle build

Browse Source
This commit is contained in:
SamB440
2022-04-15 20:41:50 +01:00
parent 010f3518f8
commit 4d9926dbcf
7 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle.kts
View File

@@ -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 {

5
modern/build.gradle.kts
View File

@@ -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"))
}

6
modern/src/main/java/net/islandearth/rpgregions/api/integrations/griefprevention/GriefPreventionIntegration.java
View File

@@ -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<Location> getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) {
public @NonNull List<Location> getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) {
List<Location> points = new ArrayList<>();
Claim claim = GriefPrevention.instance.dataStore.getClaimAt(regionLocation, false, null);
if (regionId != null && !String.valueOf(claim.getID()).equals(regionId)) {

6
modern/src/main/java/net/islandearth/rpgregions/api/integrations/residence/ResidenceIntegration.java
View File

@@ -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<Location> getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) {
public @NonNull List<Location> getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) {
return new ArrayList<>();
}
}

6
modern/src/main/java/net/islandearth/rpgregions/api/integrations/ultraregions/UltraRegionsIntegration.java
View File

@@ -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<Location> getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) {
public @NonNull List<Location> getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) {
List<Location> points = new ArrayList<>();
for (Region region : getProtectedRegions(regionLocation)) {
if (regionId != null && !region.getName().equals(regionId)) {

6
modern/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardIntegration.java
View File

@@ -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<Location> getBoundingBoxPoints(Location regionLocation, @Nullable String regionId) {
List<Location> points = new ArrayList<>();
for (ProtectedRegion protectedRegion : getProtectedRegions(regionLocation)) {

3
rpgregions/build.gradle.kts
View File

@@ -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")
}
}