Skip to content

Commit 5b30bde

Browse files
ItzKatzeItzKatze
committed
feat: fishing sacks
1 parent 6188124 commit 5b30bde

9 files changed

Lines changed: 775 additions & 299 deletions

File tree

‎commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,11 @@ public enum ItemType {
378378
LARGE_AGRONOMY_SACK(Material.PLAYER_HEAD, Rarity.EPIC),
379379
LARGE_ENCHANTED_AGRONOMY_SACK(Material.PLAYER_HEAD, Rarity.EPIC),
380380

381+
SMALL_FISHING_SACK(Material.PLAYER_HEAD, Rarity.UNCOMMON),
382+
MEDIUM_FISHING_SACK(Material.PLAYER_HEAD, Rarity.RARE),
383+
LARGE_FISHING_SACK(Material.PLAYER_HEAD, Rarity.EPIC),
384+
LARGE_ENCHANTED_FISHING_SACK(Material.PLAYER_HEAD, Rarity.EPIC),
385+
381386
/**
382387
* Runes
383388
*/
@@ -557,8 +562,6 @@ public enum ItemType {
557562
POLISHED_PUMPKIN(Material.PLAYER_HEAD, Rarity.RARE),
558563
BOX_OF_SEEDS(Material.PLAYER_HEAD, Rarity.RARE),
559564
ENCHANTED_BOOKSHELF(Material.BOOKSHELF, Rarity.UNCOMMON),
560-
ENCHANTED_COOKED_FISH(Material.COOKED_COD, Rarity.RARE),
561-
ENCHANTED_RAW_FISH(Material.COD, Rarity.RARE),
562565
ENCHANTED_IRON_INGOT(Material.IRON_INGOT, Rarity.RARE),
563566
TIGHTLY_TIED_HAY_BALE(Material.PLAYER_HEAD, Rarity.RARE),
564567
COMPOST(Material.PLAYER_HEAD, Rarity.UNCOMMON),
@@ -593,6 +596,20 @@ public enum ItemType {
593596
GOLD_MAGMAFISH(Material.PLAYER_HEAD, Rarity.LEGENDARY),
594597
DIAMOND_MAGMAFISH(Material.PLAYER_HEAD, Rarity.MYTHIC),
595598
FISHING_ROD(Material.FISHING_ROD, Rarity.COMMON),
599+
AGARIMOO_TONGUE(Material.MUTTON, Rarity.UNCOMMON),
600+
ALLIGATOR_SKIN(Material.GREEN_DYE, Rarity.UNCOMMON),
601+
BLUE_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON),
602+
BROKEN_RADAR(Material.PLAYER_HEAD, Rarity.UNCOMMON),
603+
BRONZE_BOWL(Material.PLAYER_HEAD, Rarity.UNCOMMON),
604+
BUSTED_BELT_BUCKLE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
605+
CAN_OF_WORMS(Material.PLAYER_HEAD, Rarity.UNCOMMON),
606+
CHUM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
607+
EMPERORS_SKULL(Material.PLAYER_HEAD, Rarity.UNCOMMON),
608+
GLOWING_MUSHROOM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
609+
HALF_EATEN_MUSHROOM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
610+
OLD_LEATHER_BOOT(Material.PLAYER_HEAD, Rarity.UNCOMMON),
611+
RUSTY_COIN(Material.PLAYER_HEAD, Rarity.UNCOMMON),
612+
TORN_CLOTH(Material.PLAYER_HEAD, Rarity.UNCOMMON),
596613

597614
/**
598615
* Combat Props
@@ -1178,8 +1195,8 @@ public enum ItemType {
11781195
PRISMARINE_CRYSTALS(Material.PRISMARINE_CRYSTALS, Rarity.COMMON),
11791196
PRISMARINE_SHARD(Material.PRISMARINE_SHARD, Rarity.COMMON),
11801197
PUFFERFISH(Material.PUFFERFISH, Rarity.COMMON),
1181-
COD(Material.COD, Rarity.COMMON),
1182-
SALMON(Material.SALMON, Rarity.COMMON),
1198+
RAW_FISH(Material.COD, Rarity.COMMON),
1199+
RAW_SALMON(Material.SALMON, Rarity.COMMON),
11831200
TORCH(Material.TORCH, Rarity.COMMON),
11841201
RAW_BEEF(Material.BEEF, Rarity.UNCOMMON),
11851202
RAW_CHICKEN(Material.CHICKEN, Rarity.UNCOMMON),
@@ -1817,10 +1834,11 @@ public enum ItemType {
18171834
ENCHANTED_ICE(Material.ICE, Rarity.UNCOMMON),
18181835
ENCHANTED_MAGMA_CREAM(Material.MAGMA_CREAM, Rarity.UNCOMMON),
18191836
ENCHANTED_BROWN_MUSHROOM_BLOCK(Material.BROWN_MUSHROOM_BLOCK, Rarity.RARE),
1820-
ENCHANTED_CLAY(Material.CLAY_BALL, Rarity.UNCOMMON),
1837+
ENCHANTED_CLAY_BALL(Material.CLAY_BALL, Rarity.UNCOMMON),
1838+
ENCHANTED_CLAY_BLOCK(Material.CLAY, Rarity.RARE),
18211839
ENCHANTED_TROPICAL_FISH(Material.TROPICAL_FISH, Rarity.UNCOMMON),
1822-
ENCHANTED_COD(Material.COD, Rarity.UNCOMMON),
1823-
ENCHANTED_COOKED_COD(Material.COOKED_COD, Rarity.RARE),
1840+
ENCHANTED_RAW_FISH(Material.COD, Rarity.UNCOMMON),
1841+
ENCHANTED_COOKED_FISH(Material.COOKED_COD, Rarity.RARE),
18241842
ENCHANTED_MUTTON(Material.MUTTON, Rarity.UNCOMMON),
18251843
ENCHANTED_COOKED_MUTTON(Material.COOKED_MUTTON, Rarity.RARE),
18261844
ENCHANTED_RAW_SALMON(Material.SALMON, Rarity.UNCOMMON),

‎configuration/skyblock/collections/farming.yml‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,3 +1128,147 @@ collections:
11281128
- type: XP
11291129
data:
11301130
xp: 4
1131+
- itemType: MOONFLOWER
1132+
rewards:
1133+
- amount: 1000
1134+
rewards:
1135+
- type: XP
1136+
data:
1137+
xp: 4
1138+
- type: RECIPE_UNLOCK
1139+
data:
1140+
unlockedItemType: ENCHANTED_MOONFLOWER
1141+
- amount: 5000
1142+
rewards:
1143+
- type: XP
1144+
data:
1145+
xp: 4
1146+
- amount: 10000
1147+
rewards:
1148+
- type: XP
1149+
data:
1150+
xp: 4
1151+
- amount: 25000
1152+
rewards:
1153+
- type: XP
1154+
data:
1155+
xp: 4
1156+
- type: RECIPE_UNLOCK
1157+
data:
1158+
unlockedItemType: COMPACTED_MOONFLOWER
1159+
- amount: 100000
1160+
rewards:
1161+
- type: XP
1162+
data:
1163+
xp: 4
1164+
- amount: 250000
1165+
rewards:
1166+
- type: XP
1167+
data:
1168+
xp: 4
1169+
- amount: 500000
1170+
rewards:
1171+
- type: XP
1172+
data:
1173+
xp: 4
1174+
- amount: 1000000
1175+
rewards:
1176+
- type: XP
1177+
data:
1178+
xp: 4
1179+
- itemType: SUNFLOWER
1180+
rewards:
1181+
- amount: 1000
1182+
rewards:
1183+
- type: XP
1184+
data:
1185+
xp: 4
1186+
- type: RECIPE_UNLOCK
1187+
data:
1188+
unlockedItemType: ENCHANTED_SUNFLOWER
1189+
- amount: 5000
1190+
rewards:
1191+
- type: XP
1192+
data:
1193+
xp: 4
1194+
- amount: 10000
1195+
rewards:
1196+
- type: XP
1197+
data:
1198+
xp: 4
1199+
- amount: 25000
1200+
rewards:
1201+
- type: XP
1202+
data:
1203+
xp: 4
1204+
- type: RECIPE_UNLOCK
1205+
data:
1206+
unlockedItemType: COMPACTED_SUNFLOWER
1207+
- amount: 100000
1208+
rewards:
1209+
- type: XP
1210+
data:
1211+
xp: 4
1212+
- amount: 250000
1213+
rewards:
1214+
- type: XP
1215+
data:
1216+
xp: 4
1217+
- amount: 500000
1218+
rewards:
1219+
- type: XP
1220+
data:
1221+
xp: 4
1222+
- amount: 1000000
1223+
rewards:
1224+
- type: XP
1225+
data:
1226+
xp: 4
1227+
- itemType: WILD_ROSE
1228+
rewards:
1229+
- amount: 1000
1230+
rewards:
1231+
- type: XP
1232+
data:
1233+
xp: 4
1234+
- type: RECIPE_UNLOCK
1235+
data:
1236+
unlockedItemType: ENCHANTED_WILD_ROSE
1237+
- amount: 5000
1238+
rewards:
1239+
- type: XP
1240+
data:
1241+
xp: 4
1242+
- amount: 10000
1243+
rewards:
1244+
- type: XP
1245+
data:
1246+
xp: 4
1247+
- amount: 25000
1248+
rewards:
1249+
- type: XP
1250+
data:
1251+
xp: 4
1252+
- type: RECIPE_UNLOCK
1253+
data:
1254+
unlockedItemType: COMPACTED_WILD_ROSE
1255+
- amount: 100000
1256+
rewards:
1257+
- type: XP
1258+
data:
1259+
xp: 4
1260+
- amount: 250000
1261+
rewards:
1262+
- type: XP
1263+
data:
1264+
xp: 4
1265+
- amount: 500000
1266+
rewards:
1267+
- type: XP
1268+
data:
1269+
xp: 4
1270+
- amount: 1000000
1271+
rewards:
1272+
- type: XP
1273+
data:
1274+
xp: 4

‎configuration/skyblock/collections/fishing.yml‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ collections:
1818
xp: 4
1919
- type: RECIPE_UNLOCK
2020
data:
21-
unlockedItemType: ENCHANTED_CLAY
21+
unlockedItemType: ENCHANTED_CLAY_BALL
2222
- amount: 250
2323
rewards:
2424
- type: XP
@@ -39,6 +39,14 @@ collections:
3939
- type: XP
4040
data:
4141
xp: 4
42+
- amount: 5000
43+
rewards:
44+
- type: XP
45+
data:
46+
xp: 4
47+
- type: RECIPE_UNLOCK
48+
data:
49+
unlockedItemType: ENCHANTED_CLAY_BLOCK
4250
- itemType: TROPICAL_FISH
4351
rewards:
4452
- amount: 10
@@ -388,6 +396,9 @@ collections:
388396
- type: XP
389397
data:
390398
xp: 4
399+
- type: RECIPE_UNLOCK
400+
data:
401+
unlockedItemType: SMALL_FISHING_SACK
391402
- amount: 800
392403
rewards:
393404
- type: XP
@@ -398,6 +409,9 @@ collections:
398409
- type: XP
399410
data:
400411
xp: 4
412+
- type: RECIPE_UNLOCK
413+
data:
414+
unlockedItemType: MEDIUM_FISHING_SACK
401415
- amount: 4800
402416
rewards:
403417
- type: XP
@@ -408,12 +422,18 @@ collections:
408422
- type: XP
409423
data:
410424
xp: 4
425+
- type: RECIPE_UNLOCK
426+
data:
427+
unlockedItemType: LARGE_FISHING_SACK
411428
- amount: 18000
412429
rewards:
413430
- type: XP
414431
data:
415432
xp: 4
416-
- itemType: COD
433+
- type: RECIPE_UNLOCK
434+
data:
435+
unlockedItemType: LARGE_ENCHANTED_FISHING_SACK
436+
- itemType: RAW_FISH
417437
rewards:
418438
- amount: 20
419439
rewards:
@@ -494,7 +514,7 @@ collections:
494514
- type: CUSTOM_AWARD
495515
data:
496516
customAward: FISHING_BAG_UPGRADE_4
497-
- itemType: SALMON
517+
- itemType: RAW_SALMON
498518
rewards:
499519
- amount: 20
500520
rewards:

‎configuration/skyblock/items/compactedItems.yml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ items:
263263
- id: SELLABLE
264264
value: 320
265265

266-
- id: ENCHANTED_CLAY
266+
- id: ENCHANTED_CLAY_BALL
267267
material: CLAY_BALL
268268
rarity: UNCOMMON
269269
default_statistics: {}
@@ -274,6 +274,17 @@ items:
274274
- id: SELLABLE
275275
value: 480
276276

277+
- id: ENCHANTED_CLAY_BLOCK
278+
material: CLAY_BLOCK
279+
rarity: RARE
280+
default_statistics: {}
281+
components:
282+
- id: ENCHANTED
283+
recipe_type: FISHING
284+
item_id: ENCHANTED_CLAY_BALL
285+
- id: SELLABLE
286+
value: 76800
287+
277288
- id: ENCHANTED_TROPICAL_FISH
278289
material: TROPICAL_FISH
279290
rarity: UNCOMMON
@@ -1177,7 +1188,7 @@ items:
11771188
components:
11781189
- id: ENCHANTED
11791190
recipe_type: FISHING
1180-
item_id: COD
1191+
item_id: RAW_FISH
11811192
- id: SELLABLE
11821193
value: 960
11831194

@@ -1199,7 +1210,7 @@ items:
11991210
components:
12001211
- id: ENCHANTED
12011212
recipe_type: FISHING
1202-
item_id: SALMON
1213+
item_id: RAW_SALMON
12031214
- id: SELLABLE
12041215
value: 1600
12051216

@@ -1666,12 +1677,12 @@ items:
16661677
- id: SKULL_HEAD
16671678
texture: c4989d846862952f8ac844abbd4c1f77bf85e924c2bf98236f8d9253624d879f
16681679

1669-
- id: ENCHANTED_WILD_ROSE
1680+
- id: COMPACTED_WILD_ROSE
16701681
rarity: COMMON
16711682
components:
16721683
- id: ENCHANTED
16731684
recipe_type: FARMING
1674-
item_id: ENCHANTED_PUMPKIN
1685+
item_id: ENCHANTED_WILD_ROSE
16751686
- id: SELLABLE
16761687
value: 256000.0
16771688
- id: SKULL_HEAD

‎configuration/skyblock/items/fishing/vanilla.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ items:
44
components:
55
- id: SELLABLE
66
value: 3.0
7-
- id: COD
7+
- id: RAW_FISH
88
rarity: COMMON
99
components:
1010
- id: SELLABLE
@@ -47,7 +47,7 @@ items:
4747
effect_duration: 180
4848
effect_amplifier: 0
4949
alchemy_xp: 12
50-
- id: SALMON
50+
- id: RAW_SALMON
5151
rarity: COMMON
5252
components:
5353
- id: SELLABLE

0 commit comments

Comments
 (0)