Rename 'panel' package to 'panels'.

Move GuiUtils to 'panels' package. Delete Utils package.
BentoBoxWorld · Jun 12, 2019 · 6a1c81b · 6a1c81b
1 parent df8f09a
commit 6a1c81b
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 50 deletions.
diff --git a/src/main/java/world/bentobox/biomes/BiomesAddonManager.java b/src/main/java/world/bentobox/biomes/BiomesAddonManager.java
@@ -17,7 +17,7 @@
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.biomes.database.objects.BiomesObject;
 import world.bentobox.biomes.config.Settings.VisibilityMode;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/admin/AddBiomeCommand.java b/src/main/java/world/bentobox/biomes/commands/admin/AddBiomeCommand.java
@@ -10,7 +10,7 @@
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.biomes.commands.ExpandedCompositeCommand;
 import world.bentobox.biomes.database.objects.BiomesObject;
-import world.bentobox.biomes.panel.admin.EditBiomeGUI;
+import world.bentobox.biomes.panels.admin.EditBiomeGUI;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/admin/AdminCommand.java b/src/main/java/world/bentobox/biomes/commands/admin/AdminCommand.java
@@ -7,7 +7,7 @@
 import world.bentobox.bentobox.api.commands.admin.AdminReloadCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.biomes.BiomesAddon;
-import world.bentobox.biomes.panel.admin.AdminGUI;
+import world.bentobox.biomes.panels.admin.AdminGUI;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/admin/EditBiomeCommand.java b/src/main/java/world/bentobox/biomes/commands/admin/EditBiomeCommand.java
@@ -13,8 +13,8 @@
 import world.bentobox.biomes.BiomesAddonManager;
 import world.bentobox.biomes.commands.ExpandedCompositeCommand;
 import world.bentobox.biomes.database.objects.BiomesObject;
-import world.bentobox.biomes.panel.admin.ListBiomesGUI;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.admin.ListBiomesGUI;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/admin/SetBiomeCommand.java b/src/main/java/world/bentobox/biomes/commands/admin/SetBiomeCommand.java
@@ -11,7 +11,7 @@
 import world.bentobox.biomes.commands.ExpandedCompositeCommand;
 import world.bentobox.biomes.database.objects.BiomesObject;
 import world.bentobox.biomes.config.Settings.UpdateMode;
