Refactor package from org.zhdev.varioutil to org.zhdev to shorter length

all/pom.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <artifactId>parent</artifactId>
-        <groupId>org.zhdev.varioutil</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>all</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>velocity</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>misc</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>db</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>io</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>common</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-</project>

bukkit/pom.xml

@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.zhdev.varioutil</groupId>
-        <artifactId>parent</artifactId>
+        <groupId>org.zhdev</groupId>
+        <artifactId>varioutil</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.21.1-R0.1-SNAPSHOT</version>
+            <version>1.21.8-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>authlib</artifactId>
-            <version>4.0.43</version>
+            <version>6.0.54</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

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;

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;
 

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

common/pom.xml

@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>parent</artifactId>
-        <groupId>org.zhdev.varioutil</groupId>
+        <artifactId>varioutil</artifactId>
+        <groupId>org.zhdev</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

common/src/main/java/org/zhdev/Version.java

@@ -1,4 +1,4 @@
-package org.zhdev.varioutil;
+package org.zhdev;
 
 import org.jetbrains.annotations.NotNull;
 

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;

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;
 

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;
 

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;

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;

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;

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 extends Enum<T>> T[] getValues(T eNum) {

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;

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;

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;

db/pom.xml

@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>parent</artifactId>
-        <groupId>org.zhdev.varioutil</groupId>
+        <artifactId>varioutil</artifactId>
+        <groupId>org.zhdev</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

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;

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;

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;
 

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;
 

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;
 

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;

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() {

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;
 

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<T, R, E extends Exception> {

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;

io/pom.xml

@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>parent</artifactId>
-        <groupId>org.zhdev.varioutil</groupId>
+        <artifactId>varioutil</artifactId>
+        <groupId>org.zhdev</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

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;

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() {

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;

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;

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;

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;

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;

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;

misc/pom.xml

@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>parent</artifactId>
-        <groupId>org.zhdev.varioutil</groupId>
+        <artifactId>varioutil</artifactId>
+        <groupId>org.zhdev</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

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;

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;

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;

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">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.zhdev.varioutil</groupId>
-    <artifactId>parent</artifactId>
+    <groupId>org.zhdev</groupId>
+    <artifactId>varioutil</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
@@ -21,7 +21,6 @@
         <module>misc</module>
         <module>bukkit</module>
         <module>velocity</module>
-        <module>all</module>
     </modules>
 
     <distributionManagement>
@@ -47,7 +46,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>8</source>
                     <target>8</target>
@@ -56,7 +55,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.3</version>
                 <configuration>
                     <filters>
                         <filter>
@@ -82,7 +81,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.4.1</version>
                 <configuration>
                     <archive>
                         <addMavenDescriptor>false</addMavenDescriptor>
@@ -98,7 +97,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.6.3</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -147,7 +146,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations-java5</artifactId>
-            <version>24.0.1</version>
+            <version>24.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

velocity/pom.xml

@@ -5,8 +5,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>parent</artifactId>
-        <groupId>org.zhdev.varioutil</groupId>
+        <artifactId>varioutil</artifactId>
+        <groupId>org.zhdev</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

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;