Skip to content

Commit f8ea78a

Browse files
ItzKatzeItzKatze
authored
Merge pull request #591 from ItzKatze/master
updated fairy souls
2 parents c776f8d + 5bfbc23 commit f8ea78a

3 files changed

Lines changed: 141 additions & 112 deletions

File tree

‎configuration/skyblock/Minestom.fairysouls.csv‎

Lines changed: 126 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -132,113 +132,136 @@ _id,zone,x,y,z
132132
131,DEEP_CAVERNS,-8,74,-44
133133
132,DEEP_CAVERNS,71,167,-12
134134
133,DEEP_CAVERNS,22,156,-42
135-
134,DWARVEN_MINES,-9,230,-135
136-
135,DWARVEN_MINES,-21,208,-59
137-
136,DWARVEN_MINES,-139,220,-89
135+
134,DWARVEN_MINES,-21,208,-59
136+
135,DWARVEN_MINES,-139,220,-89
137+
136,DWARVEN_MINES,-9,230,-135
138138
137,DWARVEN_MINES,155,189,123
139-
138,DWARVEN_MINES,133,104,104
140-
139,DWARVEN_MINES,-53,205,50
141-
140,DWARVEN_MINES,34,102,86
142-
141,DWARVEN_MINES,-204,131,199
143-
142,DWARVEN_MINES,22,127,184
144-
143,DWARVEN_MINES,-110,142,143
145-
144,DWARVEN_MINES,-116,142,154
146-
145,SPIDERS_DEN,-279,127,-177
147-
146,SPIDERS_DEN,-185,135,-290
148-
147,SPIDERS_DEN,-147,78,-299
149-
148,SPIDERS_DEN,-169,62,-289
150-
149,SPIDERS_DEN,-297,90,-169
151-
150,SPIDERS_DEN,-309,63,-185
152-
151,SPIDERS_DEN,-309,66,-245
153-
152,SPIDERS_DEN,-203,169,-320
154-
153,SPIDERS_DEN,-222,74,-361
155-
154,SPIDERS_DEN,-140,85,-335
156-
155,SPIDERS_DEN,-198,160,-331
157-
156,SPIDERS_DEN,-160,62,-275
158-
157,SPIDERS_DEN,-301,92,-171
159-
158,SPIDERS_DEN,-294,36,-274
160-
159,SPIDERS_DEN,-204,94,-241
161-
160,SPIDERS_DEN,-336,82,-153
162-
161,SPIDERS_DEN,-422,106,-206
163-
162,SPIDERS_DEN,-322,95,-281
164-
163,SPIDERS_DEN,-336,111,-253
165-
164,CRIMSON_ISLE,-644,125,-689
166-
165,CRIMSON_ISLE,-79,139,-779
167-
166,CRIMSON_ISLE,-352,191,-553
168-
167,CRIMSON_ISLE,-717,164,-981
169-
168,CRIMSON_ISLE,-726,144,-891
170-
169,CRIMSON_ISLE,-690,122,-752
171-
170,CRIMSON_ISLE,-31,178,-907
172-
171,CRIMSON_ISLE,-297,81,-835
173-
172,CRIMSON_ISLE,-462,78,-698
174-
173,CRIMSON_ISLE,-383,71,-883
175-
174,CRIMSON_ISLE,-721,125,-811
176-
175,CRIMSON_ISLE,-480,104,-593
177-
176,CRIMSON_ISLE,-606,154,-800
178-
177,CRIMSON_ISLE,-106,89,-883
179-
178,CRIMSON_ISLE,-343,235,-780
180-
179,CRIMSON_ISLE,-500,127,-795
181-
180,CRIMSON_ISLE,-346,75,-552
182-
181,CRIMSON_ISLE,-445,110,-1026
183-
182,CRIMSON_ISLE,-361,133,-469
184-
183,CRIMSON_ISLE,-247,44,-512
185-
184,CRIMSON_ISLE,-380,141,-1020
186-
185,CRIMSON_ISLE,-310,156,-1008
187-
186,CRIMSON_ISLE,-412,58,-935
188-
187,CRIMSON_ISLE,-396,108,-764
189-
188,CRIMSON_ISLE,-342,101,-484
190-
189,CRIMSON_ISLE,-35,116,-1055
191-
190,CRIMSON_ISLE,-361,69,-425
192-
191,CRIMSON_ISLE,14,108,-769
193-
192,CRIMSON_ISLE,-479,114,-972
194-
193,THE_END,-517,100,-295
195-
194,THE_END,-583,208,-272
196-
195,THE_END,-696,116,-256
197-
196,THE_END,-587,122,-276
198-
197,THE_END,-587,48,-293
199-
198,THE_END,-492,21,-175
200-
199,THE_END,-492,81,-275
201-
200,THE_END,-545,92,-257
202-
201,THE_END,-748,106,-284
203-
202,THE_END,-723,75,-222
204-
203,THE_END,-609,84,-230
205-
204,THE_END,-657,36,-201
206-
205,THE_PARK,-294,85,31
207-
206,THE_PARK,-315,89,-72
208-
207,THE_PARK,-390,61,-6
209-
208,THE_PARK,-357,99,79
210-
209,THE_PARK,-386,108,-69
211-
210,THE_PARK,-404,136,6
212-
211,THE_PARK,-454,120,-58
213-
212,THE_PARK,-408,122,-92
139+
138,DWARVEN_MINES,34,102,86
140+
139,DWARVEN_MINES,133,104,104
141+
140,DWARVEN_MINES,22,127,184
142+
141,DWARVEN_MINES,-110,142,143
143+
142,DWARVEN_MINES,-116,142,154
144+
143,DWARVEN_MINES,-204,131,199
145+
144,DWARVEN_MINES,-53,205,50
146+
145,DWARVEN_MINES,20,121,240
147+
146,DWARVEN_MINES,-18,121,397
148+
147,DWARVEN_MINES,111,160,412
149+
148,DWARVEN_MINES,-195,124,-15
150+
149,SPIDERS_DEN,-279,127,-177
151+
150,SPIDERS_DEN,-185,135,-290
152+
151,SPIDERS_DEN,-147,78,-299
153+
152,SPIDERS_DEN,-169,62,-289
154+
153,SPIDERS_DEN,-297,90,-169
155+
154,SPIDERS_DEN,-309,63,-185
156+
155,SPIDERS_DEN,-309,66,-245
157+
156,SPIDERS_DEN,-203,169,-320
158+
157,SPIDERS_DEN,-222,74,-361
159+
158,SPIDERS_DEN,-140,85,-335
160+
159,SPIDERS_DEN,-198,160,-331
161+
160,SPIDERS_DEN,-160,62,-275
162+
161,SPIDERS_DEN,-301,92,-171
163+
162,SPIDERS_DEN,-294,36,-274
164+
163,SPIDERS_DEN,-204,94,-241
165+
164,SPIDERS_DEN,-336,82,-153
166+
165,SPIDERS_DEN,-422,106,-206
167+
166,SPIDERS_DEN,-322,95,-281
168+
167,SPIDERS_DEN,-336,111,-253
169+
168,CRIMSON_ISLE,-644,125,-689
170+
169,CRIMSON_ISLE,-79,139,-779
171+
170,CRIMSON_ISLE,-352,191,-553
172+
171,CRIMSON_ISLE,-717,164,-981
173+
172,CRIMSON_ISLE,-726,144,-891
174+
173,CRIMSON_ISLE,-690,122,-752
175+
174,CRIMSON_ISLE,-31,178,-907
176+
175,CRIMSON_ISLE,-297,81,-835
177+
176,CRIMSON_ISLE,-462,78,-698
178+
177,CRIMSON_ISLE,-383,71,-883
179+
178,CRIMSON_ISLE,-721,125,-811
180+
179,CRIMSON_ISLE,-480,104,-593
181+
180,CRIMSON_ISLE,-606,154,-800
182+
181,CRIMSON_ISLE,-106,89,-883
183+
182,CRIMSON_ISLE,-343,235,-780
184+
183,CRIMSON_ISLE,-500,127,-795
185+
184,CRIMSON_ISLE,-346,75,-552
186+
185,CRIMSON_ISLE,-445,110,-1026
187+
186,CRIMSON_ISLE,-361,133,-469
188+
187,CRIMSON_ISLE,-247,44,-512
189+
188,CRIMSON_ISLE,-380,141,-1020
190+
189,CRIMSON_ISLE,-310,156,-1008
191+
190,CRIMSON_ISLE,-412,58,-935
192+
191,CRIMSON_ISLE,-396,108,-764
193+
192,CRIMSON_ISLE,-342,101,-484
194+
193,CRIMSON_ISLE,-35,116,-1055
195+
194,CRIMSON_ISLE,-361,69,-425
196+
195,CRIMSON_ISLE,14,108,-769
197+
196,CRIMSON_ISLE,-479,114,-972
198+
197,THE_END,-517,100,-295
199+
198,THE_END,-583,208,-272
200+
199,THE_END,-696,116,-256
201+
200,THE_END,-587,122,-276
202+
201,THE_END,-587,48,-293
203+
202,THE_END,-492,21,-175
204+
203,THE_END,-492,81,-275
205+
204,THE_END,-545,92,-257
206+
205,THE_END,-748,106,-284
207+
206,THE_END,-723,75,-222
208+
207,THE_END,-609,84,-230
209+
208,THE_END,-657,36,-201
210+
209,THE_PARK,-315,89,-72
211+
210,THE_PARK,-294,85,31
212+
211,THE_PARK,-390,61,-6
213+
212,THE_PARK,-357,99,79
214214
213,THE_PARK,-450,113,-87
215-
214,THE_PARK,-370,112,-118
216-
215,THE_PARK,-471,132,-125
217-
216,JERRYS_WORKSHOP,-95,77,20
218-
217,JERRYS_WORKSHOP,-44,87,76
219-
218,JERRYS_WORKSHOP,-7,108,107
220-
219,JERRYS_WORKSHOP,56,108,64
221-
220,JERRYS_WORKSHOP,74,109,-18
222-
221,THE_RIFT,253,123,90
223-
222,DUNGEON_HUB,17,124,-58
224-
223,DUNGEON_HUB,1,134,75
225-
224,DUNGEON_HUB,10,164,-10
226-
225,DUNGEON_HUB,-139,46,-1
227-
226,DUNGEON_HUB,-55,82,-10
228-
227,DUNGEON_HUB,-4,21,-17
229-
228,DUNGEON_HUB,14,60,99
230-
229,MISC_DUNGEONS,0,0,0
231-
230,MISC_DUNGEONS,0,0,0
232-
231,MISC_DUNGEONS,0,0,0
233-
232,MISC_DUNGEONS,0,0,0
215+
214,THE_PARK,-471,132,-125
216+
215,THE_PARK,-408,122,-92
217+
216,THE_PARK,-454,120,-58
218+
217,THE_PARK,-404,136,6
219+
218,THE_PARK,-386,108,-69
220+
219,THE_PARK,-370,112,-118
221+
220,JERRYS_WORKSHOP,-95,77,20
222+
221,JERRYS_WORKSHOP,-44,87,76
223+
222,JERRYS_WORKSHOP,-7,108,107
224+
223,JERRYS_WORKSHOP,56,108,64
225+
224,JERRYS_WORKSHOP,74,109,-18
226+
225,THE_RIFT,253,123,90
227+
226,DUNGEON_HUB,17,124,-58
228+
227,DUNGEON_HUB,1,134,75
229+
228,DUNGEON_HUB,10,164,-10
230+
229,DUNGEON_HUB,-139,46,-1
231+
230,DUNGEON_HUB,-55,82,-10
232+
231,DUNGEON_HUB,-4,21,-17
233+
232,DUNGEON_HUB,14,60,99
234234
233,MISC_DUNGEONS,0,0,0
235235
234,MISC_DUNGEONS,0,0,0
236236
235,MISC_DUNGEONS,0,0,0
237237
236,MISC_DUNGEONS,0,0,0
238238
237,MISC_DUNGEONS,0,0,0
239-
238,MISC_FISHING,0,0,0
240-
239,MISC_FISHING,0,0,0
241-
240,MISC_FISHING,0,0,0
242-
241,MISC_FISHING,0,0,0
243-
242,MISC_GARDEN,0,0,0
244-
243,MISC_PLACEABLE,0,0,0
239+
238,MISC_DUNGEONS,0,0,0
240+
239,MISC_DUNGEONS,0,0,0
241+
240,MISC_DUNGEONS,0,0,0
242+
241,MISC_DUNGEONS,0,0,0
243+
242,MISC_FISHING,0,0,0
244+
243,MISC_FISHING,0,0,0
245+
244,MISC_FISHING,0,0,0
246+
245,MISC_FISHING,0,0,0
247+
246,MISC_GARDEN,0,0,0
248+
247,MISC_GARDEN,0,0,0
249+
248,MISC_PLACEABLE,0,0,0
250+
249,MISC_GLACITE_MINESHAFTS,0,0,0
251+
250,BACKWATER_BAYOU,33,61,-41
252+
251,BACKWATER_BAYOU,62,76,5
253+
252,BACKWATER_BAYOU,16,59,-7
254+
253,BACKWATER_BAYOU,72,115,-12
255+
254,BACKWATER_BAYOU,2,67,10
256+
255,GALATEA,-601,128,-20
257+
256,GALATEA,-565,95,17
258+
257,GALATEA,-556,94,60
259+
258,GALATEA,-598,107,16
260+
259,GALATEA,-586,90,-26
261+
260,GALATEA,-620,66,32
262+
261,GALATEA,-663,64,62
263+
262,GALATEA,-621,108,-86
264+
263,GALATEA,-696,76,-44
265+
264,GALATEA,-737,101,-17
266+
265,GALATEA,-707,131,1
267+
266,GALATEA,-702,169,-2

