From 3d6bcac699a348cf7f34c7aa89399f9956e7eedf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9D=8F=E9=BB=91?= <sky@asgard.me>
Date: Mon, 8 Jul 2019 14:37:31 +0800
Subject: [PATCH] Fix

---
 build.gradle                                                  | 4 ++++
 src/main/scala/io/{lzzel => izzel}/tlibscala/AsyncTask.scala  | 2 +-
 src/main/scala/io/{lzzel => izzel}/tlibscala/Example.scala    | 2 +-
 src/main/scala/io/{lzzel => izzel}/tlibscala/Implicits.scala  | 4 ++--
 src/main/scala/io/{lzzel => izzel}/tlibscala/Prelude.scala    | 2 +-
 .../io/{lzzel => izzel}/tlibscala/ScalaTaskExecutor.scala     | 2 +-
 src/main/scala/io/{lzzel => izzel}/tlibscala/Task.scala       | 2 +-
 .../io/{lzzel => izzel}/tlibscala/runtime/RichLocation.scala  | 2 +-
 .../tlibscala/runtime/RichOfflinePlayer.scala                 | 2 +-
 .../io/{lzzel => izzel}/tlibscala/runtime/RichPlayer.scala    | 2 +-
 .../io/{lzzel => izzel}/tlibscala/runtime/RichVector.scala    | 2 +-
 11 files changed, 15 insertions(+), 11 deletions(-)
 rename src/main/scala/io/{lzzel => izzel}/tlibscala/AsyncTask.scala (95%)
 rename src/main/scala/io/{lzzel => izzel}/tlibscala/Example.scala (97%)
 rename src/main/scala/io/{lzzel => izzel}/tlibscala/Implicits.scala (90%)
 rename src/main/scala/io/{lzzel => izzel}/tlibscala/Prelude.scala (98%)
 rename src/main/scala/io/{lzzel => izzel}/tlibscala/ScalaTaskExecutor.scala (95%)
 rename src/main/scala/io/{lzzel => izzel}/tlibscala/Task.scala (95%)
 rename src/main/scala/io/{lzzel => izzel}/tlibscala/runtime/RichLocation.scala (94%)
 rename src/main/scala/io/{lzzel => izzel}/tlibscala/runtime/RichOfflinePlayer.scala (95%)
 rename src/main/scala/io/{lzzel => izzel}/tlibscala/runtime/RichPlayer.scala (97%)
 rename src/main/scala/io/{lzzel => izzel}/tlibscala/runtime/RichVector.scala (94%)

