Move VisibilityMode and UpdateMode enums to Settings class.

BentoBoxWorld · Jan 8, 2019 · ce0d390 · ce0d390
1 parent 1a86acf
commit ce0d390
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 47 deletions.
diff --git a/src/main/java/world/bentobox/biomes/BiomesAddonManager.java b/src/main/java/world/bentobox/biomes/BiomesAddonManager.java
@@ -14,8 +14,8 @@
 import world.bentobox.bentobox.database.Database;
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.biomes.objects.BiomesObject;
+import world.bentobox.biomes.objects.Settings.VisibilityMode;
 import world.bentobox.biomes.utils.Utils;
-import world.bentobox.biomes.utils.Utils.VisibilityMode;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/ExpandedCompositeCommand.java b/src/main/java/world/bentobox/biomes/commands/ExpandedCompositeCommand.java
@@ -12,8 +12,8 @@
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.biomes.BiomesAddon;
 import world.bentobox.biomes.objects.BiomesObject;
+import world.bentobox.biomes.objects.Settings.UpdateMode;
 import world.bentobox.biomes.utils.Utils;
-import world.bentobox.biomes.utils.Utils.UpdateMode;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/admin/SetBiomeCommand.java b/src/main/java/world/bentobox/biomes/commands/admin/SetBiomeCommand.java
@@ -12,10 +12,9 @@
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.biomes.commands.ExpandedCompositeCommand;
 import world.bentobox.biomes.objects.BiomesObject;
+import world.bentobox.biomes.objects.Settings.UpdateMode;
 import world.bentobox.biomes.panel.admin.AdminUserListPanel;
 import world.bentobox.biomes.tasks.BiomeUpdateHelper;
-import world.bentobox.biomes.utils.Utils.UpdateMode;
-
 
 /**
  * This is admin command that allows to change user biomes.

diff --git a/src/main/java/world/bentobox/biomes/commands/admin/SettingsCommand.java b/src/main/java/world/bentobox/biomes/commands/admin/SettingsCommand.java
@@ -10,10 +10,9 @@
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.biomes.commands.ExpandedCompositeCommand;
+import world.bentobox.biomes.objects.Settings.UpdateMode;
 import world.bentobox.biomes.panel.admin.AdminSettingsPanel;
 import world.bentobox.biomes.utils.Utils;
-import world.bentobox.biomes.utils.Utils.UpdateMode;
-
 
 /**
  * This command allows to edit biomes addon settings.

diff --git a/src/main/java/world/bentobox/biomes/commands/user/BiomesSetCommand.java b/src/main/java/world/bentobox/biomes/commands/user/BiomesSetCommand.java
@@ -12,8 +12,8 @@
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.biomes.commands.ExpandedCompositeCommand;
 import world.bentobox.biomes.objects.BiomesObject;
+import world.bentobox.biomes.objects.Settings.UpdateMode;
 import world.bentobox.biomes.tasks.BiomeUpdateHelper;
-import world.bentobox.biomes.utils.Utils.UpdateMode;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/listeners/ChangeOwnerListener.java b/src/main/java/world/bentobox/biomes/listeners/ChangeOwnerListener.java
@@ -13,6 +13,7 @@
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.biomes.BiomesAddon;
 import world.bentobox.biomes.objects.BiomesObject;
+import world.bentobox.biomes.objects.Settings.UpdateMode;
 import world.bentobox.biomes.tasks.BiomeUpdateHelper;
 import world.bentobox.biomes.utils.Utils;
 
@@ -99,7 +100,7 @@ else if (acidIsland.isPresent() &&
 				newUser,
 				defaultBiomeObject,
 				event.getIsland().getWorld(),
-				Utils.UpdateMode.ISLAND,
+				UpdateMode.ISLAND,
 				1,
 				false).updateIslandBiome();
 		}

diff --git a/src/main/java/world/bentobox/biomes/objects/Settings.java b/src/main/java/world/bentobox/biomes/objects/Settings.java
@@ -5,8 +5,6 @@
 import world.bentobox.bentobox.api.configuration.ConfigEntry;
 import world.bentobox.bentobox.api.configuration.StoreAt;
 import world.bentobox.bentobox.database.objects.DataObject;
-import world.bentobox.biomes.utils.Utils.UpdateMode;
-import world.bentobox.biomes.utils.Utils.VisibilityMode;
 
 
 /**
@@ -89,7 +87,7 @@ public int getCoolDown()
 	 */
 	public VisibilityMode getVisibilityMode()
 	{
-		return visibilityMode;
+		return this.visibilityMode;
 	}
 
 