‎type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/questlog/GUIFairySoulsGuide.java‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
public class GUIFairySoulsGuide extends HypixelInventoryGUI {
1919

2020
private final int[] LOCATION_SLOTS = {
21-
11, 12, 13, 14, 15, 16,
22-
19, 20, 21, 22, 23, 24
21+
11, 12, 13, 14, 15, 16,
22+
19, 20, 21, 22, 23, 24, 25,
23+
28
2324
};
2425

2526
public GUIFairySoulsGuide() {
@@ -36,14 +37,16 @@ public void onOpen(InventoryGUIOpenEvent e) {
3637
@Override
3738
public ItemStack.Builder getItem(HypixelPlayer p) {
3839
SkyBlockPlayer player = (SkyBlockPlayer) p;
39-
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);
40-
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);
40+
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);
41+
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);
4142
return ItemStackCreator.getStackHead("§dMiscellaneous", "126ec1ca185b47aad39f931db8b0a8500ded86a127a204886ed4b3783ad1775c", 1,
42-
"§7Fairy Souls: §e" + x + "§7/§d" + y,
43-
" §7Dungeon: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_DUNGEONS),
43+
"§7Fairy Souls: §e" + optainedSouls + "§7/§d" + totalSouls,
44+
" §7Dungeons: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_DUNGEONS),
4445
" §7Fishing: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_FISHING),
4546
" §7Garden: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_GARDEN),
46-
" §7Placeable: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_PLACEABLE));
47+
" §7Placeable: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_PLACEABLE),
48+
" §7Glacite Mineshafts: §d" + player.getFairySoulHandler().getMax(FairySoulZone.MISC_GLACITE_MINESHAFTS)
49+
);
4750
}
4851
});
4952
FairySouls[] allFairySouls = FairySouls.values();
@@ -95,6 +98,8 @@ private enum FairySouls {
9598
THE_RIFT("The Rift", "f26192609d6c46ade73e807fc40dbc3a1a1afbb456ae165785b0fe834dd1cb57", FairySoulZone.THE_RIFT),
9699
GOLD_MINE("Gold Mine", "73bc965d579c3c6039f0a17eb7c2e6faf538c7a5de8e60ec7a719360d0a857a9", FairySoulZone.GOLD_MINE),
97100
THE_PARK("The Park", "a221f813dacee0fef8c59f76894dbb26415478d9ddfc44c2e708a6d3b7549b", FairySoulZone.THE_PARK),
101+
GALATEA("Galatea", "a211ac81698c229d8ef2fae89f62a6a961b30d8b82b97161863090e90bff02a5", FairySoulZone.GALATEA),
102+
BACKWATER_BAYOU("Backwater Bayou", "1c0cd33590f64d346d98cdd01606938742e715dda6737353306a44f81c8ba426", FairySoulZone.BACKWATER_BAYOU),
98103
;
99104
private final String regionName;
100105
private final String texture;

‎type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/user/fairysouls/FairySoulZone.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public enum FairySoulZone {
99
THE_FARMING_ISLANDS,
1010
THE_PARK,
1111
GALATEA,
12+
BACKWATER_BAYOU,
1213
SPIDERS_DEN,
1314
THE_END,
1415
CRIMSON_ISLE,
@@ -17,6 +18,6 @@ public enum FairySoulZone {
1718
MISC_DUNGEONS,
1819
MISC_FISHING,
1920
MISC_GARDEN,
20-
MISC_PLACEABLE
21-
21+
MISC_PLACEABLE,
22+
MISC_GLACITE_MINESHAFTS,
2223
}

0 commit comments

Comments
 (0)