Add new locations

1 files changed, 72 insertions, 44 deletions

diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java b/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java
index 1ae126f..ebe03bf 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java
@@ -2,14 +2,15 @@ package com.thatgravyboat.skyblockhud.location;
 
 public enum Locations {
     //ERROR LOCATIONS
-    DEFAULT("unknown", "Somewhere on Skyblock...", LocationCategory.ERROR),
+    DEFAULT("unknown", "Error", LocationCategory.ERROR),
     NONE("none", "Unknown", LocationCategory.ERROR),
-    //PRIVATE ISLAND
+    //ISLAND
     YOURISLAND("yourisland", "Your Island", LocationCategory.ISLAND),
     GUESTISLAND("guestisland", "Guest Island", LocationCategory.ISLAND),
     THEGARDEN("garden", "The Garden", LocationCategory.ISLAND),
     GUESTGARDEN("guestgarden", "Guest Garden", LocationCategory.ISLAND),
     MOULBERRYSISLAND("moulberryisland", "Cool Dude Hub", LocationCategory.ISLAND),
+
     //HUB
     VILLAGE("village", "Village", LocationCategory.HUB),
     AUCTIONHOUSE("auctionhouse", "Auction House", LocationCategory.HUB),
@@ -41,12 +42,16 @@ public enum Locations {
     HEXATORUM("hexatorum", "Hexatorum", LocationCategory.HUB),
     SHENSAUCTION("shensauction", "Shen's Auction", LocationCategory.HUB),
     REGALIAROOM("regaliaroom", "Regalia Room", LocationCategory.HUB),
+    ARCHERYRANGE("archeryrange", "Archery Range", LocationCategory.HUB),
+    UNINCORPORATEDTERRITOR("unincorporatedterritor", "Unincorporated Territory", LocationCategory.HUB),
+
     //THE BARN
     THEBARN("thebarn", "The Barn", LocationCategory.BARN),
     WINDMILL("windmill", "Windmill", LocationCategory.BARN),
     //MUSHROOM DESERT
     MUSHROOMDESERT("mushroomdesert", "Mushroom Desert", LocationCategory.MUSHROOMDESERT),
     DESERTSETTLEMENT("desertsettlement", "Desert Settlement", LocationCategory.MUSHROOMDESERT),
+    DESERTMOUNTAIN("desertmountain", "Desert Mountain", LocationCategory.MUSHROOMDESERT),
     OASIS("oasis", "Oasis", LocationCategory.MUSHROOMDESERT),
     MUSHROOMGORGE("mushroomgorge", "Mushroom Gorge", LocationCategory.MUSHROOMDESERT),
     SHEPHERDSKEEP("shepherdskeep", "Shepherds Keep", LocationCategory.MUSHROOMDESERT),
@@ -67,57 +72,30 @@ public enum Locations {
     OBSIDIANSANCTUARY("obsidiansanctuary", "Obsidian Sanctuary", LocationCategory.DEEPCAVERNS),
     //SPIDERS DEN
     SPIDERSDEN("spidersden", "Spider's Den", LocationCategory.SPIDERSDEN),
+    GRANDMASHOUSE("grandmashouse", "Grandma's House", LocationCategory.SPIDERSDEN),
+    ARACHNESBURROW("arachnesburrow", "Arachne's Burrow", LocationCategory.SPIDERSDEN),
+    ARACHNESSANCTUARY("arachnessanctuary", "Arachne's Sanctuary", LocationCategory.SPIDERSDEN),
+    SPIDERMOUND("spidermound", "Spider Mound", LocationCategory.SPIDERSDEN),
+    GRAVELMINES("gravelmines", "Gravel Mines", LocationCategory.SPIDERSDEN),
+
     //THE END
     THEEND("theend", "The End", LocationCategory.THEEND),
     DRAGONSNEST("dragonsnest", "Dragon's Nest", LocationCategory.THEEND),
     VOIDSEPULTURE("voidsepulture", "Void Sepulture", LocationCategory.THEEND),
+    VOIDSLATE("voidslate", "Void Slate", LocationCategory.THEEND),
+    ZEALOTBRUISERHIDEOUT("zealotbruiserhideout", "Zealot Bruiser Hideout", LocationCategory.THEEND),
     //PARK
     HOWLINGCAVE("howlingcave", "Howling Cave", LocationCategory.PARK),
     BIRCHPARK("birchpark", "Birch Park", LocationCategory.PARK),
     SPRUCEWOODS("sprucewoods", "Spruce Woods", LocationCategory.PARK),
+    LONELYISLAND("lonelyisland", "Lonely Island", LocationCategory.PARK),
+    MELODYSPLATEAU("melodysplateau", "Melody's Plateau", LocationCategory.PARK),
+    MELANCHOLICVIKING("melancholicviking", "Melancholic Viking", LocationCategory.PARK),
     DARKTHICKET("darkthicket", "Dark Thicket", LocationCategory.PARK),
     SAVANNAWOODLAND("savannawoodland", "Savanna Woodland", LocationCategory.PARK),
     JUNGLEISLAND("jungleisland", "Jungle Island", LocationCategory.PARK),
-    //CRIMSON ISLE
-    CRIMSONISLE("crimsonisle", "Crimson Isle", LocationCategory.CRIMSON),
-    CRIMSONFIELDS("crimsonfields", "Crimson Fields", LocationCategory.CRIMSON),
-    CATHEDRAL("cathedral", "Cathedral", LocationCategory.CRIMSON),
-    BARBARIANOUTPOST("barbarianoutpost", "Barbarian Outpost", LocationCategory.CRIMSON),
-    MAGEOUTPOST("mageoutpost", "Mage Outpost", LocationCategory.CRIMSON),
-    THEBASTION("thebastion", "The Bastion", LocationCategory.CRIMSON),
-    BLAZINGVOLCANO("blazingvolcano", "Blazing Volcano", LocationCategory.CRIMSON),
-    BURNINGDESERT("burningdesert", "Burning Desert", LocationCategory.CRIMSON),
-    DOJO("dojo", "Dojo", LocationCategory.CRIMSON),
-    DRAGONTAIL("dragontail", "Dragontail", LocationCategory.CRIMSON),
-    DRAGONTAILTOWNSQUARE("dragontailtownsquare", "Dragontail Townsquare", LocationCategory.CRIMSON),
-    DRAGONTAILAUCTIONHOUS("dragontailauctionhous", "Dragontail AH", LocationCategory.CRIMSON),
-    DRAGONTAILBAZAAR("dragontailbazaar", "Dragontail BZ", LocationCategory.CRIMSON),
-    DRAGONTAILBANK("dragontailbank", "Dragontail Bank", LocationCategory.CRIMSON),
-    DRAGONTAILBLACKSMITH("dragontailblacksmith", "Dragontail Blacksmith", LocationCategory.CRIMSON),
-    DRAGONTAILMINIONSHOP("dragontailminionshop", "Dragontail Minion Shop", LocationCategory.CRIMSON),
-    CHIEFSHUT("chiefshut", "Chief's Hut", LocationCategory.CRIMSON),
-    FORGOTTENSKULL("forgottenskull", "Forgotten Skull", LocationCategory.CRIMSON),
-    KUUDRASEND("kuudrasend", "Kuudra's End", LocationCategory.CRIMSON),
-    MAGMACHAMBER("magmachamber", "Magma Chamber", LocationCategory.CRIMSON),
-    MYSTICMARSH("mysticmarsh", "Mystic Marsh", LocationCategory.CRIMSON),
-    ODGERSHUT("odgershut", "Odger's Hut", LocationCategory.CRIMSON),
-    RUINSOFASHFANG("ruinsofashfang", "Ruins of Ashfang", LocationCategory.CRIMSON),
-    SCARLETON("scarleton", "Scarleton", LocationCategory.CRIMSON),
-    SCARLETONPLAZA("scarletonplaza", "Scarleton Plaza", LocationCategory.CRIMSON),
-    SCARLETONAUCTIONHOUS("scarletonauctionhous", "Scarleton AH", LocationCategory.CRIMSON),
-    SCARLETONBAZAAR("scarletonbazaar", "Scarleton BZ", LocationCategory.CRIMSON),
-    SCARLETONBANK("scarletonbank", "Scarleton Bank", LocationCategory.CRIMSON),
-    SCARLETONBLACKSMITH("scarletonblacksmith", "Scarleton Blacksmith", LocationCategory.CRIMSON),
-    SCARLETONMINIONSHOP("scarletonminionshop", "Scarleton Minion Shop", LocationCategory.CRIMSON),
-    STRONGHOLD("stronghold", "Stronghold", LocationCategory.CRIMSON),
-    THEWASTELAND("thewasteland", "The Wasteland", LocationCategory.CRIMSON),
-    MATRIARCHSLAIR("matriarchslair", "Matriarch's Lair", LocationCategory.CRIMSON),
-    BELLYOFTHEBEAST("bellyofthebeast", "Belly of the Beast", LocationCategory.CRIMSON),
-    AURASLAB("auraslab", "Aura's Lab", LocationCategory.CRIMSON),
-    COURTYARD("courtyard", "Courtyard", LocationCategory.CRIMSON),
-    IGRUPANSCHICKENCOOP("igrupanschickencoop", "Igrupan's Chicken Coop", LocationCategory.CRIMSON),
-    THRONEROOM("throneroom", "Throne Room", LocationCategory.CRIMSON),
-    MAGECOUNCIL("magecouncil", "Mage Council", LocationCategory.CRIMSON),
+    //BLAZING FORTRESS
+    BLAZINGFORTRESS("blazingfortress", "Blazing Fortress", LocationCategory.CRIMSON),
     //DUNGEONS
     DUNGEONHUB("dungeonhub", "Dungeon Hub", LocationCategory.DN),
     CATACOMBS("catacombs", "The Catacombs", LocationCategory.DN),
@@ -125,6 +103,14 @@ public enum Locations {
     //JERRYISLAND
     JERRYSWORKSHOP("jerrysworkshop", "Jerry's Workshop", LocationCategory.JERRY),
     JERRYPOND("jerrypond", "Jerry Pond", LocationCategory.JERRY),
+    REFLECTIVEPOND("reflectivepond", "Reflective Pond", LocationCategory.JERRY),
+    MOUNTJERRY("mountjerry", "Mount Jerry", LocationCategory.JERRY),
+    HOTSPRINGS("hotsprings", "Hot Springs", LocationCategory.JERRY),
+    TERRYSSHACK("terrysshack", "Terry's Shack", LocationCategory.JERRY),
+    GLACIALCAVE("glacialcave", "Glacial Cave", LocationCategory.JERRY),
+    GARYSSHACK("garysshack", "Gary's Shack", LocationCategory.JERRY),
+    SHERRYSSHOWROOM("sherrysshowroom", "Sherry's Showroom", LocationCategory.JERRY),
+    EINARYSEMPORIUM("einarysemporium", "Einary's Emporium", LocationCategory.JERRY),
     //DWARVENMINES
     THELIFT("thelift", "The Lift", LocationCategory.DWARVENMINES),
     DWARVENVILLAGE("dwarvenvillage", "Dwarven Village", LocationCategory.DWARVENMINES),
@@ -158,7 +144,7 @@ public enum Locations {
     MITHRILDEPOSITS("mithrildeposits", "Mithril Deposits", LocationCategory.CRYSTALHOLLOWS),
     MINESOFDIVAN("minesofdivan", "Mines of Divan", LocationCategory.CRYSTALHOLLOWS),
     MAGMAFIELDS("magmafields", "Magma Fields", LocationCategory.CRYSTALHOLLOWS),
-    KHAZADDM("khzaddm", "Khazad-d\u00FBm", LocationCategory.CRYSTALHOLLOWS),
+    KHAZADDM("khzaddm", "Khazad-dûm", LocationCategory.CRYSTALHOLLOWS),
     GOBLINHOLDOUT("goblinholdout", "Goblin Holdout", LocationCategory.CRYSTALHOLLOWS),
     GOBLINQUEENSDEN("goblinqueensden", "Goblin Queens Den", LocationCategory.CRYSTALHOLLOWS),
     PRECURSORREMNANTS("precursorremnants", "Precursor Remnants", LocationCategory.CRYSTALHOLLOWS),
@@ -166,7 +152,49 @@ public enum Locations {
     CRYSTALNUCLEUS("crystalnucleus", "Crystal Nucleus", LocationCategory.CRYSTALHOLLOWS),
     CRYSTALHOLLOWS("crystalhollows", "Crystal Hollows", LocationCategory.CRYSTALHOLLOWS),
     FAIRYGROTTO("fairygrotto", "Fairy Grotto", LocationCategory.CRYSTALHOLLOWS),
-    ;
+
+    //CRIMSON ISLE
+    CRIMSONISLE("crimsonisle", "Crimson Isle", LocationCategory.CRIMSON),
+    STRONGHOLD("stronghold", "Stronghold", LocationCategory.CRIMSON),
+    CRIMSONFIELDS("crimsonfields", "Crimson Fields", LocationCategory.CRIMSON),
+    BURNINGDESERT("burningdesert", "Burning Desert", LocationCategory.CRIMSON),
+    DRAGONTAIL("dragontail", "Dragontail", LocationCategory.CRIMSON),
+    DRAGONTAILBANK("dragontailbank", "Dragontail Bank", LocationCategory.CRIMSON),
+    DRAGONTAILTOWNSQUARE("dragontailtownsquare", "Dragontail Townsquare", LocationCategory.CRIMSON),
+    DRAGONTAILAUCTIONHOUS("dragontailah", "Dragontail Auction House", LocationCategory.CRIMSON),
+    THEBASTION("thebastion", "The Bastion", LocationCategory.CRIMSON),
+    RUINSOFASHFANG("ruinsash", "Ruins of Ashfang", LocationCategory.CRIMSON),
+    FORGOTTENSKULL("forskull", "Forgotten Skull", LocationCategory.CRIMSON),
+    THEWASTELAND("waste", "The Wasteland", LocationCategory.CRIMSON),
+    MYSTICMARSH("marsh", "Mystic Marsh", LocationCategory.CRIMSON),
+    CATHEDRAL("cathedral", "Cathedral", LocationCategory.CRIMSON),
+    SCARLETON("scarleton", "Scarleton", LocationCategory.CRIMSON),
+    SCARLETONPLAZA("scarletonpl", "Scarleton Plaza", LocationCategory.CRIMSON),
+    SCARLETONAUCTIONHOUSE("scarletonah", "Scarleton Auction House", LocationCategory.CRIMSON),
+    SCARLETONBANK("scarletonbank", "Scarleton Bank", LocationCategory.CRIMSON),
+    SCARLETONBAZAAR("scarletonbz", "Scarleton Bazaar", LocationCategory.CRIMSON),
+    SCARLETONBLACKSMITH("scarletonblacksmith", "Scarleton Blacksmith", LocationCategory.CRIMSON),
+    SCARLETONMINIONSHOP("scarletonminshop", "Scarleton Minion Shop", LocationCategory.CRIMSON),
+    COURTYARD("court", "Courtyard", LocationCategory.CRIMSON),
+    AURASLAB("lab", "Aura's Lab", LocationCategory.CRIMSON),
+    DOJO("dojo", "Dojo", LocationCategory.CRIMSON),
+    DOJOAREA("dojoarea", "Dojo Area", LocationCategory.CRIMSON),
+    BARBARIANOUTPOST("barbar", "Barbarian Outpost", LocationCategory.CRIMSON),
+    MAGMACHAMBER("magma", "Magma Chamber", LocationCategory.CRIMSON),
+    MINIONSHOP("minshop", "Minion Shop", LocationCategory.CRIMSON),
+    BLAZINGVOLCANO("volcano", "Blazing Volcano", LocationCategory.CRIMSON),
+    KUUUNDRAEND("kuuundraend", "Kuundra's End", LocationCategory.CRIMSON),
+    DRAGONTAILBAZAAR("dragontailbz", "Dragontail Bazaar", LocationCategory.CRIMSON),
+    DRAGONTAILBLACKSMITH("dragontailblacksmith", "Dragontail Blacksmith", LocationCategory.CRIMSON),
+    MAGECOUNCIL("magecouncil", "Mage Council", LocationCategory.CRIMSON),
+    MAGEOUTPOST("mageoutpost", "Mage Outpost", LocationCategory.CRIMSON),
+    ODGERSHUT("odgershut", "Odger's Hut", LocationCategory.CRIMSON),
+    PLHLEGBLASTPOOL("ppool", "Plhlegblast Pool", LocationCategory.CRIMSON),
+    SMOLDERINGTOMB("smolderingtomb", "Smoldering Tomb", LocationCategory.CRIMSON),
+    THEDUKEDOM("dukedom", "The Dukedom", LocationCategory.CRIMSON),
+    THRONEROOM("throneroom", "Throne Room", LocationCategory.CRIMSON),
+    CHIEFSHUT("chiefshut", "Chief's Hut", LocationCategory.CRIMSON),
+    IGRUPANSCHICKENCOOP("igrupancoop", "Igrupan's Chicken Coop", LocationCategory.CRIMSON);
 
     private final String name;
     private final String displayName;