@@ -165,6 +163,34 @@ public void setVisibilityMode(VisibilityMode visibilityMode)
 	}
 
 
+// ---------------------------------------------------------------------
+// Section: Enums used for Settings.
+// ---------------------------------------------------------------------
+
+
+	/**
+	 * This enum describes all possible variants how to calculate new biome location.
+	 */
+	public enum UpdateMode
+	{
+		ISLAND,
+		CHUNK,
+		SQUARE
+	}
+
+
+	/**
+	 * This enum describes all possible variants which biomes users should see
+	 */
+	public enum VisibilityMode
+	{
+		ALL,
+		ACCESSIBLE,
+		DEPLOYED,
+		TOGGLEABLE
+	}
+
+
 // ---------------------------------------------------------------------
 // Section: Variables
 // ---------------------------------------------------------------------

diff --git a/src/main/java/world/bentobox/biomes/panel/CommonPanel.java b/src/main/java/world/bentobox/biomes/panel/CommonPanel.java
@@ -10,8 +10,8 @@
 import world.bentobox.bentobox.api.panels.PanelItem;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.biomes.BiomesAddon;
-import world.bentobox.biomes.utils.Utils.UpdateMode;
-import world.bentobox.biomes.utils.Utils.VisibilityMode;
+import world.bentobox.biomes.objects.Settings.UpdateMode;
+import world.bentobox.biomes.objects.Settings.VisibilityMode;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/panel/admin/AdminSettingsPanel.java b/src/main/java/world/bentobox/biomes/panel/admin/AdminSettingsPanel.java
@@ -10,10 +10,10 @@
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.biomes.BiomesAddon;
+import world.bentobox.biomes.objects.Settings.UpdateMode;
+import world.bentobox.biomes.objects.Settings.VisibilityMode;
 import world.bentobox.biomes.panel.CommonPanel;
 import world.bentobox.biomes.utils.Utils;
-import world.bentobox.biomes.utils.Utils.UpdateMode;
-import world.bentobox.biomes.utils.Utils.VisibilityMode;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/panel/user/ChangeBiomePanel.java b/src/main/java/world/bentobox/biomes/panel/user/ChangeBiomePanel.java
@@ -14,9 +14,9 @@
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.biomes.BiomesAddon;
 import world.bentobox.biomes.objects.BiomesObject;
+import world.bentobox.biomes.objects.Settings.UpdateMode;
+import world.bentobox.biomes.objects.Settings.VisibilityMode;
 import world.bentobox.biomes.panel.CommonPanel;
-import world.bentobox.biomes.utils.Utils.UpdateMode;
-import world.bentobox.biomes.utils.Utils.VisibilityMode;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/tasks/BiomeUpdateHelper.java b/src/main/java/world/bentobox/biomes/tasks/BiomeUpdateHelper.java
@@ -14,7 +14,7 @@
 import world.bentobox.bentobox.hooks.VaultHook;
 import world.bentobox.biomes.BiomesAddon;
 import world.bentobox.biomes.objects.BiomesObject;
-import world.bentobox.biomes.utils.Utils.UpdateMode;
+import world.bentobox.biomes.objects.Settings.UpdateMode;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/utils/Utils.java b/src/main/java/world/bentobox/biomes/utils/Utils.java
@@ -11,6 +11,7 @@
 
 import world.bentobox.biomes.BiomesAddon;
 import world.bentobox.biomes.objects.BiomesObject;
+import world.bentobox.biomes.objects.Settings.UpdateMode;
 
 
 /**
@@ -248,33 +249,4 @@ public static UpdateMode parseStrictToUpdateMode(String type)
 				return null;
 		}
 	}
-
-
-
-// ---------------------------------------------------------------------
-// Section: Public Enums
-// ---------------------------------------------------------------------
-
-
-	/**
-	 * This enum describes all possible variants how to calculate new biome location.
-	 */
-	public enum UpdateMode
-	{
-		ISLAND,
-		CHUNK,
-		SQUARE
-	}
-
-
-	/**
-	 * This enum describes all possible variants which biomes users should see
-	 */
-	public enum VisibilityMode
-	{
-		ALL,
-		ACCESSIBLE,
-		DEPLOYED,
-		TOGGLEABLE
-	}
 }