502647092
/
TabooLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Framework adjustment

master
坏黑 2019-07-06 12:03:15 +08:00
parent 9af34b9940
commit 8b1b14ae7c
123 changed files with 287 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/config.yml → src/main/resources/settings.yml
View File

@ -21,9 +21,6 @@ LOCALE:
# 启用后将会收到大量调试信息, 不建议使用
SERVER: false
# 网络连接测试地址
TEST-URL: 'aliyun.com'
# 玩家列表（TAB-API）是否根据前缀排序
TABLIST-SORT: true

6
src/main/scala/io/izzel/taboolib/PluginLoader.java
View File

@ -8,9 +8,9 @@ import io.izzel.taboolib.module.config.TConfig;
import io.izzel.taboolib.module.config.TConfigWatcher;
import io.izzel.taboolib.module.dependency.TDependencyInjector;
import io.izzel.taboolib.module.inject.TListenerHandler;
import io.izzel.taboolib.module.mysql.IHost;
import io.izzel.taboolib.module.mysql.hikari.HikariHandler;
import io.izzel.taboolib.origin.database.PluginDataManager;
import io.izzel.taboolib.module.db.IHost;
import io.izzel.taboolib.module.db.source.HikariHandler;
import io.izzel.taboolib.module.db.yaml.PluginDataManager;
import org.bukkit.plugin.Plugin;
import java.util.List;

25
src/main/scala/io/izzel/taboolib/TabooLib.java
View File