diff --git a/build.gradle b/build.gradle
index cc8f684..17f5cac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,6 +39,10 @@ dependencies {
 shadowJar {
     // 免得 MANIFEST.MF 里面刷一堆 lib 难看
     taskActions.removeIf { it.actionClassName.contains 'configureShadowTask' }
+
+    relocate 'org.apache.commons', 'io.izzel.taboolib.internal.apache'
+    relocate 'org.objectweb.asm', 'io.izzel.taboolib.internal.asm'
+    relocate 'com.google.gson', 'io.izzel.taboolib.internal.gson'
 }
 
 processResources {
diff --git a/src/main/scala/io/lzzel/tlibscala/AsyncTask.scala b/src/main/scala/io/izzel/tlibscala/AsyncTask.scala
similarity index 95%
rename from src/main/scala/io/lzzel/tlibscala/AsyncTask.scala
rename to src/main/scala/io/izzel/tlibscala/AsyncTask.scala
index f9b788c..0f5c6ce 100644
--- a/src/main/scala/io/lzzel/tlibscala/AsyncTask.scala
+++ b/src/main/scala/io/izzel/tlibscala/AsyncTask.scala
@@ -1,4 +1,4 @@
-package io.lzzel.tlibscala
+package io.izzel.tlibscala
 
 import org.bukkit.plugin.Plugin
 
diff --git a/src/main/scala/io/lzzel/tlibscala/Example.scala b/src/main/scala/io/izzel/tlibscala/Example.scala
similarity index 97%
rename from src/main/scala/io/lzzel/tlibscala/Example.scala
rename to src/main/scala/io/izzel/tlibscala/Example.scala
index aed96f6..6a9b843 100644
--- a/src/main/scala/io/lzzel/tlibscala/Example.scala
+++ b/src/main/scala/io/izzel/tlibscala/Example.scala
@@ -1,4 +1,4 @@
-package io.lzzel.tlibscala
+package io.izzel.tlibscala
 
 import Prelude._
 import org.bukkit.Material
diff --git a/src/main/scala/io/lzzel/tlibscala/Implicits.scala b/src/main/scala/io/izzel/tlibscala/Implicits.scala
similarity index 90%
rename from src/main/scala/io/lzzel/tlibscala/Implicits.scala
rename to src/main/scala/io/izzel/tlibscala/Implicits.scala
index 1568974..aeaa533 100644
--- a/src/main/scala/io/lzzel/tlibscala/Implicits.scala
+++ b/src/main/scala/io/izzel/tlibscala/Implicits.scala
@@ -1,6 +1,6 @@
-package io.lzzel.tlibscala
+package io.izzel.tlibscala
 
-import io.lzzel.tlibscala.runtime.{RichLocation, RichOfflinePlayer, RichPlayer, RichVector}
+import io.izzel.tlibscala.runtime.{RichLocation, RichOfflinePlayer, RichPlayer, RichVector}
 import org.bukkit.entity.Player
 import org.bukkit.util.Vector
 import org.bukkit.{Location, OfflinePlayer, World, util}
diff --git a/src/main/scala/io/lzzel/tlibscala/Prelude.scala b/src/main/scala/io/izzel/tlibscala/Prelude.scala
similarity index 98%
rename from src/main/scala/io/lzzel/tlibscala/Prelude.scala
rename to src/main/scala/io/izzel/tlibscala/Prelude.scala
index e2db6f7..2a48719 100644
--- a/src/main/scala/io/lzzel/tlibscala/Prelude.scala
+++ b/src/main/scala/io/izzel/tlibscala/Prelude.scala
@@ -1,4 +1,4 @@
-package io.lzzel.tlibscala
+package io.izzel.tlibscala
 
 import io.izzel.taboolib.module.locale.TLocale.Logger
 import org.bukkit.Bukkit
diff --git a/src/main/scala/io/lzzel/tlibscala/ScalaTaskExecutor.scala b/src/main/scala/io/izzel/tlibscala/ScalaTaskExecutor.scala
similarity index 95%
rename from src/main/scala/io/lzzel/tlibscala/ScalaTaskExecutor.scala
rename to src/main/scala/io/izzel/tlibscala/ScalaTaskExecutor.scala
index 35eed5c..e063244 100644
--- a/src/main/scala/io/lzzel/tlibscala/ScalaTaskExecutor.scala
+++ b/src/main/scala/io/izzel/tlibscala/ScalaTaskExecutor.scala
@@ -1,4 +1,4 @@
-package io.lzzel.tlibscala
+package io.izzel.tlibscala
 
 import org.bukkit.scheduler.BukkitRunnable
 
diff --git a/src/main/scala/io/lzzel/tlibscala/Task.scala b/src/main/scala/io/izzel/tlibscala/Task.scala
similarity index 95%
rename from src/main/scala/io/lzzel/tlibscala/Task.scala
rename to src/main/scala/io/izzel/tlibscala/Task.scala
index a34b8a5..78ee2f8 100644
--- a/src/main/scala/io/lzzel/tlibscala/Task.scala
+++ b/src/main/scala/io/izzel/tlibscala/Task.scala
@@ -1,4 +1,4 @@
-package io.lzzel.tlibscala
+package io.izzel.tlibscala
 
 import org.bukkit.plugin.Plugin
 
diff --git a/src/main/scala/io/lzzel/tlibscala/runtime/RichLocation.scala b/src/main/scala/io/izzel/tlibscala/runtime/RichLocation.scala
similarity index 94%
rename from src/main/scala/io/lzzel/tlibscala/runtime/RichLocation.scala
rename to src/main/scala/io/izzel/tlibscala/runtime/RichLocation.scala
index 8e74abb..b4d700f 100644
--- a/src/main/scala/io/lzzel/tlibscala/runtime/RichLocation.scala
+++ b/src/main/scala/io/izzel/tlibscala/runtime/RichLocation.scala
@@ -1,4 +1,4 @@
-package io.lzzel.tlibscala.runtime
+package io.izzel.tlibscala.runtime
 
 import org.bukkit.Location
 
diff --git a/src/main/scala/io/lzzel/tlibscala/runtime/RichOfflinePlayer.scala b/src/main/scala/io/izzel/tlibscala/runtime/RichOfflinePlayer.scala
similarity index 95%
rename from src/main/scala/io/lzzel/tlibscala/runtime/RichOfflinePlayer.scala
rename to src/main/scala/io/izzel/tlibscala/runtime/RichOfflinePlayer.scala
index 49aac50..53c579a 100644
--- a/src/main/scala/io/lzzel/tlibscala/runtime/RichOfflinePlayer.scala
+++ b/src/main/scala/io/izzel/tlibscala/runtime/RichOfflinePlayer.scala
@@ -1,4 +1,4 @@
-package io.lzzel.tlibscala.runtime
+package io.izzel.tlibscala.runtime
 
 import io.izzel.taboolib.module.compat.EconomyHook
 import io.izzel.taboolib.util.item.ItemBuilder
diff --git a/src/main/scala/io/lzzel/tlibscala/runtime/RichPlayer.scala b/src/main/scala/io/izzel/tlibscala/runtime/RichPlayer.scala
similarity index 97%
rename from src/main/scala/io/lzzel/tlibscala/runtime/RichPlayer.scala
rename to src/main/scala/io/izzel/tlibscala/runtime/RichPlayer.scala
index 38688c7..bc844f2 100644
--- a/src/main/scala/io/lzzel/tlibscala/runtime/RichPlayer.scala
+++ b/src/main/scala/io/izzel/tlibscala/runtime/RichPlayer.scala
@@ -1,4 +1,4 @@
-package io.lzzel.tlibscala.runtime
+package io.izzel.tlibscala.runtime
 
 import io.izzel.taboolib.module.locale.TLocale
 import io.izzel.taboolib.module.compat.PermissionHook
diff --git a/src/main/scala/io/lzzel/tlibscala/runtime/RichVector.scala b/src/main/scala/io/izzel/tlibscala/runtime/RichVector.scala
similarity index 94%
rename from src/main/scala/io/lzzel/tlibscala/runtime/RichVector.scala
rename to src/main/scala/io/izzel/tlibscala/runtime/RichVector.scala
index f12a79a..9d9b290 100644
--- a/src/main/scala/io/lzzel/tlibscala/runtime/RichVector.scala
+++ b/src/main/scala/io/izzel/tlibscala/runtime/RichVector.scala
@@ -1,4 +1,4 @@
-package io.lzzel.tlibscala.runtime
+package io.izzel.tlibscala.runtime
 
 import org.bukkit.util.Vector