Merge pull request #530 from ItzKatze/master

added skyblock folder in configuration

Author: Swofty-Developments

.gitignore

@@ -43,6 +43,6 @@ build/
 .DS_Store
 
 ### Islands ###
-/configuration/hypixel_island_template/
-/configuration/hypixel_hub/
+/configuration/skyblock/islands/hypixel_skyblock_island_template/
+/configuration/skyblock/islands/hypixel_skyblock_hub/
 /configuration/hypixel_prototype_lobby/

DockerFiles/Dockerfile.game_server

@@ -39,19 +39,19 @@ RUN cp configuration_files/NanoLimbo-1.9.1-all.jar ./NanoLimbo-1.9.1-all.jar
 RUN cp configuration_files/settings.yml ./settings.yml
 
 # Copy Songs Folder
-RUN cp -R configuration_files/songs ./configuration/songs
+RUN cp -R configuration_files/songs ./configuration/skyblock/songs
 
 # Copy Collections
-RUN cp -R configuration_files/collections ./configuration/collections
+RUN cp -R configuration_files/collections ./configuration/skyblock/collections
 
 # Copy Items
-RUN cp -R configuration_files/items ./configuration/items
+RUN cp -R configuration_files/items ./configuration/skyblock/items
 
 # Copy SkyBlockPack
-RUN cp -R configuration_files/SkyBlockPack ./configuration/SkyBlockPack
+RUN cp -R configuration_files/SkyBlockPack ./configuration/skyblock/SkyBlockPack
 
 # Copy pack_textures
-RUN cp -R configuration_files/pack_textures ./configuration/pack_textures
+RUN cp -R configuration_files/pack_textures ./configuration/skyblock/pack_textures
 
 # Copy Entrypoint Script
 RUN cp configuration_files/entrypoint.sh ./entrypoint.sh

README.md

@@ -1,9 +1,9 @@
 package net.swofty.commons;
 
 public enum CustomWorlds {
-    ISLANDS_TEMPLATE("hypixel_island_template"),
+    SKYBLOCK_ISLAND_TEMPLATE("hypixel_skyblock_island_template"),
     SKYBLOCK_HUB("hypixel_skyblock_hub"),
-    DUNGEON_HUB("hypixel_dungeon_hub"),
+    SKYBLOCK_DUNGEON_HUB("hypixel_skyblock_dungeon_hub"),
     PROTOTYPE_LOBBY("hypixel_prototype_lobby"),
     BEDWARS_LOBBY("hypixel_bedwars_lobby"),
     ;
@@ -15,6 +15,10 @@ public enum CustomWorlds {
     }
 
     public String getFolderName() {
-        return "./configuration/" + folderName;
+        if (name().startsWith("SKYBLOCK_")) {
+            return "./configuration/skyblock/islands/" + folderName;
+        } else {
+            return "./configuration/" + folderName;
+        }
     }
 }

commons/src/main/java/net/swofty/commons/CustomWorlds.java

@@ -6,7 +6,7 @@
 
 @Getter
 public enum Songs {
-    WILDERNESS(Path.of("./configuration/songs/wilderness.nbs")),
+    WILDERNESS(Path.of("./configuration/skyblock/songs/wilderness.nbs")),
     ;
 
     private final Path path;

commons/src/main/java/net/swofty/commons/Songs.java

@@ -15,7 +15,7 @@
 
 @Data
 public class ReforgeLoader {
-    private static final File REFORGES_DIR = new File("./configuration/reforges");
+    private static final File REFORGES_DIR = new File("./configuration/skyblock/reforges");
     private static final Map<String, Reforge> LOADED_REFORGES = new HashMap<>();
 
     @Data

commons/src/main/java/net/swofty/commons/item/reforge/ReforgeLoader.java

@@ -16,10 +16,10 @@ sed -i "s/secret: '.*'/secret: '$secret'/" ./settings.yml
 screen -wipe
 
 # Start services in separate screen sessions
-screen -dmS SkyBlockCore_ISLAND java --enable-preview -jar SkyBlockCore.jar ISLAND
+screen -dmS SkyBlockCore_ISLAND java --enable-preview -jar SkyBlockCore.jar SKYBLOCK_ISLAND
 sleep 20
-screen -dmS SkyBlockCore_HUB java --enable-preview -jar SkyBlockCore.jar HUB
-screen -dmS SkyBlockCore_FARMING java --enable-preview -jar SkyBlockCore.jar THE_FARMING_ISLANDS
+screen -dmS SkyBlockCore_HUB java --enable-preview -jar SkyBlockCore.jar SKYBLOCK_HUB
+screen -dmS SkyBlockCore_FARMING java --enable-preview -jar SkyBlockCore.jar SKYBLOCK_THE_FARMING_ISLANDS
 screen -dmS NanoLimbo java -jar NanoLimbo-1.9.1-all.jar
 screen -dmS ServiceAPI java -jar ServiceAPI.jar
 screen -dmS ServiceAuctionHouse java -jar ServiceAuctionHouse.jar