From 492250caca24b68cbae406f7a5398b2cd2136bb7 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Tue, 7 Dec 2021 17:16:29 -0600 Subject: [PATCH] Update for TFM refactor --- Spigot-1_14/pom.xml | 6 +- Spigot/pom.xml | 297 +++++++++--------- WG/pom.xml | 151 ++++----- .../worldguardextraflags/wg/TFMHandler.java | 2 +- pom.xml | 8 +- 5 files changed, 237 insertions(+), 227 deletions(-) diff --git a/Spigot-1_14/pom.xml b/Spigot-1_14/pom.xml index 889baa8..1a92c51 100644 --- a/Spigot-1_14/pom.xml +++ b/Spigot-1_14/pom.xml @@ -20,15 +20,15 @@ ess-repo - http://repo.ess3.net/content/groups/essentials + https://repo.ess3.net/content/groups/essentials empcraft - http://ci.athion.net/job/FastAsyncWorldEdit/ws/mvn/ + https://ci.athion.net/job/FastAsyncWorldEdit/ws/mvn/ dmulloy2-repo - http://repo.dmulloy2.net/nexus/repository/public/ + https://repo.dmulloy2.net/nexus/repository/public/ diff --git a/Spigot/pom.xml b/Spigot/pom.xml index 9eb70fd..8f81d5c 100644 --- a/Spigot/pom.xml +++ b/Spigot/pom.xml @@ -1,153 +1,162 @@ - 4.0.0 - - net.goldtreeservers - worldguardextraflags - 4.1.6-SNAPSHOT - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + net.goldtreeservers + worldguardextraflags + 4.1.6-SNAPSHOT + - net.goldtreeservers.worldguardextraflags - Spigot + net.goldtreeservers.worldguardextraflags + Spigot - - WorldGuardExtraFlags - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.0 - - - package - - shade - - - - - - - org.bstats - net.goldtreeservers.worldguardextraflags.bstats - - - - - *:* - - **/*.java - **/*.SF - **/*.DSA - - - - - - - + + WorldGuardExtraFlags + + + org.apache.maven.plugins + maven-shade-plugin + 3.3.1-SNAPSHOT + + + package + + shade + + + + + + + org.bstats + net.goldtreeservers.worldguardextraflags.bstats + + + + + *:* + + **/*.java + **/*.SF + **/*.DSA + + + + + + + - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - sk89q-repo - https://maven.sk89q.com/repo/ - - - essentialsx-repo - https://ci.ender.zone/plugin/repository/everything/ - - - empcraft - http://ci.athion.net/job/FastAsyncWorldEdit/ws/mvn/ - - - dmulloy2-repo - http://repo.dmulloy2.net/nexus/repository/public/ - - - CodeMC - https://repo.codemc.org/repository/maven-public - - + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + sk89q-repo + https://maven.sk89q.com/repo/ + + + essentialsx-repo + https://ci.ender.zone/plugin/repository/everything/ + + + empcraft + https://ci.athion.net/job/FastAsyncWorldEdit/ws/mvn/ + + + dmulloy2-repo + https://repo.dmulloy2.net/nexus/repository/public/ + + + CodeMC + https://repo.codemc.org/repository/maven-public + + + maven-snapshots + https://repository.apache.org/content/repositories/snapshots/ + + - + - net.goldtreeservers.worldguardextraflags - common - ${project.version} - compile - - - net.goldtreeservers.worldguardextraflags - wg - ${project.version} - compile - - - net.goldtreeservers.worldguardextraflags - wg6 - ${project.version} - compile - - - net.goldtreeservers.worldguardextraflags - wg7 - ${project.version} - compile - - - net.goldtreeservers.worldguardextraflags - spigot-1_14 - ${project.version} - compile + org.apache.maven.plugins + maven-shade-plugin + 3.3.1-SNAPSHOT + + net.goldtreeservers.worldguardextraflags + common + ${project.version} + compile + + + net.goldtreeservers.worldguardextraflags + wg + ${project.version} + compile + + + net.goldtreeservers.worldguardextraflags + wg6 + ${project.version} + compile + + + net.goldtreeservers.worldguardextraflags + wg7 + ${project.version} + compile + + + net.goldtreeservers.worldguardextraflags + spigot-1_14 + ${project.version} + compile + - - org.spigotmc - spigot-api - 1.13-R0.1-SNAPSHOT - provided - - - com.sk89q.worldedit - worldedit-bukkit - 7.0.0-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-legacy - 7.0.0-SNAPSHOT - provided - - - net.ess3 - EssentialsX - 2.17.0 - provided - - - com.boydti - fawe-api - 18.07.27-3ed2e57-1163-20.5.2 - provided - - - com.comphenix.protocol - ProtocolLib - 4.5.0 - provided - - - org.bstats - bstats-bukkit - 1.7 - compile - - + + org.spigotmc + spigot-api + 1.13-R0.1-SNAPSHOT + provided + + + com.sk89q.worldedit + worldedit-bukkit + 7.0.0-SNAPSHOT + provided + + + com.sk89q.worldguard + worldguard-legacy + 7.0.0-SNAPSHOT + provided + + + net.ess3 + EssentialsX + 2.17.0 + provided + + + com.boydti + fawe-api + 18.07.27-3ed2e57-1163-20.5.2 + provided + + + com.comphenix.protocol + ProtocolLib + 4.5.0 + provided + + + org.bstats + bstats-bukkit + 1.7 + compile + + \ No newline at end of file diff --git a/WG/pom.xml b/WG/pom.xml index 1f079a5..3211db6 100644 --- a/WG/pom.xml +++ b/WG/pom.xml @@ -1,79 +1,80 @@ - - 4.0.0 - - net.goldtreeservers - worldguardextraflags - 4.1.6-SNAPSHOT - + + 4.0.0 + + net.goldtreeservers + worldguardextraflags + 4.1.6-SNAPSHOT + - net.goldtreeservers.worldguardextraflags - wg + net.goldtreeservers.worldguardextraflags + wg - - - jitpack.io - https://jitpack.io - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - sk89q-repo - https://maven.sk89q.com/repo/ - - - essentialsx-repo - https://ci.ender.zone/plugin/repository/everything/ - - - telesphoreo-repo - https://telesphoreo.me/repo/maven - - + + + jitpack.io + https://jitpack.io + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + sk89q-repo + https://maven.sk89q.com/repo/ + + + essentialsx-repo + https://ci.ender.zone/plugin/repository/everything/ + + + telesphoreo-repo + https://nexus.telesphoreo.me/repository/totalfreedom/ + + - - - org.spigotmc - spigot-api - 1.13-R0.1-SNAPSHOT - provided - - - com.sk89q.worldedit - worldedit-core - 7.0.0-SNAPSHOT - provided - - - com.sk89q.worldedit - worldedit-bukkit - 7.0.0-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-core - 7.0.0-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-legacy - 7.0.0-SNAPSHOT - provided - - - net.ess3 - EssentialsX - 2.17.0 - provided - - - com.github.AtlasMediaGroup - TotalFreedomMod - development-0be2aa718f-1 - provided - - + + + org.spigotmc + spigot-api + 1.13-R0.1-SNAPSHOT + provided + + + com.sk89q.worldedit + worldedit-core + 7.0.0-SNAPSHOT + provided + + + com.sk89q.worldedit + worldedit-bukkit + 7.0.0-SNAPSHOT + provided + + + com.sk89q.worldguard + worldguard-core + 7.0.0-SNAPSHOT + provided + + + com.sk89q.worldguard + worldguard-legacy + 7.0.0-SNAPSHOT + provided + + + net.ess3 + EssentialsX + 2.17.0 + provided + + + me.totalfreedom + TotalFreedomMod + 7.1.0 + provided + + \ No newline at end of file diff --git a/WG/src/main/java/net/goldtreeservers/worldguardextraflags/wg/TFMHandler.java b/WG/src/main/java/net/goldtreeservers/worldguardextraflags/wg/TFMHandler.java index 3bb4142..72dfd2a 100644 --- a/WG/src/main/java/net/goldtreeservers/worldguardextraflags/wg/TFMHandler.java +++ b/WG/src/main/java/net/goldtreeservers/worldguardextraflags/wg/TFMHandler.java @@ -26,6 +26,6 @@ public class TFMHandler public static boolean isAdmin(String name) { - return getTFM().al.getEntryByName(name) != null; + return getTFM().adminList.getEntryByName(name) != null; } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4950ca8..8277213 100644 --- a/pom.xml +++ b/pom.xml @@ -13,10 +13,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.6.1 + 3.8.1 - 1.8 - 1.8 + 17 + 17 @@ -26,7 +26,7 @@ org.projectlombok lombok - 1.16.18 + 1.18.22 provided