diff --git a/BetterRTPAddons/pom.xml b/BetterRTPAddons/pom.xml
index dc10d8a..26d9961 100644
--- a/BetterRTPAddons/pom.xml
+++ b/BetterRTPAddons/pom.xml
@@ -7,7 +7,7 @@
me.SuperRonanCraft
BetterRTPAddons
jar
- 1.8.8
+ 1.8.10
1.8
diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/Main.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/Main.java
index f08b531..4f05d5f 100644
--- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/Main.java
+++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/Main.java
@@ -1,5 +1,6 @@
package me.SuperRonanCraft.BetterRTPAddons;
+import lombok.Getter;
import me.SuperRonanCraft.BetterRTPAddons.util.Files;
import me.SuperRonanCraft.BetterRTPAddons.util.ReloadListener;
import org.bukkit.Bukkit;
@@ -7,8 +8,11 @@ import org.bukkit.plugin.java.JavaPlugin;
public class Main extends JavaPlugin {
+ @Getter
private static Main instance;
+ @Getter
private final AddonsHandler addonsHandler = new AddonsHandler();
+ @Getter
private final Files files = new Files();
public final AddonMessages msgs = new AddonMessages();
private final ReloadListener reloadListener = new ReloadListener();
@@ -30,15 +34,4 @@ public class Main extends JavaPlugin {
addonsHandler.load();
}
- public Files getFiles() {
- return files;
- }
-
- public AddonsHandler getAddonsHandler() {
- return addonsHandler;
- }
-
- public static Main getInstance() {
- return instance;
- }
}
diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/cmds/AddonsCommand_Version.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/cmds/AddonsCommand_Version.java
index f520285..0f738fc 100644
--- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/cmds/AddonsCommand_Version.java
+++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/cmds/AddonsCommand_Version.java
@@ -1,17 +1,9 @@
package me.SuperRonanCraft.BetterRTPAddons.cmds;
-import me.SuperRonanCraft.BetterRTP.BetterRTP;
-import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
-import me.SuperRonanCraft.BetterRTP.references.messages.Message;
-import me.SuperRonanCraft.BetterRTPAddons.AddonMessages;
-import me.SuperRonanCraft.BetterRTPAddons.AddonsHandler;
import me.SuperRonanCraft.BetterRTPAddons.Main;
import me.SuperRonanCraft.BetterRTPAddons.util.Message_ADDONS;
import org.bukkit.command.CommandSender;
-import java.util.ArrayList;
-import java.util.List;
-
public class AddonsCommand_Version implements AddonsCommands {
@Override
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/PermissionCheck.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/PermissionCheck.java
index 47445e1..2919544 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/PermissionCheck.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/PermissionCheck.java
@@ -49,9 +49,10 @@ public interface PermissionCheck {
String getNode();
+ @Getter
class PermissionResult {
- @Getter private final boolean passed;
- @Getter private final String string;
+ private final boolean passed;
+ private final String string;
PermissionResult(String string, boolean passed) {
this.passed = passed;
this.string = string;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/PermissionNode.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/PermissionNode.java
index ee7c873..db24bb7 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/PermissionNode.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/PermissionNode.java
@@ -2,6 +2,7 @@ package me.SuperRonanCraft.BetterRTP.references;
import lombok.Getter;
+@Getter
public enum PermissionNode implements PermissionCheck {
ADMIN("admin"),
@@ -25,7 +26,7 @@ public enum PermissionNode implements PermissionCheck {
DEVELOPER("DEVELOPER_PERM"),
;
- @Getter private final String node;
+ private final String node;
PermissionNode(String node) {
this.node = PermissionCheck.getPrefix() + node;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/Permissions.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/Permissions.java
index ab26be0..5a02914 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/Permissions.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/Permissions.java
@@ -16,93 +16,3 @@ public class Permissions {
}
}
- //Moved to PermissionNode.NODE
- /*private final String pre = "betterrtp.";
-
- public boolean getUse(CommandSender sendi) {
- return checkPerm(pre + "use", sendi);
- }
-
- public boolean getBypassEconomy(CommandSender sendi) {
- return checkPerm(pre + "bypass.economy", sendi);
- }
-
- public boolean getBypassHunger(CommandSender sendi) {
- return checkPerm(pre + "bypass.hunger", sendi);
- }
-
- public boolean getBypassCooldown(CommandSender sendi) {
- return checkPerm(pre + "bypass.cooldown", sendi);
- }
-
- public boolean getBypassDelay(CommandSender sendi) {
- return checkPerm(pre + "bypass.delay", sendi);
- }
-
- public boolean getReload(CommandSender sendi) {
- return checkPerm(pre + "reload", sendi);
- }
-
- public boolean getSettings(CommandSender sendi) {
- return checkPerm(pre + "settings", sendi);
- }
-
- public boolean getInfo(CommandSender sendi) {
- return checkPerm(pre + "info", sendi);
- }
-
- public boolean getUpdate(CommandSender sendi) {
- return checkPerm(pre + "updater", sendi);
- }
-
- public boolean getRtpOther(CommandSender sendi) {
- return checkPerm(pre + "player", sendi);
- }
-
- public boolean getBiome(CommandSender sendi) {
- return checkPerm(pre + "biome", sendi);
- }
-
- public boolean getWorld(CommandSender sendi) {
- return checkPerm(pre + "world", sendi);
- }
-
- public boolean getSignCreate(CommandSender sendi) {
- return checkPerm(pre + "sign", sendi);
- }
-
- public boolean getTest(CommandSender sendi) {
- return checkPerm(pre + "test", sendi);
- }
-
- public boolean getVersion(CommandSender sendi) {
- return checkPerm(pre + "version", sendi);
- }
-
- public boolean getAWorld(CommandSender sendi, String world) {
- if (checkPerm(pre + "world.*", sendi))
- return true;
- else if (world == null) {
- for (World w : Bukkit.getWorlds())
- if (checkPerm(pre + "world." + w.getName(), sendi))
- return true;
- } else
- return checkPerm(pre + "world." + world, sendi);
- return false;
- }
-
- public boolean getEdit(CommandSender sendi) {
- return checkPerm(pre + "edit", sendi);
- }
-
- public boolean getLocation(CommandSender sendi) {
- return checkPerm(pre + "location", sendi);
- }
-
- public boolean getLocation(CommandSender sendi, String location) {
- return checkPerm(pre + "location." + location, sendi);
- }
-
- public boolean getPermissionGroup(CommandSender sendi, String group) {
- return checkPerm(pre + "group." + group, sendi);
- }*/
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/worlds/WorldPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/worlds/WorldPlayer.java
index 145fe1d..71ce05a 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/worlds/WorldPlayer.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/worlds/WorldPlayer.java
@@ -17,8 +17,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.*;
public class WorldPlayer implements RTPWorld, RTPWorld_Defaulted {
- private boolean useWorldborder;
- private boolean RTPOnDeath;
+ private boolean useWorldborder, RTPOnDeath;
private int CenterX, CenterZ, maxRad, minRad, price, min_y, max_y;
private long cooldown;
private List Biomes;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java
index 3d0dcd7..e652811 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java
@@ -28,9 +28,11 @@ public class SoftDepends {
+ @Setter
+ @Getter
static public class RegionPlugin {
- @Getter @Setter private boolean respecting;
- @Getter @Setter private boolean enabled;
+ private boolean respecting;
+ private boolean enabled;
}
private void debug(String str) {