From f42c15e2255c30a44cbd9d4a4a4ca1152da9ed20 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 8 Feb 2019 17:51:50 -0800 Subject: [PATCH] Removes extraneous settings https://github.com/BentoBoxWorld/BentoBox/issues/531 --- .gitignore | 3 + .../world/bentobox/caveblock/Settings.java | 77 ------------------- src/main/resources/config.yml | 7 -- 3 files changed, 3 insertions(+), 84 deletions(-) diff --git a/.gitignore b/.gitignore index c836fce..a581609 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* /target/ +/.DS_Store +/.classpath +/.project diff --git a/src/main/java/world/bentobox/caveblock/Settings.java b/src/main/java/world/bentobox/caveblock/Settings.java index a1571bd..9e74479 100644 --- a/src/main/java/world/bentobox/caveblock/Settings.java +++ b/src/main/java/world/bentobox/caveblock/Settings.java @@ -412,16 +412,6 @@ public class Settings implements DataObject, WorldSettings } - /** - * This method returns the resetConfirmation object. - * @return the resetConfirmation object. - */ - public boolean isResetConfirmation() - { - return resetConfirmation; - } - - /** * This method returns the leaversLoseReset object. * @return the leaversLoseReset object. @@ -508,16 +498,6 @@ public class Settings implements DataObject, WorldSettings } - /** - * This method returns the respawnOnIsland object. - * @return the respawnOnIsland object. - */ - public boolean isRespawnOnIsland() - { - return respawnOnIsland; - } - - /** * This method returns the allowSetHomeInNether object. * @return the allowSetHomeInNether object. @@ -627,16 +607,6 @@ public class Settings implements DataObject, WorldSettings } - /** - * This method returns the closePanelOnClickOutside object. - * @return the closePanelOnClickOutside object. - */ - public boolean isClosePanelOnClickOutside() - { - return closePanelOnClickOutside; - } - - /** * @return the permission prefix */ @@ -1195,17 +1165,6 @@ public class Settings implements DataObject, WorldSettings } - /** - * This method sets the resetConfirmation object value. - * @param resetConfirmation the resetConfirmation object new value. - * - */ - public void setResetConfirmation(boolean resetConfirmation) - { - this.resetConfirmation = resetConfirmation; - } - - /** * This method sets the leaversLoseReset object value. * @param leaversLoseReset the leaversLoseReset object new value. @@ -1294,17 +1253,6 @@ public class Settings implements DataObject, WorldSettings } - /** - * This method sets the respawnOnIsland object value. - * @param respawnOnIsland the respawnOnIsland object new value. - * - */ - public void setRespawnOnIsland(boolean respawnOnIsland) - { - this.respawnOnIsland = respawnOnIsland; - } - - /** * This method sets the allowSetHomeInNether object value. * @param allowSetHomeInNether the allowSetHomeInNether object new value. @@ -1414,18 +1362,6 @@ public class Settings implements DataObject, WorldSettings this.ivSettings = ivSettings; } - - /** - * This method sets the closePanelOnClickOutside object value. - * @param closePanelOnClickOutside the closePanelOnClickOutside object new value. - * - */ - public void setClosePanelOnClickOutside(boolean closePanelOnClickOutside) - { - this.closePanelOnClickOutside = closePanelOnClickOutside; - } - - /** * This method sets the resetEpoch object value. * @param resetEpoch the resetEpoch object new value. @@ -1895,9 +1831,6 @@ public class Settings implements DataObject, WorldSettings @ConfigEntry(path = "island.reset.reset-limit") private int resetLimit = -1; - @ConfigEntry(path = "island.require-confirmation.reset") - private boolean resetConfirmation = true; - @ConfigComment("Kicked or leaving players lose resets") @ConfigComment("Players who leave a team will lose an island reset chance") @ConfigComment("If a player has zero resets left and leaves a team, they cannot make a new") @@ -1946,10 +1879,6 @@ public class Settings implements DataObject, WorldSettings @ConfigEntry(path = "island.reset.on-leave.ender-chest") private boolean onLeaveResetEnderChest = false; - @ConfigComment("Have player's respawn on their island if they die") - @ConfigEntry(path = "island.respawn-on-island") - private boolean respawnOnIsland = true; - // Sethome @ConfigEntry(path = "island.sethome.nether.allow") private boolean allowSetHomeInNether = true; @@ -1993,12 +1922,6 @@ public class Settings implements DataObject, WorldSettings @ConfigEntry(path = "protection.invincible-visitors") private List ivSettings = new ArrayList<>(); - //---------------------------------------------------------------------------------------/ - - @ConfigComment("Whether GUIs should be closed when the player clicks outside.") - @ConfigEntry(path = "panel.close-on-click-outside") - private boolean closePanelOnClickOutside = true; - //---------------------------------------------------------------------------------------/ @ConfigComment("These settings should not be edited") @ConfigEntry(path = "do-not-edit-these-settings.reset-epoch") diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 14482ff..29691c8 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -311,10 +311,6 @@ island: inventory: false # Reset Ender Chest - if true, the player's Ender Chest will be cleared. ender-chest: false - require-confirmation: - reset: true - # Have player's respawn on their island if they die - respawn-on-island: false sethome: nether: allow: true @@ -364,9 +360,6 @@ protection: - HOT_FLOOR - CRAMMING - VOID -panel: - # Whether GUIs should be closed when the player clicks outside. - close-on-click-outside: true do-not-edit-these-settings: # These settings should not be edited reset-epoch: 0