diff --git a/all/pom.xml b/all/pom.xml
deleted file mode 100644
index 15ea13c..0000000
--- a/all/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
- 4.0.0
-
-
- parent
- org.zhdev.varioutil
- 1.0-SNAPSHOT
-
-
- all
-
-
-
- ${project.groupId}
- velocity
- ${project.version}
- compile
-
-
- ${project.groupId}
- bukkit
- ${project.version}
- compile
-
-
- ${project.groupId}
- misc
- ${project.version}
- compile
-
-
- ${project.groupId}
- db
- ${project.version}
- compile
-
-
- ${project.groupId}
- io
- ${project.version}
- compile
-
-
- ${project.groupId}
- common
- ${project.version}
- compile
-
-
-
\ No newline at end of file
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index 78b24a9..e1d72ef 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -5,8 +5,8 @@
4.0.0
- org.zhdev.varioutil
- parent
+ org.zhdev
+ varioutil
1.0-SNAPSHOT
@@ -47,7 +47,7 @@
org.spigotmc
spigot-api
- 1.21.1-R0.1-SNAPSHOT
+ 1.21.8-R0.1-SNAPSHOT
provided
@@ -59,7 +59,7 @@
com.mojang
authlib
- 4.0.43
+ 6.0.54
provided
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/BukkitPlugin.java b/bukkit/src/main/java/org/zhdev/BukkitPlugin.java
similarity index 98%
rename from bukkit/src/main/java/org/zhdev/varioutil/BukkitPlugin.java
rename to bukkit/src/main/java/org/zhdev/BukkitPlugin.java
index 377eafe..02635e2 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/BukkitPlugin.java
+++ b/bukkit/src/main/java/org/zhdev/BukkitPlugin.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil;
+package org.zhdev;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/LegacyMaterial.java b/bukkit/src/main/java/org/zhdev/bukkit/LegacyMaterial.java
similarity index 97%
rename from bukkit/src/main/java/org/zhdev/varioutil/bukkit/LegacyMaterial.java
rename to bukkit/src/main/java/org/zhdev/bukkit/LegacyMaterial.java
index c6f1fef..c45326a 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/LegacyMaterial.java
+++ b/bukkit/src/main/java/org/zhdev/bukkit/LegacyMaterial.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.bukkit;
+package org.zhdev.bukkit;
import org.bukkit.Material;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/AbstractPluginCommand.java b/bukkit/src/main/java/org/zhdev/bukkit/command/AbstractPluginCommand.java
similarity index 98%
rename from bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/AbstractPluginCommand.java
rename to bukkit/src/main/java/org/zhdev/bukkit/command/AbstractPluginCommand.java
index b41319e..8ed5c15 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/AbstractPluginCommand.java
+++ b/bukkit/src/main/java/org/zhdev/bukkit/command/AbstractPluginCommand.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.bukkit.command;
+package org.zhdev.bukkit.command;
import org.bukkit.command.*;
import org.bukkit.plugin.Plugin;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/PreparedPluginCommand.java b/bukkit/src/main/java/org/zhdev/bukkit/command/PreparedPluginCommand.java
similarity index 95%
rename from bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/PreparedPluginCommand.java
rename to bukkit/src/main/java/org/zhdev/bukkit/command/PreparedPluginCommand.java
index c3866e2..cabcf35 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/PreparedPluginCommand.java
+++ b/bukkit/src/main/java/org/zhdev/bukkit/command/PreparedPluginCommand.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.bukkit.command;
+package org.zhdev.bukkit.command;
import org.bukkit.command.*;
import org.bukkit.plugin.Plugin;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/ClickHandler.java b/bukkit/src/main/java/org/zhdev/bukkit/gui/ClickHandler.java
similarity index 83%
rename from bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/ClickHandler.java
rename to bukkit/src/main/java/org/zhdev/bukkit/gui/ClickHandler.java
index 7c9aef7..9ae2688 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/ClickHandler.java
+++ b/bukkit/src/main/java/org/zhdev/bukkit/gui/ClickHandler.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.bukkit.gui;
+package org.zhdev.bukkit.gui;
import org.bukkit.event.inventory.InventoryClickEvent;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/Gui.java b/bukkit/src/main/java/org/zhdev/bukkit/gui/Gui.java
similarity index 98%
rename from bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/Gui.java
rename to bukkit/src/main/java/org/zhdev/bukkit/gui/Gui.java
index 59d87dd..99ee199 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/Gui.java
+++ b/bukkit/src/main/java/org/zhdev/bukkit/gui/Gui.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.bukkit.gui;
+package org.zhdev.bukkit.gui;
import org.bukkit.Material;
import org.bukkit.entity.Player;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiConfig.java b/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiConfig.java
similarity index 95%
rename from bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiConfig.java
rename to bukkit/src/main/java/org/zhdev/bukkit/gui/GuiConfig.java
index f3dbe05..ef6d95a 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiConfig.java
+++ b/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiConfig.java
@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.bukkit.gui;
+package org.zhdev.bukkit.gui;
-import org.zhdev.varioutil.config.ConfigSection;
+import org.zhdev.config.ConfigSection;
import java.util.Collections;
import java.util.HashMap;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiHolder.java b/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiHolder.java
similarity index 92%
rename from bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiHolder.java
rename to bukkit/src/main/java/org/zhdev/bukkit/gui/GuiHolder.java
index ab31d90..c46bca9 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiHolder.java
+++ b/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiHolder.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.bukkit.gui;
+package org.zhdev.bukkit.gui;
import org.bukkit.Bukkit;
import org.bukkit.inventory.Inventory;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIcon.java b/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIcon.java
similarity index 97%
rename from bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIcon.java
rename to bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIcon.java
index ca641b7..bcaa7db 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIcon.java
+++ b/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIcon.java
@@ -1,11 +1,11 @@
-package org.zhdev.varioutil.bukkit.gui;
+package org.zhdev.bukkit.gui;
import org.bukkit.Material;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.SkullMeta;
-import org.zhdev.varioutil.util.BukkitUtils;
+import org.zhdev.util.BukkitUtils;
import java.util.Arrays;
import java.util.Collections;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIconConfig.java b/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIconConfig.java
similarity index 87%
rename from bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIconConfig.java
rename to bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIconConfig.java
index 69375d6..09338b1 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIconConfig.java
+++ b/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIconConfig.java
@@ -1,9 +1,9 @@
-package org.zhdev.varioutil.bukkit.gui;
+package org.zhdev.bukkit.gui;
-import org.zhdev.varioutil.config.ConfigSection;
-import org.zhdev.varioutil.util.StringUtils;
+import org.zhdev.config.ConfigSection;
+import org.zhdev.util.StringUtils;
import org.bukkit.Material;
-import org.zhdev.varioutil.bukkit.LegacyMaterial;
+import org.zhdev.bukkit.LegacyMaterial;
public class GuiIconConfig {
protected final Material type;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiListener.java b/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiListener.java
similarity index 98%
rename from bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiListener.java
rename to bukkit/src/main/java/org/zhdev/bukkit/gui/GuiListener.java
index 43fac37..0fd71f8 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiListener.java
+++ b/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiListener.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.bukkit.gui;
+package org.zhdev.bukkit.gui;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiType.java b/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiType.java
similarity index 96%
rename from bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiType.java
rename to bukkit/src/main/java/org/zhdev/bukkit/gui/GuiType.java
index 250be28..817af9c 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiType.java
+++ b/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiType.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.bukkit.gui;
+package org.zhdev.bukkit.gui;
import org.bukkit.Bukkit;
import org.bukkit.event.inventory.InventoryType;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/config/BukkitYamlConfig.java b/bukkit/src/main/java/org/zhdev/config/BukkitYamlConfig.java
similarity index 97%
rename from bukkit/src/main/java/org/zhdev/varioutil/config/BukkitYamlConfig.java
rename to bukkit/src/main/java/org/zhdev/config/BukkitYamlConfig.java
index 323102e..9aae1ad 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/config/BukkitYamlConfig.java
+++ b/bukkit/src/main/java/org/zhdev/config/BukkitYamlConfig.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.config;
+package org.zhdev.config;
import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.bukkit.configuration.serialization.ConfigurationSerialization;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/util/BukkitReflectionUtils.java b/bukkit/src/main/java/org/zhdev/util/BukkitReflectionUtils.java
similarity index 99%
rename from bukkit/src/main/java/org/zhdev/varioutil/util/BukkitReflectionUtils.java
rename to bukkit/src/main/java/org/zhdev/util/BukkitReflectionUtils.java
index 45283ef..ccd093b 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/util/BukkitReflectionUtils.java
+++ b/bukkit/src/main/java/org/zhdev/util/BukkitReflectionUtils.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.util;
+package org.zhdev.util;
import com.mojang.authlib.GameProfile;
import org.bukkit.Bukkit;
diff --git a/bukkit/src/main/java/org/zhdev/varioutil/util/BukkitUtils.java b/bukkit/src/main/java/org/zhdev/util/BukkitUtils.java
similarity index 98%
rename from bukkit/src/main/java/org/zhdev/varioutil/util/BukkitUtils.java
rename to bukkit/src/main/java/org/zhdev/util/BukkitUtils.java
index 60e39c7..a5415da 100644
--- a/bukkit/src/main/java/org/zhdev/varioutil/util/BukkitUtils.java
+++ b/bukkit/src/main/java/org/zhdev/util/BukkitUtils.java
@@ -1,8 +1,8 @@
-package org.zhdev.varioutil.util;
+package org.zhdev.util;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
-import org.zhdev.varioutil.Version;
+import org.zhdev.Version;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandMap;
diff --git a/common/pom.xml b/common/pom.xml
index d4a9e0f..3e42e6a 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,8 +5,8 @@
4.0.0
- parent
- org.zhdev.varioutil
+ varioutil
+ org.zhdev
1.0-SNAPSHOT
diff --git a/common/src/main/java/org/zhdev/varioutil/Version.java b/common/src/main/java/org/zhdev/Version.java
similarity index 99%
rename from common/src/main/java/org/zhdev/varioutil/Version.java
rename to common/src/main/java/org/zhdev/Version.java
index fe36e98..9109268 100644
--- a/common/src/main/java/org/zhdev/varioutil/Version.java
+++ b/common/src/main/java/org/zhdev/Version.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil;
+package org.zhdev;
import org.jetbrains.annotations.NotNull;
diff --git a/common/src/main/java/org/zhdev/varioutil/language/Language.java b/common/src/main/java/org/zhdev/language/Language.java
similarity index 96%
rename from common/src/main/java/org/zhdev/varioutil/language/Language.java
rename to common/src/main/java/org/zhdev/language/Language.java
index a8b6ec6..588a864 100644
--- a/common/src/main/java/org/zhdev/varioutil/language/Language.java
+++ b/common/src/main/java/org/zhdev/language/Language.java
@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.language;
+package org.zhdev.language;
-import org.zhdev.varioutil.util.StringUtils;
+import org.zhdev.util.StringUtils;
import java.util.HashMap;
import java.util.LinkedHashMap;
diff --git a/common/src/main/java/org/zhdev/varioutil/reflection/FieldSearcher.java b/common/src/main/java/org/zhdev/reflection/FieldSearcher.java
similarity index 95%
rename from common/src/main/java/org/zhdev/varioutil/reflection/FieldSearcher.java
rename to common/src/main/java/org/zhdev/reflection/FieldSearcher.java
index f441bfb..35d2c16 100644
--- a/common/src/main/java/org/zhdev/varioutil/reflection/FieldSearcher.java
+++ b/common/src/main/java/org/zhdev/reflection/FieldSearcher.java
@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.reflection;
+package org.zhdev.reflection;
-import org.zhdev.varioutil.util.ReflectionUtils;
+import org.zhdev.util.ReflectionUtils;
import java.lang.reflect.Field;
diff --git a/common/src/main/java/org/zhdev/varioutil/reflection/MethodSearcher.java b/common/src/main/java/org/zhdev/reflection/MethodSearcher.java
similarity index 96%
rename from common/src/main/java/org/zhdev/varioutil/reflection/MethodSearcher.java
rename to common/src/main/java/org/zhdev/reflection/MethodSearcher.java
index dc754de..da144a4 100644
--- a/common/src/main/java/org/zhdev/varioutil/reflection/MethodSearcher.java
+++ b/common/src/main/java/org/zhdev/reflection/MethodSearcher.java
@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.reflection;
+package org.zhdev.reflection;
-import org.zhdev.varioutil.util.ReflectionUtils;
+import org.zhdev.util.ReflectionUtils;
import java.lang.reflect.Method;
diff --git a/common/src/main/java/org/zhdev/varioutil/util/ArrayUtils.java b/common/src/main/java/org/zhdev/util/ArrayUtils.java
similarity index 98%
rename from common/src/main/java/org/zhdev/varioutil/util/ArrayUtils.java
rename to common/src/main/java/org/zhdev/util/ArrayUtils.java
index 52ea91a..748d8d4 100644
--- a/common/src/main/java/org/zhdev/varioutil/util/ArrayUtils.java
+++ b/common/src/main/java/org/zhdev/util/ArrayUtils.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.util;
+package org.zhdev.util;
import java.util.Collection;
import java.util.function.Function;
diff --git a/common/src/main/java/org/zhdev/varioutil/util/CollectionUtils.java b/common/src/main/java/org/zhdev/util/CollectionUtils.java
similarity index 98%
rename from common/src/main/java/org/zhdev/varioutil/util/CollectionUtils.java
rename to common/src/main/java/org/zhdev/util/CollectionUtils.java
index 8123340..0c1b153 100644
--- a/common/src/main/java/org/zhdev/varioutil/util/CollectionUtils.java
+++ b/common/src/main/java/org/zhdev/util/CollectionUtils.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.util;
+package org.zhdev.util;
import java.util.Collection;
import java.util.List;
diff --git a/common/src/main/java/org/zhdev/varioutil/util/DateTimeUtils.java b/common/src/main/java/org/zhdev/util/DateTimeUtils.java
similarity index 99%
rename from common/src/main/java/org/zhdev/varioutil/util/DateTimeUtils.java
rename to common/src/main/java/org/zhdev/util/DateTimeUtils.java
index 3d1f791..35778d8 100644
--- a/common/src/main/java/org/zhdev/varioutil/util/DateTimeUtils.java
+++ b/common/src/main/java/org/zhdev/util/DateTimeUtils.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.util;
+package org.zhdev.util;
import java.time.*;
import java.time.format.DateTimeFormatter;
diff --git a/common/src/main/java/org/zhdev/varioutil/util/EnumUtils.java b/common/src/main/java/org/zhdev/util/EnumUtils.java
similarity index 98%
rename from common/src/main/java/org/zhdev/varioutil/util/EnumUtils.java
rename to common/src/main/java/org/zhdev/util/EnumUtils.java
index a8b3b36..680a07e 100644
--- a/common/src/main/java/org/zhdev/varioutil/util/EnumUtils.java
+++ b/common/src/main/java/org/zhdev/util/EnumUtils.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.util;
+package org.zhdev.util;
public class EnumUtils {
private static > T[] getValues(T eNum) {
diff --git a/common/src/main/java/org/zhdev/varioutil/util/ReflectionUtils.java b/common/src/main/java/org/zhdev/util/ReflectionUtils.java
similarity index 98%
rename from common/src/main/java/org/zhdev/varioutil/util/ReflectionUtils.java
rename to common/src/main/java/org/zhdev/util/ReflectionUtils.java
index b0a1e73..dd71599 100644
--- a/common/src/main/java/org/zhdev/varioutil/util/ReflectionUtils.java
+++ b/common/src/main/java/org/zhdev/util/ReflectionUtils.java
@@ -1,7 +1,7 @@
-package org.zhdev.varioutil.util;
+package org.zhdev.util;
-import org.zhdev.varioutil.reflection.FieldSearcher;
-import org.zhdev.varioutil.reflection.MethodSearcher;
+import org.zhdev.reflection.FieldSearcher;
+import org.zhdev.reflection.MethodSearcher;
import java.io.File;
import java.io.IOException;
diff --git a/common/src/main/java/org/zhdev/varioutil/util/ResourceUtils.java b/common/src/main/java/org/zhdev/util/ResourceUtils.java
similarity index 98%
rename from common/src/main/java/org/zhdev/varioutil/util/ResourceUtils.java
rename to common/src/main/java/org/zhdev/util/ResourceUtils.java
index f418e44..b1eb07c 100644
--- a/common/src/main/java/org/zhdev/varioutil/util/ResourceUtils.java
+++ b/common/src/main/java/org/zhdev/util/ResourceUtils.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.util;
+package org.zhdev.util;
import java.io.*;
import java.net.URL;
diff --git a/common/src/main/java/org/zhdev/varioutil/util/StringUtils.java b/common/src/main/java/org/zhdev/util/StringUtils.java
similarity index 99%
rename from common/src/main/java/org/zhdev/varioutil/util/StringUtils.java
rename to common/src/main/java/org/zhdev/util/StringUtils.java
index 32617a8..6c4bd84 100644
--- a/common/src/main/java/org/zhdev/varioutil/util/StringUtils.java
+++ b/common/src/main/java/org/zhdev/util/StringUtils.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.util;
+package org.zhdev.util;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/db/pom.xml b/db/pom.xml
index f9bfd01..1b61707 100644
--- a/db/pom.xml
+++ b/db/pom.xml
@@ -5,8 +5,8 @@
4.0.0
- parent
- org.zhdev.varioutil
+ varioutil
+ org.zhdev
1.0-SNAPSHOT
diff --git a/db/src/main/java/org/zhdev/varioutil/sql/AbstractProvider.java b/db/src/main/java/org/zhdev/sql/AbstractProvider.java
similarity index 95%
rename from db/src/main/java/org/zhdev/varioutil/sql/AbstractProvider.java
rename to db/src/main/java/org/zhdev/sql/AbstractProvider.java
index 0c121bf..94ba499 100644
--- a/db/src/main/java/org/zhdev/varioutil/sql/AbstractProvider.java
+++ b/db/src/main/java/org/zhdev/sql/AbstractProvider.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.sql;
+package org.zhdev.sql;
import java.sql.Connection;
import java.sql.SQLException;
diff --git a/db/src/main/java/org/zhdev/varioutil/sql/ConnectionProvider.java b/db/src/main/java/org/zhdev/sql/ConnectionProvider.java
similarity index 93%
rename from db/src/main/java/org/zhdev/varioutil/sql/ConnectionProvider.java
rename to db/src/main/java/org/zhdev/sql/ConnectionProvider.java
index a3b0059..d5861db 100644
--- a/db/src/main/java/org/zhdev/varioutil/sql/ConnectionProvider.java
+++ b/db/src/main/java/org/zhdev/sql/ConnectionProvider.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.sql;
+package org.zhdev.sql;
import java.sql.Connection;
import java.sql.SQLException;
diff --git a/db/src/main/java/org/zhdev/varioutil/sql/H2Provider.java b/db/src/main/java/org/zhdev/sql/H2Provider.java
similarity index 86%
rename from db/src/main/java/org/zhdev/varioutil/sql/H2Provider.java
rename to db/src/main/java/org/zhdev/sql/H2Provider.java
index c3d960c..cdccea4 100644
--- a/db/src/main/java/org/zhdev/varioutil/sql/H2Provider.java
+++ b/db/src/main/java/org/zhdev/sql/H2Provider.java
@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.sql;
+package org.zhdev.sql;
-import org.zhdev.varioutil.util.SqlUtils;
+import org.zhdev.util.SqlUtils;
import java.sql.Connection;
diff --git a/db/src/main/java/org/zhdev/varioutil/sql/MysqlProvider.java b/db/src/main/java/org/zhdev/sql/MysqlProvider.java
similarity index 89%
rename from db/src/main/java/org/zhdev/varioutil/sql/MysqlProvider.java
rename to db/src/main/java/org/zhdev/sql/MysqlProvider.java
index afdad1d..d4b4576 100644
--- a/db/src/main/java/org/zhdev/varioutil/sql/MysqlProvider.java
+++ b/db/src/main/java/org/zhdev/sql/MysqlProvider.java
@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.sql;
+package org.zhdev.sql;
-import org.zhdev.varioutil.util.SqlUtils;
+import org.zhdev.util.SqlUtils;
import java.sql.Connection;
diff --git a/db/src/main/java/org/zhdev/varioutil/sql/NullProvider.java b/db/src/main/java/org/zhdev/sql/NullProvider.java
similarity index 89%
rename from db/src/main/java/org/zhdev/varioutil/sql/NullProvider.java
rename to db/src/main/java/org/zhdev/sql/NullProvider.java
index cc15acf..6fee12c 100644
--- a/db/src/main/java/org/zhdev/varioutil/sql/NullProvider.java
+++ b/db/src/main/java/org/zhdev/sql/NullProvider.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.sql;
+package org.zhdev.sql;
import java.sql.Connection;
diff --git a/db/src/main/java/org/zhdev/varioutil/sql/SqlAdapter.java b/db/src/main/java/org/zhdev/sql/SqlAdapter.java
similarity index 97%
rename from db/src/main/java/org/zhdev/varioutil/sql/SqlAdapter.java
rename to db/src/main/java/org/zhdev/sql/SqlAdapter.java
index 0e76e1b..df1a599 100644
--- a/db/src/main/java/org/zhdev/varioutil/sql/SqlAdapter.java
+++ b/db/src/main/java/org/zhdev/sql/SqlAdapter.java
@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.sql;
+package org.zhdev.sql;
-import org.zhdev.varioutil.util.CheckedFunction;
+import org.zhdev.util.CheckedFunction;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
diff --git a/db/src/main/java/org/zhdev/varioutil/sql/SqlException.java b/db/src/main/java/org/zhdev/sql/SqlException.java
similarity index 90%
rename from db/src/main/java/org/zhdev/varioutil/sql/SqlException.java
rename to db/src/main/java/org/zhdev/sql/SqlException.java
index 4eb0e4c..3745808 100644
--- a/db/src/main/java/org/zhdev/varioutil/sql/SqlException.java
+++ b/db/src/main/java/org/zhdev/sql/SqlException.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.sql;
+package org.zhdev.sql;
public class SqlException extends RuntimeException {
public SqlException() {
diff --git a/db/src/main/java/org/zhdev/varioutil/sql/SqliteProvider.java b/db/src/main/java/org/zhdev/sql/SqliteProvider.java
similarity index 80%
rename from db/src/main/java/org/zhdev/varioutil/sql/SqliteProvider.java
rename to db/src/main/java/org/zhdev/sql/SqliteProvider.java
index c13a2a6..bc4e1cc 100644
--- a/db/src/main/java/org/zhdev/varioutil/sql/SqliteProvider.java
+++ b/db/src/main/java/org/zhdev/sql/SqliteProvider.java
@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.sql;
+package org.zhdev.sql;
-import org.zhdev.varioutil.util.SqlUtils;
+import org.zhdev.util.SqlUtils;
import java.sql.Connection;
diff --git a/db/src/main/java/org/zhdev/varioutil/util/CheckedFunction.java b/db/src/main/java/org/zhdev/util/CheckedFunction.java
similarity index 76%
rename from db/src/main/java/org/zhdev/varioutil/util/CheckedFunction.java
rename to db/src/main/java/org/zhdev/util/CheckedFunction.java
index fe399a7..b448da6 100755
--- a/db/src/main/java/org/zhdev/varioutil/util/CheckedFunction.java
+++ b/db/src/main/java/org/zhdev/util/CheckedFunction.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.util;
+package org.zhdev.util;
@FunctionalInterface
public interface CheckedFunction {
diff --git a/db/src/main/java/org/zhdev/varioutil/util/SqlUtils.java b/db/src/main/java/org/zhdev/util/SqlUtils.java
similarity index 98%
rename from db/src/main/java/org/zhdev/varioutil/util/SqlUtils.java
rename to db/src/main/java/org/zhdev/util/SqlUtils.java
index bd0aadf..cb039b3 100644
--- a/db/src/main/java/org/zhdev/varioutil/util/SqlUtils.java
+++ b/db/src/main/java/org/zhdev/util/SqlUtils.java
@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.util;
+package org.zhdev.util;
-import org.zhdev.varioutil.sql.SqlException;
+import org.zhdev.sql.SqlException;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
diff --git a/io/pom.xml b/io/pom.xml
index bab45ef..466f0e5 100644
--- a/io/pom.xml
+++ b/io/pom.xml
@@ -5,8 +5,8 @@
4.0.0
- parent
- org.zhdev.varioutil
+ varioutil
+ org.zhdev
1.0-SNAPSHOT
diff --git a/io/src/main/java/org/zhdev/varioutil/config/Config.java b/io/src/main/java/org/zhdev/config/Config.java
similarity index 98%
rename from io/src/main/java/org/zhdev/varioutil/config/Config.java
rename to io/src/main/java/org/zhdev/config/Config.java
index 009ea4c..f7a0a22 100644
--- a/io/src/main/java/org/zhdev/varioutil/config/Config.java
+++ b/io/src/main/java/org/zhdev/config/Config.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.config;
+package org.zhdev.config;
import java.io.*;
import java.nio.charset.StandardCharsets;
diff --git a/io/src/main/java/org/zhdev/varioutil/config/ConfigException.java b/io/src/main/java/org/zhdev/config/ConfigException.java
similarity index 90%
rename from io/src/main/java/org/zhdev/varioutil/config/ConfigException.java
rename to io/src/main/java/org/zhdev/config/ConfigException.java
index 58d78cf..8bb0e2c 100644
--- a/io/src/main/java/org/zhdev/varioutil/config/ConfigException.java
+++ b/io/src/main/java/org/zhdev/config/ConfigException.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.config;
+package org.zhdev.config;
public class ConfigException extends RuntimeException {
public ConfigException() {
diff --git a/io/src/main/java/org/zhdev/varioutil/config/ConfigSection.java b/io/src/main/java/org/zhdev/config/ConfigSection.java
similarity index 99%
rename from io/src/main/java/org/zhdev/varioutil/config/ConfigSection.java
rename to io/src/main/java/org/zhdev/config/ConfigSection.java
index feb05e4..e639c83 100644
--- a/io/src/main/java/org/zhdev/varioutil/config/ConfigSection.java
+++ b/io/src/main/java/org/zhdev/config/ConfigSection.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.config;
+package org.zhdev.config;
import java.util.List;
import java.util.Map;
diff --git a/io/src/main/java/org/zhdev/varioutil/config/ConfigSectionNode.java b/io/src/main/java/org/zhdev/config/ConfigSectionNode.java
similarity index 90%
rename from io/src/main/java/org/zhdev/varioutil/config/ConfigSectionNode.java
rename to io/src/main/java/org/zhdev/config/ConfigSectionNode.java
index b38c609..c32a669 100644
--- a/io/src/main/java/org/zhdev/varioutil/config/ConfigSectionNode.java
+++ b/io/src/main/java/org/zhdev/config/ConfigSectionNode.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.config;
+package org.zhdev.config;
final class ConfigSectionNode {
Object value;
diff --git a/io/src/main/java/org/zhdev/varioutil/config/MapConfigSection.java b/io/src/main/java/org/zhdev/config/MapConfigSection.java
similarity index 99%
rename from io/src/main/java/org/zhdev/varioutil/config/MapConfigSection.java
rename to io/src/main/java/org/zhdev/config/MapConfigSection.java
index f25c97c..0fc7668 100644
--- a/io/src/main/java/org/zhdev/varioutil/config/MapConfigSection.java
+++ b/io/src/main/java/org/zhdev/config/MapConfigSection.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.config;
+package org.zhdev.config;
import java.util.*;
import java.util.function.Function;
diff --git a/io/src/main/java/org/zhdev/varioutil/config/YamlConfig.java b/io/src/main/java/org/zhdev/config/YamlConfig.java
similarity index 99%
rename from io/src/main/java/org/zhdev/varioutil/config/YamlConfig.java
rename to io/src/main/java/org/zhdev/config/YamlConfig.java
index d89b157..4dccc8d 100644
--- a/io/src/main/java/org/zhdev/varioutil/config/YamlConfig.java
+++ b/io/src/main/java/org/zhdev/config/YamlConfig.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.config;
+package org.zhdev.config;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.LoaderOptions;
diff --git a/io/src/main/java/org/zhdev/varioutil/config/YamlConfigConstructor.java b/io/src/main/java/org/zhdev/config/YamlConfigConstructor.java
similarity index 91%
rename from io/src/main/java/org/zhdev/varioutil/config/YamlConfigConstructor.java
rename to io/src/main/java/org/zhdev/config/YamlConfigConstructor.java
index 7444f79..1f32baa 100644
--- a/io/src/main/java/org/zhdev/varioutil/config/YamlConfigConstructor.java
+++ b/io/src/main/java/org/zhdev/config/YamlConfigConstructor.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.config;
+package org.zhdev.config;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.constructor.SafeConstructor;
diff --git a/io/src/main/java/org/zhdev/varioutil/config/YamlConfigRepresenter.java b/io/src/main/java/org/zhdev/config/YamlConfigRepresenter.java
similarity index 86%
rename from io/src/main/java/org/zhdev/varioutil/config/YamlConfigRepresenter.java
rename to io/src/main/java/org/zhdev/config/YamlConfigRepresenter.java
index dc563d0..6f36064 100644
--- a/io/src/main/java/org/zhdev/varioutil/config/YamlConfigRepresenter.java
+++ b/io/src/main/java/org/zhdev/config/YamlConfigRepresenter.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.config;
+package org.zhdev.config;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.representer.Representer;
diff --git a/misc/pom.xml b/misc/pom.xml
index a5c8af1..af94194 100644
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -5,8 +5,8 @@
4.0.0
- parent
- org.zhdev.varioutil
+ varioutil
+ org.zhdev
1.0-SNAPSHOT
diff --git a/misc/src/main/java/org/zhdev/varioutil/PreparedPlugin.java b/misc/src/main/java/org/zhdev/PreparedPlugin.java
similarity index 88%
rename from misc/src/main/java/org/zhdev/varioutil/PreparedPlugin.java
rename to misc/src/main/java/org/zhdev/PreparedPlugin.java
index ca03e6e..c8e17e0 100644
--- a/misc/src/main/java/org/zhdev/varioutil/PreparedPlugin.java
+++ b/misc/src/main/java/org/zhdev/PreparedPlugin.java
@@ -1,10 +1,10 @@
-package org.zhdev.varioutil;
+package org.zhdev;
-import org.zhdev.varioutil.config.Config;
-import org.zhdev.varioutil.config.ConfigException;
-import org.zhdev.varioutil.language.Language;
-import org.zhdev.varioutil.util.ResourceUtils;
-import org.zhdev.varioutil.sql.SqlAdapter;
+import org.zhdev.config.Config;
+import org.zhdev.config.ConfigException;
+import org.zhdev.language.Language;
+import org.zhdev.util.ResourceUtils;
+import org.zhdev.sql.SqlAdapter;
import java.io.IOException;
import java.io.InputStream;
diff --git a/misc/src/main/java/org/zhdev/varioutil/util/ColorUtils.java b/misc/src/main/java/org/zhdev/util/ColorUtils.java
similarity index 98%
rename from misc/src/main/java/org/zhdev/varioutil/util/ColorUtils.java
rename to misc/src/main/java/org/zhdev/util/ColorUtils.java
index 10d4f89..a2fed23 100644
--- a/misc/src/main/java/org/zhdev/varioutil/util/ColorUtils.java
+++ b/misc/src/main/java/org/zhdev/util/ColorUtils.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.util;
+package org.zhdev.util;
import java.util.HashMap;
import java.util.Map;
diff --git a/misc/src/main/java/org/zhdev/varioutil/util/ConfigUtils.java b/misc/src/main/java/org/zhdev/util/ConfigUtils.java
similarity index 92%
rename from misc/src/main/java/org/zhdev/varioutil/util/ConfigUtils.java
rename to misc/src/main/java/org/zhdev/util/ConfigUtils.java
index 8e6fb0e..9591361 100644
--- a/misc/src/main/java/org/zhdev/varioutil/util/ConfigUtils.java
+++ b/misc/src/main/java/org/zhdev/util/ConfigUtils.java
@@ -1,9 +1,8 @@
-package org.zhdev.varioutil.util;
+package org.zhdev.util;
-import org.zhdev.varioutil.config.ConfigSection;
-import org.zhdev.varioutil.language.Language;
-import org.zhdev.varioutil.sql.*;
-import org.zhdev.varioutil.sql.*;
+import org.zhdev.config.ConfigSection;
+import org.zhdev.language.Language;
+import org.zhdev.sql.*;
import java.io.File;
import java.util.ArrayList;
diff --git a/pom.xml b/pom.xml
index 961cb02..2c4bb9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- org.zhdev.varioutil
- parent
+ org.zhdev
+ varioutil
1.0-SNAPSHOT
pom
@@ -21,7 +21,6 @@
misc
bukkit
velocity
- all
@@ -47,7 +46,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.10.1
+ 3.13.0
8
8
@@ -56,7 +55,7 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.4.1
+ 3.5.3
@@ -82,7 +81,7 @@
org.apache.maven.plugins
maven-jar-plugin
- 3.2.2
+ 3.4.1
false
@@ -98,7 +97,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.4.1
+ 3.6.3
attach-javadocs
@@ -147,7 +146,7 @@
org.jetbrains
annotations-java5
- 24.0.1
+ 24.1.0
provided
diff --git a/velocity/pom.xml b/velocity/pom.xml
index be0e707..32aa20e 100644
--- a/velocity/pom.xml
+++ b/velocity/pom.xml
@@ -5,8 +5,8 @@
4.0.0
- parent
- org.zhdev.varioutil
+ varioutil
+ org.zhdev
1.0-SNAPSHOT
diff --git a/velocity/src/main/java/org/zhdev/varioutil/config/VelocityTomlConfig.java b/velocity/src/main/java/org/zhdev/config/VelocityTomlConfig.java
similarity index 99%
rename from velocity/src/main/java/org/zhdev/varioutil/config/VelocityTomlConfig.java
rename to velocity/src/main/java/org/zhdev/config/VelocityTomlConfig.java
index beb9483..01f9e1f 100644
--- a/velocity/src/main/java/org/zhdev/varioutil/config/VelocityTomlConfig.java
+++ b/velocity/src/main/java/org/zhdev/config/VelocityTomlConfig.java
@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.config;
+package org.zhdev.config;
import com.electronwill.nightconfig.core.CommentedConfig;
import com.electronwill.nightconfig.toml.TomlFormat;