@ -4,12 +4,12 @@ import io.izzel.taboolib.module.locale.TLocaleLoader;
import io.izzel.taboolib.module.config.TConfig;
import io.izzel.taboolib.module.config.TConfigWatcher;
import io.izzel.taboolib.module.dependency.Dependency;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.module.mysql.hikari.HikariHandler;
import io.izzel.taboolib.module.locale.logger.TLogger;
import io.izzel.taboolib.module.db.source.HikariHandler;
import io.izzel.taboolib.module.nms.NMSHandler;
import io.izzel.taboolib.origin.database.PlayerDataManager;
import io.izzel.taboolib.origin.database.PluginDataManager;
import io.izzel.taboolib.plugin.InternalPlugin;
import io.izzel.taboolib.module.db.yaml.PlayerDataManager;
import io.izzel.taboolib.module.db.yaml.PluginDataManager;
import io.izzel.taboolib.common.plugin.InternalPlugin;
import io.izzel.taboolib.util.Files;
import io.izzel.taboolib.util.IO;
import org.bukkit.configuration.file.YamlConfiguration;
@ -34,10 +34,11 @@ public class TabooLib {
private static TabooLib inst = new TabooLib();
private static TLogger logger;
private static TConfig config;
// 当前运行版本
private static double version;
// 第三方依赖下载位置
private File libsFolder;
// 本地数据文件
private File playerDataFolder;
private File serverDataFolder;
@ -45,11 +46,11 @@ public class TabooLib {
private YamlConfiguration internal = new YamlConfiguration();
public TabooLib() {
// 创建配置
inst = this;
logger = TLogger.getUnformatted("TabooLib");
config = TConfig.create(getPlugin(), "config.yml");
libsFolder = Files.folder("plugins/TabooLib/libs");
// 配置文件从 config.yml 修改为 settings.yml 防止与老版本插件冲突
config = TConfig.create(getPlugin(), "settings.yml");
// 数据文件
playerDataFolder = Files.folder(config.getString("DATAURL.PLAYER-DATA"));
serverDataFolder = Files.folder(config.getString("DATAURL.SERVER-DATA"));
// 加载版本号
@ -119,10 +120,6 @@ public class TabooLib {
return version;
}
public File getLibsFolder() {
return libsFolder;
}
public File getPlayerDataFolder() {
return playerDataFolder;
}

2
src/main/scala/io/izzel/taboolib/TabooLibAPI.java
View File

@ -1,7 +1,7 @@
package io.izzel.taboolib;
import io.izzel.taboolib.module.nms.NMSHandler;
import io.izzel.taboolib.origin.database.PluginDataManager;
import io.izzel.taboolib.module.db.yaml.PluginDataManager;
import io.izzel.taboolib.util.Strings;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;

8
src/main/scala/io/izzel/taboolib/TabooLibLoader.java
View File

@ -4,10 +4,10 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import io.izzel.taboolib.module.dependency.TDependencyInjector;
import io.izzel.taboolib.module.inject.TSchedule;
import io.izzel.taboolib.origin.client.TabooLibClient;
import io.izzel.taboolib.origin.client.TabooLibServer;
import io.izzel.taboolib.origin.database.PlayerDataManager;
import io.izzel.taboolib.origin.database.PluginDataManager;
import io.izzel.taboolib.client.TabooLibClient;
import io.izzel.taboolib.client.TabooLibServer;
import io.izzel.taboolib.module.db.yaml.PlayerDataManager;
import io.izzel.taboolib.module.db.yaml.PluginDataManager;
import io.izzel.taboolib.util.Files;
import io.izzel.taboolib.util.Reflection;
import org.bukkit.Bukkit;

14
src/main/scala/io/izzel/taboolib/origin/client/TabooLibClient.java → src/main/scala/io/izzel/taboolib/client/TabooLibClient.java
View File

@ -1,12 +1,12 @@
package io.izzel.taboolib.origin.client;
package io.izzel.taboolib.client;
import io.izzel.taboolib.TabooLib;
import io.izzel.taboolib.client.packet.Packet;
import io.izzel.taboolib.client.packet.impl.PacketCommand;
import io.izzel.taboolib.client.packet.impl.PacketMessage;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.module.command.lite.SimpleCommandBuilder;
import io.izzel.taboolib.origin.client.packet.Packet;
import io.izzel.taboolib.origin.client.packet.PacketSerializer;
import io.izzel.taboolib.origin.client.packet.impl.PacketCommand;
import io.izzel.taboolib.origin.client.packet.impl.PacketMessage;
import io.izzel.taboolib.module.command.lite.CommandBuilder;
import io.izzel.taboolib.client.packet.PacketSerializer;
import io.izzel.taboolib.util.ArrayUtil;
import org.bukkit.Bukkit;
import org.bukkit.util.NumberConversions;
@ -81,7 +81,7 @@ public class TabooLibClient {
}
});
SimpleCommandBuilder.create("TabooLibClient", TabooLib.getPlugin())
CommandBuilder.create("TabooLibClient", TabooLib.getPlugin())
.aliases("tclient")
.permission("*")
.execute((sender, args) -> {

12
src/main/scala/io/izzel/taboolib/origin/client/TabooLibServer.java → src/main/scala/io/izzel/taboolib/client/TabooLibServer.java
View File

@ -1,11 +1,11 @@
package io.izzel.taboolib.origin.client;
package io.izzel.taboolib.client;
import io.izzel.taboolib.TabooLibAPI;
import io.izzel.taboolib.origin.client.packet.Packet;
import io.izzel.taboolib.origin.client.packet.PacketSerializer;
import io.izzel.taboolib.origin.client.packet.impl.PacketHeartbeat;
import io.izzel.taboolib.origin.client.packet.impl.PacketQuit;
import io.izzel.taboolib.origin.client.server.ClientConnection;
import io.izzel.taboolib.client.packet.Packet;
import io.izzel.taboolib.client.packet.PacketSerializer;
import io.izzel.taboolib.client.packet.impl.PacketHeartbeat;
import io.izzel.taboolib.client.server.ClientConnection;
import io.izzel.taboolib.client.packet.impl.PacketQuit;
import org.bukkit.util.NumberConversions;
import java.io.IOException;

2
src/main/scala/io/izzel/taboolib/origin/client/TabooLibSettings.java → src/main/scala/io/izzel/taboolib/client/TabooLibSettings.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.client;
package io.izzel.taboolib.client;
import java.io.IOException;
import java.io.InputStream;

2
src/main/scala/io/izzel/taboolib/origin/client/packet/Packet.java → src/main/scala/io/izzel/taboolib/client/packet/Packet.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.client.packet;
package io.izzel.taboolib.client.packet;
import com.google.gson.JsonObject;

2
src/main/scala/io/izzel/taboolib/origin/client/packet/PacketParser.java → src/main/scala/io/izzel/taboolib/client/packet/PacketParser.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.client.packet;
package io.izzel.taboolib.client.packet;
import com.google.gson.JsonObject;
import io.izzel.taboolib.TabooLib;

4
src/main/scala/io/izzel/taboolib/origin/client/packet/PacketSerializer.java → src/main/scala/io/izzel/taboolib/client/packet/PacketSerializer.java
View File

@ -1,12 +1,12 @@
package io.izzel.taboolib.origin.client.packet;
package io.izzel.taboolib.client.packet;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException;
import io.izzel.taboolib.TabooLibAPI;
import io.izzel.taboolib.TabooLibLoader;
import io.izzel.taboolib.client.packet.impl.PacketEmpty;
import io.izzel.taboolib.module.inject.TListener;
import io.izzel.taboolib.origin.client.packet.impl.PacketEmpty;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;

2
src/main/scala/io/izzel/taboolib/origin/client/packet/PacketType.java → src/main/scala/io/izzel/taboolib/client/packet/PacketType.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.client.packet;
package io.izzel.taboolib.client.packet;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
src/main/scala/io/izzel/taboolib/origin/client/packet/PacketValue.java → src/main/scala/io/izzel/taboolib/client/packet/PacketValue.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.client.packet;
package io.izzel.taboolib.client.packet;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

8
src/main/scala/io/izzel/taboolib/origin/client/packet/impl/PacketAlive.java → src/main/scala/io/izzel/taboolib/client/packet/impl/PacketAlive.java
View File

@ -1,8 +1,8 @@
package io.izzel.taboolib.origin.client.packet.impl;
package io.izzel.taboolib.client.packet.impl;
import io.izzel.taboolib.origin.client.TabooLibServer;
import io.izzel.taboolib.origin.client.packet.Packet;
import io.izzel.taboolib.origin.client.packet.PacketType;
import io.izzel.taboolib.client.TabooLibServer;
import io.izzel.taboolib.client.packet.Packet;
import io.izzel.taboolib.client.packet.PacketType;
/**
* @Author sky

10
src/main/scala/io/izzel/taboolib/origin/client/packet/impl/PacketCommand.java → src/main/scala/io/izzel/taboolib/client/packet/impl/PacketCommand.java
View File

@ -1,9 +1,9 @@
package io.izzel.taboolib.origin.client.packet.impl;
package io.izzel.taboolib.client.packet.impl;
import io.izzel.taboolib.origin.client.TabooLibServer;
import io.izzel.taboolib.origin.client.packet.Packet;
import io.izzel.taboolib.origin.client.packet.PacketType;
import io.izzel.taboolib.origin.client.packet.PacketValue;
import io.izzel.taboolib.client.TabooLibServer;
import io.izzel.taboolib.client.packet.Packet;
import io.izzel.taboolib.client.packet.PacketType;
import io.izzel.taboolib.client.packet.PacketValue;
import org.bukkit.Bukkit;
/**

6
src/main/scala/io/izzel/taboolib/origin/client/packet/impl/PacketEmpty.java → src/main/scala/io/izzel/taboolib/client/packet/impl/PacketEmpty.java
View File

@ -1,7 +1,7 @@
package io.izzel.taboolib.origin.client.packet.impl;
package io.izzel.taboolib.client.packet.impl;
import io.izzel.taboolib.origin.client.packet.Packet;
import io.izzel.taboolib.origin.client.packet.PacketType;
import io.izzel.taboolib.client.packet.Packet;
import io.izzel.taboolib.client.packet.PacketType;
/**
* @Author sky

8
src/main/scala/io/izzel/taboolib/origin/client/packet/impl/PacketHeartbeat.java → src/main/scala/io/izzel/taboolib/client/packet/impl/PacketHeartbeat.java
View File

@ -1,8 +1,8 @@
package io.izzel.taboolib.origin.client.packet.impl;
package io.izzel.taboolib.client.packet.impl;
import io.izzel.taboolib.origin.client.TabooLibClient;
import io.izzel.taboolib.origin.client.packet.Packet;
import io.izzel.taboolib.origin.client.packet.PacketType;
import io.izzel.taboolib.client.TabooLibClient;
import io.izzel.taboolib.client.packet.Packet;
import io.izzel.taboolib.client.packet.PacketType;
/**
* @Author sky

8
src/main/scala/io/izzel/taboolib/origin/client/packet/impl/PacketJoin.java → src/main/scala/io/izzel/taboolib/client/packet/impl/PacketJoin.java
View File

@ -1,9 +1,9 @@
package io.izzel.taboolib.origin.client.packet.impl;
package io.izzel.taboolib.client.packet.impl;
import io.izzel.taboolib.client.TabooLibServer;
import io.izzel.taboolib.client.packet.Packet;
import io.izzel.taboolib.client.packet.PacketType;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.origin.client.TabooLibServer;
import io.izzel.taboolib.origin.client.packet.Packet;
import io.izzel.taboolib.origin.client.packet.PacketType;
/**
* @Author sky

10
src/main/scala/io/izzel/taboolib/origin/client/packet/impl/PacketMessage.java → src/main/scala/io/izzel/taboolib/client/packet/impl/PacketMessage.java
View File

@ -1,10 +1,10 @@
package io.izzel.taboolib.origin.client.packet.impl;
package io.izzel.taboolib.client.packet.impl;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.origin.client.TabooLibServer;
import io.izzel.taboolib.origin.client.packet.Packet;
import io.izzel.taboolib.origin.client.packet.PacketType;
import io.izzel.taboolib.origin.client.packet.PacketValue;
import io.izzel.taboolib.client.TabooLibServer;
import io.izzel.taboolib.client.packet.Packet;
import io.izzel.taboolib.client.packet.PacketType;
import io.izzel.taboolib.client.packet.PacketValue;
import org.bukkit.Bukkit;
/**

10
src/main/scala/io/izzel/taboolib/origin/client/packet/impl/PacketQuit.java → src/main/scala/io/izzel/taboolib/client/packet/impl/PacketQuit.java
View File

@ -1,10 +1,10 @@
package io.izzel.taboolib.origin.client.packet.impl;
package io.izzel.taboolib.client.packet.impl;
import io.izzel.taboolib.client.TabooLibServer;
import io.izzel.taboolib.client.packet.Packet;
import io.izzel.taboolib.client.packet.PacketType;
import io.izzel.taboolib.client.packet.PacketValue;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.origin.client.TabooLibServer;
import io.izzel.taboolib.origin.client.packet.Packet;
import io.izzel.taboolib.origin.client.packet.PacketType;
import io.izzel.taboolib.origin.client.packet.PacketValue;
/**
* @Author sky

10
src/main/scala/io/izzel/taboolib/origin/client/server/ClientConnection.java → src/main/scala/io/izzel/taboolib/client/server/ClientConnection.java
View File

@ -1,9 +1,9 @@
package io.izzel.taboolib.origin.client.server;
package io.izzel.taboolib.client.server;
import io.izzel.taboolib.origin.client.TabooLibServer;
import io.izzel.taboolib.origin.client.TabooLibSettings;
import io.izzel.taboolib.origin.client.packet.impl.PacketJoin;
import io.izzel.taboolib.origin.client.packet.impl.PacketQuit;
import io.izzel.taboolib.client.TabooLibServer;
import io.izzel.taboolib.client.TabooLibSettings;
import io.izzel.taboolib.client.packet.impl.PacketJoin;
import io.izzel.taboolib.client.packet.impl.PacketQuit;
import org.bukkit.util.NumberConversions;
import java.io.BufferedReader;

6
src/main/scala/io/izzel/taboolib/command/TabooLibExecuteCommand.java → src/main/scala/io/izzel/taboolib/common/command/TabooLibExecuteCommand.java
View File

@ -1,10 +1,10 @@
package io.izzel.taboolib.command;
package io.izzel.taboolib.common.command;
import io.izzel.taboolib.TabooLibAPI;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.module.command.base.BaseMainCommand;
import io.izzel.taboolib.module.command.base.BaseSubCommand;
import io.izzel.taboolib.module.command.TCommand;
import io.izzel.taboolib.module.command.base.BaseCommand;
import io.izzel.taboolib.module.command.base.CommandArgument;
import io.izzel.taboolib.module.command.base.CommandRegister;
import io.izzel.taboolib.util.ArrayUtil;
@ -17,7 +17,7 @@ import org.bukkit.entity.Player;
* @Author sky
* @Since 2018-07-04 21:32
*/
@TCommand(
@BaseCommand(
name = "taboolibexecute",
aliases = {"texecute"},
permission = "taboolib.admin"

6
src/main/scala/io/izzel/taboolib/command/TabooLibLocaleCommand.java → src/main/scala/io/izzel/taboolib/common/command/TabooLibLocaleCommand.java
View File

@ -1,10 +1,10 @@
package io.izzel.taboolib.command;
package io.izzel.taboolib.common.command;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.module.locale.TLocaleLoader;
import io.izzel.taboolib.module.command.base.BaseMainCommand;
import io.izzel.taboolib.module.command.base.BaseSubCommand;
import io.izzel.taboolib.module.command.TCommand;
import io.izzel.taboolib.module.command.base.BaseCommand;
import io.izzel.taboolib.module.command.base.CommandArgument;
import io.izzel.taboolib.module.command.base.CommandRegister;
import org.bukkit.Bukkit;
@ -21,7 +21,7 @@ import java.util.stream.IntStream;
* @author sky
* @since 2018-04-22 14:36:28
*/
@TCommand(
@BaseCommand(
name = "tabooliblocale",
aliases = {"taboolocale", "tlocale"},
permission = "taboolib.admin"

14
src/main/scala/io/izzel/taboolib/command/TabooLibPluginCommand.java → src/main/scala/io/izzel/taboolib/common/command/TabooLibPluginCommand.java
View File

@ -1,17 +1,17 @@
package io.izzel.taboolib.command;
package io.izzel.taboolib.common.command;
import com.google.common.base.Joiner;
import io.izzel.taboolib.TabooLibAPI;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.module.command.TCommand;
import io.izzel.taboolib.module.command.base.BaseCommand;
import io.izzel.taboolib.module.command.base.BaseMainCommand;
import io.izzel.taboolib.module.command.base.BaseSubCommand;
import io.izzel.taboolib.module.command.base.CommandArgument;
import io.izzel.taboolib.module.command.base.CommandRegister;
import io.izzel.taboolib.origin.plugin.PluginLoadState;
import io.izzel.taboolib.origin.plugin.PluginLoadStateType;
import io.izzel.taboolib.origin.plugin.PluginUnloadState;
import io.izzel.taboolib.origin.plugin.PluginUtils;
import io.izzel.taboolib.util.plugin.PluginLoadState;
import io.izzel.taboolib.util.plugin.PluginLoadStateType;
import io.izzel.taboolib.util.plugin.PluginUnloadState;
import io.izzel.taboolib.util.plugin.PluginUtils;
import io.izzel.taboolib.util.ArrayUtil;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
@ -26,7 +26,7 @@ import java.util.stream.Collectors;
* @Author sky
* @Since 2018-05-07 20:14
*/
@TCommand(
@BaseCommand(
name = "taboolibplugin",
aliases = {"tabooplugin", "tplugin"},
permission = "taboolib.admin"

2
src/main/scala/io/izzel/taboolib/origin/event/PlayerJumpEvent.java → src/main/scala/io/izzel/taboolib/common/event/PlayerJumpEvent.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.event;
package io.izzel.taboolib.common.event;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;

2
src/main/scala/io/izzel/taboolib/origin/event/PlayerLoadedEvent.java → src/main/scala/io/izzel/taboolib/common/event/PlayerLoadedEvent.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.event;
package io.izzel.taboolib.common.event;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;

2
src/main/scala/io/izzel/taboolib/listener/ListenerNetWork.java → src/main/scala/io/izzel/taboolib/common/listener/ListenerNetWork.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.listener;
package io.izzel.taboolib.common.listener;
import io.izzel.taboolib.module.inject.TListener;
import org.bukkit.event.EventHandler;

10
src/main/scala/io/izzel/taboolib/listener/ListenerPlayerCommand.java → src/main/scala/io/izzel/taboolib/common/listener/ListenerPlayerCommand.java
View File

@ -1,13 +1,13 @@
package io.izzel.taboolib.listener;
package io.izzel.taboolib.common.listener;
import io.izzel.taboolib.TabooLibAPI;
import io.izzel.taboolib.Version;
import io.izzel.taboolib.module.inject.TListener;
import io.izzel.taboolib.module.item.Items;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.util.item.Items;
import io.izzel.taboolib.module.locale.logger.TLogger;
import io.izzel.taboolib.module.tellraw.TellrawJson;
import io.izzel.taboolib.origin.database.PlayerDataManager;
import io.izzel.taboolib.origin.database.PluginDataManager;
import io.izzel.taboolib.module.db.yaml.PlayerDataManager;
import io.izzel.taboolib.module.db.yaml.PluginDataManager;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;

4
src/main/scala/io/izzel/taboolib/listener/ListenerPlayerJump.java → src/main/scala/io/izzel/taboolib/common/listener/ListenerPlayerJump.java
View File

@ -1,7 +1,7 @@
package io.izzel.taboolib.listener;
package io.izzel.taboolib.common.listener;
import io.izzel.taboolib.module.inject.TListener;
import io.izzel.taboolib.origin.event.PlayerJumpEvent;
import io.izzel.taboolib.common.event.PlayerJumpEvent;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Location;

2
src/main/scala/io/izzel/taboolib/plugin/InternalJavaPlugin.java → src/main/scala/io/izzel/taboolib/common/plugin/InternalJavaPlugin.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.plugin;
package io.izzel.taboolib.common.plugin;
import org.bukkit.plugin.java.JavaPlugin;

4
src/main/scala/io/izzel/taboolib/plugin/InternalPlugin.java → src/main/scala/io/izzel/taboolib/common/plugin/InternalPlugin.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.plugin;
package io.izzel.taboolib.common.plugin;
import io.izzel.taboolib.TabooLib;
import io.izzel.taboolib.util.Files;
@ -40,7 +40,7 @@ public class InternalPlugin implements Plugin {
@Override
public PluginDescriptionFile getDescription() {
return new PluginDescriptionFile("TabooLib", String.valueOf(TabooLib.getVersion()), "io.izzel.taboolib.plugin.InternalJavaPlugin");
return new PluginDescriptionFile("TabooLib", String.valueOf(TabooLib.getVersion()), "io.izzel.taboolib.common.plugin.InternalJavaPlugin");
}
@Override

2
src/main/scala/io/izzel/taboolib/plugin/InternalPluginLoader.java → src/main/scala/io/izzel/taboolib/common/plugin/InternalPluginLoader.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.plugin;
package io.izzel.taboolib.common.plugin;
import org.bukkit.Bukkit;
import org.bukkit.event.Event;

6
src/main/scala/io/izzel/taboolib/origin/cronus/CronusParser.java → src/main/scala/io/izzel/taboolib/cronus/CronusParser.java
View File

@ -1,7 +1,7 @@
package io.izzel.taboolib.origin.cronus;
package io.izzel.taboolib.cronus;
import io.izzel.taboolib.origin.cronus.bukkit.ItemStack;
import io.izzel.taboolib.origin.cronus.bukkit.Location;
import io.izzel.taboolib.cronus.bukkit.ItemStack;
import io.izzel.taboolib.cronus.bukkit.Location;
import org.bukkit.Bukkit;
import org.bukkit.util.NumberConversions;

2
src/main/scala/io/izzel/taboolib/origin/cronus/CronusUtils.java → src/main/scala/io/izzel/taboolib/cronus/CronusUtils.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.cronus;
package io.izzel.taboolib.cronus;
import io.izzel.taboolib.util.Strings;
import org.bukkit.Material;

4
src/main/scala/io/izzel/taboolib/origin/cronus/bukkit/ItemStack.java → src/main/scala/io/izzel/taboolib/cronus/bukkit/ItemStack.java
View File

@ -1,6 +1,6 @@
package io.izzel.taboolib.origin.cronus.bukkit;
package io.izzel.taboolib.cronus.bukkit;
import io.izzel.taboolib.module.item.Items;
import io.izzel.taboolib.util.item.Items;
import org.bukkit.Material;
import org.bukkit.entity.Player;

2
src/main/scala/io/izzel/taboolib/origin/cronus/bukkit/Location.java → src/main/scala/io/izzel/taboolib/cronus/bukkit/Location.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.cronus.bukkit;
package io.izzel.taboolib.cronus.bukkit;
import org.bukkit.Bukkit;

4
src/main/scala/io/izzel/taboolib/origin/cronus/util/StringExpression.java → src/main/scala/io/izzel/taboolib/cronus/util/StringExpression.java
View File

@ -1,6 +1,6 @@
package io.izzel.taboolib.origin.cronus.util;
package io.izzel.taboolib.cronus.util;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.module.locale.logger.TLogger;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.module.inject.TInject;

2
src/main/scala/io/izzel/taboolib/origin/cronus/util/StringNumber.java → src/main/scala/io/izzel/taboolib/cronus/util/StringNumber.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.cronus.util;
package io.izzel.taboolib.cronus.util;
/**
* @Author 坏黑

7
src/main/scala/io/izzel/taboolib/module/command/TCommandHandler.java
View File

@ -1,6 +1,7 @@
package io.izzel.taboolib.module.command;
import io.izzel.taboolib.TabooLibAPI;
import io.izzel.taboolib.module.command.base.BaseCommand;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.module.command.base.BaseMainCommand;
import io.izzel.taboolib.module.inject.TFunction;
@ -107,7 +108,7 @@ public class TCommandHandler {
* @param baseMainCommand 命令对象
* @return {@link BaseMainCommand}
*/
public static BaseMainCommand registerCommand(TCommand tCommand, String command, BaseMainCommand baseMainCommand, Plugin plugin) {
public static BaseMainCommand registerCommand(BaseCommand tCommand, String command, BaseMainCommand baseMainCommand, Plugin plugin) {
if (Bukkit.getPluginCommand(command) == null) {
registerPluginCommand(
plugin,
@ -129,8 +130,8 @@ public class TCommandHandler {
*/
public static void registerCommand(Plugin plugin) {
for (Class pluginClass : Files.getClasses(plugin)) {
if (BaseMainCommand.class.isAssignableFrom(pluginClass) && pluginClass.isAnnotationPresent(TCommand.class)) {
TCommand tCommand = (TCommand) pluginClass.getAnnotation(TCommand.class);
if (BaseMainCommand.class.isAssignableFrom(pluginClass) && pluginClass.isAnnotationPresent(BaseCommand.class)) {
BaseCommand tCommand = (BaseCommand) pluginClass.getAnnotation(BaseCommand.class);
try {
registerCommand(tCommand, tCommand.name(), (BaseMainCommand) pluginClass.newInstance(), plugin);
} catch (Exception e) {

4
src/main/scala/io/izzel/taboolib/module/command/TCommand.java → src/main/scala/io/izzel/taboolib/module/command/base/BaseCommand.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.command;
package io.izzel.taboolib.module.command.base;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@ -11,7 +11,7 @@ import java.lang.annotation.Target;
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface TCommand {
public @interface BaseCommand {
String name();

30
src/main/scala/io/izzel/taboolib/module/command/lite/SimpleCommandBuilder.java → src/main/scala/io/izzel/taboolib/module/command/lite/CommandBuilder.java
View File

@ -13,7 +13,7 @@ import java.util.List;
* @Since 2018-08-27 8:42
* @BuilderLevel 1.0
*/
public class SimpleCommandBuilder {
public class CommandBuilder {
public static final CompleterTab EMPTY_COMPLETER_TAB = ((sender, args) -> new ArrayList<>());
public static final CompleterCommand EMPTY_COMPLETER_COMMAND = ((sender, args) -> {});
@ -30,7 +30,7 @@ public class SimpleCommandBuilder {
private boolean forceRegister;
private boolean build;
SimpleCommandBuilder(String command, Plugin plugin) {
CommandBuilder(String command, Plugin plugin) {
this.command = command;
this.plugin = plugin;
this.description = "";
@ -39,61 +39,61 @@ public class SimpleCommandBuilder {
this.build = false;
}
public static SimpleCommandBuilder create(String command, Plugin plugin) {
return new SimpleCommandBuilder(command.toLowerCase(), plugin);
public static CommandBuilder create(String command, Plugin plugin) {
return new CommandBuilder(command.toLowerCase(), plugin);
}
public SimpleCommandBuilder command(String command) {
public CommandBuilder command(String command) {
this.command = command;
return this;
}
public SimpleCommandBuilder plugin(Plugin plugin) {
public CommandBuilder plugin(Plugin plugin) {
this.plugin = plugin;
return this;
}
public SimpleCommandBuilder description(String description) {
public CommandBuilder description(String description) {
this.description = description;
return this;
}
public SimpleCommandBuilder usage(String usage) {
public CommandBuilder usage(String usage) {
this.usage = usage;
return this;
}
public SimpleCommandBuilder aliases(String... aliases) {
public CommandBuilder aliases(String... aliases) {
this.aliases = ArrayUtil.asList(aliases);
return this;
}
public SimpleCommandBuilder permission(String permission) {
public CommandBuilder permission(String permission) {
this.permission = permission;
return this;
}
public SimpleCommandBuilder permissionMessage(String permissionMessage) {
public CommandBuilder permissionMessage(String permissionMessage) {
this.permissionMessage = permissionMessage;
return this;
}
public SimpleCommandBuilder execute(CompleterCommand completerCommand) {
public CommandBuilder execute(CompleterCommand completerCommand) {
this.completerCommand = completerCommand;
return this;
}
public SimpleCommandBuilder tab(CompleterTab completerTab) {
public CommandBuilder tab(CompleterTab completerTab) {
this.completerTab = completerTab;
return this;
}
public SimpleCommandBuilder forceRegister() {
public CommandBuilder forceRegister() {
this.forceRegister = true;
return this;
}
public SimpleCommandBuilder build() {
public CommandBuilder build() {
Preconditions.checkNotNull(plugin, "缺少 \"plugin\" 部分");
Preconditions.checkNotNull(command, "缺少 \"command\" 部分");
Preconditions.checkNotNull(completerCommand, "缺少 \"CompleterCommand\" 部分");

2
src/main/scala/io/izzel/taboolib/module/config/TConfig.java
View File

@ -4,7 +4,7 @@ import com.google.common.collect.Maps;
import io.izzel.taboolib.TabooLib;
import io.izzel.taboolib.TabooLibAPI;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.module.locale.logger.TLogger;
import io.izzel.taboolib.util.Files;
import io.izzel.taboolib.util.Ref;
import org.bukkit.configuration.InvalidConfigurationException;

2
src/main/scala/io/izzel/taboolib/module/mysql/IColumn.java → src/main/scala/io/izzel/taboolib/module/db/IColumn.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.mysql;
package io.izzel.taboolib.module.db;
/**
* @Author 坏黑

2
src/main/scala/io/izzel/taboolib/module/mysql/IHost.java → src/main/scala/io/izzel/taboolib/module/db/IHost.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.mysql;
package io.izzel.taboolib.module.db;
import org.bukkit.plugin.Plugin;

8
src/main/scala/io/izzel/taboolib/module/mysql/hikari/HikariHandler.java → src/main/scala/io/izzel/taboolib/module/db/source/HikariHandler.java
View File

@ -1,13 +1,13 @@
package io.izzel.taboolib.module.mysql.hikari;
package io.izzel.taboolib.module.db.source;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.module.config.TConfig;
import io.izzel.taboolib.module.inject.TInject;
import io.izzel.taboolib.module.mysql.IHost;
import io.izzel.taboolib.module.mysql.builder.SQLHost;
import io.izzel.taboolib.module.mysql.lite.SQLiteHost;
import io.izzel.taboolib.module.db.IHost;
import io.izzel.taboolib.module.db.sql.SQLHost;
import io.izzel.taboolib.module.db.sqlite.SQLiteHost;
import org.bukkit.configuration.file.FileConfiguration;
import javax.sql.DataSource;

4
src/main/scala/io/izzel/taboolib/module/mysql/hikari/MapDataSource.java → src/main/scala/io/izzel/taboolib/module/db/source/MapDataSource.java
View File

@ -1,7 +1,7 @@
package io.izzel.taboolib.module.mysql.hikari;
package io.izzel.taboolib.module.db.source;
import com.zaxxer.hikari.HikariDataSource;
import io.izzel.taboolib.module.mysql.IHost;
import io.izzel.taboolib.module.db.IHost;
import java.util.concurrent.atomic.AtomicInteger;

4
src/main/scala/io/izzel/taboolib/module/mysql/builder/SQLColumn.java → src/main/scala/io/izzel/taboolib/module/db/sql/SQLColumn.java
View File

@ -1,7 +1,7 @@
package io.izzel.taboolib.module.mysql.builder;
package io.izzel.taboolib.module.db.sql;
import io.izzel.taboolib.util.Strings;
import io.izzel.taboolib.module.mysql.IColumn;
import io.izzel.taboolib.module.db.IColumn;
import java.util.Arrays;

2
src/main/scala/io/izzel/taboolib/module/mysql/builder/SQLColumnOption.java → src/main/scala/io/izzel/taboolib/module/db/sql/SQLColumnOption.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.mysql.builder;
package io.izzel.taboolib.module.db.sql;
/**
* @Author sky

2
src/main/scala/io/izzel/taboolib/module/mysql/builder/SQLColumnType.java → src/main/scala/io/izzel/taboolib/module/db/sql/SQLColumnType.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.mysql.builder;
package io.izzel.taboolib.module.db.sql;
/**
* @Author sky

2
src/main/scala/io/izzel/taboolib/module/mysql/builder/SQLExecutor.java → src/main/scala/io/izzel/taboolib/module/db/sql/SQLExecutor.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.mysql.builder;
package io.izzel.taboolib.module.db.sql;
import java.sql.Connection;
import java.sql.PreparedStatement;

4
src/main/scala/io/izzel/taboolib/module/mysql/builder/SQLHost.java → src/main/scala/io/izzel/taboolib/module/db/sql/SQLHost.java
View File

@ -1,6 +1,6 @@
package io.izzel.taboolib.module.mysql.builder;
package io.izzel.taboolib.module.db.sql;
import io.izzel.taboolib.module.mysql.IHost;
import io.izzel.taboolib.module.db.IHost;
import io.izzel.taboolib.util.Strings;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.plugin.Plugin;

8
src/main/scala/io/izzel/taboolib/module/mysql/builder/SQLTable.java → src/main/scala/io/izzel/taboolib/module/db/sql/SQLTable.java
View File

@ -1,8 +1,8 @@
package io.izzel.taboolib.module.mysql.builder;
package io.izzel.taboolib.module.db.sql;
import io.izzel.taboolib.module.mysql.IColumn;
import io.izzel.taboolib.module.mysql.builder.query.RunnableQuery;
import io.izzel.taboolib.module.mysql.builder.query.RunnableUpdate;
import io.izzel.taboolib.module.db.IColumn;
import io.izzel.taboolib.module.db.sql.query.RunnableQuery;
import io.izzel.taboolib.module.db.sql.query.RunnableUpdate;
import io.izzel.taboolib.util.ArrayUtil;
import io.izzel.taboolib.util.Strings;

6
src/main/scala/io/izzel/taboolib/module/mysql/builder/query/RunnableQuery.java → src/main/scala/io/izzel/taboolib/module/db/sql/query/RunnableQuery.java
View File

@ -1,7 +1,7 @@
package io.izzel.taboolib.module.mysql.builder.query;
package io.izzel.taboolib.module.db.sql.query;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.module.mysql.builder.SQLExecutor;
import io.izzel.taboolib.module.locale.logger.TLogger;
import io.izzel.taboolib.module.db.sql.SQLExecutor;
import javax.sql.DataSource;
import java.sql.Connection;

6
src/main/scala/io/izzel/taboolib/module/mysql/builder/query/RunnableUpdate.java → src/main/scala/io/izzel/taboolib/module/db/sql/query/RunnableUpdate.java
View File

@ -1,7 +1,7 @@
package io.izzel.taboolib.module.mysql.builder.query;
package io.izzel.taboolib.module.db.sql.query;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.module.mysql.builder.SQLExecutor;
import io.izzel.taboolib.module.locale.logger.TLogger;
import io.izzel.taboolib.module.db.sql.SQLExecutor;
import javax.sql.DataSource;
import java.sql.Connection;

2
src/main/scala/io/izzel/taboolib/module/mysql/builder/query/TaskResult.java → src/main/scala/io/izzel/taboolib/module/db/sql/query/TaskResult.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.mysql.builder.query;
package io.izzel.taboolib.module.db.sql.query;
import java.sql.ResultSet;
import java.sql.SQLException;

2
src/main/scala/io/izzel/taboolib/module/mysql/builder/query/TaskStatement.java → src/main/scala/io/izzel/taboolib/module/db/sql/query/TaskStatement.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.mysql.builder.query;
package io.izzel.taboolib.module.db.sql.query;
import java.sql.PreparedStatement;
import java.sql.SQLException;

4
src/main/scala/io/izzel/taboolib/module/mysql/lite/SQLiteColumn.java → src/main/scala/io/izzel/taboolib/module/db/sqlite/SQLiteColumn.java
View File

@ -1,7 +1,7 @@
package io.izzel.taboolib.module.mysql.lite;
package io.izzel.taboolib.module.db.sqlite;
import io.izzel.taboolib.util.Strings;
import io.izzel.taboolib.module.mysql.IColumn;
import io.izzel.taboolib.module.db.IColumn;
import java.util.Arrays;

2
src/main/scala/io/izzel/taboolib/module/mysql/lite/SQLiteColumnOption.java → src/main/scala/io/izzel/taboolib/module/db/sqlite/SQLiteColumnOption.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.mysql.lite;
package io.izzel.taboolib.module.db.sqlite;
/**
* @Author sky

2
src/main/scala/io/izzel/taboolib/module/mysql/lite/SQLiteColumnType.java → src/main/scala/io/izzel/taboolib/module/db/sqlite/SQLiteColumnType.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.mysql.lite;
package io.izzel.taboolib.module.db.sqlite;
/**
* @Author 坏黑

4
src/main/scala/io/izzel/taboolib/module/mysql/lite/SQLiteHost.java → src/main/scala/io/izzel/taboolib/module/db/sqlite/SQLiteHost.java
View File

@ -1,6 +1,6 @@
package io.izzel.taboolib.module.mysql.lite;
package io.izzel.taboolib.module.db.sqlite;
import io.izzel.taboolib.module.mysql.IHost;
import io.izzel.taboolib.module.db.IHost;
import org.bukkit.plugin.Plugin;
import java.io.File;

4
src/main/scala/io/izzel/taboolib/origin/database/PlayerDataManager.java → src/main/scala/io/izzel/taboolib/module/db/yaml/PlayerDataManager.java
View File

@ -1,8 +1,8 @@
package io.izzel.taboolib.origin.database;
package io.izzel.taboolib.module.db.yaml;
import io.izzel.taboolib.TabooLib;
import io.izzel.taboolib.module.inject.TListener;
import io.izzel.taboolib.origin.event.PlayerLoadedEvent;
import io.izzel.taboolib.common.event.PlayerLoadedEvent;
import io.izzel.taboolib.util.Files;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;

7
src/main/scala/io/izzel/taboolib/origin/database/PluginDataManager.java → src/main/scala/io/izzel/taboolib/module/db/yaml/PluginDataManager.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.database;
package io.izzel.taboolib.module.db.yaml;
import io.izzel.taboolib.TabooLib;
import io.izzel.taboolib.module.locale.TLocale;
@ -38,10 +38,7 @@ public class PluginDataManager {
}
public static void saveAllCaches(boolean remove) {
long time = System.currentTimeMillis();
for (String plugin : CACHE_DATA_PLUGIN.keySet()) {
saveAllCaches(getFixedPlugin(plugin), remove);
}
CACHE_DATA_PLUGIN.keySet().forEach(plugin -> saveAllCaches(getFixedPlugin(plugin), remove));
}
public static void saveConfiguration(FileConfiguration conf, File file) {

2
src/main/scala/io/izzel/taboolib/module/inject/PlayerContainerLoader.java
View File

@ -1,7 +1,7 @@
package io.izzel.taboolib.module.inject;
import io.izzel.taboolib.TabooLibLoader;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.module.locale.logger.TLogger;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;

2
src/main/scala/io/izzel/taboolib/module/inject/TFunctionLoader.java
View File

@ -2,7 +2,7 @@ package io.izzel.taboolib.module.inject;
import io.izzel.taboolib.TabooLibAPI;
import io.izzel.taboolib.TabooLibLoader;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.module.locale.logger.TLogger;
import org.bukkit.plugin.Plugin;
import java.lang.reflect.Method;

12
src/main/scala/io/izzel/taboolib/module/inject/TInjectLoader.java
View File

@ -3,13 +3,13 @@ package io.izzel.taboolib.module.inject;
import com.google.common.collect.Maps;
import io.izzel.taboolib.TabooLibAPI;
import io.izzel.taboolib.TabooLibLoader;
import io.izzel.taboolib.module.command.lite.SimpleCommandBuilder;
import io.izzel.taboolib.module.command.lite.CommandBuilder;
import io.izzel.taboolib.module.config.TConfig;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.module.locale.logger.TLogger;
import io.izzel.taboolib.module.packet.TPacketHandler;
import io.izzel.taboolib.module.packet.TPacketListener;
import io.izzel.taboolib.origin.lite.cooldown.Cooldown;
import io.izzel.taboolib.origin.lite.cooldown.Cooldowns;
import io.izzel.taboolib.util.lite.cooldown.Cooldown;
import io.izzel.taboolib.util.lite.cooldown.Cooldowns;
import org.bukkit.plugin.Plugin;
import java.lang.reflect.Field;
@ -58,9 +58,9 @@ public class TInjectLoader implements TabooLibLoader.Loader {
}
});
// SimpleCommandBuilder Inject
injectTypes.put(SimpleCommandBuilder.class, (plugin, field, args, instance) -> {
injectTypes.put(CommandBuilder.class, (plugin, field, args, instance) -> {
try {
SimpleCommandBuilder builder = (SimpleCommandBuilder) field.get(instance);
CommandBuilder builder = (CommandBuilder) field.get(instance);
if (builder.isBuild()) {
TLogger.getGlobalLogger().error("Command was registered. (" + field.getType().getName() + ")");
} else {

4
src/main/scala/io/izzel/taboolib/module/inject/TListenerHandler.java
View File

@ -3,8 +3,8 @@ package io.izzel.taboolib.module.inject;
import io.izzel.taboolib.TabooLibAPI;
import io.izzel.taboolib.TabooLibLoader;
import io.izzel.taboolib.Version;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.origin.cronus.util.StringExpression;
import io.izzel.taboolib.module.locale.logger.TLogger;
import io.izzel.taboolib.cronus.util.StringExpression;
import io.izzel.taboolib.util.Strings;
import io.izzel.taboolib.util.Reflection;
import org.bukkit.Bukkit;

2
src/main/scala/io/izzel/taboolib/module/inject/TScheduleLoader.java
View File

@ -4,7 +4,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import io.izzel.taboolib.TabooLib;
import io.izzel.taboolib.TabooLibLoader;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.module.locale.logger.TLogger;
import org.bukkit.plugin.Plugin;
import org.bukkit.scheduler.BukkitRunnable;

2
src/main/scala/io/izzel/taboolib/module/locale/TLocale.java
View File

@ -1,7 +1,7 @@
package io.izzel.taboolib.module.locale;
import io.izzel.taboolib.TabooLib;
import io.izzel.taboolib.module.logger.TLoggerManager;
import io.izzel.taboolib.module.locale.logger.TLoggerManager;
import io.izzel.taboolib.module.nms.NMSHandler;
import io.izzel.taboolib.module.tellraw.TellrawCreator;
import io.izzel.taboolib.util.Ref;

2
src/main/scala/io/izzel/taboolib/module/locale/TLocaleLoader.java
View File

@ -4,7 +4,7 @@ import io.izzel.taboolib.TabooLib;
import io.izzel.taboolib.TabooLibAPI;
import io.izzel.taboolib.module.locale.type.*;
import io.izzel.taboolib.module.config.TConfigWatcher;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.module.locale.logger.TLogger;
import io.izzel.taboolib.util.Files;
import io.izzel.taboolib.util.IO;
import io.izzel.taboolib.util.Strings;

2
src/main/scala/io/izzel/taboolib/module/logger/TLogger.java → src/main/scala/io/izzel/taboolib/module/locale/logger/TLogger.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.logger;
package io.izzel.taboolib.module.locale.logger;
import io.izzel.taboolib.TabooLibAPI;
import io.izzel.taboolib.module.locale.TLocale;

2
src/main/scala/io/izzel/taboolib/module/logger/TLoggerManager.java → src/main/scala/io/izzel/taboolib/module/locale/logger/TLoggerManager.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.logger;
package io.izzel.taboolib.module.locale.logger;
import org.bukkit.plugin.Plugin;

4
src/main/scala/io/izzel/taboolib/module/locale/type/TLocaleBook.java
View File

@ -5,8 +5,8 @@ import io.izzel.taboolib.TabooLib;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.module.locale.TLocaleSerialize;
import io.izzel.taboolib.module.tellraw.TellrawJson;
import io.izzel.taboolib.origin.book.BookFormatter;
import io.izzel.taboolib.origin.book.builder.BookBuilder;
import io.izzel.taboolib.util.book.BookFormatter;
import io.izzel.taboolib.util.book.builder.BookBuilder;
import io.izzel.taboolib.util.Strings;
import io.izzel.taboolib.util.chat.ComponentSerializer;
import org.bukkit.command.CommandSender;

14
src/main/scala/io/izzel/taboolib/module/locale/type/TLocaleSound.java
View File

@ -2,7 +2,7 @@ package io.izzel.taboolib.module.locale.type;
import com.google.common.collect.Maps;
import io.izzel.taboolib.module.locale.TLocaleSerialize;
import io.izzel.taboolib.origin.lite.Sounds;
import io.izzel.taboolib.util.lite.SoundPack;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.serialization.SerializableAs;
import org.bukkit.entity.Player;
@ -21,19 +21,19 @@ import java.util.stream.Collectors;
@SerializableAs("ACTION")
public class TLocaleSound extends TLocaleSerialize {
private final List<Sounds> soundPacks;
private final List<SoundPack> soundPacks;
public TLocaleSound(List<Sounds> soundPacks) {
public TLocaleSound(List<SoundPack> soundPacks) {
this.soundPacks = soundPacks;
}
public static TLocaleSound valueOf(Map<String, Object> map) {
List<Sounds> soundPacks = new ArrayList<>();
List<SoundPack> soundPacks = new ArrayList<>();
Object sounds = map.containsKey("sounds") ? map.get("sounds") : map.getOrDefault("sound", "");
if (sounds instanceof List) {
soundPacks = ((List<String>) sounds).stream().map(Sounds::new).collect(Collectors.toList());
soundPacks = ((List<String>) sounds).stream().map(SoundPack::new).collect(Collectors.toList());
} else {
soundPacks.add(new Sounds(sounds.toString()));
soundPacks.add(new SoundPack(sounds.toString()));
}
return new TLocaleSound(soundPacks);
}
@ -61,7 +61,7 @@ public class TLocaleSound extends TLocaleSerialize {
if (soundPacks.size() == 1) {
map.put("sounds", soundPacks.get(0).toString());
} else if (soundPacks.size() > 1) {
map.put("sounds", soundPacks.stream().map(Sounds::toString).collect(Collectors.toList()));
map.put("sounds", soundPacks.stream().map(SoundPack::toString).collect(Collectors.toList()));
}
return map;
}

2
src/main/scala/io/izzel/taboolib/module/packet/channel/InternalChannelExecutor.java
View File

@ -1,6 +1,6 @@
package io.izzel.taboolib.module.packet.channel;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.module.locale.logger.TLogger;
import io.netty.channel.Channel;
import net.minecraft.server.v1_8_R3.Packet;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;

2
src/main/scala/io/izzel/taboolib/module/tellraw/internal/InternalTellraw.java
View File

@ -1,7 +1,7 @@
package io.izzel.taboolib.module.tellraw.internal;
import io.izzel.taboolib.Version;
import io.izzel.taboolib.module.item.Items;
import io.izzel.taboolib.util.item.Items;
import io.izzel.taboolib.module.lite.SimpleReflection;
import io.izzel.taboolib.module.packet.TPacketHandler;
import io.izzel.taboolib.module.tellraw.TellrawVersion;

2
src/main/scala/io/izzel/taboolib/util/Files.java
View File

@ -2,7 +2,7 @@ package io.izzel.taboolib.util;
import io.izzel.taboolib.TabooLib;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.plugin.InternalPlugin;
import io.izzel.taboolib.common.plugin.InternalPlugin;
import io.izzel.taboolib.util.eagletdl.EagletTask;
import io.izzel.taboolib.util.eagletdl.ProgressEvent;
import org.bukkit.configuration.file.FileConfiguration;

2
src/main/scala/io/izzel/taboolib/origin/book/BookAchievement.java → src/main/scala/io/izzel/taboolib/util/book/BookAchievement.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.book;
package io.izzel.taboolib.util.book;
import org.bukkit.Achievement;

4
src/main/scala/io/izzel/taboolib/origin/book/BookFormatter.java → src/main/scala/io/izzel/taboolib/util/book/BookFormatter.java
View File

@ -1,6 +1,6 @@
package io.izzel.taboolib.origin.book;
package io.izzel.taboolib.util.book;
import io.izzel.taboolib.origin.book.builder.BookBuilder;
import io.izzel.taboolib.util.book.builder.BookBuilder;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

4
src/main/scala/io/izzel/taboolib/origin/book/BookReflection.java → src/main/scala/io/izzel/taboolib/util/book/BookReflection.java
View File

@ -1,9 +1,9 @@
package io.izzel.taboolib.origin.book;
package io.izzel.taboolib.util.book;
import io.izzel.taboolib.util.chat.BaseComponent;
import io.izzel.taboolib.util.chat.TextComponent;
import io.izzel.taboolib.util.chat.ComponentSerializer;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.module.locale.logger.TLogger;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

2
src/main/scala/io/izzel/taboolib/origin/book/action/ClickAction.java → src/main/scala/io/izzel/taboolib/util/book/action/ClickAction.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.book.action;
package io.izzel.taboolib.util.book.action;
import io.izzel.taboolib.util.chat.ClickEvent;

8
src/main/scala/io/izzel/taboolib/origin/book/action/HoverAction.java → src/main/scala/io/izzel/taboolib/util/book/action/HoverAction.java
View File

@ -1,10 +1,10 @@
package io.izzel.taboolib.origin.book.action;
package io.izzel.taboolib.util.book.action;
import io.izzel.taboolib.util.chat.BaseComponent;
import io.izzel.taboolib.util.chat.HoverEvent;
import io.izzel.taboolib.util.chat.TextComponent;
import io.izzel.taboolib.origin.book.BookAchievement;
import io.izzel.taboolib.origin.book.BookReflection;
import io.izzel.taboolib.util.book.BookAchievement;
import io.izzel.taboolib.util.book.BookReflection;
import org.bukkit.Achievement;
import org.bukkit.entity.Entity;
import org.bukkit.inventory.ItemStack;
@ -55,7 +55,7 @@ public interface HoverAction {
* @return a new HoverAction instance
*/
static HoverAction showItem(ItemStack item) {
return new SimpleHoverAction(HoverEvent.Action.SHOW_ITEM, io.izzel.taboolib.origin.book.BookReflection.itemToComponents(item));
return new SimpleHoverAction(HoverEvent.Action.SHOW_ITEM, io.izzel.taboolib.util.book.BookReflection.itemToComponents(item));
}
/**

8
src/main/scala/io/izzel/taboolib/origin/book/builder/BookBuilder.java → src/main/scala/io/izzel/taboolib/util/book/builder/BookBuilder.java
View File

@ -1,7 +1,7 @@
package io.izzel.taboolib.origin.book.builder;
package io.izzel.taboolib.util.book.builder;
import io.izzel.taboolib.util.chat.BaseComponent;
import io.izzel.taboolib.origin.book.BookReflection;
import io.izzel.taboolib.util.book.BookReflection;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.BookMeta;
@ -93,7 +93,7 @@ public class BookBuilder {
* @return the BookBuilder's calling instance
*/
public BookBuilder pages(BaseComponent[]... pages) {
io.izzel.taboolib.origin.book.BookReflection.setPages(meta, pages);
io.izzel.taboolib.util.book.BookReflection.setPages(meta, pages);
return this;
}
@ -103,7 +103,7 @@ public class BookBuilder {
* @return the BookBuilder's calling instance
*/
public BookBuilder pages(List<BaseComponent[]> pages) {
io.izzel.taboolib.origin.book.BookReflection.setPages(meta, pages.toArray(new BaseComponent[0][]));
io.izzel.taboolib.util.book.BookReflection.setPages(meta, pages.toArray(new BaseComponent[0][]));
return this;
}

2
src/main/scala/io/izzel/taboolib/origin/book/builder/PageBuilder.java → src/main/scala/io/izzel/taboolib/util/book/builder/PageBuilder.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.book.builder;
package io.izzel.taboolib.util.book.builder;
import io.izzel.taboolib.util.ArrayUtil;
import io.izzel.taboolib.util.chat.BaseComponent;

6
src/main/scala/io/izzel/taboolib/origin/book/builder/TextBuilder.java → src/main/scala/io/izzel/taboolib/util/book/builder/TextBuilder.java
View File

@ -1,11 +1,11 @@
package io.izzel.taboolib.origin.book.builder;
package io.izzel.taboolib.util.book.builder;
import io.izzel.taboolib.util.chat.BaseComponent;
import io.izzel.taboolib.util.chat.ClickEvent;
import io.izzel.taboolib.util.chat.HoverEvent;
import io.izzel.taboolib.util.chat.TextComponent;
import io.izzel.taboolib.origin.book.action.ClickAction;
import io.izzel.taboolib.origin.book.action.HoverAction;
import io.izzel.taboolib.util.book.action.ClickAction;
import io.izzel.taboolib.util.book.action.HoverAction;
/**
* @author sky

2
src/main/scala/io/izzel/taboolib/module/item/ItemBuilder.java → src/main/scala/io/izzel/taboolib/util/item/ItemBuilder.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.item;
package io.izzel.taboolib.util.item;
import io.izzel.taboolib.Version;
import io.izzel.taboolib.module.locale.TLocale;

4
src/main/scala/io/izzel/taboolib/module/item/Items.java → src/main/scala/io/izzel/taboolib/util/item/Items.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.item;
package io.izzel.taboolib.util.item;
import io.izzel.taboolib.Version;
import io.izzel.taboolib.module.locale.TLocale;
@ -7,7 +7,7 @@ import io.izzel.taboolib.module.nms.NMSHandler;
import io.izzel.taboolib.module.nms.nbt.NBTBase;
import io.izzel.taboolib.module.nms.nbt.NBTCompound;
import io.izzel.taboolib.module.nms.nbt.NBTList;
import io.izzel.taboolib.origin.lite.Numbers;
import io.izzel.taboolib.util.lite.Numbers;
import org.bukkit.Color;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;

2
src/main/scala/io/izzel/taboolib/module/item/inventory/ClickEvent.java → src/main/scala/io/izzel/taboolib/util/item/inventory/ClickEvent.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.item.inventory;
package io.izzel.taboolib.util.item.inventory;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;

2
src/main/scala/io/izzel/taboolib/module/item/inventory/ClickListener.java → src/main/scala/io/izzel/taboolib/util/item/inventory/ClickListener.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.item.inventory;
package io.izzel.taboolib.util.item.inventory;
import io.izzel.taboolib.module.inject.TListener;
import org.bukkit.Bukkit;

2
src/main/scala/io/izzel/taboolib/module/item/inventory/ClickListenerOffhand.java → src/main/scala/io/izzel/taboolib/util/item/inventory/ClickListenerOffhand.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.item.inventory;
package io.izzel.taboolib.util.item.inventory;
import io.izzel.taboolib.module.inject.TListener;
import org.bukkit.event.EventHandler;

2
src/main/scala/io/izzel/taboolib/module/item/inventory/ClickTask.java → src/main/scala/io/izzel/taboolib/util/item/inventory/ClickTask.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.item.inventory;
package io.izzel.taboolib.util.item.inventory;
/**
* @Author 坏黑

2
src/main/scala/io/izzel/taboolib/module/item/inventory/ClickType.java → src/main/scala/io/izzel/taboolib/util/item/inventory/ClickType.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.item.inventory;
package io.izzel.taboolib.util.item.inventory;
/**
* @Author 坏黑

2
src/main/scala/io/izzel/taboolib/module/item/inventory/CloseTask.java → src/main/scala/io/izzel/taboolib/util/item/inventory/CloseTask.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.item.inventory;
package io.izzel.taboolib.util.item.inventory;
import org.bukkit.event.inventory.InventoryCloseEvent;

2
src/main/scala/io/izzel/taboolib/module/item/inventory/MenuBuilder.java → src/main/scala/io/izzel/taboolib/util/item/inventory/MenuBuilder.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.item.inventory;
package io.izzel.taboolib.util.item.inventory;
import com.google.common.collect.Maps;
import io.izzel.taboolib.TabooLib;

2
src/main/scala/io/izzel/taboolib/module/item/inventory/MenuHolder.java → src/main/scala/io/izzel/taboolib/util/item/inventory/MenuHolder.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.module.item.inventory;
package io.izzel.taboolib.util.item.inventory;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;

2
src/main/scala/io/izzel/taboolib/origin/lite/Catchers.java → src/main/scala/io/izzel/taboolib/util/lite/Catchers.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.lite;
package io.izzel.taboolib.util.lite;
import io.izzel.taboolib.TabooLib;
import org.bukkit.Bukkit;

6
src/main/scala/io/izzel/taboolib/origin/lite/Logs.java → src/main/scala/io/izzel/taboolib/util/lite/Logs.java
View File

@ -1,8 +1,8 @@
package io.izzel.taboolib.origin.lite;
package io.izzel.taboolib.util.lite;
import io.izzel.taboolib.TabooLib;
import io.izzel.taboolib.module.locale.TLocale;
import io.izzel.taboolib.module.command.TCommand;
import io.izzel.taboolib.module.command.base.BaseCommand;
import io.izzel.taboolib.module.command.base.BaseMainCommand;
import io.izzel.taboolib.module.command.base.BaseSubCommand;
import io.izzel.taboolib.module.command.base.CommandArgument;
@ -21,7 +21,7 @@ import java.text.SimpleDateFormat;
/**
* @author sky
*/
@TCommand(
@BaseCommand(
name = "tabooliblogs",
aliases = {"tlog", "tlogs"},
permission = "taboolib.admin"

2
src/main/scala/io/izzel/taboolib/origin/lite/Numbers.java → src/main/scala/io/izzel/taboolib/util/lite/Numbers.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.lite;
package io.izzel.taboolib.util.lite;
import java.text.DecimalFormat;
import java.util.Random;

38
src/main/scala/io/izzel/taboolib/origin/lite/Effects.java → src/main/scala/io/izzel/taboolib/util/lite/Particles.java
View File

@ -1,4 +1,4 @@
package io.izzel.taboolib.origin.lite;
package io.izzel.taboolib.util.lite;
import io.izzel.taboolib.Version;
import io.izzel.taboolib.module.nms.NMSHandler;
@ -46,7 +46,7 @@ import java.util.Random;
* @author DarkBlade12
* @version 1.8
*/
public enum Effects {
public enum Particles {
BARRIER,
BLOCK_CRACK(ParticleProperty.REQUIRES_DATA),
@ -110,15 +110,15 @@ public enum Effects {
private final List<ParticleProperty> properties;
private int min, max;
Effects(ParticleProperty... properties) {
Particles(ParticleProperty... properties) {
this(0, 0, properties);
}
Effects(int min, ParticleProperty... properties) {
Particles(int min, ParticleProperty... properties) {
this(min, 0, properties);
}
Effects(int min, int max, ParticleProperty... properties) {
Particles(int min, int max, ParticleProperty... properties) {
this.properties = Arrays.asList(properties);
this.min = min;
this.max = max;
@ -173,8 +173,8 @@ public enum Effects {
* @param name Name of the particle effect
* @return The particle effect
*/
public static Effects fromName(String name) {
for (Effects effect : values()) {
public static Particles fromName(String name) {
for (Particles effect : values()) {
if (effect.name().equalsIgnoreCase(name)) {
if (!effect.isSupported()) {
throw new ParticleVersionException();
@ -213,7 +213,7 @@ public enum Effects {
* @param data Particle data
* @return Whether the data type is correct or not
*/
private static boolean isDataCorrect(Effects effect, Object data) {
private static boolean isDataCorrect(Particles effect, Object data) {
return ((effect == BLOCK_CRACK || effect == BLOCK_DUST) && (mcVersion < 13 ? data instanceof MaterialData : data instanceof BlockData)) || (effect == ITEM_CRACK && data instanceof ItemStack);
}
@ -224,7 +224,7 @@ public enum Effects {
* @param color Particle color
* @return Whether the color type is correct or not
*/
private static boolean isColorCorrect(Effects effect, ParticleColor color) {
private static boolean isColorCorrect(Particles effect, ParticleColor color) {
return ((effect == SPELL_MOB || effect == SPELL_MOB_AMBIENT || effect == REDSTONE) && color instanceof OrdinaryColor) || (effect == NOTE && color instanceof NoteColor);
}
@ -391,7 +391,7 @@ public enum Effects {
}
/**
* Represents the color for effects like {@link Effects#SPELL_MOB}, {@link Effects#SPELL_MOB_AMBIENT}, {@link Effects#REDSTONE} and {@link Effects#NOTE}
* Represents the color for effects like {@link Particles#SPELL_MOB}, {@link Particles#SPELL_MOB_AMBIENT}, {@link Particles#REDSTONE} and {@link Particles#NOTE}
* <p>
* This class is part of the <b>ParticleEffect Library</b> and follows the same usage conditions
*
@ -422,7 +422,7 @@ public enum Effects {
}
/**
* Represents the color for effects like {@link Effects#SPELL_MOB}, {@link Effects#SPELL_MOB_AMBIENT} and {@link Effects#NOTE}
* Represents the color for effects like {@link Particles#SPELL_MOB}, {@link Particles#SPELL_MOB_AMBIENT} and {@link Particles#NOTE}
* <p>
* This class is part of the <b>ParticleEffect Library</b> and follows the same usage conditions
*
@ -534,7 +534,7 @@ public enum Effects {
}
/**
* Represents the color for the {@link Effects#NOTE} effect
* Represents the color for the {@link Particles#NOTE} effect
* <p>
* This class is part of the <b>ParticleEffect Library</b> and follows the same usage conditions
*
@ -599,18 +599,18 @@ public enum Effects {
public static class Particle {
private static Random random = new Random();
private Effects effect;
private Particles effect;
private ParticleShape shape;
private OrdinaryColor color;
private byte typeCode;
public Particle(Effects effect, ParticleShape shape, OrdinaryColor color) {
public Particle(Particles effect, ParticleShape shape, OrdinaryColor color) {
this.effect = effect;
this.shape = shape;
this.color = color;
this.typeCode = (byte) (effect == Effects.NOTE ? 2 : (effect.hasProperty(ParticleProperty.COLORABLE) ? 1 : 0));
this.typeCode = (byte) (effect == Particles.NOTE ? 2 : (effect.hasProperty(ParticleProperty.COLORABLE) ? 1 : 0));
}
public String toString() {
@ -649,7 +649,7 @@ public enum Effects {
effect.display(color, offX, offY, offZ, amount, lc, p);
break;
case 2:
Effects.NOTE.display(new Effects.NoteColor(random.nextInt(24)), offX, offY, offZ, amount, lc, /*p.getPlayer(),*/ p);
Particles.NOTE.display(new Particles.NoteColor(random.nextInt(24)), offX, offY, offZ, amount, lc, /*p.getPlayer(),*/ p);
break;
case 0:
effect.display(offX, offY, offZ, 0.001, amount, lc, p);
@ -658,7 +658,7 @@ public enum Effects {
}
public static Particle deserialize(Map<String, Object> map) {
return new Particle(Effects.fromName((String) map.get("particleEffect")), ParticleShape.valueOf(((String) map.get("particleShape")).toUpperCase()), new OrdinaryColor(Color.deserialize(((MemorySection) map.get("particleColor")).getValues(false))));
return new Particle(Particles.fromName((String) map.get("particleEffect")), ParticleShape.valueOf(((String) map.get("particleShape")).toUpperCase()), new OrdinaryColor(Color.deserialize(((MemorySection) map.get("particleColor")).getValues(false))));
}
}
@ -736,7 +736,7 @@ public enum Effects {
/*private static Class<?> enumParticle;
private static String ver;
private static String pack;*/
private final Effects effect;
private final Particles effect;
private float offsetX;
private float offsetY;
private float offsetZ;
@ -762,7 +762,7 @@ public enum Effects {
* @param data Data of the effect
* @throws IllegalArgumentException If the speed or amount is lower than 0
*/
public ParticlePacket(Effects effect, double offsetX, double offsetY, double offsetZ, double speed, int amount, boolean longDistance, Object data) throws IllegalArgumentException {
public ParticlePacket(Particles effect, double offsetX, double offsetY, double offsetZ, double speed, int amount, boolean longDistance, Object data) throws IllegalArgumentException {
initialize();
if (speed < 0) {
throw new IllegalArgumentException("The speed is lower than 0");

5
src/main/scala/io/izzel/taboolib/origin/lite/Boards.java → src/main/scala/io/izzel/taboolib/util/lite/Scoreboards.java
View File

@ -1,14 +1,13 @@
package io.izzel.taboolib.origin.lite;
package io.izzel.taboolib.util.lite;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.scoreboard.DisplaySlot;
import org.bukkit.scoreboard.Scoreboard;
import java.util.*;
import java.util.stream.IntStream;
public class Boards {
public class Scoreboards {
static String fixTitle(String title) {
if (title == null) {

4
src/main/scala/io/izzel/taboolib/origin/lite/Scripts.java → src/main/scala/io/izzel/taboolib/util/lite/Scripts.java
View File

@ -1,6 +1,6 @@
package io.izzel.taboolib.origin.lite;
package io.izzel.taboolib.util.lite;
import io.izzel.taboolib.module.logger.TLogger;
import io.izzel.taboolib.module.locale.logger.TLogger;
import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
import io.izzel.taboolib.module.inject.TFunction;

Some files were not shown because too many files have changed in this diff Show More