From 5ab083f19a938b1aabd9ebf809378d41cf873cbc Mon Sep 17 00:00:00 2001
From: sky <sky@asgard.me>
Date: Tue, 10 Mar 2020 10:14:57 +0800
Subject: [PATCH] Update 5.2

---
 build.gradle                                        |  2 +-
 .../taboolib/module/config/TConfigWatcher.java      |  3 +--
 .../izzel/taboolib/module/inject/TInjectHelper.java | 10 +++++-----
 .../scala/io/izzel/taboolib/util/item/Items.java    | 13 ++-----------
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index a92ca03..65f2e93 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'me.skymc'
-version = '5.19'
+version = '5.2'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
diff --git a/src/main/scala/io/izzel/taboolib/module/config/TConfigWatcher.java b/src/main/scala/io/izzel/taboolib/module/config/TConfigWatcher.java
index 22b6240..bcbe6ae 100644
--- a/src/main/scala/io/izzel/taboolib/module/config/TConfigWatcher.java
+++ b/src/main/scala/io/izzel/taboolib/module/config/TConfigWatcher.java
@@ -48,8 +48,7 @@ public class TConfigWatcher {
     public void addSimpleListener(File file, Runnable runnable) {
         try {
             addListener(file, null, obj -> runnable.run());
-        } catch (Throwable t) {
-            t.printStackTrace();
+        } catch (Throwable ignored) {
         }
     }
 
diff --git a/src/main/scala/io/izzel/taboolib/module/inject/TInjectHelper.java b/src/main/scala/io/izzel/taboolib/module/inject/TInjectHelper.java
index 2799cdb..3b1cedc 100644
--- a/src/main/scala/io/izzel/taboolib/module/inject/TInjectHelper.java
+++ b/src/main/scala/io/izzel/taboolib/module/inject/TInjectHelper.java
@@ -48,13 +48,11 @@ public class TInjectHelper {
                 instance.add(PluginLoader.get(plugin));
             }
             // TInject
-            else if (TInjectCreator.getInstanceMap().entrySet().stream().anyMatch(e -> e.getKey().getType().equals(pluginClass))) {
+            if (TInjectCreator.getInstanceMap().entrySet().stream().anyMatch(e -> e.getKey().getType().equals(pluginClass))) {
                 TInjectCreator.getInstanceMap().entrySet().stream().filter(e -> e.getKey().getType().equals(pluginClass)).forEach(i -> instance.add(i.getValue().getInstance()));
             }
             // TListener
-            else {
-                instance.addAll(TListenerHandler.getInstance(plugin, pluginClass));
-            }
+            instance.addAll(TListenerHandler.getInstance(plugin, pluginClass));
         }
         // Nothing
         if (instance.isEmpty()) {
@@ -84,9 +82,11 @@ public class TInjectHelper {
                 instance.add(PluginLoader.get(plugin));
             }
             // TInject
-            else if (TInjectCreator.getInstanceMap().entrySet().stream().anyMatch(e -> e.getKey().getType().equals(pluginClass))) {
+            if (TInjectCreator.getInstanceMap().entrySet().stream().anyMatch(e -> e.getKey().getType().equals(pluginClass))) {
                 TInjectCreator.getInstanceMap().entrySet().stream().filter(e -> e.getKey().getType().equals(pluginClass)).forEach(i -> instance.add(i.getValue().getInstance()));
             }
+            // TListener
+            instance.addAll(TListenerHandler.getInstance(plugin, pluginClass));
         }
         // Nothing
         if (instance.isEmpty()) {
diff --git a/src/main/scala/io/izzel/taboolib/util/item/Items.java b/src/main/scala/io/izzel/taboolib/util/item/Items.java
index 5da8953..d40c9a4 100644
--- a/src/main/scala/io/izzel/taboolib/util/item/Items.java
+++ b/src/main/scala/io/izzel/taboolib/util/item/Items.java
@@ -11,7 +11,6 @@ import io.izzel.taboolib.module.nms.nbt.Attribute;
 import io.izzel.taboolib.module.nms.nbt.NBTBase;
 import io.izzel.taboolib.module.nms.nbt.NBTCompound;
 import io.izzel.taboolib.module.nms.nbt.NBTList;
-import io.izzel.taboolib.util.Reflection;
 import org.bukkit.Color;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
@@ -76,11 +75,7 @@ public class Items {
     public static Material asMaterial(String args) {
         try {
             Material material = Material.getMaterial(args.toUpperCase());
-            if (material != null) {
-                return material;
-            }
-            Object getById = Reflection.invokeMethod(Material.class, "getMaterial", NumberConversions.toInt(args));
-            return getById != null ? (Material) getById : null;
+            return material != null ? material : Material.getMaterial(Integer.valueOf(args));
         } catch (Exception e) {
             return Material.STONE;
         }
@@ -106,11 +101,7 @@ public class Items {
     public static Enchantment asEnchantment(String enchant) {
         try {
             Enchantment enchantment = Enchantment.getByName(enchant);
-            if (enchantment != null) {
-                return enchantment;
-            }
-            Object getById = Reflection.invokeMethod(Enchantment.class, "getById", NumberConversions.toInt(enchant));
-            return getById != null ? (Enchantment) getById : null;
+            return enchantment != null ? enchantment : Enchantment.getById(Integer.valueOf(enchant));
         } catch (Exception e) {
             return null;
         }