Rename package name from net.zhira to org.zhdev
This commit is contained in:
parent
2debf329a8
commit
d7bb8c65de
60 changed files with 111 additions and 121 deletions
12
README.md
12
README.md
|
|
@ -10,7 +10,7 @@
|
||||||
```xml
|
```xml
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.zhira.varioutil</groupId>
|
<groupId>org.zhdev.varioutil</groupId>
|
||||||
<artifactId>all</artifactId>
|
<artifactId>all</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.0-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
```xml
|
```xml
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.zhira.varioutil</groupId>
|
<groupId>org.zhdev.varioutil</groupId>
|
||||||
<artifactId>common</artifactId>
|
<artifactId>common</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.0-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
```java
|
```java
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
|
|
||||||
import net.zhira.varioutil.ReflectionUtils;
|
import org.zhdev.varioutil.ReflectionUtils;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
|
||||||
public class BukkitFields {
|
public class BukkitFields {
|
||||||
|
|
@ -53,7 +53,7 @@ public class BukkitFields {
|
||||||
```xml
|
```xml
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.zhira.varioutil</groupId>
|
<groupId>org.zhdev.varioutil</groupId>
|
||||||
<artifactId>io</artifactId>
|
<artifactId>io</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.0-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
@ -62,8 +62,8 @@ public class BukkitFields {
|
||||||
#### Code
|
#### Code
|
||||||
|
|
||||||
```java
|
```java
|
||||||
import net.zhira.varioutil.Config;
|
import org.zhdev.varioutil.Config;
|
||||||
import net.zhira.varioutil.YamlConfig;
|
import org.zhdev.varioutil.YamlConfig;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>parent</artifactId>
|
<artifactId>parent</artifactId>
|
||||||
<groupId>net.zhira.varioutil</groupId>
|
<groupId>org.zhdev.varioutil</groupId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>net.zhira.varioutil</groupId>
|
<groupId>org.zhdev.varioutil</groupId>
|
||||||
<artifactId>parent</artifactId>
|
<artifactId>parent</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil;
|
package org.zhdev.varioutil;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package net.zhira.varioutil;
|
package org.zhdev.varioutil;
|
||||||
|
|
||||||
import net.zhira.varioutil.language.Language;
|
import org.zhdev.varioutil.language.Language;
|
||||||
import net.zhira.varioutil.util.CollectionUtils;
|
import org.zhdev.varioutil.util.CollectionUtils;
|
||||||
import net.zhira.varioutil.util.ColorUtils;
|
import org.zhdev.varioutil.util.ColorUtils;
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandExecutor;
|
import org.bukkit.command.CommandExecutor;
|
||||||
import org.bukkit.command.PluginIdentifiableCommand;
|
import org.bukkit.command.PluginIdentifiableCommand;
|
||||||
|
|
@ -12,14 +12,14 @@ import org.bukkit.event.Listener;
|
||||||
import org.bukkit.plugin.PluginDescriptionFile;
|
import org.bukkit.plugin.PluginDescriptionFile;
|
||||||
import org.bukkit.plugin.java.JavaPluginLoader;
|
import org.bukkit.plugin.java.JavaPluginLoader;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import net.zhira.varioutil.bukkit.command.PreparedPluginCommand;
|
import org.zhdev.varioutil.bukkit.command.PreparedPluginCommand;
|
||||||
import net.zhira.varioutil.config.BukkitYamlConfig;
|
import org.zhdev.varioutil.config.BukkitYamlConfig;
|
||||||
import net.zhira.varioutil.config.Config;
|
import org.zhdev.varioutil.config.Config;
|
||||||
import net.zhira.varioutil.config.ConfigSection;
|
import org.zhdev.varioutil.config.ConfigSection;
|
||||||
import net.zhira.varioutil.config.YamlConfig;
|
import org.zhdev.varioutil.config.YamlConfig;
|
||||||
import net.zhira.varioutil.sql.SqlAdapter;
|
import org.zhdev.varioutil.sql.SqlAdapter;
|
||||||
import net.zhira.varioutil.util.BukkitUtils;
|
import org.zhdev.varioutil.util.BukkitUtils;
|
||||||
import net.zhira.varioutil.util.ConfigUtils;
|
import org.zhdev.varioutil.util.ConfigUtils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
|
@ -103,7 +103,7 @@ public abstract class BukkitPreparedPlugin extends BukkitPlugin implements Liste
|
||||||
@NotNull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
public final FileConfiguration getConfig() {
|
public final FileConfiguration getConfig() {
|
||||||
throw new UnsupportedOperationException("You should use PreparedBukkitPlugin#getConfiguration");
|
throw new UnsupportedOperationException("You should use BukkitPreparedPlugin#getDefaultConfig");
|
||||||
}
|
}
|
||||||
|
|
||||||
public Config getDefaultConfig() {
|
public Config getDefaultConfig() {
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.bukkit;
|
package org.zhdev.varioutil.bukkit;
|
||||||
|
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.bukkit.command;
|
package org.zhdev.varioutil.bukkit.command;
|
||||||
|
|
||||||
import org.bukkit.command.*;
|
import org.bukkit.command.*;
|
||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.bukkit.command;
|
package org.zhdev.varioutil.bukkit.command;
|
||||||
|
|
||||||
import org.bukkit.command.*;
|
import org.bukkit.command.*;
|
||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.bukkit.gui;
|
package org.zhdev.varioutil.bukkit.gui;
|
||||||
|
|
||||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.bukkit.gui;
|
package org.zhdev.varioutil.bukkit.gui;
|
||||||
|
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
package net.zhira.varioutil.bukkit.gui;
|
package org.zhdev.varioutil.bukkit.gui;
|
||||||
|
|
||||||
import net.zhira.varioutil.config.ConfigSection;
|
import org.zhdev.varioutil.config.ConfigSection;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.bukkit.gui;
|
package org.zhdev.varioutil.bukkit.gui;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
package net.zhira.varioutil.bukkit.gui;
|
package org.zhdev.varioutil.bukkit.gui;
|
||||||
|
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.inventory.ItemFlag;
|
import org.bukkit.inventory.ItemFlag;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
import org.bukkit.inventory.meta.ItemMeta;
|
||||||
import org.bukkit.inventory.meta.SkullMeta;
|
import org.bukkit.inventory.meta.SkullMeta;
|
||||||
import net.zhira.varioutil.util.BukkitUtils;
|
import org.zhdev.varioutil.util.BukkitUtils;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
package net.zhira.varioutil.bukkit.gui;
|
package org.zhdev.varioutil.bukkit.gui;
|
||||||
|
|
||||||
import net.zhira.varioutil.config.ConfigSection;
|
import org.zhdev.varioutil.config.ConfigSection;
|
||||||
import net.zhira.varioutil.util.StringUtils;
|
import org.zhdev.varioutil.util.StringUtils;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import net.zhira.varioutil.bukkit.LegacyMaterial;
|
import org.zhdev.varioutil.bukkit.LegacyMaterial;
|
||||||
|
|
||||||
public class GuiIconConfig {
|
public class GuiIconConfig {
|
||||||
protected final Material type;
|
protected final Material type;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.bukkit.gui;
|
package org.zhdev.varioutil.bukkit.gui;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.bukkit.gui;
|
package org.zhdev.varioutil.bukkit.gui;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.event.inventory.InventoryType;
|
import org.bukkit.event.inventory.InventoryType;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.config;
|
package org.zhdev.varioutil.config;
|
||||||
|
|
||||||
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
||||||
import org.bukkit.configuration.serialization.ConfigurationSerialization;
|
import org.bukkit.configuration.serialization.ConfigurationSerialization;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.util;
|
package org.zhdev.varioutil.util;
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
import com.mojang.authlib.GameProfile;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
|
@ -54,12 +54,7 @@ class BukkitReflectionUtils {
|
||||||
private static class ModernGameProfileConsumer implements GameProfileConsumer {
|
private static class ModernGameProfileConsumer implements GameProfileConsumer {
|
||||||
private final Class<?> __ResolvableProfile_CLASS = ReflectionUtils.getType("net.minecraft.world.item.component.ResolvableProfile");
|
private final Class<?> __ResolvableProfile_CLASS = ReflectionUtils.getType("net.minecraft.world.item.component.ResolvableProfile");
|
||||||
private final Constructor<?> __ResolvableProfile_CONSTRUCTOR;
|
private final Constructor<?> __ResolvableProfile_CONSTRUCTOR;
|
||||||
protected final Method __setProfile__CraftMetaSkull__METHOD = ReflectionUtils.methodSearcher()
|
protected final Method __setProfile__CraftMetaSkull__METHOD = ReflectionUtils.getMethod(__ResolvableProfile_CLASS, "setProfile", __ResolvableProfile_CLASS);
|
||||||
.type(__CraftMetaSkull__CLASS)
|
|
||||||
.methodOf("setProfile")
|
|
||||||
.parameters(__ResolvableProfile_CLASS)
|
|
||||||
.returns(void.class)
|
|
||||||
.search();
|
|
||||||
|
|
||||||
ModernGameProfileConsumer() {
|
ModernGameProfileConsumer() {
|
||||||
Constructor<?> resolvableConstructor;
|
Constructor<?> resolvableConstructor;
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package net.zhira.varioutil.util;
|
package org.zhdev.varioutil.util;
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
import com.mojang.authlib.GameProfile;
|
||||||
import com.mojang.authlib.properties.Property;
|
import com.mojang.authlib.properties.Property;
|
||||||
import net.zhira.varioutil.Version;
|
import org.zhdev.varioutil.Version;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandMap;
|
import org.bukkit.command.CommandMap;
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>parent</artifactId>
|
<artifactId>parent</artifactId>
|
||||||
<groupId>net.zhira.varioutil</groupId>
|
<groupId>org.zhdev.varioutil</groupId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil;
|
package org.zhdev.varioutil;
|
||||||
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
package net.zhira.varioutil.language;
|
package org.zhdev.varioutil.language;
|
||||||
|
|
||||||
import net.zhira.varioutil.util.StringUtils;
|
import org.zhdev.varioutil.util.StringUtils;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
package net.zhira.varioutil.reflection;
|
package org.zhdev.varioutil.reflection;
|
||||||
|
|
||||||
import net.zhira.varioutil.util.ReflectionUtils;
|
import org.zhdev.varioutil.util.ReflectionUtils;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
package net.zhira.varioutil.reflection;
|
package org.zhdev.varioutil.reflection;
|
||||||
|
|
||||||
import net.zhira.varioutil.util.ReflectionUtils;
|
import org.zhdev.varioutil.util.ReflectionUtils;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.util;
|
package org.zhdev.varioutil.util;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.util;
|
package org.zhdev.varioutil.util;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.util;
|
package org.zhdev.varioutil.util;
|
||||||
|
|
||||||
import java.time.*;
|
import java.time.*;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.util;
|
package org.zhdev.varioutil.util;
|
||||||
|
|
||||||
public class EnumUtils {
|
public class EnumUtils {
|
||||||
private static <T extends Enum<T>> T[] getValues(T eNum) {
|
private static <T extends Enum<T>> T[] getValues(T eNum) {
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package net.zhira.varioutil.util;
|
package org.zhdev.varioutil.util;
|
||||||
|
|
||||||
import net.zhira.varioutil.reflection.FieldSearcher;
|
import org.zhdev.varioutil.reflection.FieldSearcher;
|
||||||
import net.zhira.varioutil.reflection.MethodSearcher;
|
import org.zhdev.varioutil.reflection.MethodSearcher;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.util;
|
package org.zhdev.varioutil.util;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.util;
|
package org.zhdev.varioutil.util;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>parent</artifactId>
|
<artifactId>parent</artifactId>
|
||||||
<groupId>net.zhira.varioutil</groupId>
|
<groupId>org.zhdev.varioutil</groupId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.sql;
|
package org.zhdev.varioutil.sql;
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.sql;
|
package org.zhdev.varioutil.sql;
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
package net.zhira.varioutil.sql;
|
package org.zhdev.varioutil.sql;
|
||||||
|
|
||||||
import net.zhira.varioutil.util.SqlUtils;
|
import org.zhdev.varioutil.util.SqlUtils;
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
package net.zhira.varioutil.sql;
|
package org.zhdev.varioutil.sql;
|
||||||
|
|
||||||
import net.zhira.varioutil.util.SqlUtils;
|
import org.zhdev.varioutil.util.SqlUtils;
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.sql;
|
package org.zhdev.varioutil.sql;
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
package net.zhira.varioutil.sql;
|
package org.zhdev.varioutil.sql;
|
||||||
|
|
||||||
import net.zhira.varioutil.util.CheckedFunction;
|
import org.zhdev.varioutil.util.CheckedFunction;
|
||||||
|
|
||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.sql;
|
package org.zhdev.varioutil.sql;
|
||||||
|
|
||||||
public class SqlException extends RuntimeException {
|
public class SqlException extends RuntimeException {
|
||||||
public SqlException() {
|
public SqlException() {
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
package net.zhira.varioutil.sql;
|
package org.zhdev.varioutil.sql;
|
||||||
|
|
||||||
import net.zhira.varioutil.util.SqlUtils;
|
import org.zhdev.varioutil.util.SqlUtils;
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.util;
|
package org.zhdev.varioutil.util;
|
||||||
|
|
||||||
@FunctionalInterface
|
@FunctionalInterface
|
||||||
public interface CheckedFunction<T, R, E extends Exception> {
|
public interface CheckedFunction<T, R, E extends Exception> {
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
package net.zhira.varioutil.util;
|
package org.zhdev.varioutil.util;
|
||||||
|
|
||||||
import net.zhira.varioutil.sql.SqlException;
|
import org.zhdev.varioutil.sql.SqlException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>parent</artifactId>
|
<artifactId>parent</artifactId>
|
||||||
<groupId>net.zhira.varioutil</groupId>
|
<groupId>org.zhdev.varioutil</groupId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.config;
|
package org.zhdev.varioutil.config;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
|
|
@ -12,13 +12,7 @@ public interface Config extends ConfigSection {
|
||||||
void load(Reader reader);
|
void load(Reader reader);
|
||||||
|
|
||||||
default void load(InputStream stream) {
|
default void load(InputStream stream) {
|
||||||
InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8);
|
load(new InputStreamReader(stream, StandardCharsets.UTF_8));
|
||||||
load(reader);
|
|
||||||
try {
|
|
||||||
reader.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new ConfigException(e);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
default void load(Path path) throws IOException, ConfigException {
|
default void load(Path path) throws IOException, ConfigException {
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.config;
|
package org.zhdev.varioutil.config;
|
||||||
|
|
||||||
public class ConfigException extends RuntimeException {
|
public class ConfigException extends RuntimeException {
|
||||||
public ConfigException() {
|
public ConfigException() {
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.config;
|
package org.zhdev.varioutil.config;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.config;
|
package org.zhdev.varioutil.config;
|
||||||
|
|
||||||
final class ConfigSectionNode {
|
final class ConfigSectionNode {
|
||||||
Object value;
|
Object value;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.config;
|
package org.zhdev.varioutil.config;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.config;
|
package org.zhdev.varioutil.config;
|
||||||
|
|
||||||
import org.yaml.snakeyaml.DumperOptions;
|
import org.yaml.snakeyaml.DumperOptions;
|
||||||
import org.yaml.snakeyaml.LoaderOptions;
|
import org.yaml.snakeyaml.LoaderOptions;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.config;
|
package org.zhdev.varioutil.config;
|
||||||
|
|
||||||
import org.yaml.snakeyaml.LoaderOptions;
|
import org.yaml.snakeyaml.LoaderOptions;
|
||||||
import org.yaml.snakeyaml.constructor.SafeConstructor;
|
import org.yaml.snakeyaml.constructor.SafeConstructor;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.config;
|
package org.zhdev.varioutil.config;
|
||||||
|
|
||||||
import org.yaml.snakeyaml.DumperOptions;
|
import org.yaml.snakeyaml.DumperOptions;
|
||||||
import org.yaml.snakeyaml.representer.Representer;
|
import org.yaml.snakeyaml.representer.Representer;
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>parent</artifactId>
|
<artifactId>parent</artifactId>
|
||||||
<groupId>net.zhira.varioutil</groupId>
|
<groupId>org.zhdev.varioutil</groupId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
package net.zhira.varioutil;
|
package org.zhdev.varioutil;
|
||||||
|
|
||||||
import net.zhira.varioutil.config.Config;
|
import org.zhdev.varioutil.config.Config;
|
||||||
import net.zhira.varioutil.config.ConfigException;
|
import org.zhdev.varioutil.config.ConfigException;
|
||||||
import net.zhira.varioutil.language.Language;
|
import org.zhdev.varioutil.language.Language;
|
||||||
import net.zhira.varioutil.util.ResourceUtils;
|
import org.zhdev.varioutil.util.ResourceUtils;
|
||||||
import net.zhira.varioutil.sql.SqlAdapter;
|
import org.zhdev.varioutil.sql.SqlAdapter;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.util;
|
package org.zhdev.varioutil.util;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
package net.zhira.varioutil.util;
|
package org.zhdev.varioutil.util;
|
||||||
|
|
||||||
import net.zhira.varioutil.config.ConfigSection;
|
import org.zhdev.varioutil.config.ConfigSection;
|
||||||
import net.zhira.varioutil.language.Language;
|
import org.zhdev.varioutil.language.Language;
|
||||||
import net.zhira.varioutil.sql.*;
|
import org.zhdev.varioutil.sql.*;
|
||||||
|
import org.zhdev.varioutil.sql.*;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
2
pom.xml
2
pom.xml
|
|
@ -4,7 +4,7 @@
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
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>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>net.zhira.varioutil</groupId>
|
<groupId>org.zhdev.varioutil</groupId>
|
||||||
<artifactId>parent</artifactId>
|
<artifactId>parent</artifactId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.0-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>parent</artifactId>
|
<artifactId>parent</artifactId>
|
||||||
<groupId>net.zhira.varioutil</groupId>
|
<groupId>org.zhdev.varioutil</groupId>
|
||||||
<version>1.0-SNAPSHOT</version>
|
<version>1.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil;
|
package org.zhdev.varioutil;
|
||||||
|
|
||||||
import com.velocitypowered.api.proxy.ProxyServer;
|
import com.velocitypowered.api.proxy.ProxyServer;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
@ -1,17 +1,17 @@
|
||||||
package net.zhira.varioutil;
|
package org.zhdev.varioutil;
|
||||||
|
|
||||||
import com.velocitypowered.api.event.Subscribe;
|
import com.velocitypowered.api.event.Subscribe;
|
||||||
import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
|
import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
|
||||||
import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
|
import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
|
||||||
import com.velocitypowered.api.proxy.ProxyServer;
|
import com.velocitypowered.api.proxy.ProxyServer;
|
||||||
import net.zhira.varioutil.config.ConfigSection;
|
import org.zhdev.varioutil.config.ConfigSection;
|
||||||
import net.zhira.varioutil.language.Language;
|
import org.zhdev.varioutil.language.Language;
|
||||||
import net.zhira.varioutil.util.ColorUtils;
|
import org.zhdev.varioutil.util.ColorUtils;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import net.zhira.varioutil.config.Config;
|
import org.zhdev.varioutil.config.Config;
|
||||||
import net.zhira.varioutil.config.VelocityTomlConfig;
|
import org.zhdev.varioutil.config.VelocityTomlConfig;
|
||||||
import net.zhira.varioutil.sql.SqlAdapter;
|
import org.zhdev.varioutil.sql.SqlAdapter;
|
||||||
import net.zhira.varioutil.util.ConfigUtils;
|
import org.zhdev.varioutil.util.ConfigUtils;
|
||||||
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package net.zhira.varioutil.config;
|
package org.zhdev.varioutil.config;
|
||||||
|
|
||||||
import com.electronwill.nightconfig.core.CommentedConfig;
|
import com.electronwill.nightconfig.core.CommentedConfig;
|
||||||
import com.electronwill.nightconfig.toml.TomlFormat;
|
import com.electronwill.nightconfig.toml.TomlFormat;
|
||||||
Loading…
Add table
Add a link
Reference in a new issue