clean up

Ghost-chu · Ghost-chu · commit 5fb5e47bdedf · 2021-10-03T18:31:06.000+08:00
diff --git a/src/main/java/org/maxgamer/quickshop/command/CommandProcesser.java b/src/main/java/org/maxgamer/quickshop/command/CommandProcesser.java
@@ -30,8 +30,10 @@
 @Deprecated
 public interface CommandProcesser extends CommandHandler<CommandSender> {
 
+    @Override
     void onCommand(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] cmdArg);
 
+    @Override
     @Nullable
     default List<String> onTabComplete(
             @NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] cmdArg) {
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_TaxAccount.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_TaxAccount.java
@@ -53,10 +53,11 @@ public void onCommand(@NotNull Player sender, @NotNull String commandLabel, @Not
                         plugin.text().of(sender, "taxaccount-unset").send();
                         return;
                     }
-                    if (Util.isUUID(cmdArg[0]))
+                    if (Util.isUUID(cmdArg[0])) {
                         shop.setTaxAccount(UUID.fromString(cmdArg[0]));
-                    else
+                    } else {
                         shop.setTaxAccount(Bukkit.getOfflinePlayer(cmdArg[0]).getUniqueId());
+                    }
                     plugin.text().of(sender, "taxaccount-unset", cmdArg[0]).send();
                     return;
                 } else {
diff --git a/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Update.java b/src/main/java/org/maxgamer/quickshop/command/subcommand/SubCommand_Update.java
@@ -53,7 +53,7 @@ public void onCommand(@NotNull CommandSender sender, @NotNull String commandLabe
                 return;
             }
 
-            if (cmdArg.length == 0 || !cmdArg[0].equalsIgnoreCase("confirm")) {
+            if (cmdArg.length == 0 || !"confirm".equalsIgnoreCase(cmdArg[0])) {
                 MsgUtil.sendDirectMessage(sender, ChatColor.RED + "You will need to restart the server to complete the update of plugin! Before restarting plugin will stop working!");
                 MsgUtil.sendDirectMessage(sender, ChatColor.RED + "Type " + ChatColor.BOLD + "/qs update confirm" + ChatColor.RESET + ChatColor.RED + " to confirm update");
                 return;
diff --git a/src/main/java/org/maxgamer/quickshop/database/DataType.java b/src/main/java/org/maxgamer/quickshop/database/DataType.java
@@ -15,16 +15,18 @@ public class DataType {
 
     public DataType(@NotNull DataTypeMapping type, @Nullable Integer length, @NotNull Object defaultValue) {
         this.datatype = type;
-        if (length != null)
+        if (length != null) {
             Validate.isTrue(length > 1, "Field length cannot be negative or zero.");
+        }
         this.length = length;
         this.defaultValue = defaultValue;
     }
 
     public DataType(@NotNull DataTypeMapping type, @Nullable Integer length) {
         this.datatype = type;
-        if (length != null)
+        if (length != null) {
             Validate.isTrue(length > 1, "Field length cannot be negative or zero.");
+        }
         this.length = length;
         this.defaultValue = null;
     }
diff --git a/src/main/java/org/maxgamer/quickshop/database/DatabaseHelper.java b/src/main/java/org/maxgamer/quickshop/database/DatabaseHelper.java
@@ -165,16 +165,18 @@ public boolean createColumn(@NotNull String tableName, @NotNull String columnNam
 
         try {
             String table = plugin.getDbPrefix() + tableName;
-            if (manager.hasColumn(table, columnName))
+            if (manager.hasColumn(table, columnName)) {
                 return false;
+            }
             String sqlString;
             if (manager.getDatabase() instanceof MySQLCore) {
                 sqlString = "alter table " + table + " add " + columnName + " " + type.getDatatype().getMysql();
             } else {
                 sqlString = "alter table " + table + " add column " + columnName + " " + type.getDatatype().getSqlite();
             }
-            if (type.getLength() != null)
+            if (type.getLength() != null) {
                 sqlString += "(" + type.getLength().toString() + ") ";
+            }
             Util.debugLog("Append sql for creating column is " + sqlString);
             manager.runInstantTask(new DatabaseTask(sqlString, new DatabaseTask.Task() {
                 @Override
diff --git a/src/main/java/org/maxgamer/quickshop/event/QSEvent.java b/src/main/java/org/maxgamer/quickshop/event/QSEvent.java
@@ -58,8 +58,9 @@ public void callEvent() {
      */
     public boolean callCancellableEvent() {
         QuickShop.getInstance().getServer().getPluginManager().callEvent(this);
-        if (this instanceof Cancellable)
+        if (this instanceof Cancellable) {
             return ((Cancellable) this).isCancelled();
+        }
         return false;
     }
 
diff --git a/src/main/java/org/maxgamer/quickshop/integration/advancedregionmarket/AdvancedShopRegionMarketIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/advancedregionmarket/AdvancedShopRegionMarketIntegration.java
@@ -100,7 +100,7 @@ public void load() {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPluginLoad(PluginEnableEvent event) {
-        if (event.getPlugin().getName().equals("ArmShopBridge")) {
+        if ("ArmShopBridge".equals(event.getPlugin().getName())) {
             scanAndUnregister();
         }
     }
diff --git a/src/main/java/org/maxgamer/quickshop/integration/iridiumskyblock/IridiumSkyblockIntegration.java b/src/main/java/org/maxgamer/quickshop/integration/iridiumskyblock/IridiumSkyblockIntegration.java
@@ -80,7 +80,9 @@ private void init() {
      */
     @Override
     public boolean canCreateShopHere(@NotNull Player player, @NotNull Location location) {
-        if (!IridiumSkyblockAPI.getInstance().isIslandWorld(location.getWorld())) return false;
+        if (!IridiumSkyblockAPI.getInstance().isIslandWorld(location.getWorld())) {
+            return false;
+        }
         Optional<Island> island = IridiumSkyblockAPI.getInstance().getIslandViaLocation(location);
         if (!island.isPresent()) {
             return false;
@@ -135,7 +137,9 @@ public void deleteShopsWhenIslandDelete(IslandDeleteEvent event) {
         Island island = event.getIsland();
         List<User> members = event.getIsland().getMembers();
         for (Shop shop : plugin.getShopManager().getAllShops()) {
-            if (!island.isInIsland(shop.getLocation())) continue;
+            if (!island.isInIsland(shop.getLocation())) {
+                continue;
+            }
             for (User user : members) {
                 if (shop.getOwner().equals(user.getUuid())) {
                     plugin.logEvent(new ShopRemoveLog(Util.getNilUniqueId(),String.format("[%s Integration]Shop %s deleted caused by ShopOwnerQuitFromIsland", this.getName(), shop),shop.saveToInfoStorage()));
@@ -150,7 +154,9 @@ public void deleteShopsWhenIslandDelete(IslandRegenEvent event) {
         Island island = event.getIsland();
         List<User> members = event.getIsland().getMembers();
         for (Shop shop : plugin.getShopManager().getAllShops()) {
-            if (!island.isInIsland(shop.getLocation())) continue;
+            if (!island.isInIsland(shop.getLocation())) {
+                continue;
+            }
             for (User user : members) {
                 if (shop.getOwner().equals(user.getUuid())) {
                     plugin.logEvent(new ShopRemoveLog(Util.getNilUniqueId(),String.format("[%s Integration]Shop %s deleted caused by ShopOwnerQuitFromIsland", this.getName(), shop),shop.saveToInfoStorage()));
@@ -164,7 +170,9 @@ public void deleteShopsWhenIslandDelete(IslandRegenEvent event) {
     public void deleteShopWhenMemberKicked(UserKickEvent event) {
         Island island = event.getIsland();
         for (Shop shop : plugin.getShopManager().getPlayerAllShops(event.getUser().getUuid())) {
-            if (!island.isInIsland(shop.getLocation())) continue;
+            if (!island.isInIsland(shop.getLocation())) {
+                continue;
+            }
             plugin.logEvent(new ShopRemoveLog(Util.getNilUniqueId(),String.format("[%s Integration]Shop %s deleted caused by ShopOwnerQuitFromIsland", this.getName(), shop),shop.saveToInfoStorage()));
             shop.delete();
         }
diff --git a/src/main/java/org/maxgamer/quickshop/listener/DisplayProtectionListener.java b/src/main/java/org/maxgamer/quickshop/listener/DisplayProtectionListener.java
@@ -63,8 +63,9 @@ public DisplayProtectionListener(QuickShop plugin, Cache cache) {
      */
     @Override
     public ReloadResult reloadModule() throws Exception {
-        if (useEnhanceProtection == plugin.getConfig().getBoolean("shop.enchance-display-protect"))
+        if (useEnhanceProtection == plugin.getConfig().getBoolean("shop.enchance-display-protect")) {
             return ReloadResult.builder().status(ReloadStatus.SUCCESS).build();
+        }
         return ReloadResult.builder().status(ReloadStatus.REQUIRE_RESTART).build();
     }
 
diff --git a/src/main/java/org/maxgamer/quickshop/listener/worldedit/WorldEditAdapter.java b/src/main/java/org/maxgamer/quickshop/listener/worldedit/WorldEditAdapter.java
@@ -42,6 +42,7 @@ public void register() {
         weBukkit.getWorldEdit().getEventBus().register(this);
     }
 
+    @Override
     public void unregister() {
         weBukkit.getWorldEdit().getEventBus().unregister(this);
     }
diff --git a/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java b/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java
@@ -210,6 +210,7 @@ private void updateShopData() {
         this.update();
     }
 
+    @Override
     public boolean isDisableDisplay() {
         return disableDisplay;
     }
@@ -225,10 +226,12 @@ public void setDisableDisplay(boolean disabled) {
     @Override
     @Nullable
     public UUID getTaxAccount() {
-        if (taxAccount != null)
+        if (taxAccount != null) {
             return taxAccount;
-        if (plugin.getShopManager().getCacheTaxAccount() != null)
+        }
+        if (plugin.getShopManager().getCacheTaxAccount() != null) {
             return plugin.getShopManager().getCacheTaxAccount().getUniqueId();
+        }
         return null;
 
     }
@@ -517,8 +520,9 @@ public boolean isAttached(@NotNull Block b) {
      */
     @Override
     public boolean matches(@Nullable ItemStack item) {
-        if (item == null)
+        if (item == null) {
             return false;
+        }
         ItemStack guest = item.clone();
         guest.setAmount(1);
         ItemStack owner = this.item.clone();
diff --git a/src/main/java/org/maxgamer/quickshop/shop/ShopManager.java b/src/main/java/org/maxgamer/quickshop/shop/ShopManager.java
@@ -685,10 +685,11 @@ public void actionBuy(
             total = e.getTotal(); // Allow addon to set it
         }
         Trader taxAccount;
-        if (shop.getTaxAccount() != null)
+        if (shop.getTaxAccount() != null) {
             taxAccount = new Trader(shop.getTaxAccount().toString(), Bukkit.getOfflinePlayer(shop.getTaxAccount()));
-        else
+        } else {
             taxAccount = this.cacheTaxAccount;
+        }
         EconomyTransaction transaction;
         EconomyTransaction.EconomyTransactionBuilder builder = EconomyTransaction.builder()
                 .core(eco)
@@ -1052,10 +1053,11 @@ public void actionSell(
         // SELLING Player -> Shop Owner
         EconomyTransaction transaction;
         Trader taxAccount;
-        if (shop.getTaxAccount() != null)
+        if (shop.getTaxAccount() != null) {
             taxAccount = new Trader(shop.getTaxAccount().toString(), Bukkit.getOfflinePlayer(shop.getTaxAccount()));
-        else
+        } else {
             taxAccount = this.cacheTaxAccount;
+        }
         EconomyTransaction.EconomyTransactionBuilder builder = EconomyTransaction.builder()
                 .allowLoan(plugin.getConfig().getBoolean("shop.allow-economy-loan", false))
                 .core(eco)
diff --git a/src/main/java/org/maxgamer/quickshop/shop/ShopPurger.java b/src/main/java/org/maxgamer/quickshop/shop/ShopPurger.java
@@ -23,7 +23,9 @@ public void run() {
             return;
         }
         executing = true;
-        if (!plugin.getConfig().getBoolean("purge.enabled")) return;
+        if (!plugin.getConfig().getBoolean("purge.enabled")) {
+            return;
+        }
         Util.debugLog("[Shop Purger] Scanning and removing shops");
         int days = plugin.getConfig().getInt("purge.days", 360);
         boolean deleteBanned = plugin.getConfig().getBoolean("purge.banned");
@@ -48,10 +50,12 @@ public void run() {
             boolean markDeletion = player.isBanned() && deleteBanned;
             //noinspection ConstantConditions
             long noOfDaysBetween = ChronoUnit.DAYS.between(Util.getDateTimeFromTimestamp(lastPlayed), Util.getDateTimeFromTimestamp(System.currentTimeMillis()));
-            if (noOfDaysBetween > days)
+            if (noOfDaysBetween > days) {
                 markDeletion = true;
-            if (!markDeletion)
+            }
+            if (!markDeletion) {
                 continue;
+            }
             plugin.getLogger().info("[Shop Purger] Shop " + shop + " has been purged.");
             shop.delete(false);
             if (returnCreationFee) {
diff --git a/src/main/java/org/maxgamer/quickshop/util/JsonUtil.java b/src/main/java/org/maxgamer/quickshop/util/JsonUtil.java
@@ -133,10 +133,12 @@ public static Gson getPrettyPrinting() {
     }
     public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy
     {
+        @Override
         public boolean shouldSkipClass(Class<?> clazz) {
             return clazz.getDeclaredAnnotation(Hidden.class) != null;
         }
 
+        @Override
         public boolean shouldSkipField(FieldAttributes f) {
             return f.getAnnotation(Hidden.class) != null;
         }
diff --git a/src/main/java/org/maxgamer/quickshop/util/Util.java b/src/main/java/org/maxgamer/quickshop/util/Util.java
@@ -1162,7 +1162,9 @@ public static String getClassPrefix() {
         try {
             Class<?> c = Class.forName(className);
             className = c.getSimpleName();
-            if (!c.getSimpleName().isEmpty()) className = c.getSimpleName();
+            if (!c.getSimpleName().isEmpty()) {
+                className = c.getSimpleName();
+            }
         } catch (ClassNotFoundException ignored) {
         }
         String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
@@ -1392,8 +1394,9 @@ public static void mainThreadRun(@NotNull Runnable runnable) {
 
     // http://www.java2s.com/Tutorials/Java/Data_Type_How_to/Date_Convert/Convert_long_type_timestamp_to_LocalDate_and_LocalDateTime.htm
     public static LocalDateTime getDateTimeFromTimestamp(long timestamp) {
-        if (timestamp == 0)
+        if (timestamp == 0) {
             return null;
+        }
         return LocalDateTime.ofInstant(Instant.ofEpochSecond(timestamp), TimeZone
                 .getDefault().toZoneId());
     }
diff --git a/src/main/java/org/maxgamer/quickshop/util/language/game/MojangGameLanguageImpl.java b/src/main/java/org/maxgamer/quickshop/util/language/game/MojangGameLanguageImpl.java
@@ -84,7 +84,7 @@ public MojangGameLanguageImpl(@NotNull QuickShop plugin, @NotNull String languag
             } else {
                 if (isCountryEmpty || isLanguageEmpty) {
                     languageCode = isLanguageEmpty ? country + '_' + country : language + '_' + language;
-                    if (languageCode.equals("en_en")) {
+                    if ("en_en".equals(languageCode)) {
                         languageCode = "en_US";
                     }
                     plugin.getLogger().warning("Unable to get language code, guessing " + languageCode + " instead, If it's incorrect, please change game-language option in config.yml.");
diff --git a/src/main/java/org/maxgamer/quickshop/util/language/game/distributions/MojangDistribution.java b/src/main/java/org/maxgamer/quickshop/util/language/game/distributions/MojangDistribution.java
@@ -49,9 +49,12 @@ public MojangDistribution(QuickShop plugin, MojangApiMirror mirror) {
     public VersionManifest getVersionManifest() {
         String url = mirror.getLauncherMetaRoot()+"/mc/game/version_manifest.json";
         String data;
-        if (requestCachePool.getIfPresent(url) != null)
+        if (requestCachePool.getIfPresent(url) != null) {
             return JsonUtil.standard().fromJson(requestCachePool.getIfPresent(url),VersionManifest.class);
-        if (!grabIntoCaches(url)) return null;
+        }
+        if (!grabIntoCaches(url)) {
+            return null;
+        }
         return JsonUtil.standard().fromJson(requestCachePool.getIfPresent(url),VersionManifest.class);
     }
 
@@ -61,7 +64,9 @@ public GameManifest getGameManifest(VersionManifest versionManifest, String game
         for (VersionManifest.VersionsDTO version : versionManifest.getVersions()) {
             if(version.getId().equals(gameVersion)){
                 String url = version.getUrl();
-                if (!grabIntoCaches(url)) return null;
+                if (!grabIntoCaches(url)) {
+                    return null;
+                }
                 return JsonUtil.standard().fromJson(requestCachePool.getIfPresent(url),GameManifest.class);
             }
         }
@@ -71,16 +76,20 @@ public GameManifest getGameManifest(VersionManifest versionManifest, String game
     public List<String> getAvailableLanguages(){
         List<String> languages = new ArrayList<>();
         VersionManifest versionManifest = getVersionManifest();
-        if(versionManifest == null)
+        if(versionManifest == null) {
             return Collections.emptyList();
+        }
         GameManifest gameManifest = getGameManifest(versionManifest, ReflectFactory.getServerVersion());
-        if(gameManifest == null)
+        if(gameManifest == null) {
             return Collections.emptyList();
-        if(!grabIntoCaches(gameManifest.getAssetIndex().getUrl()))
+        }
+        if(!grabIntoCaches(gameManifest.getAssetIndex().getUrl())) {
             return Collections.emptyList();
+        }
         String versionMapping = requestCachePool.getIfPresent(gameManifest.getAssetIndex().getUrl());
-        if(versionMapping == null)
+        if(versionMapping == null) {
             return Collections.emptyList();
+        }
         for (Map.Entry<String, JsonElement> objects : JsonUtil.parser().parse(versionMapping).getAsJsonObject().get("objects").getAsJsonObject().entrySet()) {
             if(objects.getKey().startsWith("minecraft/lang/")){
                 languages.add(StringUtils.substringBetween("minecraft/lang/",".json"));
@@ -94,7 +103,9 @@ public boolean grabIntoCaches(String url) {
         String data;
         try (Response response = client.newCall(new Request.Builder().get().url(url).build()).execute()) {
             val body = response.body();
-            if (body == null) return true;
+            if (body == null) {
+                return true;
+            }
             data = body.string();
             if (response.code() != 200) {
                 plugin.getLogger().warning("Couldn't get manifest: " + response.code() + ", please report to QuickShop!");
diff --git a/src/main/java/org/maxgamer/quickshop/util/language/text/TextManager.java b/src/main/java/org/maxgamer/quickshop/util/language/text/TextManager.java
diff --git a/src/main/java/org/maxgamer/quickshop/util/language/text/distributions/crowdin/CrowdinOTA.java b/src/main/java/org/maxgamer/quickshop/util/language/text/distributions/crowdin/CrowdinOTA.java
diff --git a/src/main/java/org/maxgamer/quickshop/util/reload/ReloadManager.java b/src/main/java/org/maxgamer/quickshop/util/reload/ReloadManager.java
diff --git a/src/main/java/org/maxgamer/quickshop/watcher/OngoingFeeWatcher.java b/src/main/java/org/maxgamer/quickshop/watcher/OngoingFeeWatcher.java

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void onCommand(@NotNull CommandSender sender, @NotNull String commandLabe`
`53`	`53`	`return;`
`54`	`54`	`}`
`55`	`55`
`56`		`- if (cmdArg.length == 0 \|\| !cmdArg[0].equalsIgnoreCase("confirm")) {`
	`56`	`+ if (cmdArg.length == 0 \|\| !"confirm".equalsIgnoreCase(cmdArg[0])) {`
`57`	`57`	`MsgUtil.sendDirectMessage(sender, ChatColor.RED + "You will need to restart the server to complete the update of plugin! Before restarting plugin will stop working!");`
`58`	`58`	`MsgUtil.sendDirectMessage(sender, ChatColor.RED + "Type " + ChatColor.BOLD + "/qs update confirm" + ChatColor.RESET + ChatColor.RED + " to confirm update");`
`59`	`59`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public void load() {`
`100`	`100`
`101`	`101`	`@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)`
`102`	`102`	`public void onPluginLoad(PluginEnableEvent event) {`
`103`		`- if (event.getPlugin().getName().equals("ArmShopBridge")) {`
	`103`	`+ if ("ArmShopBridge".equals(event.getPlugin().getName())) {`
`104`	`104`	`scanAndUnregister();`
`105`	`105`	`}`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public void register() {`
`42`	`42`	`weBukkit.getWorldEdit().getEventBus().register(this);`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ @Override`
`45`	`46`	`public void unregister() {`
`46`	`47`	`weBukkit.getWorldEdit().getEventBus().unregister(this);`
`47`	`48`	`}`