zhdev/varioutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Compare commits

base: zhdev:e6f026109bc640ad4591d885cac8d83c00b0db7e
Branches Tags
zhdev:master
..
compare: zhdev:372e4f8ac7f04ca9268f8d509c85da632fb29a7d
Branches Tags
zhdev:master

4 commits
e6f026109b ... 372e4f8ac7

Author SHA1 Message Date
Roman Zhuravlev
372e4f8ac7 Improve description and examples 2025-08-31 19:35:08 +05:00
Roman Zhuravlev
b091ca6b46 Refactor package from org.zhdev.varioutil to org.zhdev to shorter length 2025-08-31 19:34:40 +05:00
Roman Zhuravlev
9fbe620b6a Reworked usage of special methods onEnable & onDisable 2025-08-31 19:33:22 +05:00
Roman Zhuravlev
1d501f0bf2 Remove getSLF4JLogger method 2025-08-31 19:32:04 +05:00
60 changed files with 203 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

99
README.md
View file

@ -1,4 +1,14 @@
### Add as maven dependency
# 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`.
```xml
<repositories>
<repository>
@ -7,63 +17,80 @@
</repository>
</repositories>
```
Then add the artifact as a dependency, for example `common`.
```xml
<dependencies>
<dependency>
<groupId>org.zhdev.varioutil</groupId>
<artifactId>all</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
```
### Example for reflection
#### Maven dependency
```xml
<dependencies>
<dependency>
<groupId>org.zhdev.varioutil</groupId>
<groupId>org.zhdev</groupId>
<artifactId>common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
```
#### Code
```java
import java.lang.reflect.Field;
import org.zhdev.varioutil.ReflectionUtils;
import org.bukkit.Bukkit;
## 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.
public class BukkitFields {
public static final Field METHOD__CraftServer__getServer;
### 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.
static {
METHOD__CraftServer__getServer = ReflectionUtils.methodSearcher()
.of(Bukkit.getServer())
.methodOf("getServer")
.returns(CLASS__DedicatedServer)
.search();
}
}
```
### Example for yaml
#### Maven dependency
Add the required `bukkit` dependency.
```xml
<dependencies>
<dependency>
<groupId>org.zhdev.varioutil</groupId>
<groupId>org.zhdev</groupId>
<artifactId>bukkit</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
```
#### Code
Add the following code.
```java
package org.zhdev;
import org.zhdev.config.BukkitYamlConfig;
import org.zhdev.config.Config;
public class BukmanBukkitPlugin extends BukkitPreparedPlugin {
private final Config extraConfig = new BukkitYamlConfig("extra-config.yml");
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;
}
}
```
### More YAML examples
#### Maven dependency
If you only need YAML parsing, just add the `io` maven dependency.
```xml
<dependencies>
<dependency>
<groupId>org.zhdev</groupId>
<artifactId>io</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
```
#### Code
```java
import org.zhdev.varioutil.Config;
import org.zhdev.varioutil.YamlConfig;
import org.zhdev.Config;
import org.zhdev.YamlConfig;
import java.util.List;

53
all/pom.xml
View file

@ -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>

8
bukkit/pom.xml
View file

@ -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>

2
bukkit/src/main/java/org/zhdev/varioutil/BukkitPlugin.java → bukkit/src/main/java/org/zhdev/BukkitPlugin.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil;
package org.zhdev;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;

48
bukkit/src/main/java/org/zhdev/varioutil/BukkitPreparedPlugin.java → bukkit/src/main/java/org/zhdev/BukkitPreparedPlugin.java
View file

@ -1,8 +1,8 @@
package org.zhdev.varioutil;
package org.zhdev;
import org.zhdev.varioutil.language.Language;
import org.zhdev.varioutil.util.CollectionUtils;
import org.zhdev.varioutil.util.ColorUtils;
import org.zhdev.language.Language;
import org.zhdev.util.CollectionUtils;
import org.zhdev.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.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 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 java.io.File;
import java.nio.file.Path;
@ -138,11 +138,17 @@ public abstract class BukkitPreparedPlugin extends BukkitPlugin implements Liste
sqlAdapter.setProvider(ConfigUtils.createSqlConnectionProvider(databaseConfig, getDataFolder().getPath()));
}
protected void onLoading() {}
protected void onPreLoad() {}
protected void onEnabling() {}
protected void onPostLoad() {}
protected void onDisabling() {}
protected void onPreEnable() {}
protected void onPostEnable() {}
protected void onPreDisable() {}
protected void onPostDisable() {}
private void load() {
loadDefaultConfig();
@ -152,8 +158,9 @@ public abstract class BukkitPreparedPlugin extends BukkitPlugin implements Liste
@Override
public final void onLoad() {
onPreLoad();
load();
onLoading();
onPostLoad();
}
private void enable() {
@ -162,8 +169,9 @@ public abstract class BukkitPreparedPlugin extends BukkitPlugin implements Liste
@Override
public final void onEnable() {
onPreEnable();
enable();
onEnabling();
onPostEnable();
}
private void disable() {
@ -180,11 +188,11 @@ public abstract class BukkitPreparedPlugin extends BukkitPlugin implements Liste
@Override
public final void onDisable() {
try {
onDisabling();
onPreDisable();
disable();
} catch (Exception e) {
onPostDisable();
} finally {
disable();
throw e;
}
}

2
bukkit/src/main/java/org/zhdev/varioutil/bukkit/LegacyMaterial.java → bukkit/src/main/java/org/zhdev/bukkit/LegacyMaterial.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.bukkit;
package org.zhdev.bukkit;
import org.bukkit.Material;

2
bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/AbstractPluginCommand.java → bukkit/src/main/java/org/zhdev/bukkit/command/AbstractPluginCommand.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.bukkit.command;
package org.zhdev.bukkit.command;
import org.bukkit.command.*;
import org.bukkit.plugin.Plugin;

2
bukkit/src/main/java/org/zhdev/varioutil/bukkit/command/PreparedPluginCommand.java → bukkit/src/main/java/org/zhdev/bukkit/command/PreparedPluginCommand.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.bukkit.command;
package org.zhdev.bukkit.command;
import org.bukkit.command.*;
import org.bukkit.plugin.Plugin;

2
bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/ClickHandler.java → bukkit/src/main/java/org/zhdev/bukkit/gui/ClickHandler.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.bukkit.gui;
package org.zhdev.bukkit.gui;
import org.bukkit.event.inventory.InventoryClickEvent;

2
bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/Gui.java → bukkit/src/main/java/org/zhdev/bukkit/gui/Gui.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.bukkit.gui;
package org.zhdev.bukkit.gui;
import org.bukkit.Material;
import org.bukkit.entity.Player;

4
bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiConfig.java → bukkit/src/main/java/org/zhdev/bukkit/gui/GuiConfig.java
View file

@ -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;

2
bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiHolder.java → bukkit/src/main/java/org/zhdev/bukkit/gui/GuiHolder.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.bukkit.gui;
package org.zhdev.bukkit.gui;
import org.bukkit.Bukkit;
import org.bukkit.inventory.Inventory;

4
bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIcon.java → bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIcon.java
View file

@ -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;

8
bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiIconConfig.java → bukkit/src/main/java/org/zhdev/bukkit/gui/GuiIconConfig.java
View file

@ -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;

2
bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiListener.java → bukkit/src/main/java/org/zhdev/bukkit/gui/GuiListener.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.bukkit.gui;
package org.zhdev.bukkit.gui;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;

2
bukkit/src/main/java/org/zhdev/varioutil/bukkit/gui/GuiType.java → bukkit/src/main/java/org/zhdev/bukkit/gui/GuiType.java
View file

@ -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;

2
bukkit/src/main/java/org/zhdev/varioutil/config/BukkitYamlConfig.java → bukkit/src/main/java/org/zhdev/config/BukkitYamlConfig.java
View file

@ -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;

2
bukkit/src/main/java/org/zhdev/varioutil/util/BukkitReflectionUtils.java → bukkit/src/main/java/org/zhdev/util/BukkitReflectionUtils.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.util;
package org.zhdev.util;
import com.mojang.authlib.GameProfile;
import org.bukkit.Bukkit;

4
bukkit/src/main/java/org/zhdev/varioutil/util/BukkitUtils.java → bukkit/src/main/java/org/zhdev/util/BukkitUtils.java
View file

@ -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;

4
common/pom.xml
View file

@ -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>

2
common/src/main/java/org/zhdev/varioutil/Version.java → common/src/main/java/org/zhdev/Version.java
View file

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

4
common/src/main/java/org/zhdev/varioutil/language/Language.java → common/src/main/java/org/zhdev/language/Language.java
View file

@ -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;

4
common/src/main/java/org/zhdev/varioutil/reflection/FieldSearcher.java → common/src/main/java/org/zhdev/reflection/FieldSearcher.java
View file

@ -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;

4
common/src/main/java/org/zhdev/varioutil/reflection/MethodSearcher.java → common/src/main/java/org/zhdev/reflection/MethodSearcher.java
View file

@ -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;

2
common/src/main/java/org/zhdev/varioutil/util/ArrayUtils.java → common/src/main/java/org/zhdev/util/ArrayUtils.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.util;
package org.zhdev.util;
import java.util.Collection;
import java.util.function.Function;

2
common/src/main/java/org/zhdev/varioutil/util/CollectionUtils.java → common/src/main/java/org/zhdev/util/CollectionUtils.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.util;
package org.zhdev.util;
import java.util.Collection;
import java.util.List;

2
common/src/main/java/org/zhdev/varioutil/util/DateTimeUtils.java → common/src/main/java/org/zhdev/util/DateTimeUtils.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.util;
package org.zhdev.util;
import java.time.*;
import java.time.format.DateTimeFormatter;

2
common/src/main/java/org/zhdev/varioutil/util/EnumUtils.java → common/src/main/java/org/zhdev/util/EnumUtils.java
View file

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

6
common/src/main/java/org/zhdev/varioutil/util/ReflectionUtils.java → common/src/main/java/org/zhdev/util/ReflectionUtils.java
View file

@ -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;

2
common/src/main/java/org/zhdev/varioutil/util/ResourceUtils.java → common/src/main/java/org/zhdev/util/ResourceUtils.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.util;
package org.zhdev.util;
import java.io.*;
import java.net.URL;

2
common/src/main/java/org/zhdev/varioutil/util/StringUtils.java → common/src/main/java/org/zhdev/util/StringUtils.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.util;
package org.zhdev.util;
import java.util.ArrayList;
import java.util.Iterator;

4
db/pom.xml
View file

@ -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>

2
db/src/main/java/org/zhdev/varioutil/sql/AbstractProvider.java → db/src/main/java/org/zhdev/sql/AbstractProvider.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.sql;
package org.zhdev.sql;
import java.sql.Connection;
import java.sql.SQLException;

2
db/src/main/java/org/zhdev/varioutil/sql/ConnectionProvider.java → db/src/main/java/org/zhdev/sql/ConnectionProvider.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.sql;
package org.zhdev.sql;
import java.sql.Connection;
import java.sql.SQLException;

4
db/src/main/java/org/zhdev/varioutil/sql/H2Provider.java → db/src/main/java/org/zhdev/sql/H2Provider.java
View file

@ -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;

4
db/src/main/java/org/zhdev/varioutil/sql/MysqlProvider.java → db/src/main/java/org/zhdev/sql/MysqlProvider.java
View file

@ -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;

2
db/src/main/java/org/zhdev/varioutil/sql/NullProvider.java → db/src/main/java/org/zhdev/sql/NullProvider.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.sql;
package org.zhdev.sql;
import java.sql.Connection;

4
db/src/main/java/org/zhdev/varioutil/sql/SqlAdapter.java → db/src/main/java/org/zhdev/sql/SqlAdapter.java
View file

@ -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;

2
db/src/main/java/org/zhdev/varioutil/sql/SqlException.java → db/src/main/java/org/zhdev/sql/SqlException.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.sql;
package org.zhdev.sql;
public class SqlException extends RuntimeException {
public SqlException() {

4
db/src/main/java/org/zhdev/varioutil/sql/SqliteProvider.java → db/src/main/java/org/zhdev/sql/SqliteProvider.java
View file

@ -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;

2
db/src/main/java/org/zhdev/varioutil/util/CheckedFunction.java → db/src/main/java/org/zhdev/util/CheckedFunction.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.util;
package org.zhdev.util;
@FunctionalInterface
public interface CheckedFunction<T, R, E extends Exception> {

4
db/src/main/java/org/zhdev/varioutil/util/SqlUtils.java → db/src/main/java/org/zhdev/util/SqlUtils.java
View file

@ -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;

4
io/pom.xml
View file

@ -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>

2
io/src/main/java/org/zhdev/varioutil/config/Config.java → io/src/main/java/org/zhdev/config/Config.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.config;
package org.zhdev.config;
import java.io.*;
import java.nio.charset.StandardCharsets;

2
io/src/main/java/org/zhdev/varioutil/config/ConfigException.java → io/src/main/java/org/zhdev/config/ConfigException.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.config;
package org.zhdev.config;
public class ConfigException extends RuntimeException {
public ConfigException() {

2
io/src/main/java/org/zhdev/varioutil/config/ConfigSection.java → io/src/main/java/org/zhdev/config/ConfigSection.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.config;
package org.zhdev.config;
import java.util.List;
import java.util.Map;

2
io/src/main/java/org/zhdev/varioutil/config/ConfigSectionNode.java → io/src/main/java/org/zhdev/config/ConfigSectionNode.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.config;
package org.zhdev.config;
final class ConfigSectionNode {
Object value;

2
io/src/main/java/org/zhdev/varioutil/config/MapConfigSection.java → io/src/main/java/org/zhdev/config/MapConfigSection.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.config;
package org.zhdev.config;
import java.util.*;
import java.util.function.Function;

2
io/src/main/java/org/zhdev/varioutil/config/YamlConfig.java → io/src/main/java/org/zhdev/config/YamlConfig.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.config;
package org.zhdev.config;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.LoaderOptions;

2
io/src/main/java/org/zhdev/varioutil/config/YamlConfigConstructor.java → io/src/main/java/org/zhdev/config/YamlConfigConstructor.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.config;
package org.zhdev.config;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.constructor.SafeConstructor;

2
io/src/main/java/org/zhdev/varioutil/config/YamlConfigRepresenter.java → io/src/main/java/org/zhdev/config/YamlConfigRepresenter.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.config;
package org.zhdev.config;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.representer.Representer;

4
misc/pom.xml
View file

@ -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>

12
misc/src/main/java/org/zhdev/varioutil/PreparedPlugin.java → misc/src/main/java/org/zhdev/PreparedPlugin.java
View file

@ -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;

2
misc/src/main/java/org/zhdev/varioutil/util/ColorUtils.java → misc/src/main/java/org/zhdev/util/ColorUtils.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil.util;
package org.zhdev.util;
import java.util.HashMap;
import java.util.Map;

9
misc/src/main/java/org/zhdev/varioutil/util/ConfigUtils.java → misc/src/main/java/org/zhdev/util/ConfigUtils.java
View file

@ -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;

15
pom.xml
View file

@ -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>

4
velocity/pom.xml
View file

@ -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>

6
velocity/src/main/java/org/zhdev/varioutil/VelocityPlugin.java → velocity/src/main/java/org/zhdev/VelocityPlugin.java
View file

@ -1,4 +1,4 @@
package org.zhdev.varioutil;
package org.zhdev;
import com.velocitypowered.api.proxy.ProxyServer;
import org.slf4j.Logger;
@ -27,8 +27,4 @@ public abstract class VelocityPlugin {
public java.util.logging.Logger getLogger() {
return java.util.logging.Logger.getLogger(logger.getName());
}
public Logger getSLF4JLogger() {
return logger;
}
}

30
velocity/src/main/java/org/zhdev/varioutil/VelocityPreparedPlugin.java → velocity/src/main/java/org/zhdev/VelocityPreparedPlugin.java
View file

@ -1,17 +1,17 @@
package org.zhdev.varioutil;
package org.zhdev;
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.varioutil.config.ConfigSection;
import org.zhdev.varioutil.language.Language;
import org.zhdev.varioutil.util.ColorUtils;
import org.zhdev.config.ConfigSection;
import org.zhdev.language.Language;
import org.zhdev.util.ColorUtils;
import org.slf4j.Logger;
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 org.zhdev.config.Config;
import org.zhdev.config.VelocityTomlConfig;
import org.zhdev.sql.SqlAdapter;
import org.zhdev.util.ConfigUtils;
import java.nio.file.Path;
@ -59,20 +59,26 @@ public abstract class VelocityPreparedPlugin extends VelocityPlugin implements P
return sqlAdapter;
}
protected void onEnabling() {}
protected void onPreEnable() {}
protected void onDisabling() {}
protected void onPostEnable() {}
protected void onPreDisable() {}
protected void onPostDisable() {}
@Subscribe
private void onProxyInitialization(ProxyInitializeEvent event) {
onPreEnable();
loadConfig(defaultConfig);
loadPhrases();
establishSqlConnection();
onEnabling();
onPostEnable();
}
@Subscribe
private void onProxyInitialization(ProxyShutdownEvent event) {
onDisabling();
onPreDisable();
onPostDisable();
}
}

2
velocity/src/main/java/org/zhdev/varioutil/config/VelocityTomlConfig.java → velocity/src/main/java/org/zhdev/config/VelocityTomlConfig.java
View file

@ -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;