Merge Changes into panel-rework branch

BentoBoxWorld · Jan 6, 2019 · f002219 · f002219 · BONNe · Jan 6, 2019
1 parent 6319487
commit f002219
Show file tree

Hide file tree

Showing 26 changed files with 92 additions and 94 deletions.
diff --git a/pom.xml b/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>world.bentobox</groupId>
             <artifactId>bentobox</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/world/bentobox/biomes/BiomesAddon.java b/src/main/java/world/bentobox/biomes/BiomesAddon.java
@@ -1,14 +1,14 @@
 package world.bentobox.biomes;
 
 
-import world.bentobox.biomes.commands.admin.AdminCommand;
-import world.bentobox.biomes.commands.user.BiomesCommand;
-import world.bentobox.biomes.listeners.ChangeOwnerListener;
-import world.bentobox.biomes.objects.Settings;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.configuration.Config;
 import world.bentobox.bentobox.managers.CommandsManager;
+import world.bentobox.biomes.commands.admin.AdminCommand;
+import world.bentobox.biomes.commands.user.BiomesCommand;
+import world.bentobox.biomes.listeners.ChangeOwnerListener;
+import world.bentobox.biomes.objects.Settings;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/BiomesAddonManager.java b/src/main/java/world/bentobox/biomes/BiomesAddonManager.java
@@ -1,5 +1,6 @@
 package world.bentobox.biomes;
 
+
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.configuration.ConfigurationSection;
@@ -9,12 +10,12 @@
 import java.io.IOException;
 import java.util.*;
 
-import world.bentobox.biomes.objects.BiomesObject;
-import world.bentobox.biomes.utils.Utils;
-import world.bentobox.biomes.utils.Utils.VisibilityMode;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.Database;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.biomes.objects.BiomesObject;
+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
@@ -5,15 +5,15 @@
 import java.util.List;
 import java.util.UUID;
 
-import world.bentobox.biomes.BiomesAddon;
-import world.bentobox.biomes.objects.BiomesObject;
-import world.bentobox.biomes.utils.Utils;
-import world.bentobox.biomes.utils.Utils.UpdateMode;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.biomes.BiomesAddon;
+import world.bentobox.biomes.objects.BiomesObject;
+import world.bentobox.biomes.utils.Utils;
+import world.bentobox.biomes.utils.Utils.UpdateMode;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/admin/AddBiomeCommand.java b/src/main/java/world/bentobox/biomes/commands/admin/AddBiomeCommand.java
@@ -6,14 +6,14 @@
 import java.util.List;
 import java.util.Optional;
 
-import world.bentobox.biomes.commands.ExpandedCompositeCommand;
-import world.bentobox.biomes.objects.BiomesObject;
-import world.bentobox.biomes.panel.admin.AdminBiomeEditPanel;
-import world.bentobox.biomes.utils.Utils;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.biomes.commands.ExpandedCompositeCommand;
+import world.bentobox.biomes.objects.BiomesObject;
+import world.bentobox.biomes.panel.admin.AdminBiomeEditPanel;
+import world.bentobox.biomes.utils.Utils;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/admin/AdminCommand.java b/src/main/java/world/bentobox/biomes/commands/admin/AdminCommand.java
@@ -3,11 +3,11 @@
 
 import java.util.List;
 
-import world.bentobox.biomes.BiomesAddon;
-import world.bentobox.biomes.panel.admin.AdminMainPanel;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 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.AdminMainPanel;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/admin/EditBiomeCommand.java b/src/main/java/world/bentobox/biomes/commands/admin/EditBiomeCommand.java
@@ -8,14 +8,14 @@
 import java.util.List;
 import java.util.Optional;
 
-import world.bentobox.biomes.commands.ExpandedCompositeCommand;
-import world.bentobox.biomes.objects.BiomesObject;
-import world.bentobox.biomes.panel.admin.AdminBiomeListPanel;
-import world.bentobox.biomes.utils.Utils;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.biomes.commands.ExpandedCompositeCommand;
+import world.bentobox.biomes.objects.BiomesObject;
+import world.bentobox.biomes.panel.admin.AdminBiomeListPanel;
+import world.bentobox.biomes.utils.Utils;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/admin/ImportCommand.java b/src/main/java/world/bentobox/biomes/commands/admin/ImportCommand.java
@@ -5,11 +5,11 @@
 import java.util.List;
 import java.util.Optional;
 
