From 017e559641e0d8872f60a86310ef4ceda0792c40 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 5 Nov 2020 15:48:47 +0100 Subject: [PATCH] Cleanup --- .../customdimensions/CDCommand.java | 30 ------------------- .../customdimensions/CustomDimensions.java | 3 +- src/main/resources/plugin.yml | 6 +--- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 src/main/java/buttondevteam/customdimensions/CDCommand.java diff --git a/src/main/java/buttondevteam/customdimensions/CDCommand.java b/src/main/java/buttondevteam/customdimensions/CDCommand.java deleted file mode 100644 index 12f1f8a..0000000 --- a/src/main/java/buttondevteam/customdimensions/CDCommand.java +++ /dev/null @@ -1,30 +0,0 @@ -package buttondevteam.customdimensions; - -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; - -public class CDCommand implements CommandExecutor { - private final CustomDimensions plugin; - - public CDCommand(CustomDimensions plugin) {this.plugin = plugin;} - - @Override - public boolean onCommand(CommandSender sender, Command command, String alias, String[] args) { - sender.sendMessage("§bLoading custom dimensions..."); - sender.sendMessage("To reload a dimension, specify its name after the command"); - try { - if (args.length > 0) - if (!Bukkit.unloadWorld(args[0], true)) - sender.sendMessage("§cFailed to unload world " + args[0]); - plugin.reloadConfig(); //Reload ignore list - plugin.load(); - } catch (Exception e) { - e.printStackTrace(); - } - sender.sendMessage("§bFinished loading custom dimensions!"); - sender.sendMessage("See the console for more details"); - return true; - } -} diff --git a/src/main/java/buttondevteam/customdimensions/CustomDimensions.java b/src/main/java/buttondevteam/customdimensions/CustomDimensions.java index 9ea255a..97ff647 100644 --- a/src/main/java/buttondevteam/customdimensions/CustomDimensions.java +++ b/src/main/java/buttondevteam/customdimensions/CustomDimensions.java @@ -20,7 +20,6 @@ import java.util.*; public class CustomDimensions extends JavaPlugin implements Listener { @Override public void onEnable() { - //Objects.requireNonNull(getCommand("cdload")).setExecutor(new CDCommand(this)); - dimensions aren't updated on /minecraft:reload getLogger().info("Loading custom dimensions..."); try { load(); @@ -30,7 +29,7 @@ public class CustomDimensions extends JavaPlugin implements Listener { getLogger().info("Finished loading custom dimensions!"); } - public void load() throws Exception { + private void load() throws Exception { var console = ((CraftServer) Bukkit.getServer()).getServer(); var field = console.getClass().getSuperclass().getDeclaredField("saveData"); field.setAccessible(true); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 636af8c..f34a7ed 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,8 +3,4 @@ main: buttondevteam.customdimensions.CustomDimensions version: '1.4' api-version: '1.16' loadbefore: - - Multiverse-Core -#commands: -# cdload: -# description: Load custom dimensions that aren't loaded at the moment -# permission: customdimensions.load \ No newline at end of file + - Multiverse-Core \ No newline at end of file