From 04ae4117be6e7daffe939b489faac56ac2af0006 Mon Sep 17 00:00:00 2001 From: mworzala Date: Fri, 9 Feb 2024 14:19:43 -0500 Subject: [PATCH] fix: oops, forgot to remove some stuff --- .../demo/commands/LoadExtensionCommand.java | 69 ------------------- .../demo/extension/TestExtension.java | 21 ------ demo/src/main/resources/extension.json | 13 ---- 3 files changed, 103 deletions(-) delete mode 100644 demo/src/main/java/net/minestom/demo/commands/LoadExtensionCommand.java delete mode 100644 demo/src/main/java/net/minestom/demo/extension/TestExtension.java delete mode 100644 demo/src/main/resources/extension.json diff --git a/demo/src/main/java/net/minestom/demo/commands/LoadExtensionCommand.java b/demo/src/main/java/net/minestom/demo/commands/LoadExtensionCommand.java deleted file mode 100644 index f617c818d..000000000 --- a/demo/src/main/java/net/minestom/demo/commands/LoadExtensionCommand.java +++ /dev/null @@ -1,69 +0,0 @@ -package net.minestom.demo.commands; - -import net.kyori.adventure.text.Component; -import net.minestom.server.MinecraftServer; -import net.minestom.server.command.CommandSender; -import net.minestom.server.command.builder.Command; -import net.minestom.server.command.builder.CommandContext; -import net.minestom.server.command.builder.arguments.ArgumentString; -import net.minestom.server.command.builder.arguments.ArgumentType; -import net.minestom.server.command.builder.exception.ArgumentSyntaxException; -import net.minestom.server.extensions.ExtensionManager; - -import java.io.IOException; -import java.nio.file.Path; - -public class LoadExtensionCommand extends Command { - - private final ArgumentString extensionName; - - public LoadExtensionCommand() { - super("load"); - - setDefaultExecutor(this::usage); - - extensionName = ArgumentType.String("extensionName"); - - setArgumentCallback(this::extensionCallback, extensionName); - addSyntax(this::execute, extensionName); - } - - private void usage(CommandSender sender, CommandContext context) { - sender.sendMessage(Component.text("Usage: /load ")); - } - - private void execute(CommandSender sender, CommandContext context) { - final String name = context.get(extensionName); - sender.sendMessage(Component.text("extensionFile = " + name + "....")); - - ExtensionManager extensionManager = MinecraftServer.getExtensionManager(); - Path extensionFolder = extensionManager.getExtensionFolder().toPath().toAbsolutePath(); - Path extensionJar = extensionFolder.resolve(name); - try { - if (!extensionJar.toFile().getCanonicalPath().startsWith(extensionFolder.toFile().getCanonicalPath())) { - sender.sendMessage(Component.text("File name '" + name + "' does not represent a file inside the extensions folder. Will not load")); - return; - } - } catch (IOException e) { - e.printStackTrace(); - sender.sendMessage(Component.text("Failed to load extension: " + e.getMessage())); - return; - } - - try { - boolean managed = extensionManager.loadDynamicExtension(extensionJar.toFile()); - if (managed) { - sender.sendMessage(Component.text("Extension loaded!")); - } else { - sender.sendMessage(Component.text("Failed to load extension, check your logs.")); - } - } catch (Exception e) { - e.printStackTrace(); - sender.sendMessage(Component.text("Failed to load extension: " + e.getMessage())); - } - } - - private void extensionCallback(CommandSender sender, ArgumentSyntaxException exception) { - sender.sendMessage(Component.text("'" + exception.getInput() + "' is not a valid extension name!")); - } -} diff --git a/demo/src/main/java/net/minestom/demo/extension/TestExtension.java b/demo/src/main/java/net/minestom/demo/extension/TestExtension.java deleted file mode 100644 index 053b0edc1..000000000 --- a/demo/src/main/java/net/minestom/demo/extension/TestExtension.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.minestom.demo.extension; - -import net.minestom.server.extensions.Extension; - -public class TestExtension extends Extension { - @Override - public void initialize() { - System.out.println("Initialize test extension"); - - try { - Class.forName("com.mysql.cj.jdbc.Driver", true, getOrigin().getClassLoader()); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - } - - @Override - public void terminate() { - System.out.println("Terminate test extension"); - } -} diff --git a/demo/src/main/resources/extension.json b/demo/src/main/resources/extension.json deleted file mode 100644 index efb46608f..000000000 --- a/demo/src/main/resources/extension.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "entrypoint": "net.minestom.demo.extension.TestExtension", - "name": "TestExtension", - "version": "1.0.0", - "externalDependencies": { - "repositories": [ - { "name": "Central", "url": "https://repo1.maven.org/maven2/" } - ], - "artifacts": [ - "mysql:mysql-connector-java:8.0.26" - ] - } -} \ No newline at end of file