-import world.bentobox.biomes.BiomesAddon;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.biomes.BiomesAddon;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/admin/SetBiomeCommand.java b/src/main/java/world/bentobox/biomes/commands/admin/SetBiomeCommand.java
@@ -6,15 +6,15 @@
 import java.util.List;
 import java.util.Optional;
 
+import world.bentobox.bentobox.api.addons.Addon;
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.util.Util;
 import world.bentobox.biomes.commands.ExpandedCompositeCommand;
 import world.bentobox.biomes.objects.BiomesObject;
 import world.bentobox.biomes.panel.admin.AdminUserListPanel;
 import world.bentobox.biomes.tasks.BiomeUpdateHelper;
 import world.bentobox.biomes.utils.Utils.UpdateMode;
-import world.bentobox.bentobox.api.addons.Addon;
-import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bentobox.util.Util;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/admin/SettingsCommand.java b/src/main/java/world/bentobox/biomes/commands/admin/SettingsCommand.java
@@ -5,14 +5,14 @@
 import java.util.List;
 import java.util.Optional;
 
-import world.bentobox.biomes.commands.ExpandedCompositeCommand;
-import world.bentobox.biomes.panel.admin.AdminSettingsPanel;
-import world.bentobox.biomes.utils.Utils;
-import world.bentobox.biomes.utils.Utils.UpdateMode;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.biomes.commands.ExpandedCompositeCommand;
+import world.bentobox.biomes.panel.admin.AdminSettingsPanel;
+import world.bentobox.biomes.utils.Utils;
+import world.bentobox.biomes.utils.Utils.UpdateMode;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/user/BiomesCommand.java b/src/main/java/world/bentobox/biomes/commands/user/BiomesCommand.java
@@ -3,10 +3,10 @@
 
 import java.util.List;
 
-import world.bentobox.biomes.BiomesAddon;
-import world.bentobox.biomes.panel.user.ChangeBiomePanel;
 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.ChangeBiomePanel;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/user/BiomesInfoCommand.java b/src/main/java/world/bentobox/biomes/commands/user/BiomesInfoCommand.java
@@ -1,13 +1,16 @@
 package world.bentobox.biomes.commands.user;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
-import world.bentobox.biomes.commands.ExpandedCompositeCommand;
-import world.bentobox.biomes.objects.BiomesObject;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.biomes.commands.ExpandedCompositeCommand;
+import world.bentobox.biomes.objects.BiomesObject;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/commands/user/BiomesSetCommand.java b/src/main/java/world/bentobox/biomes/commands/user/BiomesSetCommand.java
@@ -1,16 +1,19 @@
 package world.bentobox.biomes.commands.user;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
-import world.bentobox.biomes.commands.ExpandedCompositeCommand;
-import world.bentobox.biomes.objects.BiomesObject;
-import world.bentobox.biomes.tasks.BiomeUpdateHelper;
-import world.bentobox.biomes.utils.Utils.UpdateMode;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.biomes.commands.ExpandedCompositeCommand;
+import world.bentobox.biomes.objects.BiomesObject;
+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
@@ -5,17 +5,16 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-
 import java.util.Optional;
 
-import world.bentobox.biomes.BiomesAddon;
-import world.bentobox.biomes.objects.BiomesObject;
-import world.bentobox.biomes.tasks.BiomeUpdateHelper;
-import world.bentobox.biomes.utils.Utils;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.events.team.TeamEvent.TeamSetownerEvent;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.biomes.BiomesAddon;
+import world.bentobox.biomes.objects.BiomesObject;
+import world.bentobox.biomes.tasks.BiomeUpdateHelper;
+import world.bentobox.biomes.utils.Utils;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/objects/Settings.java b/src/main/java/world/bentobox/biomes/objects/Settings.java
@@ -1,12 +1,12 @@
 package world.bentobox.biomes.objects;
 
 
