diff --git a/README.md b/README.md index ef2b700..f884141 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,4 @@ -# Various utilities for YAML, JDBC, Bukkit and other things. - -Varoutil is a simple API for projects with bulky APIs like YAML, JDBC, Bukkit, Velocity, and others. Its goal is to -simplify development by making code more consistent. - -Note: The Varioutil project is currently under development, there is no stable version yet. The API, package names, -artifacts, and the project name itself may change at any time. - -## Add as maven dependency -The project has its own Maven repository, so to access the artifact as a dependency you will need to add it to your -`pom.xml`. +### Add as maven dependency ```xml @@ -17,80 +7,63 @@ The project has its own Maven repository, so to access the artifact as a depende ``` -Then add the artifact as a dependency, for example `common`. ```xml - org.zhdev + org.zhdev.varioutil + all + 1.0-SNAPSHOT + + +``` + +### Example for reflection +#### Maven dependency +```xml + + + org.zhdev.varioutil common 1.0-SNAPSHOT ``` - -## Examples -Note: The project is primarily focused on making it easier to work with Bukkit and YAML, so only -examples for those are available at the moment. Public Javadocs and more examples will be available with the first -release of the Varioutil project. - -### Bukkit Plugin and YAML Parsing -Let's say we have a Bukkit plugin called Bukman, and we want to read the `extra-config.yml` file located in the -`./plugins/Bukman` directory and get the value of the `state` field from it. - -#### Maven dependency -Add the required `bukkit` dependency. -```xml - - - org.zhdev - bukkit - 1.0-SNAPSHOT - - -``` #### Code -Add the following code. ```java -package org.zhdev; +import java.lang.reflect.Field; -import org.zhdev.config.BukkitYamlConfig; -import org.zhdev.config.Config; +import org.zhdev.varioutil.ReflectionUtils; +import org.bukkit.Bukkit; -public class BukmanBukkitPlugin extends BukkitPreparedPlugin { - private final Config extraConfig = new BukkitYamlConfig("extra-config.yml"); +public class BukkitFields { + public static final Field METHOD__CraftServer__getServer; - private int state; - - @Override - protected void onPostLoad() { - // parse `./plugins/Bukman/extra-config.yml` - loadConfig(extraConfig); - - // get the value of the `state` field or get 3 if null - state = extraConfig.getInteger("state", 5); - } - - public int getState() { - return state; + static { + METHOD__CraftServer__getServer = ReflectionUtils.methodSearcher() + .of(Bukkit.getServer()) + .methodOf("getServer") + .returns(CLASS__DedicatedServer) + .search(); } } ``` -### More YAML examples + +### Example for yaml #### Maven dependency -If you only need YAML parsing, just add the `io` maven dependency. ```xml - org.zhdev + org.zhdev.varioutil io 1.0-SNAPSHOT ``` #### Code + ```java -import org.zhdev.Config; -import org.zhdev.YamlConfig; +import org.zhdev.varioutil.Config; +import org.zhdev.varioutil.YamlConfig; import java.util.List; diff --git a/all/pom.xml b/all/pom.xml new file mode 100644 index 0000000..15ea13c --- /dev/null +++ b/all/pom.xml @@ -0,0 +1,53 @@ + + + 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 e1d72ef..78b24a9 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,8 +5,8 @@ 4.0.0 - org.zhdev - varioutil + org.zhdev.varioutil + parent 1.0-SNAPSHOT @@ -47,7 +47,7 @@ org.spigotmc spigot-api - 1.21.8-R0.1-SNAPSHOT + 1.21.1-R0.1-SNAPSHOT provided @@ -59,7 +59,7 @@ com.mojang authlib - 6.0.54 + 4.0.43 provided diff --git a/bukkit/src/main/java/org/zhdev/BukkitPlugin.java b/bukkit/src/main/java/org/zhdev/varioutil/BukkitPlugin.java similarity index 98% rename from bukkit/src/main/java/org/zhdev/BukkitPlugin.java rename to bukkit/src/main/java/org/zhdev/varioutil/BukkitPlugin.java index 02635e2..377eafe 100644 --- a/bukkit/src/main/java/org/zhdev/BukkitPlugin.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/BukkitPlugin.java @@ -1,4 +1,4 @@ -package org.zhdev; +package org.zhdev.varioutil; import org.bukkit.Bukkit; import org.bukkit.command.Command; diff --git a/bukkit/src/main/java/org/zhdev/BukkitPreparedPlugin.java b/bukkit/src/main/java/org/zhdev/varioutil/BukkitPreparedPlugin.java similarity index 88% rename from bukkit/src/main/java/org/zhdev/BukkitPreparedPlugin.java rename to bukkit/src/main/java/org/zhdev/varioutil/BukkitPreparedPlugin.java index daf8da1..7896e26 100644 --- a/bukkit/src/main/java/org/zhdev/BukkitPreparedPlugin.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/BukkitPreparedPlugin.java @@ -1,8 +1,8 @@ -package org.zhdev; +package org.zhdev.varioutil; -import org.zhdev.language.Language; -import org.zhdev.util.CollectionUtils; -import org.zhdev.util.ColorUtils; +import org.zhdev.varioutil.language.Language; +import org.zhdev.varioutil.util.CollectionUtils; +import org.zhdev.varioutil.util.ColorUtils; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.PluginIdentifiableCommand; @@ -12,14 +12,14 @@ import org.bukkit.event.Listener; import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.java.JavaPluginLoader; import org.jetbrains.annotations.NotNull; -import org.zhdev.bukkit.command.PreparedPluginCommand; -import org.zhdev.config.BukkitYamlConfig; -import org.zhdev.config.Config; -import org.zhdev.config.ConfigSection; -import org.zhdev.config.YamlConfig; -import org.zhdev.sql.SqlAdapter; -import org.zhdev.util.BukkitUtils; -import org.zhdev.util.ConfigUtils; +import org.zhdev.varioutil.bukkit.command.PreparedPluginCommand; +import org.zhdev.varioutil.config.BukkitYamlConfig; +import org.zhdev.varioutil.config.Config; +import org.zhdev.varioutil.config.ConfigSection; +import org.zhdev.varioutil.config.YamlConfig; +import org.zhdev.varioutil.sql.SqlAdapter; +import org.zhdev.varioutil.util.BukkitUtils; +import org.zhdev.varioutil.util.ConfigUtils; import java.io.File; import java.nio.file.Path; @@ -138,17 +138,11 @@ public abstract class BukkitPreparedPlugin extends BukkitPlugin implements Liste sqlAdapter.setProvider(ConfigUtils.createSqlConnectionProvider(databaseConfig, getDataFolder().getPath())); } - protected void onPreLoad() {} + protected void onLoading() {} - protected void onPostLoad() {} + protected void onEnabling() {} - protected void onPreEnable() {} - - protected void onPostEnable() {} - - protected void onPreDisable() {} - - protected void onPostDisable() {} + protected void onDisabling() {} private void load() { loadDefaultConfig(); @@ -158,9 +152,8 @@ public abstract class BukkitPreparedPlugin extends BukkitPlugin implements Liste @Override public final void onLoad() { - onPreLoad(); load(); - onPostLoad(); + onLoading(); } private void enable() { @@ -169,9 +162,8 @@ public abstract class BukkitPreparedPlugin extends BukkitPlugin implements Liste @Override public final void onEnable() { - onPreEnable(); enable(); - onPostEnable(); + onEnabling(); } private void disable() { @@ -188,11 +180,11 @@ public abstract class BukkitPreparedPlugin extends BukkitPlugin implements Liste @Override public final void onDisable() { try { - onPreDisable(); + onDisabling(); disable(); - onPostDisable(); - } finally { + } catch (Exception e) { disable(); + throw e; } } diff --git a/bukkit/src/main/java/org/zhdev/bukkit/LegacyMaterial.java b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/LegacyMaterial.java similarity index 97% rename from bukkit/src/main/java/org/zhdev/bukkit/LegacyMaterial.java rename to bukkit/src/main/java/org/zhdev/varioutil/bukkit/LegacyMaterial.java index c45326a..c6f1fef 100644 --- a/bukkit/src/main/java/org/zhdev/bukkit/LegacyMaterial.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/LegacyMaterial.java @@ -1,4 +1,4 @@ -package org.zhdev.bukkit; +package org.zhdev.varioutil.bukkit; import org.bukkit.Material; diff --git a/bukkit/src/main/java/org/zhdev/bukkit/command/AbstractPluginCommand.java b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/AbstractPluginCommand.java similarity index 98% rename from bukkit/src/main/java/org/zhdev/bukkit/command/AbstractPluginCommand.java rename to bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/AbstractPluginCommand.java index 8ed5c15..b41319e 100644 --- a/bukkit/src/main/java/org/zhdev/bukkit/command/AbstractPluginCommand.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/AbstractPluginCommand.java @@ -1,4 +1,4 @@ -package org.zhdev.bukkit.command; +package org.zhdev.varioutil.bukkit.command; import org.bukkit.command.*; import org.bukkit.plugin.Plugin; diff --git a/bukkit/src/main/java/org/zhdev/bukkit/command/PreparedPluginCommand.java b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/PreparedPluginCommand.java similarity index 95% rename from bukkit/src/main/java/org/zhdev/bukkit/command/PreparedPluginCommand.java rename to bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/PreparedPluginCommand.java index cabcf35..c3866e2 100644 --- a/bukkit/src/main/java/org/zhdev/bukkit/command/PreparedPluginCommand.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/PreparedPluginCommand.java @@ -1,4 +1,4 @@ -package org.zhdev.bukkit.command; +package org.zhdev.varioutil.bukkit.command; import org.bukkit.command.*; import org.bukkit.plugin.Plugin; diff --git a/bukkit/src/main/java/org/zhdev/bukkit/gui/ClickHandler.java b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/ClickHandler.java similarity index 83% rename from bukkit/src/main/java/org/zhdev/bukkit/gui/ClickHandler.java rename to bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/ClickHandler.java index 9ae2688..7c9aef7 100644 --- a/bukkit/src/main/java/org/zhdev/bukkit/gui/ClickHandler.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/ClickHandler.java @@ -1,4 +1,4 @@ -package org.zhdev.bukkit.gui; +package org.zhdev.varioutil.bukkit.gui; import org.bukkit.event.inventory.InventoryClickEvent; diff --git a/bukkit/src/main/java/org/zhdev/bukkit/gui/Gui.java b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/Gui.java similarity index 98% rename from bukkit/src/main/java/org/zhdev/bukkit/gui/Gui.java rename to bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/Gui.java index 99ee199..59d87dd 100644 --- a/bukkit/src/main/java/org/zhdev/bukkit/gui/Gui.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/Gui.java @@ -1,4 +1,4 @@ -package org.zhdev.bukkit.gui; +package org.zhdev.varioutil.bukkit.gui; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiConfig.java b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiConfig.java similarity index 95% rename from bukkit/src/main/java/org/zhdev/bukkit/gui/GuiConfig.java rename to bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiConfig.java index ef6d95a..f3dbe05 100644 --- a/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiConfig.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiConfig.java @@ -1,6 +1,6 @@ -package org.zhdev.bukkit.gui; +package org.zhdev.varioutil.bukkit.gui; -import org.zhdev.config.ConfigSection; +import org.zhdev.varioutil.config.ConfigSection; import java.util.Collections; import java.util.HashMap; diff --git a/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiHolder.java b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiHolder.java similarity index 92% rename from bukkit/src/main/java/org/zhdev/bukkit/gui/GuiHolder.java rename to bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiHolder.java index c46bca9..ab31d90 100644 --- a/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiHolder.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiHolder.java @@ -1,4 +1,4 @@ -package org.zhdev.bukkit.gui; +package org.zhdev.varioutil.bukkit.gui; import org.bukkit.Bukkit; import org.bukkit.inventory.Inventory; diff --git a/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIcon.java b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIcon.java similarity index 97% rename from bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIcon.java rename to bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIcon.java index bcaa7db..ca641b7 100644 --- a/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIcon.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIcon.java @@ -1,11 +1,11 @@ -package org.zhdev.bukkit.gui; +package org.zhdev.varioutil.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.util.BukkitUtils; +import org.zhdev.varioutil.util.BukkitUtils; import java.util.Arrays; import java.util.Collections; diff --git a/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIconConfig.java b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIconConfig.java similarity index 87% rename from bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIconConfig.java rename to bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIconConfig.java index 09338b1..69375d6 100644 --- a/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIconConfig.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIconConfig.java @@ -1,9 +1,9 @@ -package org.zhdev.bukkit.gui; +package org.zhdev.varioutil.bukkit.gui; -import org.zhdev.config.ConfigSection; -import org.zhdev.util.StringUtils; +import org.zhdev.varioutil.config.ConfigSection; +import org.zhdev.varioutil.util.StringUtils; import org.bukkit.Material; -import org.zhdev.bukkit.LegacyMaterial; +import org.zhdev.varioutil.bukkit.LegacyMaterial; public class GuiIconConfig { protected final Material type; diff --git a/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiListener.java b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiListener.java similarity index 98% rename from bukkit/src/main/java/org/zhdev/bukkit/gui/GuiListener.java rename to bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiListener.java index 0fd71f8..43fac37 100644 --- a/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiListener.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiListener.java @@ -1,4 +1,4 @@ -package org.zhdev.bukkit.gui; +package org.zhdev.varioutil.bukkit.gui; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiType.java b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiType.java similarity index 96% rename from bukkit/src/main/java/org/zhdev/bukkit/gui/GuiType.java rename to bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiType.java index 817af9c..250be28 100644 --- a/bukkit/src/main/java/org/zhdev/bukkit/gui/GuiType.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiType.java @@ -1,4 +1,4 @@ -package org.zhdev.bukkit.gui; +package org.zhdev.varioutil.bukkit.gui; import org.bukkit.Bukkit; import org.bukkit.event.inventory.InventoryType; diff --git a/bukkit/src/main/java/org/zhdev/config/BukkitYamlConfig.java b/bukkit/src/main/java/org/zhdev/varioutil/config/BukkitYamlConfig.java similarity index 97% rename from bukkit/src/main/java/org/zhdev/config/BukkitYamlConfig.java rename to bukkit/src/main/java/org/zhdev/varioutil/config/BukkitYamlConfig.java index 9aae1ad..323102e 100644 --- a/bukkit/src/main/java/org/zhdev/config/BukkitYamlConfig.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/config/BukkitYamlConfig.java @@ -1,4 +1,4 @@ -package org.zhdev.config; +package org.zhdev.varioutil.config; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.ConfigurationSerialization; diff --git a/bukkit/src/main/java/org/zhdev/util/BukkitReflectionUtils.java b/bukkit/src/main/java/org/zhdev/varioutil/util/BukkitReflectionUtils.java similarity index 99% rename from bukkit/src/main/java/org/zhdev/util/BukkitReflectionUtils.java rename to bukkit/src/main/java/org/zhdev/varioutil/util/BukkitReflectionUtils.java index ccd093b..45283ef 100644 --- a/bukkit/src/main/java/org/zhdev/util/BukkitReflectionUtils.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/util/BukkitReflectionUtils.java @@ -1,4 +1,4 @@ -package org.zhdev.util; +package org.zhdev.varioutil.util; import com.mojang.authlib.GameProfile; import org.bukkit.Bukkit; diff --git a/bukkit/src/main/java/org/zhdev/util/BukkitUtils.java b/bukkit/src/main/java/org/zhdev/varioutil/util/BukkitUtils.java similarity index 98% rename from bukkit/src/main/java/org/zhdev/util/BukkitUtils.java rename to bukkit/src/main/java/org/zhdev/varioutil/util/BukkitUtils.java index a5415da..60e39c7 100644 --- a/bukkit/src/main/java/org/zhdev/util/BukkitUtils.java +++ b/bukkit/src/main/java/org/zhdev/varioutil/util/BukkitUtils.java @@ -1,8 +1,8 @@ -package org.zhdev.util; +package org.zhdev.varioutil.util; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; -import org.zhdev.Version; +import org.zhdev.varioutil.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 3e42e6a..d4a9e0f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,8 +5,8 @@ 4.0.0 - varioutil - org.zhdev + parent + org.zhdev.varioutil 1.0-SNAPSHOT diff --git a/common/src/main/java/org/zhdev/Version.java b/common/src/main/java/org/zhdev/varioutil/Version.java similarity index 99% rename from common/src/main/java/org/zhdev/Version.java rename to common/src/main/java/org/zhdev/varioutil/Version.java index 9109268..fe36e98 100644 --- a/common/src/main/java/org/zhdev/Version.java +++ b/common/src/main/java/org/zhdev/varioutil/Version.java @@ -1,4 +1,4 @@ -package org.zhdev; +package org.zhdev.varioutil; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/org/zhdev/language/Language.java b/common/src/main/java/org/zhdev/varioutil/language/Language.java similarity index 96% rename from common/src/main/java/org/zhdev/language/Language.java rename to common/src/main/java/org/zhdev/varioutil/language/Language.java index 588a864..a8b6ec6 100644 --- a/common/src/main/java/org/zhdev/language/Language.java +++ b/common/src/main/java/org/zhdev/varioutil/language/Language.java @@ -1,6 +1,6 @@ -package org.zhdev.language; +package org.zhdev.varioutil.language; -import org.zhdev.util.StringUtils; +import org.zhdev.varioutil.util.StringUtils; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/common/src/main/java/org/zhdev/reflection/FieldSearcher.java b/common/src/main/java/org/zhdev/varioutil/reflection/FieldSearcher.java similarity index 95% rename from common/src/main/java/org/zhdev/reflection/FieldSearcher.java rename to common/src/main/java/org/zhdev/varioutil/reflection/FieldSearcher.java index 35d2c16..f441bfb 100644 --- a/common/src/main/java/org/zhdev/reflection/FieldSearcher.java +++ b/common/src/main/java/org/zhdev/varioutil/reflection/FieldSearcher.java @@ -1,6 +1,6 @@ -package org.zhdev.reflection; +package org.zhdev.varioutil.reflection; -import org.zhdev.util.ReflectionUtils; +import org.zhdev.varioutil.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/common/src/main/java/org/zhdev/reflection/MethodSearcher.java b/common/src/main/java/org/zhdev/varioutil/reflection/MethodSearcher.java similarity index 96% rename from common/src/main/java/org/zhdev/reflection/MethodSearcher.java rename to common/src/main/java/org/zhdev/varioutil/reflection/MethodSearcher.java index da144a4..dc754de 100644 --- a/common/src/main/java/org/zhdev/reflection/MethodSearcher.java +++ b/common/src/main/java/org/zhdev/varioutil/reflection/MethodSearcher.java @@ -1,6 +1,6 @@ -package org.zhdev.reflection; +package org.zhdev.varioutil.reflection; -import org.zhdev.util.ReflectionUtils; +import org.zhdev.varioutil.util.ReflectionUtils; import java.lang.reflect.Method; diff --git a/common/src/main/java/org/zhdev/util/ArrayUtils.java b/common/src/main/java/org/zhdev/varioutil/util/ArrayUtils.java similarity index 98% rename from common/src/main/java/org/zhdev/util/ArrayUtils.java rename to common/src/main/java/org/zhdev/varioutil/util/ArrayUtils.java index 748d8d4..52ea91a 100644 --- a/common/src/main/java/org/zhdev/util/ArrayUtils.java +++ b/common/src/main/java/org/zhdev/varioutil/util/ArrayUtils.java @@ -1,4 +1,4 @@ -package org.zhdev.util; +package org.zhdev.varioutil.util; import java.util.Collection; import java.util.function.Function; diff --git a/common/src/main/java/org/zhdev/util/CollectionUtils.java b/common/src/main/java/org/zhdev/varioutil/util/CollectionUtils.java similarity index 98% rename from common/src/main/java/org/zhdev/util/CollectionUtils.java rename to common/src/main/java/org/zhdev/varioutil/util/CollectionUtils.java index 0c1b153..8123340 100644 --- a/common/src/main/java/org/zhdev/util/CollectionUtils.java +++ b/common/src/main/java/org/zhdev/varioutil/util/CollectionUtils.java @@ -1,4 +1,4 @@ -package org.zhdev.util; +package org.zhdev.varioutil.util; import java.util.Collection; import java.util.List; diff --git a/common/src/main/java/org/zhdev/util/DateTimeUtils.java b/common/src/main/java/org/zhdev/varioutil/util/DateTimeUtils.java similarity index 99% rename from common/src/main/java/org/zhdev/util/DateTimeUtils.java rename to common/src/main/java/org/zhdev/varioutil/util/DateTimeUtils.java index 35778d8..3d1f791 100644 --- a/common/src/main/java/org/zhdev/util/DateTimeUtils.java +++ b/common/src/main/java/org/zhdev/varioutil/util/DateTimeUtils.java @@ -1,4 +1,4 @@ -package org.zhdev.util; +package org.zhdev.varioutil.util; import java.time.*; import java.time.format.DateTimeFormatter; diff --git a/common/src/main/java/org/zhdev/util/EnumUtils.java b/common/src/main/java/org/zhdev/varioutil/util/EnumUtils.java similarity index 98% rename from common/src/main/java/org/zhdev/util/EnumUtils.java rename to common/src/main/java/org/zhdev/varioutil/util/EnumUtils.java index 680a07e..a8b3b36 100644 --- a/common/src/main/java/org/zhdev/util/EnumUtils.java +++ b/common/src/main/java/org/zhdev/varioutil/util/EnumUtils.java @@ -1,4 +1,4 @@ -package org.zhdev.util; +package org.zhdev.varioutil.util; public class EnumUtils { private static > T[] getValues(T eNum) { diff --git a/common/src/main/java/org/zhdev/util/ReflectionUtils.java b/common/src/main/java/org/zhdev/varioutil/util/ReflectionUtils.java similarity index 98% rename from common/src/main/java/org/zhdev/util/ReflectionUtils.java rename to common/src/main/java/org/zhdev/varioutil/util/ReflectionUtils.java index dd71599..b0a1e73 100644 --- a/common/src/main/java/org/zhdev/util/ReflectionUtils.java +++ b/common/src/main/java/org/zhdev/varioutil/util/ReflectionUtils.java @@ -1,7 +1,7 @@ -package org.zhdev.util; +package org.zhdev.varioutil.util; -import org.zhdev.reflection.FieldSearcher; -import org.zhdev.reflection.MethodSearcher; +import org.zhdev.varioutil.reflection.FieldSearcher; +import org.zhdev.varioutil.reflection.MethodSearcher; import java.io.File; import java.io.IOException; diff --git a/common/src/main/java/org/zhdev/util/ResourceUtils.java b/common/src/main/java/org/zhdev/varioutil/util/ResourceUtils.java similarity index 98% rename from common/src/main/java/org/zhdev/util/ResourceUtils.java rename to common/src/main/java/org/zhdev/varioutil/util/ResourceUtils.java index b1eb07c..f418e44 100644 --- a/common/src/main/java/org/zhdev/util/ResourceUtils.java +++ b/common/src/main/java/org/zhdev/varioutil/util/ResourceUtils.java @@ -1,4 +1,4 @@ -package org.zhdev.util; +package org.zhdev.varioutil.util; import java.io.*; import java.net.URL; diff --git a/common/src/main/java/org/zhdev/util/StringUtils.java b/common/src/main/java/org/zhdev/varioutil/util/StringUtils.java similarity index 99% rename from common/src/main/java/org/zhdev/util/StringUtils.java rename to common/src/main/java/org/zhdev/varioutil/util/StringUtils.java index 6c4bd84..32617a8 100644 --- a/common/src/main/java/org/zhdev/util/StringUtils.java +++ b/common/src/main/java/org/zhdev/varioutil/util/StringUtils.java @@ -1,4 +1,4 @@ -package org.zhdev.util; +package org.zhdev.varioutil.util; import java.util.ArrayList; import java.util.Iterator; diff --git a/db/pom.xml b/db/pom.xml index 1b61707..f9bfd01 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -5,8 +5,8 @@ 4.0.0 - varioutil - org.zhdev + parent + org.zhdev.varioutil 1.0-SNAPSHOT diff --git a/db/src/main/java/org/zhdev/sql/AbstractProvider.java b/db/src/main/java/org/zhdev/varioutil/sql/AbstractProvider.java similarity index 95% rename from db/src/main/java/org/zhdev/sql/AbstractProvider.java rename to db/src/main/java/org/zhdev/varioutil/sql/AbstractProvider.java index 94ba499..0c121bf 100644 --- a/db/src/main/java/org/zhdev/sql/AbstractProvider.java +++ b/db/src/main/java/org/zhdev/varioutil/sql/AbstractProvider.java @@ -1,4 +1,4 @@ -package org.zhdev.sql; +package org.zhdev.varioutil.sql; import java.sql.Connection; import java.sql.SQLException; diff --git a/db/src/main/java/org/zhdev/sql/ConnectionProvider.java b/db/src/main/java/org/zhdev/varioutil/sql/ConnectionProvider.java similarity index 93% rename from db/src/main/java/org/zhdev/sql/ConnectionProvider.java rename to db/src/main/java/org/zhdev/varioutil/sql/ConnectionProvider.java index d5861db..a3b0059 100644 --- a/db/src/main/java/org/zhdev/sql/ConnectionProvider.java +++ b/db/src/main/java/org/zhdev/varioutil/sql/ConnectionProvider.java @@ -1,4 +1,4 @@ -package org.zhdev.sql; +package org.zhdev.varioutil.sql; import java.sql.Connection; import java.sql.SQLException; diff --git a/db/src/main/java/org/zhdev/sql/H2Provider.java b/db/src/main/java/org/zhdev/varioutil/sql/H2Provider.java similarity index 86% rename from db/src/main/java/org/zhdev/sql/H2Provider.java rename to db/src/main/java/org/zhdev/varioutil/sql/H2Provider.java index cdccea4..c3d960c 100644 --- a/db/src/main/java/org/zhdev/sql/H2Provider.java +++ b/db/src/main/java/org/zhdev/varioutil/sql/H2Provider.java @@ -1,6 +1,6 @@ -package org.zhdev.sql; +package org.zhdev.varioutil.sql; -import org.zhdev.util.SqlUtils; +import org.zhdev.varioutil.util.SqlUtils; import java.sql.Connection; diff --git a/db/src/main/java/org/zhdev/sql/MysqlProvider.java b/db/src/main/java/org/zhdev/varioutil/sql/MysqlProvider.java similarity index 89% rename from db/src/main/java/org/zhdev/sql/MysqlProvider.java rename to db/src/main/java/org/zhdev/varioutil/sql/MysqlProvider.java index d4b4576..afdad1d 100644 --- a/db/src/main/java/org/zhdev/sql/MysqlProvider.java +++ b/db/src/main/java/org/zhdev/varioutil/sql/MysqlProvider.java @@ -1,6 +1,6 @@ -package org.zhdev.sql; +package org.zhdev.varioutil.sql; -import org.zhdev.util.SqlUtils; +import org.zhdev.varioutil.util.SqlUtils; import java.sql.Connection; diff --git a/db/src/main/java/org/zhdev/sql/NullProvider.java b/db/src/main/java/org/zhdev/varioutil/sql/NullProvider.java similarity index 89% rename from db/src/main/java/org/zhdev/sql/NullProvider.java rename to db/src/main/java/org/zhdev/varioutil/sql/NullProvider.java index 6fee12c..cc15acf 100644 --- a/db/src/main/java/org/zhdev/sql/NullProvider.java +++ b/db/src/main/java/org/zhdev/varioutil/sql/NullProvider.java @@ -1,4 +1,4 @@ -package org.zhdev.sql; +package org.zhdev.varioutil.sql; import java.sql.Connection; diff --git a/db/src/main/java/org/zhdev/sql/SqlAdapter.java b/db/src/main/java/org/zhdev/varioutil/sql/SqlAdapter.java similarity index 97% rename from db/src/main/java/org/zhdev/sql/SqlAdapter.java rename to db/src/main/java/org/zhdev/varioutil/sql/SqlAdapter.java index df1a599..0e76e1b 100644 --- a/db/src/main/java/org/zhdev/sql/SqlAdapter.java +++ b/db/src/main/java/org/zhdev/varioutil/sql/SqlAdapter.java @@ -1,6 +1,6 @@ -package org.zhdev.sql; +package org.zhdev.varioutil.sql; -import org.zhdev.util.CheckedFunction; +import org.zhdev.varioutil.util.CheckedFunction; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/db/src/main/java/org/zhdev/sql/SqlException.java b/db/src/main/java/org/zhdev/varioutil/sql/SqlException.java similarity index 90% rename from db/src/main/java/org/zhdev/sql/SqlException.java rename to db/src/main/java/org/zhdev/varioutil/sql/SqlException.java index 3745808..4eb0e4c 100644 --- a/db/src/main/java/org/zhdev/sql/SqlException.java +++ b/db/src/main/java/org/zhdev/varioutil/sql/SqlException.java @@ -1,4 +1,4 @@ -package org.zhdev.sql; +package org.zhdev.varioutil.sql; public class SqlException extends RuntimeException { public SqlException() { diff --git a/db/src/main/java/org/zhdev/sql/SqliteProvider.java b/db/src/main/java/org/zhdev/varioutil/sql/SqliteProvider.java similarity index 80% rename from db/src/main/java/org/zhdev/sql/SqliteProvider.java rename to db/src/main/java/org/zhdev/varioutil/sql/SqliteProvider.java index bc4e1cc..c13a2a6 100644 --- a/db/src/main/java/org/zhdev/sql/SqliteProvider.java +++ b/db/src/main/java/org/zhdev/varioutil/sql/SqliteProvider.java @@ -1,6 +1,6 @@ -package org.zhdev.sql; +package org.zhdev.varioutil.sql; -import org.zhdev.util.SqlUtils; +import org.zhdev.varioutil.util.SqlUtils; import java.sql.Connection; diff --git a/db/src/main/java/org/zhdev/util/CheckedFunction.java b/db/src/main/java/org/zhdev/varioutil/util/CheckedFunction.java similarity index 76% rename from db/src/main/java/org/zhdev/util/CheckedFunction.java rename to db/src/main/java/org/zhdev/varioutil/util/CheckedFunction.java index b448da6..fe399a7 100755 --- a/db/src/main/java/org/zhdev/util/CheckedFunction.java +++ b/db/src/main/java/org/zhdev/varioutil/util/CheckedFunction.java @@ -1,4 +1,4 @@ -package org.zhdev.util; +package org.zhdev.varioutil.util; @FunctionalInterface public interface CheckedFunction { diff --git a/db/src/main/java/org/zhdev/util/SqlUtils.java b/db/src/main/java/org/zhdev/varioutil/util/SqlUtils.java similarity index 98% rename from db/src/main/java/org/zhdev/util/SqlUtils.java rename to db/src/main/java/org/zhdev/varioutil/util/SqlUtils.java index cb039b3..bd0aadf 100644 --- a/db/src/main/java/org/zhdev/util/SqlUtils.java +++ b/db/src/main/java/org/zhdev/varioutil/util/SqlUtils.java @@ -1,6 +1,6 @@ -package org.zhdev.util; +package org.zhdev.varioutil.util; -import org.zhdev.sql.SqlException; +import org.zhdev.varioutil.sql.SqlException; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/io/pom.xml b/io/pom.xml index 466f0e5..bab45ef 100644 --- a/io/pom.xml +++ b/io/pom.xml @@ -5,8 +5,8 @@ 4.0.0 - varioutil - org.zhdev + parent + org.zhdev.varioutil 1.0-SNAPSHOT diff --git a/io/src/main/java/org/zhdev/config/Config.java b/io/src/main/java/org/zhdev/varioutil/config/Config.java similarity index 98% rename from io/src/main/java/org/zhdev/config/Config.java rename to io/src/main/java/org/zhdev/varioutil/config/Config.java index f7a0a22..009ea4c 100644 --- a/io/src/main/java/org/zhdev/config/Config.java +++ b/io/src/main/java/org/zhdev/varioutil/config/Config.java @@ -1,4 +1,4 @@ -package org.zhdev.config; +package org.zhdev.varioutil.config; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/io/src/main/java/org/zhdev/config/ConfigException.java b/io/src/main/java/org/zhdev/varioutil/config/ConfigException.java similarity index 90% rename from io/src/main/java/org/zhdev/config/ConfigException.java rename to io/src/main/java/org/zhdev/varioutil/config/ConfigException.java index 8bb0e2c..58d78cf 100644 --- a/io/src/main/java/org/zhdev/config/ConfigException.java +++ b/io/src/main/java/org/zhdev/varioutil/config/ConfigException.java @@ -1,4 +1,4 @@ -package org.zhdev.config; +package org.zhdev.varioutil.config; public class ConfigException extends RuntimeException { public ConfigException() { diff --git a/io/src/main/java/org/zhdev/config/ConfigSection.java b/io/src/main/java/org/zhdev/varioutil/config/ConfigSection.java similarity index 99% rename from io/src/main/java/org/zhdev/config/ConfigSection.java rename to io/src/main/java/org/zhdev/varioutil/config/ConfigSection.java index e639c83..feb05e4 100644 --- a/io/src/main/java/org/zhdev/config/ConfigSection.java +++ b/io/src/main/java/org/zhdev/varioutil/config/ConfigSection.java @@ -1,4 +1,4 @@ -package org.zhdev.config; +package org.zhdev.varioutil.config; import java.util.List; import java.util.Map; diff --git a/io/src/main/java/org/zhdev/config/ConfigSectionNode.java b/io/src/main/java/org/zhdev/varioutil/config/ConfigSectionNode.java similarity index 90% rename from io/src/main/java/org/zhdev/config/ConfigSectionNode.java rename to io/src/main/java/org/zhdev/varioutil/config/ConfigSectionNode.java index c32a669..b38c609 100644 --- a/io/src/main/java/org/zhdev/config/ConfigSectionNode.java +++ b/io/src/main/java/org/zhdev/varioutil/config/ConfigSectionNode.java @@ -1,4 +1,4 @@ -package org.zhdev.config; +package org.zhdev.varioutil.config; final class ConfigSectionNode { Object value; diff --git a/io/src/main/java/org/zhdev/config/MapConfigSection.java b/io/src/main/java/org/zhdev/varioutil/config/MapConfigSection.java similarity index 99% rename from io/src/main/java/org/zhdev/config/MapConfigSection.java rename to io/src/main/java/org/zhdev/varioutil/config/MapConfigSection.java index 0fc7668..f25c97c 100644 --- a/io/src/main/java/org/zhdev/config/MapConfigSection.java +++ b/io/src/main/java/org/zhdev/varioutil/config/MapConfigSection.java @@ -1,4 +1,4 @@ -package org.zhdev.config; +package org.zhdev.varioutil.config; import java.util.*; import java.util.function.Function; diff --git a/io/src/main/java/org/zhdev/config/YamlConfig.java b/io/src/main/java/org/zhdev/varioutil/config/YamlConfig.java similarity index 99% rename from io/src/main/java/org/zhdev/config/YamlConfig.java rename to io/src/main/java/org/zhdev/varioutil/config/YamlConfig.java index 4dccc8d..d89b157 100644 --- a/io/src/main/java/org/zhdev/config/YamlConfig.java +++ b/io/src/main/java/org/zhdev/varioutil/config/YamlConfig.java @@ -1,4 +1,4 @@ -package org.zhdev.config; +package org.zhdev.varioutil.config; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.LoaderOptions; diff --git a/io/src/main/java/org/zhdev/config/YamlConfigConstructor.java b/io/src/main/java/org/zhdev/varioutil/config/YamlConfigConstructor.java similarity index 91% rename from io/src/main/java/org/zhdev/config/YamlConfigConstructor.java rename to io/src/main/java/org/zhdev/varioutil/config/YamlConfigConstructor.java index 1f32baa..7444f79 100644 --- a/io/src/main/java/org/zhdev/config/YamlConfigConstructor.java +++ b/io/src/main/java/org/zhdev/varioutil/config/YamlConfigConstructor.java @@ -1,4 +1,4 @@ -package org.zhdev.config; +package org.zhdev.varioutil.config; import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.constructor.SafeConstructor; diff --git a/io/src/main/java/org/zhdev/config/YamlConfigRepresenter.java b/io/src/main/java/org/zhdev/varioutil/config/YamlConfigRepresenter.java similarity index 86% rename from io/src/main/java/org/zhdev/config/YamlConfigRepresenter.java rename to io/src/main/java/org/zhdev/varioutil/config/YamlConfigRepresenter.java index 6f36064..dc563d0 100644 --- a/io/src/main/java/org/zhdev/config/YamlConfigRepresenter.java +++ b/io/src/main/java/org/zhdev/varioutil/config/YamlConfigRepresenter.java @@ -1,4 +1,4 @@ -package org.zhdev.config; +package org.zhdev.varioutil.config; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.representer.Representer; diff --git a/misc/pom.xml b/misc/pom.xml index af94194..a5c8af1 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -5,8 +5,8 @@ 4.0.0 - varioutil - org.zhdev + parent + org.zhdev.varioutil 1.0-SNAPSHOT diff --git a/misc/src/main/java/org/zhdev/PreparedPlugin.java b/misc/src/main/java/org/zhdev/varioutil/PreparedPlugin.java similarity index 88% rename from misc/src/main/java/org/zhdev/PreparedPlugin.java rename to misc/src/main/java/org/zhdev/varioutil/PreparedPlugin.java index c8e17e0..ca03e6e 100644 --- a/misc/src/main/java/org/zhdev/PreparedPlugin.java +++ b/misc/src/main/java/org/zhdev/varioutil/PreparedPlugin.java @@ -1,10 +1,10 @@ -package org.zhdev; +package org.zhdev.varioutil; -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 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 java.io.IOException; import java.io.InputStream; diff --git a/misc/src/main/java/org/zhdev/util/ColorUtils.java b/misc/src/main/java/org/zhdev/varioutil/util/ColorUtils.java similarity index 98% rename from misc/src/main/java/org/zhdev/util/ColorUtils.java rename to misc/src/main/java/org/zhdev/varioutil/util/ColorUtils.java index a2fed23..10d4f89 100644 --- a/misc/src/main/java/org/zhdev/util/ColorUtils.java +++ b/misc/src/main/java/org/zhdev/varioutil/util/ColorUtils.java @@ -1,4 +1,4 @@ -package org.zhdev.util; +package org.zhdev.varioutil.util; import java.util.HashMap; import java.util.Map; diff --git a/misc/src/main/java/org/zhdev/util/ConfigUtils.java b/misc/src/main/java/org/zhdev/varioutil/util/ConfigUtils.java similarity index 92% rename from misc/src/main/java/org/zhdev/util/ConfigUtils.java rename to misc/src/main/java/org/zhdev/varioutil/util/ConfigUtils.java index 9591361..8e6fb0e 100644 --- a/misc/src/main/java/org/zhdev/util/ConfigUtils.java +++ b/misc/src/main/java/org/zhdev/varioutil/util/ConfigUtils.java @@ -1,8 +1,9 @@ -package org.zhdev.util; +package org.zhdev.varioutil.util; -import org.zhdev.config.ConfigSection; -import org.zhdev.language.Language; -import org.zhdev.sql.*; +import org.zhdev.varioutil.config.ConfigSection; +import org.zhdev.varioutil.language.Language; +import org.zhdev.varioutil.sql.*; +import org.zhdev.varioutil.sql.*; import java.io.File; import java.util.ArrayList; diff --git a/pom.xml b/pom.xml index 2c4bb9d..961cb02 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 + org.zhdev.varioutil + parent 1.0-SNAPSHOT pom @@ -21,6 +21,7 @@ misc bukkit velocity + all @@ -46,7 +47,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.10.1 8 8 @@ -55,7 +56,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.3 + 3.4.1 @@ -81,7 +82,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.1 + 3.2.2 false @@ -97,7 +98,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.4.1 attach-javadocs @@ -146,7 +147,7 @@ org.jetbrains annotations-java5 - 24.1.0 + 24.0.1 provided diff --git a/velocity/pom.xml b/velocity/pom.xml index 32aa20e..be0e707 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,8 +5,8 @@ 4.0.0 - varioutil - org.zhdev + parent + org.zhdev.varioutil 1.0-SNAPSHOT diff --git a/velocity/src/main/java/org/zhdev/VelocityPlugin.java b/velocity/src/main/java/org/zhdev/varioutil/VelocityPlugin.java similarity index 88% rename from velocity/src/main/java/org/zhdev/VelocityPlugin.java rename to velocity/src/main/java/org/zhdev/varioutil/VelocityPlugin.java index 7c40b3a..b2aa9b6 100644 --- a/velocity/src/main/java/org/zhdev/VelocityPlugin.java +++ b/velocity/src/main/java/org/zhdev/varioutil/VelocityPlugin.java @@ -1,4 +1,4 @@ -package org.zhdev; +package org.zhdev.varioutil; import com.velocitypowered.api.proxy.ProxyServer; import org.slf4j.Logger; @@ -27,4 +27,8 @@ public abstract class VelocityPlugin { public java.util.logging.Logger getLogger() { return java.util.logging.Logger.getLogger(logger.getName()); } + + public Logger getSLF4JLogger() { + return logger; + } } diff --git a/velocity/src/main/java/org/zhdev/VelocityPreparedPlugin.java b/velocity/src/main/java/org/zhdev/varioutil/VelocityPreparedPlugin.java similarity index 80% rename from velocity/src/main/java/org/zhdev/VelocityPreparedPlugin.java rename to velocity/src/main/java/org/zhdev/varioutil/VelocityPreparedPlugin.java index 2cbeb39..267a1ef 100644 --- a/velocity/src/main/java/org/zhdev/VelocityPreparedPlugin.java +++ b/velocity/src/main/java/org/zhdev/varioutil/VelocityPreparedPlugin.java @@ -1,17 +1,17 @@ -package org.zhdev; +package org.zhdev.varioutil; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; import com.velocitypowered.api.event.proxy.ProxyShutdownEvent; import com.velocitypowered.api.proxy.ProxyServer; -import org.zhdev.config.ConfigSection; -import org.zhdev.language.Language; -import org.zhdev.util.ColorUtils; +import org.zhdev.varioutil.config.ConfigSection; +import org.zhdev.varioutil.language.Language; +import org.zhdev.varioutil.util.ColorUtils; import org.slf4j.Logger; -import org.zhdev.config.Config; -import org.zhdev.config.VelocityTomlConfig; -import org.zhdev.sql.SqlAdapter; -import org.zhdev.util.ConfigUtils; +import org.zhdev.varioutil.config.Config; +import org.zhdev.varioutil.config.VelocityTomlConfig; +import org.zhdev.varioutil.sql.SqlAdapter; +import org.zhdev.varioutil.util.ConfigUtils; import java.nio.file.Path; @@ -59,26 +59,20 @@ public abstract class VelocityPreparedPlugin extends VelocityPlugin implements P return sqlAdapter; } - protected void onPreEnable() {} + protected void onEnabling() {} - protected void onPostEnable() {} - - protected void onPreDisable() {} - - protected void onPostDisable() {} + protected void onDisabling() {} @Subscribe private void onProxyInitialization(ProxyInitializeEvent event) { - onPreEnable(); loadConfig(defaultConfig); loadPhrases(); establishSqlConnection(); - onPostEnable(); + onEnabling(); } @Subscribe private void onProxyInitialization(ProxyShutdownEvent event) { - onPreDisable(); - onPostDisable(); + onDisabling(); } } diff --git a/velocity/src/main/java/org/zhdev/config/VelocityTomlConfig.java b/velocity/src/main/java/org/zhdev/varioutil/config/VelocityTomlConfig.java similarity index 99% rename from velocity/src/main/java/org/zhdev/config/VelocityTomlConfig.java rename to velocity/src/main/java/org/zhdev/varioutil/config/VelocityTomlConfig.java index 01f9e1f..beb9483 100644 --- a/velocity/src/main/java/org/zhdev/config/VelocityTomlConfig.java +++ b/velocity/src/main/java/org/zhdev/varioutil/config/VelocityTomlConfig.java @@ -1,4 +1,4 @@ -package org.zhdev.config; +package org.zhdev.varioutil.config; import com.electronwill.nightconfig.core.CommentedConfig; import com.electronwill.nightconfig.toml.TomlFormat;