From c0b43f26ea9b4d057e890418ebff8818ebeb4504 Mon Sep 17 00:00:00 2001 From: ZeroEpoch1969 <13510767+ZeroEpoch1969@users.noreply.github.com> Date: Tue, 24 Jul 2018 22:52:49 -0700 Subject: [PATCH] This is why Lombok exists --- .../totalfreedommod/admin/Admin.java | 65 ------------------- .../totalfreedommod/caging/CageData.java | 20 ------ .../totalfreedommod/freeze/Freezer.java | 5 -- .../totalfreedommod/player/FPlayer.java | 40 ------------ .../playerverification/VPlayer.java | 5 -- .../totalfreedommod/world/AdminWorld.java | 3 +- .../totalfreedommod/world/Flatlands.java | 5 -- .../world/MasterBuilderWorld.java | 3 +- 8 files changed, 2 insertions(+), 144 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java index eb99276e..329f673c 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java @@ -171,11 +171,6 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable } } - public String getLoginMessage() - { - return this.loginMessage; - } - public void removeIp(String ip) { if (ips.contains(ip)) @@ -218,64 +213,4 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable && !ips.isEmpty() && lastLogin != null; } - - public boolean isActive() - { - return this.active; - } - - public String getConfigKey() - { - return this.configKey; - } - - public String getName() - { - return this.name; - } - - public void setName(final String name) - { - this.name = name; - } - - public Rank getRank() - { - return this.rank; - } - - public void setRank(final Rank rank) - { - this.rank = rank; - } - - public List getIps() - { - return this.ips; - } - - public Date getLastLogin() - { - return this.lastLogin; - } - - public void setLastLogin(final Date lastLogin) - { - this.lastLogin = lastLogin; - } - - public void setLoginMessage(final String loginMessage) - { - this.loginMessage = loginMessage; - } - - public String getDiscordID() - { - return this.discordID; - } - - public void setDiscordID(String discordID) - { - this.discordID = discordID; - } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/caging/CageData.java b/src/main/java/me/totalfreedom/totalfreedommod/caging/CageData.java index 20b4a957..430b7ad7 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/caging/CageData.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/caging/CageData.java @@ -218,26 +218,6 @@ public class CageData } } - public boolean isCaged() - { - return this.caged; - } - - public Location getLocation() - { - return this.location; - } - - public Material getOuterMaterial() - { - return this.outerMaterial; - } - - public Material getInnerMaterial() - { - return this.innerMaterial; - } - private static class BlockData { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/freeze/Freezer.java b/src/main/java/me/totalfreedom/totalfreedommod/freeze/Freezer.java index e0fd75d7..8e5b704f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/freeze/Freezer.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/freeze/Freezer.java @@ -32,11 +32,6 @@ public class Freezer extends FreedomService { } - public boolean isGlobalFreeze() - { - return this.globalFreeze; - } - public void setGlobalFreeze(boolean frozen) { this.globalFreeze = frozen; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java b/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java index 16b2da6d..d33d16ef 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java @@ -131,41 +131,6 @@ public class FPlayer return orbitStrength; } - public boolean isInvSee() - { - return invSee; - } - - public void setInvSee(boolean toggle) - { - this.invSee = toggle; - } - - public boolean isEditBlocked() - { - return editBlocked; - } - - public void setEditBlocked(boolean toggle) - { - this.editBlocked = toggle; - } - - public boolean isPvpBlocked() - { - return pvpBlocked; - } - - public CageData getCageData() - { - return cageData; - } - - public void setPvpBlocked(boolean toggle) - { - this.pvpBlocked = toggle; - } - public boolean isFuckOff() { return fuckoffRadius > 0; @@ -378,11 +343,6 @@ public class FPlayer this.inAdminchat = inAdminchat; } - public FreezeData getFreezeData() - { - return freezeData; - } - public boolean inAdminChat() { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/playerverification/VPlayer.java b/src/main/java/me/totalfreedom/totalfreedommod/playerverification/VPlayer.java index 327244bc..f5a054d9 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/playerverification/VPlayer.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/playerverification/VPlayer.java @@ -82,11 +82,6 @@ public class VPlayer implements ConfigLoadable, ConfigSavable, Validatable return ips.remove(ip); } - public void setDiscordId(final String discordId) - { - this.discordId = discordId; - } - @Override public boolean isValid() { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/world/AdminWorld.java b/src/main/java/me/totalfreedom/totalfreedommod/world/AdminWorld.java index 9c7d5800..c78ca58f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/world/AdminWorld.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/world/AdminWorld.java @@ -27,7 +27,6 @@ public final class AdminWorld extends CustomWorld private static final long CACHE_CLEAR_FREQUENCY = 30L * 1000L; //30 seconds, milliseconds private static final long TP_COOLDOWN_TIME = 500L; //0.5 seconds, milliseconds private static final String GENERATION_PARAMETERS = ConfigEntry.FLATLANDS_GENERATE_PARAMS.getString(); - private static final String WORLD_NAME = "adminworld"; // private final Map teleportCooldown = new HashMap<>(); private final Map accessCache = new HashMap<>(); @@ -56,7 +55,7 @@ public final class AdminWorld extends CustomWorld @Override protected World generateWorld() { - final WorldCreator worldCreator = new WorldCreator(WORLD_NAME); + final WorldCreator worldCreator = new WorldCreator(getName()); worldCreator.generateStructures(false); worldCreator.type(WorldType.NORMAL); worldCreator.environment(World.Environment.NORMAL); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/world/Flatlands.java b/src/main/java/me/totalfreedom/totalfreedommod/world/Flatlands.java index f3cde1bc..d151a671 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/world/Flatlands.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/world/Flatlands.java @@ -23,7 +23,6 @@ public class Flatlands extends CustomWorld { super("flatlands"); } - private static final String WORLD_NAME = "flatlands"; @Override protected World generateWorld() @@ -90,8 +89,4 @@ public class Flatlands extends CustomWorld } } - public String getName() - { - return this.WORLD_NAME; - } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/world/MasterBuilderWorld.java b/src/main/java/me/totalfreedom/totalfreedommod/world/MasterBuilderWorld.java index 7e18565a..668861bd 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/world/MasterBuilderWorld.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/world/MasterBuilderWorld.java @@ -28,7 +28,6 @@ public final class MasterBuilderWorld extends CustomWorld // private WorldWeather weather = WorldWeather.OFF; private WorldTime time = WorldTime.INHERIT; - private static final String WORLD_NAME = "masterbuilderworld"; public MasterBuilderWorld() { @@ -44,7 +43,7 @@ public final class MasterBuilderWorld extends CustomWorld @Override protected World generateWorld() { - final WorldCreator worldCreator = new WorldCreator(WORLD_NAME); + final WorldCreator worldCreator = new WorldCreator(getName()); worldCreator.generateStructures(false); worldCreator.type(WorldType.NORMAL); worldCreator.environment(World.Environment.NORMAL);