From f3ccf080ea32965673dc3b665d8490ff24c33910 Mon Sep 17 00:00:00 2001 From: NK Date: Wed, 23 Nov 2022 22:39:05 +0000 Subject: [PATCH] Fixing issues --- src/main/java/me/night/nullvalkyrie/Main.java | 4 ---- .../me/night/nullvalkyrie/npc/RightClickNPC.java | 2 ++ .../me/night/nullvalkyrie/util/FileManager.java | 1 - src/main/resources/miners.yml | 14 -------------- src/main/resources/npcs.yml | 1 - 5 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/main/java/me/night/nullvalkyrie/Main.java b/src/main/java/me/night/nullvalkyrie/Main.java index 7bbe33a..ebd4c1f 100644 --- a/src/main/java/me/night/nullvalkyrie/Main.java +++ b/src/main/java/me/night/nullvalkyrie/Main.java @@ -4,9 +4,7 @@ import me.night.nullvalkyrie.chests.MenuListener; import me.night.nullvalkyrie.discord.DiscordClientManager; import me.night.nullvalkyrie.enchantments.EnchantmentManager; import me.night.nullvalkyrie.events.CustomItemEvents; -//import me.night.nullvalkyrie.hardpoint.GameEvent; import me.night.nullvalkyrie.events.DamageEffect; -import me.night.nullvalkyrie.hardpoint.ConfigManager; import me.night.nullvalkyrie.items.CustomItemManager; import me.night.nullvalkyrie.npc.ClickNPC; import me.night.nullvalkyrie.npc.NPC; @@ -39,7 +37,6 @@ public final class Main extends JavaPlugin implements Listener { EnchantmentManager.register(); new CustomItemManager(this); new FileManager(); - new CommandManager(this).register(); bossbar = Bukkit.createBossBar(ChatColor.GOLD + "Kuudra", BarColor.RED, BarStyle.SEGMENTED_12); Bukkit.getPluginManager().registerEvents(this, this); @@ -51,7 +48,6 @@ public final class Main extends JavaPlugin implements Listener { //Bukkit.getPluginManager().registerEvents(new GameEvent(this), this); new DiscordClientManager(); new DatabaseManager(); - ConfigManager.setConfig(); NPC.loadNPC(CustomItemManager.loadConfig("npcs.yml")); this.injector = new PacketInjector(); } diff --git a/src/main/java/me/night/nullvalkyrie/npc/RightClickNPC.java b/src/main/java/me/night/nullvalkyrie/npc/RightClickNPC.java index 24e1618..ff98f01 100644 --- a/src/main/java/me/night/nullvalkyrie/npc/RightClickNPC.java +++ b/src/main/java/me/night/nullvalkyrie/npc/RightClickNPC.java @@ -37,4 +37,6 @@ public class RightClickNPC extends Event implements Cancellable { public HandlerList getHandlers() { return HANDLERS; } + + public static HandlerList getHandlerList() { return HANDLERS; } } diff --git a/src/main/java/me/night/nullvalkyrie/util/FileManager.java b/src/main/java/me/night/nullvalkyrie/util/FileManager.java index 166e93f..a2a770f 100644 --- a/src/main/java/me/night/nullvalkyrie/util/FileManager.java +++ b/src/main/java/me/night/nullvalkyrie/util/FileManager.java @@ -5,6 +5,5 @@ import static me.night.nullvalkyrie.items.CustomItemManager.updateYamlFilesToPlu public class FileManager { public FileManager() { updateYamlFilesToPlugin("shop.yml"); - updateYamlFilesToPlugin("hardpoint.yml"); } } diff --git a/src/main/resources/miners.yml b/src/main/resources/miners.yml index 0fedaf5..e69de29 100644 --- a/src/main/resources/miners.yml +++ b/src/main/resources/miners.yml @@ -1,14 +0,0 @@ -'0': - name: Sussy - material: ENDER_CHEST - level: 10 - rate: 0.7 - enabled: true - last-claim: 1668206939600 -'1': - name: Sussy - material: ENDER_CHEST - level: 10 - rate: 0.7 - enabled: true - last-claim: 1668208245832 diff --git a/src/main/resources/npcs.yml b/src/main/resources/npcs.yml index 99d4a71..e69de29 100644 --- a/src/main/resources/npcs.yml +++ b/src/main/resources/npcs.yml @@ -1 +0,0 @@ -data: