From a5ff39cbec7c7df405c7043744da0f08a91311e6 Mon Sep 17 00:00:00 2001 From: tastybento Date: Tue, 7 May 2019 17:37:50 -0700 Subject: [PATCH] Uses ConfigObject instead of DatabaseObject for config file. --- pom.xml | 4 +- .../world/bentobox/warps/config/Settings.java | 40 ++++--------------- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index 456ec17..8766c69 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ world.bentobox warps - 1.4.0 + 1.4.1 WelcomeWarpSigns WelcomeWarpSigns is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like ASkyBlock or AcidIsland. @@ -95,7 +95,7 @@ world.bentobox bentobox - 1.4.0 + 1.5.0-SNAPSHOT world.bentobox diff --git a/src/main/java/world/bentobox/warps/config/Settings.java b/src/main/java/world/bentobox/warps/config/Settings.java index b728e3f..a955b49 100644 --- a/src/main/java/world/bentobox/warps/config/Settings.java +++ b/src/main/java/world/bentobox/warps/config/Settings.java @@ -5,8 +5,8 @@ import java.util.Set; import world.bentobox.bentobox.api.configuration.ConfigComment; import world.bentobox.bentobox.api.configuration.ConfigEntry; +import world.bentobox.bentobox.api.configuration.ConfigObject; import world.bentobox.bentobox.api.configuration.StoreAt; -import world.bentobox.bentobox.database.objects.DataObject; @StoreAt(filename="config.yml", path="addons/WelcomeWarps") @@ -15,7 +15,7 @@ import world.bentobox.bentobox.database.objects.DataObject; @ConfigComment("You cannot edit it while the server is running because changes will") @ConfigComment("be lost! Use in-game settings GUI or edit when server is offline.") @ConfigComment("") -public class Settings implements DataObject +public class Settings implements ConfigObject { @ConfigComment("") @ConfigComment("Warp Restriction - needed levels to be able to create a warp") @@ -44,12 +44,9 @@ public class Settings implements DataObject @ConfigEntry(path = "disabled-gamemodes") private Set disabledGameModes = new HashSet<>(); - @ConfigComment("") - private String uniqueId = "config"; - -// --------------------------------------------------------------------- -// Section: Constructor -// --------------------------------------------------------------------- + // --------------------------------------------------------------------- + // Section: Constructor + // --------------------------------------------------------------------- /** @@ -61,9 +58,9 @@ public class Settings implements DataObject } -// --------------------------------------------------------------------- -// Section: Methods -// --------------------------------------------------------------------- + // --------------------------------------------------------------------- + // Section: Methods + // --------------------------------------------------------------------- /** @@ -74,27 +71,6 @@ public class Settings implements DataObject return warpLevelRestriction; } - - /** - * @return the uniqueId - */ - @Override - public String getUniqueId() - { - return uniqueId; - } - - - /** - * @param uniqueId - unique ID the uniqueId to set - */ - @Override - public void setUniqueId(String uniqueId) - { - this.uniqueId = uniqueId; - } - - /** * This method sets the warpLevelRestriction object value. * @param warpLevelRestriction the warpLevelRestriction object new value.