-import world.bentobox.biomes.utils.Utils.UpdateMode;
-import world.bentobox.biomes.utils.Utils.VisibilityMode;
 import world.bentobox.bentobox.api.configuration.ConfigComment;
 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;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/panel/CommonPanel.java b/src/main/java/world/bentobox/biomes/panel/CommonPanel.java
@@ -1,19 +1,17 @@
-package world.bentobox.addons.biomes.panel;
+package world.bentobox.biomes.panel;
 
 
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.inventory.ItemStack;
-
 import java.util.Collections;
 import java.util.List;
 
-import world.bentobox.addons.biomes.BiomesAddon;
-import world.bentobox.addons.biomes.utils.Utils.VisibilityMode;
-import world.bentobox.addons.biomes.utils.Utils.UpdateMode;
 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;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/panel/admin/AdminBiomeEditPanel.java b/src/main/java/world/bentobox/biomes/panel/admin/AdminBiomeEditPanel.java
@@ -1,22 +1,21 @@
-package world.bentobox.addons.biomes.panel.admin;
+package world.bentobox.biomes.panel.admin;
 
 
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.inventory.ItemStack;
-
 import java.util.Collections;
 import java.util.List;
 
 import net.wesjd.anvilgui.AnvilGUI;
-import world.bentobox.addons.biomes.BiomesAddon;
-import world.bentobox.addons.biomes.objects.BiomesObject;
-import world.bentobox.addons.biomes.panel.CommonPanel;
-import world.bentobox.addons.biomes.utils.Utils;
 import world.bentobox.bentobox.api.panels.PanelItem;
 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.BiomesObject;
+import world.bentobox.biomes.panel.CommonPanel;
+import world.bentobox.biomes.utils.Utils;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/panel/admin/AdminBiomeListPanel.java b/src/main/java/world/bentobox/biomes/panel/admin/AdminBiomeListPanel.java
@@ -1,16 +1,16 @@
-package world.bentobox.addons.biomes.panel.admin;
+package world.bentobox.biomes.panel.admin;
 
 
 import org.bukkit.World;
 import java.util.List;
 
-import world.bentobox.addons.biomes.BiomesAddon;
-import world.bentobox.addons.biomes.objects.BiomesObject;
-import world.bentobox.addons.biomes.panel.CommonPanel;
 import world.bentobox.bentobox.api.panels.PanelItem;
 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.BiomesAddon;
+import world.bentobox.biomes.objects.BiomesObject;
+import world.bentobox.biomes.panel.CommonPanel;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/panel/admin/AdminBiomeTypePanel.java b/src/main/java/world/bentobox/biomes/panel/admin/AdminBiomeTypePanel.java
@@ -1,16 +1,16 @@
-package world.bentobox.addons.biomes.panel.admin;
+package world.bentobox.biomes.panel.admin;
 
 
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 
-import world.bentobox.addons.biomes.BiomesAddon;
-import world.bentobox.addons.biomes.panel.CommonPanel;
 import world.bentobox.bentobox.api.panels.PanelItem;
 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.BiomesAddon;
+import world.bentobox.biomes.panel.CommonPanel;
 
 
 /**

diff --git a/src/main/java/world/bentobox/biomes/panel/admin/AdminMainPanel.java b/src/main/java/world/bentobox/biomes/panel/admin/AdminMainPanel.java
@@ -1,18 +1,17 @@
-package world.bentobox.addons.biomes.panel.admin;
+package world.bentobox.biomes.panel.admin;
 
 
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.inventory.ItemStack;
-
 import java.util.Collections;
 import java.util.List;
 
-import world.bentobox.addons.biomes.BiomesAddon;
-import world.bentobox.addons.biomes.panel.CommonPanel;
 import world.bentobox.bentobox.api.panels.PanelItem;
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.biomes.BiomesAddon;
+import world.bentobox.biomes.panel.CommonPanel;
 
 
 /**