diff options
Diffstat (limited to 'src/main/java/com/thatgravyboat')
4 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java index 8818127..7348b57 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java @@ -316,8 +316,8 @@ public class SBHConfig extends Config { @Expose @ConfigOption(name = "Map Locations", desc = "Remove a location from this list if you would like the map to not show up in that location. This is so you can use other mods maps.") - @ConfigEditorDraggableList(exampleText = { "HUB", "BARN", "MUSHROOMDESERT", "GOLDMINE (No Map Yet)", "DEEPCAVERNS (No Map Yet)", "SPIDERSDEN", "PARK", "CRIMSON", "DUNGEONHUB (No Map Yet)", "JERRY (No Map Yet)", "THEEND", "DWARVENMINES", "CRYSTALHOLLOWS" }) - public List<Integer> mapLocations = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 6, 7, 10, 11)); + @ConfigEditorDraggableList(exampleText = { "HUB", "BARN", "MUSHROOMDESERT", "GOLDMINE (No Map Yet)", "DEEPCAVERNS (No Map Yet)", "SPIDERSDEN", "PARK", "CRIMSON", "DUNGEONHUB", "JERRY (No Map Yet)", "THEEND", "DWARVENMINES", "CRYSTALHOLLOWS" }) + public List<Integer> mapLocations = new ArrayList<>(Arrays.asList(0, 1, 2, 5, 6, 7, 8, 10, 11)); @Expose @ConfigOption(name = "Mini-Map Position", desc = "Allows you to change the position of the Mini-Map.") diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/MapHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/MapHandler.java index dca3c48..d8545a0 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/MapHandler.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/MapHandler.java @@ -66,12 +66,13 @@ public class MapHandler { HUB(0.5f, 494, 444, 294, 218, 294, 224, new ResourceLocation("skyblockhud", "maps/hub.png"), HubIcons.hubIcons), MUSHROOM(1.0f, 318, 316, -84, 605, -84, 612, new ResourceLocation("skyblockhud", "maps/mushroom.png"), Collections.emptyList()), SPIDERS(1.0f, 270, 238, 400, 362, 400, 364, new ResourceLocation("skyblockhud", "maps/spidersden.png"), Collections.emptyList()), - CRIMSON(0.5f, 790, 681, 752, 1070, 750, 1083, new ResourceLocation("skyblockhud", "maps/crimson.png"), Collections.emptyList()), + CRIMSON(0.5f, 792, 683, 752, 1070, 750, 1083, new ResourceLocation("skyblockhud", "maps/crimson.png"), Collections.emptyList()), BARN(1.5f, 135, 130, -82, 320, -81, 318, new ResourceLocation("skyblockhud", "maps/barn.png"), Collections.emptyList()), DWARVEN(0.5f, 409, 461, 206, 160, 202, 166, new ResourceLocation("skyblockhud", "maps/dwarven.png"), DwarvenIcons.dwarvenIcons), CRYSTAL(0.5f, 624, 624, -202, -215.7, -202, -212, new ResourceLocation("skyblockhud", "maps/crystal.png"), Collections.emptyList()), PARK(1f, 211, 230, 480, 133, 478, 134, new ResourceLocation("skyblockhud", "maps/park.png"), Collections.emptyList()), - THEEND(1f, 336, 281, 787, 403, 788, 406, new ResourceLocation("skyblockhud", "maps/end.png"), Collections.emptyList()); + THEEND(1f, 338, 283, 787, 403, 788, 406, new ResourceLocation("skyblockhud", "maps/end.png"), Collections.emptyList()), + DN(.5f, 342, 436, 338, 186, 788, 406, new ResourceLocation("skyblockhud", "maps/dn.png"), Collections.emptyList()); public float scaleFactor; public int width; diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/LocationCategory.java b/src/main/java/com/thatgravyboat/skyblockhud/location/LocationCategory.java index 55f5e70..e6a6c27 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/location/LocationCategory.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/location/LocationCategory.java @@ -16,7 +16,7 @@ public enum LocationCategory { SPIDERSDEN("spiders_den", 99, Maps.SPIDERS), PARK("park", 51, Maps.PARK), CRIMSON("crimson_isle", 107, Maps.CRIMSON), - DUNGEONHUB("dungeonhub", 115), + DN("dungeonhub", 115, Maps.DN), JERRY("jerry", 59), THEEND("the_end", 123, Maps.THEEND), DWARVENMINES("dwarven_mines", 131, Maps.DWARVEN), diff --git a/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java b/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java index 5996c12..2cec397 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java @@ -111,9 +111,9 @@ public enum Locations { AURASLAB("auraslab", "Aura's Lab", LocationCategory.CRIMSON), COURTYARD("courtyard", "Courtyard", LocationCategory.CRIMSON), //DUNGEONS - DUNGEONHUB("dungeonhub", "Dungeon Hub", LocationCategory.DUNGEONHUB), - CATACOMBS("catacombs", "The Catacombs", LocationCategory.DUNGEONHUB), - CATACOMBSENTRANCE("catacombsentrance", "Catacombs Entrance", LocationCategory.DUNGEONHUB), + DUNGEONHUB("dungeonhub", "Dungeon Hub", LocationCategory.DN), + CATACOMBS("catacombs", "The Catacombs", LocationCategory.DN), + CATACOMBSENTRANCE("catacombsentrance", "Catacombs Entrance", LocationCategory.DN), //JERRYISLAND JERRYSWORKSHOP("jerrysworkshop", "Jerry's Workshop", LocationCategory.JERRY), JERRYPOND("jerrypond", "Jerry Pond", LocationCategory.JERRY), |