From 6a9a02b8a57b9b6fc2b873d97d592b708bd6f925 Mon Sep 17 00:00:00 2001
From: Martin <Martin.Olischlaeger@icloud.com>
Date: Mon, 17 Jul 2023 21:11:40 +0200
Subject: [PATCH] refactoring for organization

---
 .../java/eu/mhsl/craftattack/spawn/Main.java  | 21 +++-------
 .../spawn/worldmuseum/WorldMueseumMain.java   | 39 +++++++++++++++++++
 .../command/WorldMuseumVillagerCommand.java   |  6 +--
 .../listener/PlayerDisconnectListener.java    |  4 +-
 .../PlayerEntityInteractListener.java         | 10 ++---
 .../{ => worldmuseum}/util/ConfigUtil.java    |  2 +-
 .../util/PlayerOnlineUtil.java                |  2 +-
 .../{ => worldmuseum}/util/PluginMessage.java |  5 ++-
 .../util/VillagerSpawner.java                 |  2 +-
 9 files changed, 61 insertions(+), 30 deletions(-)
 create mode 100644 src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/WorldMueseumMain.java
 rename src/main/java/eu/mhsl/craftattack/spawn/{ => worldmuseum}/command/WorldMuseumVillagerCommand.java (87%)
 rename src/main/java/eu/mhsl/craftattack/spawn/{ => worldmuseum}/listener/PlayerDisconnectListener.java (75%)
 rename src/main/java/eu/mhsl/craftattack/spawn/{ => worldmuseum}/listener/PlayerEntityInteractListener.java (73%)
 rename src/main/java/eu/mhsl/craftattack/spawn/{ => worldmuseum}/util/ConfigUtil.java (96%)
 rename src/main/java/eu/mhsl/craftattack/spawn/{ => worldmuseum}/util/PlayerOnlineUtil.java (91%)
 rename src/main/java/eu/mhsl/craftattack/spawn/{ => worldmuseum}/util/PluginMessage.java (72%)
 rename src/main/java/eu/mhsl/craftattack/spawn/{ => worldmuseum}/util/VillagerSpawner.java (94%)

diff --git a/src/main/java/eu/mhsl/craftattack/spawn/Main.java b/src/main/java/eu/mhsl/craftattack/spawn/Main.java
index f1f47d7..51d773a 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/Main.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/Main.java
@@ -1,38 +1,29 @@
 package eu.mhsl.craftattack.spawn;
 
