English update (#193)

* Organized imports * Minor code cleanup * Updated English locale file.
BentoBoxWorld · Oct 10, 2019 · 2aa437f · 2aa437f
1 parent 0c47f81
commit 2aa437f
Show file tree

Hide file tree

Showing 57 changed files with 846 additions and 739 deletions.
diff --git a/src/main/java/world/bentobox/challenges/ChallengesAddon.java b/src/main/java/world/bentobox/challenges/ChallengesAddon.java
@@ -1,11 +1,12 @@
 package world.bentobox.challenges;
 
 
-import org.bukkit.Material;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
+import org.bukkit.Material;
+
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.configuration.Config;

diff --git a/src/main/java/world/bentobox/challenges/ChallengesImportManager.java b/src/main/java/world/bentobox/challenges/ChallengesImportManager.java
@@ -1,8 +1,5 @@
 package world.bentobox.challenges;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.annotations.Expose;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
@@ -21,12 +18,16 @@
 
 import org.bukkit.World;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.annotations.Expose;
+
+import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.json.BentoboxTypeAdapterFactory;
 import world.bentobox.bentobox.database.objects.DataObject;
-import world.bentobox.challenges.database.object.ChallengeLevel;
-import world.bentobox.challenges.database.object.Challenge;
-import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.challenges.database.object.Challenge;
+import world.bentobox.challenges.database.object.ChallengeLevel;
 import world.bentobox.challenges.utils.Utils;
 
 

diff --git a/src/main/java/world/bentobox/challenges/ChallengesManager.java b/src/main/java/world/bentobox/challenges/ChallengesManager.java
@@ -1,8 +1,6 @@
 package world.bentobox.challenges;
 
 
-import org.eclipse.jdt.annotation.NonNull;
-
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
@@ -20,6 +18,7 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.World;
+import org.eclipse.jdt.annotation.NonNull;
 
 import world.bentobox.bentobox.api.logs.LogEntry;
 import world.bentobox.bentobox.api.user.User;

diff --git a/src/main/java/world/bentobox/challenges/commands/ChallengesCommand.java b/src/main/java/world/bentobox/challenges/commands/ChallengesCommand.java
@@ -4,9 +4,9 @@
 import java.util.Optional;
 
 import world.bentobox.bentobox.api.addons.GameModeAddon;
-import world.bentobox.challenges.ChallengesAddon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.challenges.ChallengesAddon;
 import world.bentobox.challenges.panel.user.ChallengesGUI;
 
 

diff --git a/src/main/java/world/bentobox/challenges/commands/ChallengesUserCommand.java b/src/main/java/world/bentobox/challenges/commands/ChallengesUserCommand.java
@@ -6,7 +6,6 @@
 import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
-
 import world.bentobox.challenges.ChallengesAddon;
 import world.bentobox.challenges.config.SettingsUtils.GuiMode;
 import world.bentobox.challenges.panel.GameModesGUI;

diff --git a/src/main/java/world/bentobox/challenges/commands/CompleteChallengeCommand.java b/src/main/java/world/bentobox/challenges/commands/CompleteChallengeCommand.java
@@ -1,7 +1,9 @@
 package world.bentobox.challenges.commands;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import world.bentobox.bentobox.api.addons.Addon;

diff --git a/src/main/java/world/bentobox/challenges/commands/admin/Challenges.java b/src/main/java/world/bentobox/challenges/commands/admin/Challenges.java
@@ -2,9 +2,9 @@
 
 import java.util.List;
 
-import world.bentobox.challenges.ChallengesAddon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.challenges.ChallengesAddon;
 import world.bentobox.challenges.panel.admin.AdminGUI;
 
 

diff --git a/src/main/java/world/bentobox/challenges/commands/admin/CompleteCommand.java b/src/main/java/world/bentobox/challenges/commands/admin/CompleteCommand.java
@@ -1,7 +1,11 @@
 package world.bentobox.challenges.commands.admin;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import world.bentobox.bentobox.api.addons.Addon;

diff --git a/src/main/java/world/bentobox/challenges/commands/admin/ReloadChallenges.java b/src/main/java/world/bentobox/challenges/commands/admin/ReloadChallenges.java
@@ -2,11 +2,11 @@
 
 import java.util.List;
 
-import world.bentobox.challenges.ChallengesAddon;
-import world.bentobox.challenges.ChallengesManager;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.challenges.ChallengesAddon;
+import world.bentobox.challenges.ChallengesManager;
 
 
 /**

diff --git a/src/main/java/world/bentobox/challenges/commands/admin/ResetCommand.java b/src/main/java/world/bentobox/challenges/commands/admin/ResetCommand.java
@@ -1,7 +1,11 @@
 package world.bentobox.challenges.commands.admin;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import world.bentobox.bentobox.api.addons.Addon;

diff --git a/src/main/java/world/bentobox/challenges/commands/admin/ShowChallenges.java b/src/main/java/world/bentobox/challenges/commands/admin/ShowChallenges.java
@@ -1,12 +1,11 @@
 package world.bentobox.challenges.commands.admin;
 
 import java.util.List;
-import java.util.logging.Level;
 
-import world.bentobox.challenges.ChallengesAddon;
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.challenges.ChallengesAddon;
 
 public class ShowChallenges extends CompositeCommand {
 

diff --git a/src/main/java/world/bentobox/challenges/config/Settings.java b/src/main/java/world/bentobox/challenges/config/Settings.java
@@ -13,10 +13,9 @@
 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.adapters.Adapter;
-import world.bentobox.challenges.config.SettingsUtils.GuiMode;
 import world.bentobox.challenges.config.SettingsUtils.ChallengeLore;
+import world.bentobox.challenges.config.SettingsUtils.GuiMode;
 import world.bentobox.challenges.config.SettingsUtils.LevelLore;
 import world.bentobox.challenges.config.SettingsUtils.VisibilityMode;
 import world.bentobox.challenges.database.object.adapters.ChallengeLoreAdapter;

diff --git a/src/main/java/world/bentobox/challenges/database/object/ChallengeLevel.java b/src/main/java/world/bentobox/challenges/database/object/ChallengeLevel.java
@@ -1,15 +1,17 @@
 package world.bentobox.challenges.database.object;
 
 
-import com.google.gson.annotations.Expose;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+import com.google.gson.annotations.Expose;
+
 import world.bentobox.bentobox.api.configuration.ConfigComment;
 import world.bentobox.bentobox.database.objects.DataObject;
 import world.bentobox.challenges.ChallengesManager;

diff --git a/src/main/java/world/bentobox/challenges/database/object/ChallengesPlayerData.java b/src/main/java/world/bentobox/challenges/database/object/ChallengesPlayerData.java
@@ -1,9 +1,16 @@
 package world.bentobox.challenges.database.object;
 
 
-import com.google.gson.annotations.Expose;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
 import org.eclipse.jdt.annotation.NonNull;
-import java.util.*;
+
+import com.google.gson.annotations.Expose;
 
 import world.bentobox.bentobox.api.logs.LogEntry;
 import world.bentobox.bentobox.database.objects.DataObject;

diff --git a/src/main/java/world/bentobox/challenges/database/object/adapters/RequirementsAdapter.java b/src/main/java/world/bentobox/challenges/database/object/adapters/RequirementsAdapter.java
@@ -7,6 +7,8 @@
 package world.bentobox.challenges.database.object.adapters;
 
 
+import java.lang.reflect.Type;
+
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
@@ -15,7 +17,6 @@
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-import java.lang.reflect.Type;
 
 import world.bentobox.challenges.database.object.requirements.Requirements;
 

diff --git a/...in/java/world/bentobox/challenges/database/object/requirements/InventoryRequirements.java b/...in/java/world/bentobox/challenges/database/object/requirements/InventoryRequirements.java
@@ -7,13 +7,15 @@
 package world.bentobox.challenges.database.object.requirements;
 
 
-import com.google.gson.annotations.Expose;
-import org.bukkit.inventory.ItemStack;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.bukkit.inventory.ItemStack;
+
+import com.google.gson.annotations.Expose;
+
 
 /**
  * This class contains all necessary requirements to complete inventory type challenge.

diff --git a/src/main/java/world/bentobox/challenges/database/object/requirements/IslandRequirements.java b/src/main/java/world/bentobox/challenges/database/object/requirements/IslandRequirements.java
@@ -7,14 +7,16 @@
 package world.bentobox.challenges.database.object.requirements;
 
 
-import com.google.gson.annotations.Expose;
-import org.bukkit.Material;
-import org.bukkit.entity.EntityType;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+
+import com.google.gson.annotations.Expose;
+
 
 /**
  * This class contains all necessary requirements to complete island type challenge.

diff --git a/src/main/java/world/bentobox/challenges/database/object/requirements/OtherRequirements.java b/src/main/java/world/bentobox/challenges/database/object/requirements/OtherRequirements.java
@@ -7,12 +7,9 @@
 package world.bentobox.challenges.database.object.requirements;
 
 
-import com.google.gson.annotations.Expose;
-import org.eclipse.jdt.annotation.NonNull;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+
+import com.google.gson.annotations.Expose;
 
 
 /**

diff --git a/src/main/java/world/bentobox/challenges/database/object/requirements/Requirements.java b/src/main/java/world/bentobox/challenges/database/object/requirements/Requirements.java
@@ -7,10 +7,11 @@
 package world.bentobox.challenges.database.object.requirements;
 
 
-import com.google.gson.annotations.Expose;
 import java.util.HashSet;
 import java.util.Set;
 
+import com.google.gson.annotations.Expose;
+
 
 /**
  * This abstract class allows to define requirements for each challenge.

diff --git a/src/main/java/world/bentobox/challenges/handlers/ChallengeDataRequestHandler.java b/src/main/java/world/bentobox/challenges/handlers/ChallengeDataRequestHandler.java
@@ -5,7 +5,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-
 import world.bentobox.bentobox.api.addons.request.AddonRequestHandler;
 import world.bentobox.challenges.ChallengesAddon;
 import world.bentobox.challenges.database.object.Challenge;

diff --git a/src/main/java/world/bentobox/challenges/handlers/ChallengeListRequestHandler.java b/src/main/java/world/bentobox/challenges/handlers/ChallengeListRequestHandler.java
@@ -1,10 +1,11 @@
 package world.bentobox.challenges.handlers;
 
 
-import org.bukkit.Bukkit;
 import java.util.Collections;
 import java.util.Map;
 
+import org.bukkit.Bukkit;
+
 import world.bentobox.bentobox.api.addons.request.AddonRequestHandler;
 import world.bentobox.challenges.ChallengesAddon;
 

diff --git a/src/main/java/world/bentobox/challenges/handlers/CompletedChallengesRequestHandler.java b/src/main/java/world/bentobox/challenges/handlers/CompletedChallengesRequestHandler.java
@@ -1,10 +1,13 @@
 package world.bentobox.challenges.handlers;
 
 
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
 import org.bukkit.Bukkit;
 import org.bukkit.World;
-import java.util.*;
-import java.util.stream.Collectors;
 
 import world.bentobox.bentobox.api.addons.request.AddonRequestHandler;
 import world.bentobox.challenges.ChallengesAddon;

diff --git a/src/main/java/world/bentobox/challenges/handlers/LevelListRequestHandler.java b/src/main/java/world/bentobox/challenges/handlers/LevelListRequestHandler.java
@@ -1,10 +1,11 @@
 package world.bentobox.challenges.handlers;
 
 
-import org.bukkit.Bukkit;
 import java.util.Collections;
 import java.util.Map;
 
+import org.bukkit.Bukkit;
+
 import world.bentobox.bentobox.api.addons.request.AddonRequestHandler;
 import world.bentobox.challenges.ChallengesAddon;
 

diff --git a/src/main/java/world/bentobox/challenges/listeners/ResetListener.java b/src/main/java/world/bentobox/challenges/listeners/ResetListener.java
@@ -7,10 +7,9 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import world.bentobox.bentobox.api.user.User;
-import world.bentobox.challenges.ChallengesAddon;
 import world.bentobox.bentobox.api.events.island.IslandEvent;
 import world.bentobox.bentobox.api.events.island.IslandEvent.Reason;
+import world.bentobox.challenges.ChallengesAddon;
 
 /**
  * Resets challenges when the island is reset

diff --git a/src/main/java/world/bentobox/challenges/listeners/SaveListener.java b/src/main/java/world/bentobox/challenges/listeners/SaveListener.java
@@ -6,7 +6,6 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.world.WorldSaveEvent;
 
 import world.bentobox.challenges.ChallengesAddon;
 

diff --git a/src/main/java/world/bentobox/challenges/panel/CommonGUI.java b/src/main/java/world/bentobox/challenges/panel/CommonGUI.java
@@ -9,7 +9,11 @@
 
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.conversations.*;
+import org.bukkit.conversations.Conversation;
+import org.bukkit.conversations.ConversationContext;
+import org.bukkit.conversations.ConversationFactory;
+import org.bukkit.conversations.Prompt;
+import org.bukkit.conversations.StringPrompt;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

diff --git a/src/main/java/world/bentobox/challenges/panel/GameModesGUI.java b/src/main/java/world/bentobox/challenges/panel/GameModesGUI.java
@@ -1,12 +1,12 @@
 package world.bentobox.challenges.panel;
 
 
-import org.bukkit.Material;
-import org.bukkit.World;
-
 import java.util.List;
 import java.util.Optional;
 
+import org.bukkit.Material;
+import org.bukkit.World;
+
 import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.panels.PanelItem;