From e39981d6914fc5e375c7bdfcac8d4a5d4425e4c2 Mon Sep 17 00:00:00 2001 From: sky Date: Fri, 17 Apr 2020 20:06:52 +0800 Subject: [PATCH] Update --- src/main/scala/io/izzel/taboolib/PluginLoader.java | 2 +- src/main/scala/io/izzel/taboolib/TabooLib.java | 9 +++++---- src/main/scala/io/izzel/taboolib/TabooLibLoader.java | 1 + src/main/scala/io/izzel/taboolib/Version.java | 2 +- .../izzel/taboolib/common/event/PlayerAttackEvent.java | 4 ++-- .../izzel/taboolib/common/event/PlayerJumpEvent.java | 2 +- .../taboolib/common/listener/ListenerCommand.java | 2 +- .../taboolib/common/listener/ListenerPlayerJump.java | 2 +- .../io/izzel/taboolib/common/loader/StartupLoader.java | 1 + .../izzel/taboolib/common/plugin/InternalPlugin.java | 2 +- .../taboolib/common/plugin/InternalPluginLoader.java | 2 +- .../taboolib/common/plugin/bridge/BridgeImpl.java | 3 ++- .../io/izzel/taboolib/cronus/bukkit/ItemStack.java | 10 +++++----- .../izzel/taboolib/module/ai/PathfinderExecutor.java | 1 + .../module/ai/internal/InternalPathfinderExecutor.java | 3 ++- 15 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/main/scala/io/izzel/taboolib/PluginLoader.java b/src/main/scala/io/izzel/taboolib/PluginLoader.java index c1744d0..eea81ee 100644 --- a/src/main/scala/io/izzel/taboolib/PluginLoader.java +++ b/src/main/scala/io/izzel/taboolib/PluginLoader.java @@ -90,7 +90,7 @@ public abstract class PluginLoader { // 释放文检读取 Optional.ofNullable(TConfig.getFiles().remove(plugin.getName())).ifPresent(files -> files.forEach(file -> TConfigWatcher.getInst().removeListener(file))); // 注销数据库连接 - DBSource.getDataSource().entrySet().stream().filter(dataEntry -> dataEntry.getKey().getPlugin().equals(plugin)).map(Map.Entry::getKey).forEach(DBSource::closeDataSource); + DBSource.getDataSource().keySet().stream().filter(dbSourceData -> dbSourceData.getPlugin().equals(plugin)).forEach(DBSource::closeDataSource); // 注销调度器 Bukkit.getScheduler().cancelTasks(plugin); // 卸载语言文件 diff --git a/src/main/scala/io/izzel/taboolib/TabooLib.java b/src/main/scala/io/izzel/taboolib/TabooLib.java index 5742a5a..510e808 100644 --- a/src/main/scala/io/izzel/taboolib/TabooLib.java +++ b/src/main/scala/io/izzel/taboolib/TabooLib.java @@ -15,7 +15,7 @@ import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.util.NumberConversions; import java.io.File; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.concurrent.Executors; /** @@ -44,8 +44,9 @@ public class TabooLib { private static double version; // 内部语言文件 - private YamlConfiguration internal = new YamlConfiguration(); + private final YamlConfiguration internal = new YamlConfiguration(); + @SuppressWarnings("BusyWait") public TabooLib() { inst = this; logger = TLogger.getUnformatted("TabooLib"); @@ -53,13 +54,13 @@ public class TabooLib { config = TConfig.create(getPlugin(), "settings.yml"); // 加载版本号 try { - version = NumberConversions.toDouble(IO.readFully(Files.getResource("__resources__/version"), Charset.forName("utf-8"))); + version = NumberConversions.toDouble(IO.readFully(Files.getResource("__resources__/version"), StandardCharsets.UTF_8)); } catch (Throwable t) { t.printStackTrace(); } // 加载内部语言文件 try { - internal.loadFromString(IO.readFully(Files.getResource("__resources__/lang/internal.yml"), Charset.forName("utf-8"))); + internal.loadFromString(IO.readFully(Files.getResource("__resources__/lang/internal.yml"), StandardCharsets.UTF_8)); } catch (Throwable t) { t.printStackTrace(); } diff --git a/src/main/scala/io/izzel/taboolib/TabooLibLoader.java b/src/main/scala/io/izzel/taboolib/TabooLibLoader.java index 640507a..bd45983 100644 --- a/src/main/scala/io/izzel/taboolib/TabooLibLoader.java +++ b/src/main/scala/io/izzel/taboolib/TabooLibLoader.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; * @Author 坏黑 * @Since 2019-07-05 15:30 */ +@SuppressWarnings("rawtypes") public class TabooLibLoader { static Map> pluginClasses = Maps.newHashMap(); diff --git a/src/main/scala/io/izzel/taboolib/Version.java b/src/main/scala/io/izzel/taboolib/Version.java index 90d8970..6f0f54f 100644 --- a/src/main/scala/io/izzel/taboolib/Version.java +++ b/src/main/scala/io/izzel/taboolib/Version.java @@ -12,7 +12,7 @@ public enum Version { v1_7(10700), v1_8(10800), v1_9(10900), v1_10(11000), v1_11(11100), v1_12(11200), v1_13(11300), v1_14(11400), v1_15(11500), v1_16(11600), vNull(0); - private int versionInt; + private final int versionInt; Version(int versionInt) { this.versionInt = versionInt; diff --git a/src/main/scala/io/izzel/taboolib/common/event/PlayerAttackEvent.java b/src/main/scala/io/izzel/taboolib/common/event/PlayerAttackEvent.java index c28dc64..9139c8d 100644 --- a/src/main/scala/io/izzel/taboolib/common/event/PlayerAttackEvent.java +++ b/src/main/scala/io/izzel/taboolib/common/event/PlayerAttackEvent.java @@ -6,8 +6,8 @@ import org.bukkit.entity.Player; public class PlayerAttackEvent extends EventCancellable { - private Player player; - private Entity target; + private final Player player; + private final Entity target; public PlayerAttackEvent(Player player, Entity target) { this.player = player; diff --git a/src/main/scala/io/izzel/taboolib/common/event/PlayerJumpEvent.java b/src/main/scala/io/izzel/taboolib/common/event/PlayerJumpEvent.java index fac0484..9632640 100644 --- a/src/main/scala/io/izzel/taboolib/common/event/PlayerJumpEvent.java +++ b/src/main/scala/io/izzel/taboolib/common/event/PlayerJumpEvent.java @@ -5,7 +5,7 @@ import org.bukkit.entity.Player; public class PlayerJumpEvent extends EventCancellable { - private Player player; + private final Player player; public PlayerJumpEvent(Player player) { this.player = player; diff --git a/src/main/scala/io/izzel/taboolib/common/listener/ListenerCommand.java b/src/main/scala/io/izzel/taboolib/common/listener/ListenerCommand.java index 1bbf363..9266d27 100644 --- a/src/main/scala/io/izzel/taboolib/common/listener/ListenerCommand.java +++ b/src/main/scala/io/izzel/taboolib/common/listener/ListenerCommand.java @@ -46,7 +46,7 @@ public class ListenerCommand implements Listener { StartupLoader.register(ListenerCommand.class); } - abstract class Module { + abstract static class Module { abstract public String[] name(); diff --git a/src/main/scala/io/izzel/taboolib/common/listener/ListenerPlayerJump.java b/src/main/scala/io/izzel/taboolib/common/listener/ListenerPlayerJump.java index 83b354c..aafb9fd 100644 --- a/src/main/scala/io/izzel/taboolib/common/listener/ListenerPlayerJump.java +++ b/src/main/scala/io/izzel/taboolib/common/listener/ListenerPlayerJump.java @@ -14,7 +14,7 @@ import org.bukkit.event.player.PlayerMoveEvent; public class ListenerPlayerJump implements Listener { @TInject - private static Cooldown cooldown = new Cooldown("taboolib:jump", 350); + private static final Cooldown cooldown = new Cooldown("taboolib:jump", 350); @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onJump(PlayerMoveEvent e) { diff --git a/src/main/scala/io/izzel/taboolib/common/loader/StartupLoader.java b/src/main/scala/io/izzel/taboolib/common/loader/StartupLoader.java index a235139..25ce96b 100644 --- a/src/main/scala/io/izzel/taboolib/common/loader/StartupLoader.java +++ b/src/main/scala/io/izzel/taboolib/common/loader/StartupLoader.java @@ -12,6 +12,7 @@ import java.util.List; * @Author sky * @Since 2020-03-24 23:54 */ +@SuppressWarnings("rawtypes") public class StartupLoader { static List> classList = Lists.newArrayList(); diff --git a/src/main/scala/io/izzel/taboolib/common/plugin/InternalPlugin.java b/src/main/scala/io/izzel/taboolib/common/plugin/InternalPlugin.java index 9bcaf79..19d58dc 100644 --- a/src/main/scala/io/izzel/taboolib/common/plugin/InternalPlugin.java +++ b/src/main/scala/io/izzel/taboolib/common/plugin/InternalPlugin.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; */ public class InternalPlugin implements Plugin { - private static InternalPlugin plugin; + private static final InternalPlugin plugin; public static InternalPlugin getPlugin() { return plugin; diff --git a/src/main/scala/io/izzel/taboolib/common/plugin/InternalPluginLoader.java b/src/main/scala/io/izzel/taboolib/common/plugin/InternalPluginLoader.java index 9a8c798..2ab7493 100644 --- a/src/main/scala/io/izzel/taboolib/common/plugin/InternalPluginLoader.java +++ b/src/main/scala/io/izzel/taboolib/common/plugin/InternalPluginLoader.java @@ -17,7 +17,7 @@ import java.util.regex.Pattern; */ public class InternalPluginLoader implements PluginLoader { - private static JavaPluginLoader loader; + private static final JavaPluginLoader loader; public static PluginLoader getLoader() { return loader; diff --git a/src/main/scala/io/izzel/taboolib/common/plugin/bridge/BridgeImpl.java b/src/main/scala/io/izzel/taboolib/common/plugin/bridge/BridgeImpl.java index c469e56..8a22979 100644 --- a/src/main/scala/io/izzel/taboolib/common/plugin/bridge/BridgeImpl.java +++ b/src/main/scala/io/izzel/taboolib/common/plugin/bridge/BridgeImpl.java @@ -30,12 +30,13 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +@SuppressWarnings("rawtypes") public class BridgeImpl extends InternalPluginBridge { private Object economy; private Object permission; private Method getRegionManager; - private boolean placeholder; + private final boolean placeholder; private boolean worldguard; public BridgeImpl() { diff --git a/src/main/scala/io/izzel/taboolib/cronus/bukkit/ItemStack.java b/src/main/scala/io/izzel/taboolib/cronus/bukkit/ItemStack.java index 2809b10..a8e6f64 100644 --- a/src/main/scala/io/izzel/taboolib/cronus/bukkit/ItemStack.java +++ b/src/main/scala/io/izzel/taboolib/cronus/bukkit/ItemStack.java @@ -12,11 +12,11 @@ import java.util.List; */ public class ItemStack { - private List type; - private String name; - private String lore; - private int damage; - private int amount; + private final List type; + private final String name; + private final String lore; + private final int damage; + private final int amount; public ItemStack(String type, String name, String lore, int damage, int amount) { this.type = type == null ? null : Lists.newArrayList(type.split("\\|")); diff --git a/src/main/scala/io/izzel/taboolib/module/ai/PathfinderExecutor.java b/src/main/scala/io/izzel/taboolib/module/ai/PathfinderExecutor.java index e6963e3..c66311f 100644 --- a/src/main/scala/io/izzel/taboolib/module/ai/PathfinderExecutor.java +++ b/src/main/scala/io/izzel/taboolib/module/ai/PathfinderExecutor.java @@ -8,6 +8,7 @@ import org.bukkit.entity.LivingEntity; * @Author sky * @Since 2018-09-20 20:47 */ +@SuppressWarnings("rawtypes") public abstract class PathfinderExecutor { public abstract Object getEntityInsentient(LivingEntity entity); diff --git a/src/main/scala/io/izzel/taboolib/module/ai/internal/InternalPathfinderExecutor.java b/src/main/scala/io/izzel/taboolib/module/ai/internal/InternalPathfinderExecutor.java index 137a3b0..f4429dc 100644 --- a/src/main/scala/io/izzel/taboolib/module/ai/internal/InternalPathfinderExecutor.java +++ b/src/main/scala/io/izzel/taboolib/module/ai/internal/InternalPathfinderExecutor.java @@ -22,12 +22,13 @@ import java.util.Collection; * @Author sky * @Since 2018-09-20 20:57 */ +@SuppressWarnings("rawtypes") public class InternalPathfinderExecutor extends PathfinderExecutor { private Field pathEntity; private Field pathfinderGoalSelectorSet; private Field controllerJumpCurrent; - private boolean v11400 = Version.isAfter(Version.v1_14); + private final boolean v11400 = Version.isAfter(Version.v1_14); public InternalPathfinderExecutor() { try {