Merge remote-tracking branch 'origin/master'

# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties

build.gradle

@@ -34,10 +34,14 @@ dependencies {
     shadow group: 'com.zaxxer', name: 'HikariCP', version: '3.1.0'
     shadow group: 'org.scala-lang', name: 'scala-library', version: '2.12.8'
     shadow group: 'me.clip', name: 'placeholderapi', version: '2.8.4'
+    shadow group: 'com.google.inject', name: 'guice', version: '4.2.2'
     shadow fileTree(dir: 'libs', includes: ['*.jar'])
 }
 
 shadowJar {
+
+    // 免得 MANIFEST.MF 里面刷一堆 lib 难看
+    taskActions.removeIf { it.actionClassName.contains 'configureShadowTask' }
     
     // 免得 MANIFEST.MF 里面刷一堆 lib 难看
     taskActions.removeIf { it.actionClassName.contains 'configureShadowTask' }

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Wed Jul 10 21:21:15 CST 2019
+#Wed Jul 10 22:34:36 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

src/main/scala/io/izzel/taboolib/TabooLib.java

@@ -29,6 +29,7 @@ import java.util.concurrent.Executors;
 @Dependency(type = Dependency.Type.LIBRARY, maven = "org.slf4j:slf4j-api:1.7.25", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/org.slf4j-slf4j-api-1.7.25.jar")
 @Dependency(type = Dependency.Type.LIBRARY, maven = "com.zaxxer:HikariCP:3.1.0", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/com.zaxxer-HikariCP-3.1.0.jar")
 @Dependency(type = Dependency.Type.LIBRARY, maven = "org.scala-lang:scala-library:2.12.8", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/scala-library-2.12.8.jar")
+@Dependency(type = Dependency.Type.LIBRARY, maven = "com.google.inject:guice:4.2.2", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/guice-4.2.2.jar")
 public class TabooLib {
 
     private static TabooLib inst = new TabooLib();