-import eu.mhsl.craftattack.spawn.command.WorldMuseumVillagerCommand;
-import eu.mhsl.craftattack.spawn.listener.PlayerEntityInteractListener;
-import eu.mhsl.craftattack.spawn.util.VillagerSpawner;
-import org.bukkit.Bukkit;
+import eu.mhsl.craftattack.spawn.worldmuseum.WorldMueseumMain;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.util.Objects;
-
 public final class Main extends JavaPlugin {
     private static Main instance;
 
     @Override
     public void onEnable() {
 //        init
-        saveDefaultConfig();
-        VillagerSpawner.spawnVillager();
         instance = this;
+        saveDefaultConfig();
 
-//        register Messaging-Channels
-        this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
+//        load parts
+        WorldMueseumMain.onEnable();
 
-//        register Commands
-        Objects.requireNonNull(this.getCommand("worldMuseum-villager")).setExecutor(new WorldMuseumVillagerCommand());
 
-//        register listeners
-        Bukkit.getPluginManager().registerEvents(new PlayerEntityInteractListener(), this);
 
 
 
     }
     @Override
     public void onDisable() {
-        VillagerSpawner.killVillager();
+        WorldMueseumMain.onDisable();
+
     }
 
     public static Main getInstance() {
diff --git a/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/WorldMueseumMain.java b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/WorldMueseumMain.java
new file mode 100644
index 0000000..321fc88
--- /dev/null
+++ b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/WorldMueseumMain.java
@@ -0,0 +1,39 @@
+package eu.mhsl.craftattack.spawn.worldmuseum;
+
+import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.worldmuseum.command.WorldMuseumVillagerCommand;
+import eu.mhsl.craftattack.spawn.worldmuseum.listener.PlayerEntityInteractListener;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.VillagerSpawner;
+import org.bukkit.Bukkit;
+
+import java.util.Objects;
+
+public class WorldMueseumMain {
+
+    public static void onEnable() {
+        Main main = getInstance();
+
+        VillagerSpawner.spawnVillager();
+
+
+//        register Messaging-Channels
+        main.getServer().getMessenger().registerOutgoingPluginChannel(main, "BungeeCord");
+
+
+
+//        register Commands
+        Objects.requireNonNull(main.getCommand("worldMuseum-villager")).setExecutor(new WorldMuseumVillagerCommand());
+
+//        register listeners
+        Bukkit.getPluginManager().registerEvents(new PlayerEntityInteractListener(), main);
+    }
+
+    public static void onDisable() {
+        VillagerSpawner.killVillager();
+    }
+
+    public static Main getInstance() {
+        return Main.getInstance();
+    }
+
+}
diff --git a/src/main/java/eu/mhsl/craftattack/spawn/command/WorldMuseumVillagerCommand.java b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/command/WorldMuseumVillagerCommand.java
similarity index 87%
rename from src/main/java/eu/mhsl/craftattack/spawn/command/WorldMuseumVillagerCommand.java
rename to src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/command/WorldMuseumVillagerCommand.java
index e343f63..0884b28 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/command/WorldMuseumVillagerCommand.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/command/WorldMuseumVillagerCommand.java
@@ -1,7 +1,7 @@
-package eu.mhsl.craftattack.spawn.command;
+package eu.mhsl.craftattack.spawn.worldmuseum.command;
 
-import eu.mhsl.craftattack.spawn.util.ConfigUtil;
-import eu.mhsl.craftattack.spawn.util.VillagerSpawner;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.ConfigUtil;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.VillagerSpawner;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
diff --git a/src/main/java/eu/mhsl/craftattack/spawn/listener/PlayerDisconnectListener.java b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/listener/PlayerDisconnectListener.java
similarity index 75%
rename from src/main/java/eu/mhsl/craftattack/spawn/listener/PlayerDisconnectListener.java
rename to src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/listener/PlayerDisconnectListener.java
index 8512c8d..21f78e4 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/listener/PlayerDisconnectListener.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/listener/PlayerDisconnectListener.java
@@ -1,6 +1,6 @@
-package eu.mhsl.craftattack.spawn.listener;
+package eu.mhsl.craftattack.spawn.worldmuseum.listener;
 
-import eu.mhsl.craftattack.spawn.util.PlayerOnlineUtil;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.PlayerOnlineUtil;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
diff --git a/src/main/java/eu/mhsl/craftattack/spawn/listener/PlayerEntityInteractListener.java b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/listener/PlayerEntityInteractListener.java
similarity index 73%
rename from src/main/java/eu/mhsl/craftattack/spawn/listener/PlayerEntityInteractListener.java
rename to src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/listener/PlayerEntityInteractListener.java
index 98de7c4..551a75a 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/listener/PlayerEntityInteractListener.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/listener/PlayerEntityInteractListener.java
@@ -1,9 +1,9 @@
-package eu.mhsl.craftattack.spawn.listener;
+package eu.mhsl.craftattack.spawn.worldmuseum.listener;
 
-import eu.mhsl.craftattack.spawn.util.ConfigUtil;
-import eu.mhsl.craftattack.spawn.util.PlayerOnlineUtil;
-import eu.mhsl.craftattack.spawn.util.PluginMessage;
-import eu.mhsl.craftattack.spawn.util.VillagerSpawner;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.ConfigUtil;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.PlayerOnlineUtil;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.PluginMessage;
+import eu.mhsl.craftattack.spawn.worldmuseum.util.VillagerSpawner;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/ConfigUtil.java b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/ConfigUtil.java
similarity index 96%
rename from src/main/java/eu/mhsl/craftattack/spawn/util/ConfigUtil.java
rename to src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/ConfigUtil.java
index b2f0ed9..3a71e43 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/util/ConfigUtil.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/ConfigUtil.java
@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util;
+package eu.mhsl.craftattack.spawn.worldmuseum.util;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/PlayerOnlineUtil.java b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/PlayerOnlineUtil.java
similarity index 91%
rename from src/main/java/eu/mhsl/craftattack/spawn/util/PlayerOnlineUtil.java
rename to src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/PlayerOnlineUtil.java
index 7e846de..14a2a9d 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/util/PlayerOnlineUtil.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/PlayerOnlineUtil.java
@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util;
+package eu.mhsl.craftattack.spawn.worldmuseum.util;
 
 import org.bukkit.entity.Player;
 import java.util.ArrayList;
diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/PluginMessage.java b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/PluginMessage.java
similarity index 72%
rename from src/main/java/eu/mhsl/craftattack/spawn/util/PluginMessage.java
rename to src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/PluginMessage.java
index abe39c6..d44ac46 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/util/PluginMessage.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/PluginMessage.java
@@ -1,12 +1,13 @@
-package eu.mhsl.craftattack.spawn.util;
+package eu.mhsl.craftattack.spawn.worldmuseum.util;
 
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 import eu.mhsl.craftattack.spawn.Main;
+import eu.mhsl.craftattack.spawn.worldmuseum.WorldMueseumMain;
 import org.bukkit.entity.Player;
 
 public class PluginMessage {
-    private final Main plugin = Main.getInstance();
+    private final Main plugin = WorldMueseumMain.getInstance();
     public void connect(Player player, String server) {
         ByteArrayDataOutput output = ByteStreams.newDataOutput();
         output.writeUTF("Connect");
diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/VillagerSpawner.java b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/VillagerSpawner.java
similarity index 94%
rename from src/main/java/eu/mhsl/craftattack/spawn/util/VillagerSpawner.java
rename to src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/VillagerSpawner.java
index e2e9b9e..52a1f24 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/util/VillagerSpawner.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/worldmuseum/util/VillagerSpawner.java
@@ -1,4 +1,4 @@
-package eu.mhsl.craftattack.spawn.util;
+package eu.mhsl.craftattack.spawn.worldmuseum.util;
 
 import org.bukkit.Location;
 import org.bukkit.entity.EntityType;