TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2024-12-22 16:05:02 +00:00
Code Issues Projects Releases Wiki Activity

refactor

Browse source
This commit is contained in:
speed 2020-12-05 16:42:41 -05:00
parent 9baa7dccc1
commit 73b37b4c8f
7 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Bukkit/build.gradle
View file

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

4
Bukkit/pom.xml
View file

@ -147,9 +147,9 @@
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>me.totalfreedom</groupId>
<groupId>com.github.AtlasMediaGroup</groupId>
<artifactId>TotalFreedomMod</artifactId>
<version>2020.11</version>
<version>0be2aa7</version>
<scope>runtime</scope>
</dependency>
<dependency>

5
Core/build.gradle
View file

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

4
Core/pom.xml
View file

@ -81,9 +81,9 @@
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>me.totalfreedom</groupId>
<groupId>com.github.AtlasMediaGroup</groupId>
<artifactId>TotalFreedomMod</artifactId>
<version>2020.11</version>
<version>0be2aa7</version>
<scope>runtime</scope>
</dependency>
<dependency>

2
Core/src/main/java/com/plotsquared/core/command/Command.java
View file

@ -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<String> getAliases() {

10
Core/src/main/java/me/totalfreedom/plotsquared/PlotSquaredHandler.java
View file

@ -17,21 +17,21 @@ public class PlotSquaredHandler
public static final Logger LOGGER = Bukkit.getPluginManager().getPlugin("PlotSquared").getLogger();
private static Function<Player, Boolean> 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);
}

6
build.gradle
View file

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