Merge pull request #524 from ItzKatze/master

fix: serverTypes being used wrong

Author: Swofty-Developments

.gitignore

@@ -41,5 +41,8 @@ build/
 
 ### Mac OS ###
 .DS_Store
+
+### Islands ###
 /configuration/hypixel_island_template/
 /configuration/hypixel_hub/
+/configuration/hypixel_prototype_lobby/

README.md

@@ -49,7 +49,7 @@ A video of me going through the guide [can be found here](https://www.youtube.co
 3. Download `resources.json` from [here](https://github.com/Swofty-Developments/HypixelSkyBlock/tree/master/configuration)
 4. Move this file into the `configuration` folder you just made.
 5. Download the [world files for the SkyBlock Hub, Prototype Lobby, and Island worlds.](https://www.mediafire.com/file/xxnxgkqejlh17fn/HypixelRecreationWorlds.zip/file)
-6. Get the Hypixel SkyBlock hub from the above download and put it in the configuration folder you made under the name `hypixel_hub`, and the Prototype Lobby under `hypixel_prototype_lobby`.
+6. Get the Hypixel SkyBlock hub from the above download and put it in the configuration folder you made under the name `hypixel_skyblock_hub`, and the Prototype Lobby under `hypixel_prototype_lobby`.
 7. Get the Hypixel Island default template from the above download and put it in the configuration folder you made under the name `hypixel_island_template`.
 8. Get the item and collection folders from [here](https://github.com/Swofty-Developments/HypixelSkyBlock/tree/master/configuration) and put them into your configuration folder.
 9. There should be a `forwarding.secret` file where your Velocity JAR is, take this and put it into your `resources.json` under `velocity-secret`.

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

@@ -6,8 +6,8 @@
 public enum ServerType {
     SKYBLOCK_ISLAND(true),
     SKYBLOCK_HUB(true),
-    DUNGEON_HUB(true),
-    THE_FARMING_ISLANDS(true),
+    SKYBLOCK_DUNGEON_HUB(true),
+    SKYBLOCK_THE_FARMING_ISLANDS(true),
     PROTOTYPE_LOBBY(false),
     BEDWARS_LOBBY(false),
     BEDWARS_GAME(false),
@@ -29,4 +29,16 @@ public static boolean isServerType(String type) {
     public String formatName() {
         return StringUtility.toNormalCase(name());
     }
+
+    public static ServerType getSkyblockServer(String name) {
+        if (!name.startsWith("SKYBLOCK_")) {
+            return valueOf("SKYBLOCK_" + name.toUpperCase());
+        } else {
+            return valueOf(name);
+        }
+    }
+
+    public String skyblockName() {
+        return name().replace("SKYBLOCK_", "");
+    }
 }

type.dungeonhub/src/main/java/net/swofty/type/dungeonhub/TypeDungeonHubLoader.java

@@ -30,7 +30,7 @@ public class TypeDungeonHubLoader implements SkyBlockTypeLoader {
 
     @Override
     public ServerType getType() {
-        return ServerType.DUNGEON_HUB;
+        return ServerType.SKYBLOCK_DUNGEON_HUB;
     }
 
     @Override

type.hub/src/main/java/net/swofty/type/hub/TypeHubLoader.java

@@ -48,12 +48,12 @@ public void onInitialize(MinecraftServer server) {
 
     @Override
     public void afterInitialize(MinecraftServer server) {
-        RuneEntityImpl firstStone = new RuneEntityImpl(new Pos(-37.2, 68.40, -129.15, 0, 0f), false);
-        RuneEntityImpl secondStone = new RuneEntityImpl(new Pos( -37.82, 68.40, -129.15, 0, 0f), false);
-        RuneEntityImpl thirdStone = new RuneEntityImpl(new Pos(-37.2, 68.40, -129.775, 0, 0f), false);
-        RuneEntityImpl fourthStone = new RuneEntityImpl(new Pos(-37.82, 68.40, -129.775, 0, 0f), false);
-        RuneEntityImpl head = new RuneEntityImpl(new Pos(-37.5, 69.20, -129.4, -70, 0f), true);
-        Pos runePos = new Pos(-37.5, 70, -129.5, 0, 0f);
+        RuneEntityImpl firstStone = new RuneEntityImpl(new Pos(-37.84375, 68.3125, -129.8125, 0, 0f), false);
+        RuneEntityImpl secondStone = new RuneEntityImpl(new Pos( -37.21875, 68.3125, -129.8125, 0, 0f), false);
+        RuneEntityImpl thirdStone = new RuneEntityImpl(new Pos(-37.21875, 68.3125, -129.1875, 0, 0f), false);
+        RuneEntityImpl fourthStone = new RuneEntityImpl(new Pos(-37.84375, 68.3125, -129.1875, 0, 0f), false);
+        RuneEntityImpl head = new RuneEntityImpl(new Pos(-37.65625, 69.09375, -129.34375, 45, 0f), true);
+        Pos runePos = new Pos(-37.84375, 68.3125, -129.8125, 0, 0f);
 
         AtomicReference<Double> i = new AtomicReference<>(0D);
         MinecraftServer.getSchedulerManager().scheduleTask(() -> {
@@ -102,8 +102,8 @@ public void afterInitialize(MinecraftServer server) {
     public LoaderValues getLoaderValues() {
         return new LoaderValues(
                 (type) -> switch (type) {
-                    case THE_FARMING_ISLANDS -> new Pos(74, 72, -180, 35, 0);
-                    case DUNGEON_HUB -> new Pos(-44, 88, 11.5, 0, 0);
+                    case SKYBLOCK_THE_FARMING_ISLANDS -> new Pos(74, 72, -180, 35, 0);
+                    case SKYBLOCK_DUNGEON_HUB -> new Pos(-44, 88, 11.5, 0, 0);
                     default -> new Pos(-2.5, 72.5, -69.5, 180, 0);
                 }, // Spawn position
                 true // Announce death messages

type.hub/src/main/java/net/swofty/type/hub/runes/RuneEntityImpl.java

@@ -29,7 +29,7 @@ public RuneEntityImpl(Pos position, boolean isHead) {
             ((ArmorStandMeta) this.entityMeta).setHeadRotation(new Vec( -90, 0.4, 0));
             setHelmet(ItemStackCreator.getStackHead("5c540298a017b25f9cfae9281fe5b585d770db1852b73804d1bb7c7ee53733a4").build());
         } else {
-            setHelmet(ItemStack.builder(Material.STONE_SLAB).build());
+            setHelmet(ItemStack.builder(Material.SMOOTH_STONE_SLAB).build());
         }
 
         setInstance(HypixelConst.getInstanceContainer(), position);

type.prototypelobby/src/main/java/net/swofty/type/prototypelobby/npcs/NPCSkyBlock.java

@@ -33,9 +33,9 @@ public String[] holograms(HypixelPlayer player) {
                     return server.players().size();
                 }).reduce(0, Integer::sum);
 
-                String commmaified = StringUtility.commaify(amountOnline);
+                String commaified = StringUtility.commaify(amountOnline);
                 return new String[]{
-                        "§e" + commmaified + " Playing",
+                        "§e" + commaified + " Playing",
                         "§bSkyBlock §7[v0.23.3]",
                         "§e§lCLICK"
                 };

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/SkyBlockGenericLoader.java

@@ -329,7 +329,7 @@ public void initialize(MinecraftServer server) {
          */
         if (mainInstance != null) {
             ServerHolograms.spawnAll(HypixelConst.getInstanceContainer());
-            String zone = typeLoader.getType().toString();
+            String zone = typeLoader.getType().skyblockName();
             FairySoul.spawnEntities(HypixelConst.getInstanceContainer(), FairySoulZone.valueOf(zone.toUpperCase()));
         }
 

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/monogdb/CrystalDatabase.java

@@ -103,7 +103,7 @@ public static List<CrystalData> getAllCrystals() {
             crystal.url = url;
             crystal.position = new Pos(x + 0.5, y, z + 0.5);
             crystal.itemType = itemTypeLinker;
-            crystal.serverType = ServerType.valueOf(doc.getString("serverType"));
+            crystal.serverType = ServerType.getSkyblockServer(doc.getString("serverType"));
 
             crystals.add(crystal);
         }

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/data/monogdb/RegionDatabase.java

@@ -97,7 +97,7 @@ public static List<SkyBlockRegion> getAllRegions() {
             int x2 = doc.getInteger("x2");
             int y2 = doc.getInteger("y2");
             int z2 = doc.getInteger("z2");
-            ServerType serverType = ServerType.valueOf(doc.getOrDefault("serverType", ServerType.SKYBLOCK_HUB.name()).toString());
+            ServerType serverType = ServerType.getSkyblockServer(doc.getOrDefault("serverType", ServerType.SKYBLOCK_HUB.name()).toString());
             SkyBlockRegion region = new SkyBlockRegion(
                     name,
                     new Pos(x1, y1, z1),