-import world.bentobox.biomes.panel.admin.ListUsersGUI;
+import world.bentobox.biomes.panels.admin.ListUsersGUI;
 import world.bentobox.biomes.tasks.BiomeUpdateHelper;
 
 /**

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,7 +10,7 @@
 import world.bentobox.biomes.commands.ExpandedCompositeCommand;
 import world.bentobox.biomes.config.Settings.UpdateMode;
 import world.bentobox.biomes.config.Settings.VisibilityMode;
-import world.bentobox.biomes.panel.admin.EditSettingsGUI;
+import world.bentobox.biomes.panels.admin.EditSettingsGUI;
 
 /**
  * This command allows to edit biomes addon settings.

diff --git a/src/main/java/world/bentobox/biomes/commands/user/BiomesCommand.java b/src/main/java/world/bentobox/biomes/commands/user/BiomesCommand.java
@@ -8,7 +8,7 @@
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.biomes.BiomesAddon;
-import world.bentobox.biomes.panel.user.BiomesChooseGUI;
+import world.bentobox.biomes.panels.user.BiomesChooseGUI;
 
 
 /**

diff --git a/...orld/bentobox/biomes/panel/CommonGUI.java → ...rld/bentobox/biomes/panels/CommonGUI.java b/...orld/bentobox/biomes/panel/CommonGUI.java → ...rld/bentobox/biomes/panels/CommonGUI.java
@@ -1,4 +1,4 @@
-package world.bentobox.biomes.panel;
+package world.bentobox.biomes.panels;
 
 
 import org.bukkit.Material;

diff --git a/...world/bentobox/biomes/utils/GuiUtils.java → ...orld/bentobox/biomes/panels/GuiUtils.java b/...world/bentobox/biomes/utils/GuiUtils.java → ...orld/bentobox/biomes/panels/GuiUtils.java
@@ -1,10 +1,9 @@
-package world.bentobox.biomes.utils;
+package world.bentobox.biomes.panels;
 
 
 import org.apache.commons.lang.WordUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
-import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.ItemStack;
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/...bentobox/biomes/panel/admin/AdminGUI.java → ...entobox/biomes/panels/admin/AdminGUI.java b/...bentobox/biomes/panel/admin/AdminGUI.java → ...entobox/biomes/panels/admin/AdminGUI.java
@@ -1,4 +1,4 @@
-package world.bentobox.biomes.panel.admin;
+package world.bentobox.biomes.panels.admin;
 
 
 import org.bukkit.Material;
@@ -15,8 +15,8 @@
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
 import world.bentobox.biomes.BiomesAddon;
-import world.bentobox.biomes.panel.CommonGUI;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.CommonGUI;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 /**

diff --git a/...obox/biomes/panel/admin/EditBiomeGUI.java → ...box/biomes/panels/admin/EditBiomeGUI.java b/...obox/biomes/panel/admin/EditBiomeGUI.java → ...box/biomes/panels/admin/EditBiomeGUI.java
@@ -1,4 +1,4 @@
-package world.bentobox.biomes.panel.admin;
+package world.bentobox.biomes.panels.admin;
 
 
 import org.bukkit.Material;
@@ -14,11 +14,11 @@
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.biomes.BiomesAddon;
 import world.bentobox.biomes.database.objects.BiomesObject;
-import world.bentobox.biomes.panel.CommonGUI;
-import world.bentobox.biomes.panel.util.NumberGUI;
-import world.bentobox.biomes.panel.util.SelectBiomeGUI;
-import world.bentobox.biomes.panel.util.StringListGUI;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.CommonGUI;
+import world.bentobox.biomes.panels.util.NumberGUI;
+import world.bentobox.biomes.panels.util.SelectBiomeGUI;
+import world.bentobox.biomes.panels.util.StringListGUI;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 /**

diff --git a/...x/biomes/panel/admin/EditSettingsGUI.java → .../biomes/panels/admin/EditSettingsGUI.java b/...x/biomes/panel/admin/EditSettingsGUI.java → .../biomes/panels/admin/EditSettingsGUI.java
@@ -1,4 +1,4 @@
-package world.bentobox.biomes.panel.admin;
+package world.bentobox.biomes.panels.admin;
 
 
 import org.bukkit.Material;
@@ -16,9 +16,9 @@
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.biomes.BiomesAddon;
 import world.bentobox.biomes.config.Settings;
-import world.bentobox.biomes.panel.CommonGUI;
-import world.bentobox.biomes.panel.util.NumberGUI;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.CommonGUI;
+import world.bentobox.biomes.panels.util.NumberGUI;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 public class EditSettingsGUI extends CommonGUI

diff --git a/...box/biomes/panel/admin/ListBiomesGUI.java → ...ox/biomes/panels/admin/ListBiomesGUI.java b/...box/biomes/panel/admin/ListBiomesGUI.java → ...ox/biomes/panels/admin/ListBiomesGUI.java
@@ -1,4 +1,4 @@
-package world.bentobox.biomes.panel.admin;
+package world.bentobox.biomes.panels.admin;
 
 
 import org.bukkit.Material;
@@ -11,8 +11,8 @@
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.biomes.BiomesAddon;
 import world.bentobox.biomes.database.objects.BiomesObject;
-import world.bentobox.biomes.panel.CommonGUI;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.CommonGUI;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 public class ListBiomesGUI extends CommonGUI

diff --git a/...obox/biomes/panel/admin/ListUsersGUI.java → ...box/biomes/panels/admin/ListUsersGUI.java b/...obox/biomes/panel/admin/ListUsersGUI.java → ...box/biomes/panels/admin/ListUsersGUI.java
@@ -1,14 +1,12 @@
-package world.bentobox.biomes.panel.admin;
+package world.bentobox.biomes.panels.admin;
 
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import world.bentobox.bentobox.api.panels.PanelItem;
@@ -17,9 +15,9 @@
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Players;
 import world.bentobox.biomes.BiomesAddon;
-import world.bentobox.biomes.panel.CommonGUI;
-import world.bentobox.biomes.panel.user.BiomesChooseGUI;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.CommonGUI;
+import world.bentobox.biomes.panels.user.BiomesChooseGUI;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 /**

diff --git a/...ox/biomes/panel/user/BiomesChooseGUI.java → ...x/biomes/panels/user/BiomesChooseGUI.java b/...ox/biomes/panel/user/BiomesChooseGUI.java → ...x/biomes/panels/user/BiomesChooseGUI.java
@@ -1,4 +1,4 @@
-package world.bentobox.biomes.panel.user;
+package world.bentobox.biomes.panels.user;
 
 
 import org.bukkit.Material;
@@ -16,11 +16,11 @@
 import world.bentobox.biomes.config.Settings;
 import world.bentobox.biomes.database.objects.BiomesObject;
 
-import world.bentobox.biomes.panel.CommonGUI;
+import world.bentobox.biomes.panels.CommonGUI;
 
 import world.bentobox.biomes.config.Settings.UpdateMode;
 import world.bentobox.biomes.config.Settings.VisibilityMode;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 /**

diff --git a/...obox/biomes/panel/user/UpdateModeGUI.java → ...box/biomes/panels/user/UpdateModeGUI.java b/...obox/biomes/panel/user/UpdateModeGUI.java → ...box/biomes/panels/user/UpdateModeGUI.java
@@ -1,4 +1,4 @@
-package world.bentobox.biomes.panel.user;
+package world.bentobox.biomes.panels.user;
 
 
 import org.bukkit.Material;
@@ -14,11 +14,11 @@
 import world.bentobox.biomes.BiomesAddon;
 import world.bentobox.biomes.database.objects.BiomesObject;
 
-import world.bentobox.biomes.panel.CommonGUI;
+import world.bentobox.biomes.panels.CommonGUI;
 
 import world.bentobox.biomes.config.Settings.UpdateMode;
-import world.bentobox.biomes.panel.util.NumberGUI;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.util.NumberGUI;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 /**

diff --git a/...ox/biomes/panel/util/ConfirmationGUI.java → ...x/biomes/panels/util/ConfirmationGUI.java b/...ox/biomes/panel/util/ConfirmationGUI.java → ...x/biomes/panels/util/ConfirmationGUI.java
@@ -1,4 +1,4 @@
-package world.bentobox.biomes.panel.util;
+package world.bentobox.biomes.panels.util;
 
 
 import org.bukkit.Material;
@@ -8,7 +8,7 @@
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 /**

diff --git a/...bentobox/biomes/panel/util/NumberGUI.java → ...entobox/biomes/panels/util/NumberGUI.java b/...bentobox/biomes/panel/util/NumberGUI.java → ...entobox/biomes/panels/util/NumberGUI.java
@@ -1,4 +1,4 @@
-package world.bentobox.biomes.panel.util;
+package world.bentobox.biomes.panels.util;
 
 
 import org.bukkit.Material;
@@ -11,7 +11,7 @@
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 /**

diff --git a/...box/biomes/panel/util/SelectBiomeGUI.java → ...ox/biomes/panels/util/SelectBiomeGUI.java b/...box/biomes/panel/util/SelectBiomeGUI.java → ...ox/biomes/panels/util/SelectBiomeGUI.java
@@ -1,4 +1,4 @@
-package world.bentobox.biomes.panel.util;
+package world.bentobox.biomes.panels.util;
 
 
 import org.bukkit.Material;
@@ -11,7 +11,7 @@
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.biomes.BiomesAddon;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 public class SelectBiomeGUI

diff --git a/...omes/panel/util/SelectEnvironmentGUI.java → ...mes/panels/util/SelectEnvironmentGUI.java b/...omes/panel/util/SelectEnvironmentGUI.java → ...mes/panels/util/SelectEnvironmentGUI.java
@@ -1,4 +1,4 @@
-package world.bentobox.biomes.panel.util;
+package world.bentobox.biomes.panels.util;
 
 
 import org.bukkit.Material;
@@ -10,7 +10,7 @@
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 /**

diff --git a/...obox/biomes/panel/util/StringListGUI.java → ...box/biomes/panels/util/StringListGUI.java b/...obox/biomes/panel/util/StringListGUI.java → ...box/biomes/panels/util/StringListGUI.java
@@ -1,4 +1,4 @@
-package world.bentobox.biomes.panel.util;
+package world.bentobox.biomes.panels.util;
 
 
 import org.bukkit.Material;
@@ -21,7 +21,7 @@
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
-import world.bentobox.biomes.utils.GuiUtils;
+import world.bentobox.biomes.panels.GuiUtils;
 
 
 /**