From 4aa5c1e5ae9acf42b0cca139fe67fdb069c47b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elias=20M=C3=BCller?= <elias@elias-mueller.com>
Date: Mon, 23 Oct 2023 09:17:19 +0200
Subject: [PATCH] Removed dead config files and entries Added option for
 bungeecord return server

---
 .../worldmuseum/default_config.json           |  4 ----
 .../worldmuseum/inventory/WorldSelector.java  |  3 ++-
 .../craftattack/worldmuseum/util/Config.java  | 24 +++++++------------
 .../worldmuseum/worlds/default.json           | 13 ----------
 4 files changed, 11 insertions(+), 33 deletions(-)
 delete mode 100755 src/main/java/eu/mhsl/craftattack/worldmuseum/default_config.json
 delete mode 100755 src/main/java/eu/mhsl/craftattack/worldmuseum/worlds/default.json

diff --git a/src/main/java/eu/mhsl/craftattack/worldmuseum/default_config.json b/src/main/java/eu/mhsl/craftattack/worldmuseum/default_config.json
deleted file mode 100755
index a6cadb6..0000000
--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/default_config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "start_world": "world",
-  "bungeecord": false
-}
\ No newline at end of file
diff --git a/src/main/java/eu/mhsl/craftattack/worldmuseum/inventory/WorldSelector.java b/src/main/java/eu/mhsl/craftattack/worldmuseum/inventory/WorldSelector.java
index 91b8d7e..40bf49e 100644
--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/inventory/WorldSelector.java
+++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/inventory/WorldSelector.java
@@ -1,6 +1,7 @@
 package eu.mhsl.craftattack.worldmuseum.inventory;
 
 import eu.mhsl.craftattack.worldmuseum.util.BunggeCordComunicator;
+import eu.mhsl.craftattack.worldmuseum.util.Config;
 import eu.mhsl.craftattack.worldmuseum.util.MuseumPlayer;
 import eu.mhsl.craftattack.worldmuseum.worlds.World;
 import eu.mhsl.craftattack.worldmuseum.worlds.WorldManager;
@@ -49,7 +50,7 @@ public class WorldSelector extends Inventory {
                 player.closeInventory();
                 player.startLoading();
 
-                BunggeCordComunicator.connect(player, "server");
+                BunggeCordComunicator.connect(player, Config.getInstance().getBungeeReturnServerName());
 
                 MinecraftServer.getSchedulerManager().scheduleTask(() -> {
                     if(player.isOnline()) player.kick("Timeout beim Serverwechsel. Bitte joine dem Server erneut!");
diff --git a/src/main/java/eu/mhsl/craftattack/worldmuseum/util/Config.java b/src/main/java/eu/mhsl/craftattack/worldmuseum/util/Config.java
index 9288351..c723d71 100644
--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/util/Config.java
+++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/util/Config.java
@@ -2,8 +2,6 @@ package eu.mhsl.craftattack.worldmuseum.util;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import eu.mhsl.craftattack.worldmuseum.worlds.World;
-import eu.mhsl.craftattack.worldmuseum.worlds.WorldManager;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -11,35 +9,31 @@ import java.io.IOException;
 
 public class Config {
     private static Config instance;
-    private World start_world;
     private boolean bungeecordEnabled = false;
+    private String bungeeReturnServerName;
     public static Config getInstance() {
         if (instance == null) instance = new Config();
         return instance;
     }
     public void loadConfig() {
-        checkConfig();
+        createDefaultIfNotExists();
         try {
             JsonObject config = (JsonObject) JsonParser.parseReader(new FileReader("config.json"));
-            for (World w : WorldManager.getInstance().getWorlds()) {
-                if (!w.getName().equals(config.get("start_world").getAsString())) continue;
-                this.start_world = w;
-            }
             this.bungeecordEnabled = config.get("bungeecord").getAsBoolean();
-
+            this.bungeeReturnServerName = config.get("bc-return-servername").getAsString();
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
-    private void checkConfig() {
+    private void createDefaultIfNotExists() {
         try {
             File checkfile = new File("./config.json");
             if (checkfile.createNewFile()) {
                 FileWriter fileWriter = new FileWriter("config.json");
                 String default_config = """
                         {
-                          "start_world": "world",
+                          "bc-return-servername": "server",
                           "bungeecord": false
                         }""";
                 fileWriter.write(default_config);
@@ -50,11 +44,11 @@ public class Config {
         }
     }
 
-    public World getStart_world() {
-        return start_world;
-    }
-
     public boolean isBungeecordEnabled() {
         return bungeecordEnabled;
     }
+
+    public String getBungeeReturnServerName() {
+        return bungeeReturnServerName;
+    }
 }
diff --git a/src/main/java/eu/mhsl/craftattack/worldmuseum/worlds/default.json b/src/main/java/eu/mhsl/craftattack/worldmuseum/worlds/default.json
deleted file mode 100755
index ea8e42f..0000000
--- a/src/main/java/eu/mhsl/craftattack/worldmuseum/worlds/default.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "enabled": false,
-  "name": "DEFAULT_NAME",
-  "material": "GRASS_BLOCK",
-  "spawn": {
-    "x": 0,
-    "y": 0,
-    "z": 0
-  },
-  "tags": [
-    "RANDOM_TAG"
-  ]
-}
\ No newline at end of file