diff --git a/configuration/skyblock/Minestom.fairysouls.csv b/configuration/skyblock/Minestom.fairysouls.csv index ccf58f5b3..afa089088 100644 --- a/configuration/skyblock/Minestom.fairysouls.csv +++ b/configuration/skyblock/Minestom.fairysouls.csv @@ -132,113 +132,136 @@ _id,zone,x,y,z 131,DEEP_CAVERNS,-8,74,-44 132,DEEP_CAVERNS,71,167,-12 133,DEEP_CAVERNS,22,156,-42 -134,DWARVEN_MINES,-9,230,-135 -135,DWARVEN_MINES,-21,208,-59 -136,DWARVEN_MINES,-139,220,-89 +134,DWARVEN_MINES,-21,208,-59 +135,DWARVEN_MINES,-139,220,-89 +136,DWARVEN_MINES,-9,230,-135 137,DWARVEN_MINES,155,189,123 -138,DWARVEN_MINES,133,104,104 -139,DWARVEN_MINES,-53,205,50 -140,DWARVEN_MINES,34,102,86 -141,DWARVEN_MINES,-204,131,199 -142,DWARVEN_MINES,22,127,184 -143,DWARVEN_MINES,-110,142,143 -144,DWARVEN_MINES,-116,142,154 -145,SPIDERS_DEN,-279,127,-177 -146,SPIDERS_DEN,-185,135,-290 -147,SPIDERS_DEN,-147,78,-299 -148,SPIDERS_DEN,-169,62,-289 -149,SPIDERS_DEN,-297,90,-169 -150,SPIDERS_DEN,-309,63,-185 -151,SPIDERS_DEN,-309,66,-245 -152,SPIDERS_DEN,-203,169,-320 -153,SPIDERS_DEN,-222,74,-361 -154,SPIDERS_DEN,-140,85,-335 -155,SPIDERS_DEN,-198,160,-331 -156,SPIDERS_DEN,-160,62,-275 -157,SPIDERS_DEN,-301,92,-171 -158,SPIDERS_DEN,-294,36,-274 -159,SPIDERS_DEN,-204,94,-241 -160,SPIDERS_DEN,-336,82,-153 -161,SPIDERS_DEN,-422,106,-206 -162,SPIDERS_DEN,-322,95,-281 -163,SPIDERS_DEN,-336,111,-253 -164,CRIMSON_ISLE,-644,125,-689 -165,CRIMSON_ISLE,-79,139,-779 -166,CRIMSON_ISLE,-352,191,-553 -167,CRIMSON_ISLE,-717,164,-981 -168,CRIMSON_ISLE,-726,144,-891 -169,CRIMSON_ISLE,-690,122,-752 -170,CRIMSON_ISLE,-31,178,-907 -171,CRIMSON_ISLE,-297,81,-835 -172,CRIMSON_ISLE,-462,78,-698 -173,CRIMSON_ISLE,-383,71,-883 -174,CRIMSON_ISLE,-721,125,-811 -175,CRIMSON_ISLE,-480,104,-593 -176,CRIMSON_ISLE,-606,154,-800 -177,CRIMSON_ISLE,-106,89,-883 -178,CRIMSON_ISLE,-343,235,-780 -179,CRIMSON_ISLE,-500,127,-795 -180,CRIMSON_ISLE,-346,75,-552 -181,CRIMSON_ISLE,-445,110,-1026 -182,CRIMSON_ISLE,-361,133,-469 -183,CRIMSON_ISLE,-247,44,-512 -184,CRIMSON_ISLE,-380,141,-1020 -185,CRIMSON_ISLE,-310,156,-1008 -186,CRIMSON_ISLE,-412,58,-935 -187,CRIMSON_ISLE,-396,108,-764 -188,CRIMSON_ISLE,-342,101,-484 -189,CRIMSON_ISLE,-35,116,-1055 -190,CRIMSON_ISLE,-361,69,-425 -191,CRIMSON_ISLE,14,108,-769 -192,CRIMSON_ISLE,-479,114,-972 -193,THE_END,-517,100,-295 -194,THE_END,-583,208,-272 -195,THE_END,-696,116,-256 -196,THE_END,-587,122,-276 -197,THE_END,-587,48,-293 -198,THE_END,-492,21,-175 -199,THE_END,-492,81,-275 -200,THE_END,-545,92,-257 -201,THE_END,-748,106,-284 -202,THE_END,-723,75,-222 -203,THE_END,-609,84,-230 -204,THE_END,-657,36,-201 -205,THE_PARK,-294,85,31 -206,THE_PARK,-315,89,-72 -207,THE_PARK,-390,61,-6 -208,THE_PARK,-357,99,79 -209,THE_PARK,-386,108,-69 -210,THE_PARK,-404,136,6 -211,THE_PARK,-454,120,-58 -212,THE_PARK,-408,122,-92 +138,DWARVEN_MINES,34,102,86 +139,DWARVEN_MINES,133,104,104 +140,DWARVEN_MINES,22,127,184 +141,DWARVEN_MINES,-110,142,143 +142,DWARVEN_MINES,-116,142,154 +143,DWARVEN_MINES,-204,131,199 +144,DWARVEN_MINES,-53,205,50 +145,DWARVEN_MINES,20,121,240 +146,DWARVEN_MINES,-18,121,397 +147,DWARVEN_MINES,111,160,412 +148,DWARVEN_MINES,-195,124,-15 +149,SPIDERS_DEN,-279,127,-177 +150,SPIDERS_DEN,-185,135,-290 +151,SPIDERS_DEN,-147,78,-299 +152,SPIDERS_DEN,-169,62,-289 +153,SPIDERS_DEN,-297,90,-169 +154,SPIDERS_DEN,-309,63,-185 +155,SPIDERS_DEN,-309,66,-245 +156,SPIDERS_DEN,-203,169,-320 +157,SPIDERS_DEN,-222,74,-361 +158,SPIDERS_DEN,-140,85,-335 +159,SPIDERS_DEN,-198,160,-331 +160,SPIDERS_DEN,-160,62,-275 +161,SPIDERS_DEN,-301,92,-171 +162,SPIDERS_DEN,-294,36,-274 +163,SPIDERS_DEN,-204,94,-241 +164,SPIDERS_DEN,-336,82,-153 +165,SPIDERS_DEN,-422,106,-206 +166,SPIDERS_DEN,-322,95,-281 +167,SPIDERS_DEN,-336,111,-253 +168,CRIMSON_ISLE,-644,125,-689 +169,CRIMSON_ISLE,-79,139,-779 +170,CRIMSON_ISLE,-352,191,-553 +171,CRIMSON_ISLE,-717,164,-981 +172,CRIMSON_ISLE,-726,144,-891 +173,CRIMSON_ISLE,-690,122,-752 +174,CRIMSON_ISLE,-31,178,-907 +175,CRIMSON_ISLE,-297,81,-835 +176,CRIMSON_ISLE,-462,78,-698 +177,CRIMSON_ISLE,-383,71,-883 +178,CRIMSON_ISLE,-721,125,-811 +179,CRIMSON_ISLE,-480,104,-593 +180,CRIMSON_ISLE,-606,154,-800 +181,CRIMSON_ISLE,-106,89,-883 +182,CRIMSON_ISLE,-343,235,-780 +183,CRIMSON_ISLE,-500,127,-795 +184,CRIMSON_ISLE,-346,75,-552 +185,CRIMSON_ISLE,-445,110,-1026 +186,CRIMSON_ISLE,-361,133,-469 +187,CRIMSON_ISLE,-247,44,-512 +188,CRIMSON_ISLE,-380,141,-1020 +189,CRIMSON_ISLE,-310,156,-1008 +190,CRIMSON_ISLE,-412,58,-935 +191,CRIMSON_ISLE,-396,108,-764 +192,CRIMSON_ISLE,-342,101,-484 +193,CRIMSON_ISLE,-35,116,-1055 +194,CRIMSON_ISLE,-361,69,-425 +195,CRIMSON_ISLE,14,108,-769 +196,CRIMSON_ISLE,-479,114,-972 +197,THE_END,-517,100,-295 +198,THE_END,-583,208,-272 +199,THE_END,-696,116,-256 +200,THE_END,-587,122,-276 +201,THE_END,-587,48,-293 +202,THE_END,-492,21,-175 +203,THE_END,-492,81,-275 +204,THE_END,-545,92,-257 +205,THE_END,-748,106,-284 +206,THE_END,-723,75,-222 +207,THE_END,-609,84,-230 +208,THE_END,-657,36,-201 +209,THE_PARK,-315,89,-72 +210,THE_PARK,-294,85,31 +211,THE_PARK,-390,61,-6 +212,THE_PARK,-357,99,79 213,THE_PARK,-450,113,-87 -214,THE_PARK,-370,112,-118 -215,THE_PARK,-471,132,-125 -216,JERRYS_WORKSHOP,-95,77,20 -217,JERRYS_WORKSHOP,-44,87,76 -218,JERRYS_WORKSHOP,-7,108,107 -219,JERRYS_WORKSHOP,56,108,64 -220,JERRYS_WORKSHOP,74,109,-18 -221,THE_RIFT,253,123,90 -222,DUNGEON_HUB,17,124,-58 -223,DUNGEON_HUB,1,134,75 -224,DUNGEON_HUB,10,164,-10 -225,DUNGEON_HUB,-139,46,-1 -226,DUNGEON_HUB,-55,82,-10 -227,DUNGEON_HUB,-4,21,-17 -228,DUNGEON_HUB,14,60,99 -229,MISC_DUNGEONS,0,0,0 -230,MISC_DUNGEONS,0,0,0 -231,MISC_DUNGEONS,0,0,0 -232,MISC_DUNGEONS,0,0,0 +214,THE_PARK,-471,132,-125 +215,THE_PARK,-408,122,-92 +216,THE_PARK,-454,120,-58 +217,THE_PARK,-404,136,6 +218,THE_PARK,-386,108,-69 +219,THE_PARK,-370,112,-118 +220,JERRYS_WORKSHOP,-95,77,20 +221,JERRYS_WORKSHOP,-44,87,76 +222,JERRYS_WORKSHOP,-7,108,107 +223,JERRYS_WORKSHOP,56,108,64 +224,JERRYS_WORKSHOP,74,109,-18 +225,THE_RIFT,253,123,90 +226,DUNGEON_HUB,17,124,-58 +227,DUNGEON_HUB,1,134,75 +228,DUNGEON_HUB,10,164,-10 +229,DUNGEON_HUB,-139,46,-1 +230,DUNGEON_HUB,-55,82,-10 +231,DUNGEON_HUB,-4,21,-17 +232,DUNGEON_HUB,14,60,99 233,MISC_DUNGEONS,0,0,0 234,MISC_DUNGEONS,0,0,0 235,MISC_DUNGEONS,0,0,0 236,MISC_DUNGEONS,0,0,0 237,MISC_DUNGEONS,0,0,0 -238,MISC_FISHING,0,0,0 -239,MISC_FISHING,0,0,0 -240,MISC_FISHING,0,0,0 -241,MISC_FISHING,0,0,0 -242,MISC_GARDEN,0,0,0 -243,MISC_PLACEABLE,0,0,0 +238,MISC_DUNGEONS,0,0,0 +239,MISC_DUNGEONS,0,0,0 +240,MISC_DUNGEONS,0,0,0 +241,MISC_DUNGEONS,0,0,0 +242,MISC_FISHING,0,0,0 +243,MISC_FISHING,0,0,0 +244,MISC_FISHING,0,0,0 +245,MISC_FISHING,0,0,0 +246,MISC_GARDEN,0,0,0 +247,MISC_GARDEN,0,0,0 +248,MISC_PLACEABLE,0,0,0 +249,MISC_GLACITE_MINESHAFTS,0,0,0 +250,BACKWATER_BAYOU,33,61,-41 +251,BACKWATER_BAYOU,62,76,5 +252,BACKWATER_BAYOU,16,59,-7 +253,BACKWATER_BAYOU,72,115,-12 +254,BACKWATER_BAYOU,2,67,10 +255,GALATEA,-601,128,-20 +256,GALATEA,-565,95,17 +257,GALATEA,-556,94,60 +258,GALATEA,-598,107,16 +259,GALATEA,-586,90,-26 +260,GALATEA,-620,66,32 +261,GALATEA,-663,64,62 +262,GALATEA,-621,108,-86 +263,GALATEA,-696,76,-44 +264,GALATEA,-737,101,-17 +265,GALATEA,-707,131,1 +266,GALATEA,-702,169,-2 diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/questlog/GUIFairySoulsGuide.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/questlog/GUIFairySoulsGuide.java index dbc1d77e2..2e9d8da3e 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/questlog/GUIFairySoulsGuide.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/questlog/GUIFairySoulsGuide.java @@ -18,8 +18,9 @@ public class GUIFairySoulsGuide extends HypixelInventoryGUI { private final int[] LOCATION_SLOTS = { - 11, 12, 13, 14, 15, 16, - 19, 20, 21, 22, 23, 24 + 11, 12, 13, 14, 15, 16, + 19, 20, 21, 22, 23, 24, 25, + 28 }; public GUIFairySoulsGuide() { @@ -36,14 +37,16 @@ public void onOpen(InventoryGUIOpenEvent e) { @Override public ItemStack.Builder getItem(HypixelPlayer p) { SkyBlockPlayer player = (SkyBlockPlayer) p; - int x = player.getFairySoulHandler().getFound(FairySoulZone.MISC_DUNGEONS) + player.getFairySoulHandler().getFound(FairySoulZone.MISC_FISHING) + player.getFairySoulHandler().getFound(FairySoulZone.MISC_GARDEN) + player.getFairySoulHandler().getFound(FairySoulZone.MISC_PLACEABLE); - int y = player.getFairySoulHandler().getMax(FairySoulZone.MISC_DUNGEONS) + player.getFairySoulHandler().getMax(FairySoulZone.MISC_FISHING) + player.getFairySoulHandler().getMax(FairySoulZone.MISC_GARDEN) + player.getFairySoulHandler().getMax(FairySoulZone.MISC_PLACEABLE); + int optainedSouls = player.getFairySoulHandler().getFound(FairySoulZone.MISC_DUNGEONS) + player.getFairySoulHandler().getFound(FairySoulZone.MISC_FISHING) + player.getFairySoulHandler().getFound(FairySoulZone.MISC_GARDEN) + player.getFairySoulHandler().getFound(FairySoulZone.MISC_PLACEABLE) + player.getFairySoulHandler().getFound(FairySoulZone.MISC_GLACITE_MINESHAFTS); + int totalSouls = player.getFairySoulHandler().getMax(FairySoulZone.MISC_DUNGEONS) + player.getFairySoulHandler().getMax(FairySoulZone.MISC_FISHING) + player.getFairySoulHandler().getMax(FairySoulZone.MISC_GARDEN) + player.getFairySoulHandler().getMax(FairySoulZone.MISC_PLACEABLE) + player.getFairySoulHandler().getMax(FairySoulZone.MISC_GLACITE_MINESHAFTS); return ItemStackCreator.getStackHead("§dMiscellaneous", "126ec1ca185b47aad39f931db8b0a8500ded86a127a204886ed4b3783ad1775c", 1, - "§7Fairy Souls: §e" + x + "§7/§d" + y, - " §7Dungeon: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_DUNGEONS), + "§7Fairy Souls: §e" + optainedSouls + "§7/§d" + totalSouls, + " §7Dungeons: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_DUNGEONS), " §7Fishing: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_FISHING), " §7Garden: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_GARDEN), - " §7Placeable: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_PLACEABLE)); + " §7Placeable: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_PLACEABLE), + " §7Glacite Mineshafts: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_GLACITE_MINESHAFTS) + ); } }); FairySouls[] allFairySouls = FairySouls.values(); @@ -95,6 +98,8 @@ private enum FairySouls { THE_RIFT("The Rift", "f26192609d6c46ade73e807fc40dbc3a1a1afbb456ae165785b0fe834dd1cb57", FairySoulZone.THE_RIFT), GOLD_MINE("Gold Mine", "73bc965d579c3c6039f0a17eb7c2e6faf538c7a5de8e60ec7a719360d0a857a9", FairySoulZone.GOLD_MINE), THE_PARK("The Park", "a221f813dacee0fef8c59f76894dbb26415478d9ddfc44c2e708a6d3b7549b", FairySoulZone.THE_PARK), + GALATEA("Galatea", "a211ac81698c229d8ef2fae89f62a6a961b30d8b82b97161863090e90bff02a5", FairySoulZone.GALATEA), + BACKWATER_BAYOU("Backwater Bayou", "1c0cd33590f64d346d98cdd01606938742e715dda6737353306a44f81c8ba426", FairySoulZone.BACKWATER_BAYOU), ; private final String regionName; private final String texture; diff --git a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/user/fairysouls/FairySoulZone.java b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/user/fairysouls/FairySoulZone.java index f1e6b3745..ad31a5ced 100644 --- a/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/user/fairysouls/FairySoulZone.java +++ b/type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/user/fairysouls/FairySoulZone.java @@ -9,6 +9,7 @@ public enum FairySoulZone { THE_FARMING_ISLANDS, THE_PARK, GALATEA, + BACKWATER_BAYOU, SPIDERS_DEN, THE_END, CRIMSON_ISLE, @@ -17,6 +18,6 @@ public enum FairySoulZone { MISC_DUNGEONS, MISC_FISHING, MISC_GARDEN, - MISC_PLACEABLE - + MISC_PLACEABLE, + MISC_GLACITE_MINESHAFTS, }