diff --git a/LaunchServer/LaunchServer.iml b/LaunchServer/LaunchServer.iml index 65720f2..3ca6abe 100644 --- a/LaunchServer/LaunchServer.iml +++ b/LaunchServer/LaunchServer.iml @@ -53,17 +53,6 @@ - - - - - - - - - - - @@ -75,15 +64,6 @@ - - - - - - - - - @@ -95,5 +75,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/LaunchServer/resources/bungee.yml b/LaunchServer/resources/bungee.yml deleted file mode 100644 index 64d5830..0000000 --- a/LaunchServer/resources/bungee.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: LaunchServer -description: "KeeperJerry's NekroLaunchServer" -version: 1.0 - -author: "KeeperJerry & sashok724 LLC" -website: 'https://launcher-sashok724.keeperjerry.ru/' - -main: launchserver.plugin.bungee.LaunchServerPluginBungee diff --git a/LaunchServer/resources/plugin.yml b/LaunchServer/resources/plugin.yml deleted file mode 100644 index f129abc..0000000 --- a/LaunchServer/resources/plugin.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: LaunchServer -description: "KeeperJerry's NekroLaunchServer" -version: 1.0 - -author: "KeeperJerry & sashok724 LLC" -website: 'https://launcher-sashok724.keeperjerry.ru/' - -main: launchserver.plugin.bukkit.LaunchServerPluginBukkit - -commands: - launchserver: - aliases: [launcher,ls,l] - description: "Primary LaunchServer command" - usage: '/ [args...]' diff --git a/LaunchServer/source/plugin/LaunchServerPluginBridge.java b/LaunchServer/source/plugin/LaunchServerPluginBridge.java deleted file mode 100644 index ccc7a0f..0000000 --- a/LaunchServer/source/plugin/LaunchServerPluginBridge.java +++ /dev/null @@ -1,55 +0,0 @@ -package launchserver.plugin; - -import launcher.helper.JVMHelper; -import launcher.helper.LogHelper; -import launchserver.LaunchServer; - -import java.nio.file.Path; - -public final class LaunchServerPluginBridge implements Runnable, AutoCloseable -{ - static - { - //SecurityHelper.verifyCertificates(LaunchServer.class); - JVMHelper.verifySystemProperties(LaunchServer.class, false); - } - - private final LaunchServer server; - - public LaunchServerPluginBridge(Path dir) throws Throwable - { - LogHelper.addOutput(dir.resolve("LaunchServer.log")); - LogHelper.printVersion("LaunchServer"); - - // Create new LaunchServer - long start = System.currentTimeMillis(); - try - { - server = new LaunchServer(dir, true); - } - catch (Throwable exc) - { - LogHelper.error(exc); - throw exc; - } - long end = System.currentTimeMillis(); - LogHelper.debug("LaunchServer started in %dms", end - start); - } - - @Override - public void close() - { - server.close(); - } - - @Override - public void run() - { - server.run(); - } - - public void eval(String... command) - { - server.commandHandler.eval(command, false); - } -} diff --git a/LaunchServer/source/plugin/bukkit/LaunchServerCommandBukkit.java b/LaunchServer/source/plugin/bukkit/LaunchServerCommandBukkit.java deleted file mode 100644 index 360ced1..0000000 --- a/LaunchServer/source/plugin/bukkit/LaunchServerCommandBukkit.java +++ /dev/null @@ -1,37 +0,0 @@ -package launchserver.plugin.bukkit; - -import launchserver.plugin.LaunchServerPluginBridge; -import org.bukkit.ChatColor; -import org.bukkit.command.*; - -public final class LaunchServerCommandBukkit implements CommandExecutor -{ - public final LaunchServerPluginBukkit plugin; - - public LaunchServerCommandBukkit(LaunchServerPluginBukkit plugin) - { - this.plugin = plugin; - } - - @Override - public boolean onCommand(CommandSender sender, Command command, String alias, String... args) - { - if (!(sender instanceof ConsoleCommandSender) && !(sender instanceof RemoteConsoleCommandSender)) - { - sender.sendMessage(ChatColor.RED + "Эту команду можно использовать только из консоли"); - return true; - } - - // Eval command - LaunchServerPluginBridge bridge = plugin.bridge; - if (bridge == null) - { - sender.sendMessage(ChatColor.RED + "Лаунчсервер не был полностью загружен"); - } - else - { - bridge.eval(args); - } - return true; - } -} diff --git a/LaunchServer/source/plugin/bukkit/LaunchServerPluginBukkit.java b/LaunchServer/source/plugin/bukkit/LaunchServerPluginBukkit.java deleted file mode 100644 index c8b1c3c..0000000 --- a/LaunchServer/source/plugin/bukkit/LaunchServerPluginBukkit.java +++ /dev/null @@ -1,41 +0,0 @@ -package launchserver.plugin.bukkit; - -import launcher.helper.CommonHelper; -import launchserver.plugin.LaunchServerPluginBridge; -import org.bukkit.plugin.java.JavaPlugin; - -public final class LaunchServerPluginBukkit extends JavaPlugin -{ - public volatile LaunchServerPluginBridge bridge = null; - - @Override - public void onDisable() - { - super.onDisable(); - if (bridge != null) - { - bridge.close(); - bridge = null; - } - } - - @Override - public void onEnable() - { - super.onEnable(); - - // Initialize LaunchServer - try - { - bridge = new LaunchServerPluginBridge(getDataFolder().toPath()); - } - catch (Throwable exc) - { - exc.printStackTrace(); - } - - // Register command - CommonHelper.newThread("LaunchServer Thread", true, bridge).start(); - getCommand("launchserver").setExecutor(new LaunchServerCommandBukkit(this)); - } -} diff --git a/LaunchServer/source/plugin/bungee/LaunchServerCommandBungee.java b/LaunchServer/source/plugin/bungee/LaunchServerCommandBungee.java deleted file mode 100644 index ca2fa87..0000000 --- a/LaunchServer/source/plugin/bungee/LaunchServerCommandBungee.java +++ /dev/null @@ -1,45 +0,0 @@ -package launchserver.plugin.bungee; - -import launchserver.plugin.LaunchServerPluginBridge; -import net.md_5.bungee.api.ChatColor; -import net.md_5.bungee.api.CommandSender; -import net.md_5.bungee.api.chat.BaseComponent; -import net.md_5.bungee.api.chat.TextComponent; -import net.md_5.bungee.api.plugin.Command; -import net.md_5.bungee.command.ConsoleCommandSender; - -public final class LaunchServerCommandBungee extends Command -{ - private static final BaseComponent[] NOT_CONSOLE_MESSAGE = TextComponent.fromLegacyText(ChatColor.RED + "Эту команду можно использовать только из консоли"); - private static final BaseComponent[] NOT_INITIALIZED_MESSAGE = TextComponent.fromLegacyText(ChatColor.RED + "Лаунчсервер не был полностью загружен"); - - // Instance - public final LaunchServerPluginBungee plugin; - - public LaunchServerCommandBungee(LaunchServerPluginBungee plugin) - { - super("launchserver", null, "launcher", "ls", "l"); - this.plugin = plugin; - } - - @Override - public void execute(CommandSender sender, String... args) - { - if (!(sender instanceof ConsoleCommandSender)) - { - sender.sendMessage(NOT_CONSOLE_MESSAGE); - return; - } - - // Eval command - LaunchServerPluginBridge bridge = plugin.bridge; - if (bridge == null) - { - sender.sendMessage(NOT_INITIALIZED_MESSAGE); - } - else - { - bridge.eval(args); - } - } -} diff --git a/LaunchServer/source/plugin/bungee/LaunchServerPluginBungee.java b/LaunchServer/source/plugin/bungee/LaunchServerPluginBungee.java deleted file mode 100644 index 407590a..0000000 --- a/LaunchServer/source/plugin/bungee/LaunchServerPluginBungee.java +++ /dev/null @@ -1,41 +0,0 @@ -package launchserver.plugin.bungee; - -import launcher.helper.CommonHelper; -import launchserver.plugin.LaunchServerPluginBridge; -import net.md_5.bungee.api.plugin.Plugin; - -public final class LaunchServerPluginBungee extends Plugin -{ - public volatile LaunchServerPluginBridge bridge = null; - - @Override - public void onDisable() - { - super.onDisable(); - if (bridge != null) - { - bridge.close(); - bridge = null; - } - } - - @Override - public void onEnable() - { - super.onEnable(); - - // Initialize LaunchServer - try - { - bridge = new LaunchServerPluginBridge(getDataFolder().toPath()); - } - catch (Throwable exc) - { - exc.printStackTrace(); - } - - // Register command - CommonHelper.newThread("LaunchServer Thread", true, bridge).start(); - getProxy().getPluginManager().registerCommand(this, new LaunchServerCommandBungee(this)); - } -} diff --git a/build/libraries/plugin/BungeeCord.jar b/build/libraries/plugin/BungeeCord.jar deleted file mode 100644 index 6ea3d62..0000000 --- a/build/libraries/plugin/BungeeCord.jar +++ /dev/null Binary files differ diff --git a/build/libraries/plugin/Spigot.jar b/build/libraries/plugin/Spigot.jar deleted file mode 100644 index 7407ccc..0000000 --- a/build/libraries/plugin/Spigot.jar +++ /dev/null Binary files differ