diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 6e8f3e4f2..00ce3af55 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -15,7 +15,6 @@ repositories { maven { url = "https://mvn.intellectualsites.com/content/repositories/releases" } maven { url = "https://mvn.intellectualsites.com/content/repositories/snapshots" } maven { url = "http://repo.mvdw-software.be/content/groups/public/" } - maven { url = "https://telesphoreo.me/repo/maven" } mavenLocal() } @@ -42,7 +41,7 @@ dependencies { compile("se.hyperver.hyperverse:Core:0.6.0-SNAPSHOT"){ transitive = false } compile('com.sk89q:squirrelid:1.0.0-SNAPSHOT'){ transitive = false } compile('be.maximvdw:MVdWPlaceholderAPI:3.1.1'){ transitive = false } - implementation('me.totalfreedom:TotalFreedomMod:2020.11'){ transitive = false } + implementation('com.github.AtlasMediaGroup:TotalFreedomMod:0be2aa7'){ transitive = false } } sourceCompatibility = 1.8 @@ -118,4 +117,4 @@ shadowJar.doLast { build.dependsOn(shadowJar) build.finalizedBy(copyFiles) -copyFiles.dependsOn(createPom) +copyFiles.dependsOn(createPom) \ No newline at end of file diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml index e773a0ead..74d8e9368 100644 --- a/Bukkit/pom.xml +++ b/Bukkit/pom.xml @@ -147,9 +147,9 @@ runtime - me.totalfreedom + com.github.AtlasMediaGroup TotalFreedomMod - 2020.11 + 0be2aa7 runtime diff --git a/Core/build.gradle b/Core/build.gradle index 5af995fde..ab33e884c 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -4,7 +4,6 @@ repositories { maven { url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" } maven { url = "https://rayzr.dev/repo/" } maven { url = "https://repo.dmulloy2.net/nexus/repository/public/" } - maven { url = "https://telesphoreo.me/repo/maven" } } def textVersion = "3.0.2" @@ -23,7 +22,7 @@ dependencies { implementation("org.jetbrains:annotations:20.1.0") implementation("org.khelekore:prtree:1.7.0-SNAPSHOT") implementation("org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT") - implementation("me.totalfreedom:TotalFreedomMod:2020.11") + implementation("com.github.AtlasMediaGroup:TotalFreedomMod:0be2aa7") } sourceCompatibility = 1.8 @@ -97,4 +96,4 @@ shadowJar.doLast { build.dependsOn(shadowJar) build.finalizedBy(copyFiles) -copyFiles.dependsOn(createPom) +copyFiles.dependsOn(createPom) \ No newline at end of file diff --git a/Core/pom.xml b/Core/pom.xml index e99545256..9a6dbb8bc 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -81,9 +81,9 @@ runtime - me.totalfreedom + com.github.AtlasMediaGroup TotalFreedomMod - 2020.11 + 0be2aa7 runtime diff --git a/Core/src/main/java/com/plotsquared/core/command/Command.java b/Core/src/main/java/com/plotsquared/core/command/Command.java index c49ac0510..212ce7cc9 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Command.java +++ b/Core/src/main/java/com/plotsquared/core/command/Command.java @@ -161,7 +161,7 @@ public abstract class Command { public boolean hasConfirmation(CommandCaller player) { // Confirmation message bypass - return this.confirmation && !plotSquaredHandler.isStaff(player); + return this.confirmation && !plotSquaredHandler.isAdmin(player); } public List getAliases() { diff --git a/Core/src/main/java/me/totalfreedom/plotsquared/PlotSquaredHandler.java b/Core/src/main/java/me/totalfreedom/plotsquared/PlotSquaredHandler.java index 5a708a9aa..e4bbd2022 100644 --- a/Core/src/main/java/me/totalfreedom/plotsquared/PlotSquaredHandler.java +++ b/Core/src/main/java/me/totalfreedom/plotsquared/PlotSquaredHandler.java @@ -17,21 +17,21 @@ public class PlotSquaredHandler public static final Logger LOGGER = Bukkit.getPluginManager().getPlugin("PlotSquared").getLogger(); private static Function adminProvider; - public boolean isStaff(CommandCaller commandCaller) + public boolean isAdmin(CommandCaller commandCaller) { final Player player = getPlayer(commandCaller.toString()); if (player == null) { return false; } - return isStaff(player); + return isAdmin(player); } @SuppressWarnings("unchecked") - public boolean isStaff(Player player) + public boolean isAdmin(Player player) { TotalFreedomMod tfm = getTFM(); - return tfm.sl.isStaff(player); + return tfm.al.isAdmin(player); } public static Player getPlayer(CommandCaller commandCaller) @@ -59,7 +59,7 @@ public class PlotSquaredHandler "plots.worldedit.bypass", "plots.area", "plots.grant.add", "plots.debugallowunsafe", "plots.debugroadgen", "plots.debugpaste", "plots.createroadschematic", "plots.merge", "plots.unlink", "plots.area", "plots.setup", "plots.set.flag.other", "plots.reload", "plots.backup", "plots.debug"); - if (!isStaff(player)) + if (!isAdmin(player)) { return !permission.startsWith("plots.admin") && !adminOnlyPermissions.contains(permission); } diff --git a/build.gradle b/build.gradle index c5cb49133..5fa6680c6 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { maven { url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" } maven { url = "https://rayzr.dev/repo/" } maven { url = "https://repo.dmulloy2.net/nexus/repository/public/" } - maven { url = "https://telesphoreo.me/repo/maven" } + maven { url = "https://jitpack.io" } } dependencies { classpath("com.github.jengelman.gradle.plugins:shadow:5.0.0") @@ -91,7 +91,7 @@ subprojects { testAnnotationProcessor("org.projectlombok:lombok:1.18.8") testImplementation("junit:junit:4.13") implementation("org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT") - implementation("me.totalfreedom:TotalFreedomMod:2020.11") + implementation("com.github.AtlasMediaGroup:TotalFreedomMod:0be2aa7") } configurations.all { @@ -143,4 +143,4 @@ task aggregatedJavadocs(type: Javadoc, description: "Generate javadocs from all includes += javadocTask.includes } } -} +} \ No newline at end of file