Skip to content

Commit 0fc638a

Browse files
committed
fix: award garden NPC progress from dialogue actions
1 parent c3a7f6c commit 0fc638a

53 files changed

Lines changed: 369 additions & 288 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

commons/src/generated/java/net/swofty/commons/skyblock/item/ItemType.java

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ public enum ItemType {
114114

115115
APPLE(Material.APPLE, Rarity.COMMON),
116116

117+
ARACHNE_FRAGMENT(Material.PLAYER_HEAD, Rarity.RARE),
118+
117119
ARCHFIEND_DICE(Material.PLAYER_HEAD, Rarity.EPIC),
118120

119121
ARCHITECTS_FIRST_DRAFT(Material.PAPER, Rarity.COMMON),
@@ -208,6 +210,8 @@ public enum ItemType {
208210

209211
BAT_TALISMAN(Material.PLAYER_HEAD, Rarity.RARE),
210212

213+
BEADY_EYES(Material.SPIDER_EYE, Rarity.UNCOMMON),
214+
211215
BEASTMASTER_CREST_COMMON(Material.PLAYER_HEAD, Rarity.COMMON),
212216

213217
BEASTMASTER_CREST_EPIC(Material.PLAYER_HEAD, Rarity.EPIC),
@@ -382,6 +386,8 @@ public enum ItemType {
382386

383387
BOOKSHELF(Material.BOOKSHELF, Rarity.COMMON),
384388

389+
BOOKWORMS_FAVORITE_BOOK(Material.BOOK, Rarity.RARE),
390+
385391
BOOSTER_COOKIE(Material.COOKIE, Rarity.COMMON),
386392

387393
BOW(Material.BOW, Rarity.COMMON),
@@ -484,6 +490,8 @@ public enum ItemType {
484490

485491
BURNING_KUUDRA_CORE(Material.PLAYER_HEAD, Rarity.RARE),
486492

493+
BURROWING_SPORES(Material.BROWN_MUSHROOM, Rarity.RARE),
494+
487495
BURSTSTOPPER_ARTIFACT(Material.PLAYER_HEAD, Rarity.EPIC),
488496

489497
BURSTSTOPPER_TALISMAN(Material.PLAYER_HEAD, Rarity.RARE),
@@ -564,6 +572,8 @@ public enum ItemType {
564572

565573
CAN_OF_WORMS(Material.PLAYER_HEAD, Rarity.UNCOMMON),
566574

575+
CARNIVAL_TICKET(Material.NAME_TAG, Rarity.UNCOMMON),
576+
567577
CARROT(Material.CARROT, Rarity.COMMON),
568578

569579
CARROT_BAIT(Material.PLAYER_HEAD, Rarity.COMMON),
@@ -682,8 +692,12 @@ public enum ItemType {
682692

683693
CLAY_MINION(Material.PLAYER_HEAD, Rarity.COMMON),
684694

695+
CLIPPED_WINGS(Material.FEATHER, Rarity.RARE),
696+
685697
COAL(Material.COAL, Rarity.COMMON),
686698

699+
COALROOT(Material.COAL, Rarity.UNCOMMON),
700+
687701
COAL_BLOCK(Material.COAL_BLOCK, Rarity.COMMON),
688702

689703
COAL_MINION(Material.PLAYER_HEAD, Rarity.COMMON),
@@ -734,6 +748,8 @@ public enum ItemType {
734748

735749
CONTROL_SWITCH(Material.PLAYER_HEAD, Rarity.COMMON),
736750

751+
COPPER_DYE(Material.ORANGE_DYE, Rarity.SPECIAL),
752+
737753
CORLEONITE(Material.PLAYER_HEAD, Rarity.COMMON),
738754

739755
CORNFLOWER(Material.CORNFLOWER, Rarity.COMMON),
@@ -786,8 +802,12 @@ public enum ItemType {
786802

787803
CROCHET_TIGER_PLUSHIE(Material.PLAYER_HEAD, Rarity.EPIC),
788804

805+
CROPIE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
806+
789807
CROPIE_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON),
790808

809+
CROPSHOT_GARDEN_CHIP(Material.PLAYER_HEAD, Rarity.RARE),
810+
791811
CROWN_OF_GREED(Material.GOLDEN_HELMET, Rarity.LEGENDARY),
792812

793813
CRYSTALLIZED_HEART(Material.PLAYER_HEAD, Rarity.COMMON),
@@ -924,6 +944,8 @@ public enum ItemType {
924944

925945
DECORATION_PINK_BERRY(Material.PLAYER_HEAD, Rarity.COMMON),
926946

947+
DEDICATION_I(Material.ENCHANTED_BOOK, Rarity.COMMON),
948+
927949
DEEP_ROOT(Material.PLAYER_HEAD, Rarity.COMMON),
928950

929951
DEFENSE_ENRICHMENT(Material.PLAYER_HEAD, Rarity.COMMON),
@@ -1036,6 +1058,8 @@ public enum ItemType {
10361058

10371059
DUNGEON_SACK(Material.PLAYER_HEAD, Rarity.COMMON),
10381060

1061+
DUNG_DYE(Material.BROWN_DYE, Rarity.EPIC),
1062+
10391063
DWARF_TURTLE_SHELMET(Material.PLAYER_HEAD, Rarity.RARE),
10401064

10411065
DWARVEN_SACK(Material.PLAYER_HEAD, Rarity.COMMON),
@@ -1374,12 +1398,16 @@ public enum ItemType {
13741398

13751399
ETERNAL_FLAME_RING(Material.PLAYER_HEAD, Rarity.COMMON),
13761400

1401+
ETHEREAL_VINE(Material.VINE, Rarity.RARE),
1402+
13771403
ETHERWARP_CONDUIT(Material.PLAYER_HEAD, Rarity.EPIC),
13781404

13791405
ETHERWARP_MERGER(Material.PLAYER_HEAD, Rarity.EPIC),
13801406

13811407
EVERBURNING_FLAME(Material.PLAYER_HEAD, Rarity.COMMON),
13821408

1409+
EVERGREEN_GARDEN_CHIP(Material.PLAYER_HEAD, Rarity.RARE),
1410+
13831411
EXCEEDINGLY_RARE_ENDER_ARTIFACT_UPGRADER(Material.PLAYER_HEAD, Rarity.LEGENDARY),
13841412

13851413
EXPERIENCE_BOTTLE(Material.EXPERIENCE_BOTTLE, Rarity.COMMON),
@@ -1402,6 +1430,8 @@ public enum ItemType {
14021430

14031431
FARMING_EXP_BOOST_RARE(Material.IRON_HOE, Rarity.COMMON),
14041432

1433+
FARMING_EXP_BOOST_UNCOMMON(Material.IRON_HOE, Rarity.UNCOMMON),
1434+
14051435
FARMING_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON),
14061436

14071437
FARM_SUIT_BOOTS(Material.LEATHER_BOOTS, Rarity.COMMON),
@@ -1422,6 +1452,8 @@ public enum ItemType {
14221452

14231453
FERMENTED_SPIDER_EYE(Material.FERMENTED_SPIDER_EYE, Rarity.COMMON),
14241454

1455+
FERMENTO(Material.PLAYER_HEAD, Rarity.EPIC),
1456+
14251457
FERMENTO_ARTIFACT(Material.PLAYER_HEAD, Rarity.RARE),
14261458

14271459
FERN(Material.FERN, Rarity.COMMON),
@@ -1444,6 +1476,8 @@ public enum ItemType {
14441476

14451477
FINE_CITRINE_GEM(Material.PLAYER_HEAD, Rarity.RARE),
14461478

1479+
FINE_FLOUR(Material.PLAYER_HEAD, Rarity.UNCOMMON),
1480+
14471481
FINE_JADE_GEM(Material.PLAYER_HEAD, Rarity.RARE),
14481482

14491483
FINE_JASPER_GEM(Material.PLAYER_HEAD, Rarity.RARE),
@@ -1462,6 +1496,8 @@ public enum ItemType {
14621496

14631497
FIREWORK_ROCKET(Material.FIREWORK_ROCKET, Rarity.COMMON),
14641498

1499+
FIRE_IN_A_BOTTLE(Material.EXPERIENCE_BOTTLE, Rarity.RARE),
1500+
14651501
FIRE_RESISTANCE_POTION(Material.POTION, Rarity.COMMON),
14661502

14671503
FIRE_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON),
@@ -1534,6 +1570,8 @@ public enum ItemType {
15341570

15351571
FLOWERING_AZALEA_LEAVES(Material.FLOWERING_AZALEA_LEAVES, Rarity.COMMON),
15361572

1573+
FLOWERING_BOUQUET(Material.PLAYER_HEAD, Rarity.RARE),
1574+
15371575
FLOWER_CRYSTAL(Material.PLAYER_HEAD, Rarity.COMMON),
15381576

15391577
FLOWER_MINION(Material.PLAYER_HEAD, Rarity.COMMON),
@@ -1558,6 +1596,8 @@ public enum ItemType {
15581596

15591597
FROZEN_CHICKEN(Material.PLAYER_HEAD, Rarity.RARE),
15601598

1599+
FRUIT_BOWL(Material.BOWL, Rarity.RARE),
1600+
15611601
FTX_3070(Material.PLAYER_HEAD, Rarity.COMMON),
15621602

15631603
FUMING_POTATO_BOOK(Material.BOOK, Rarity.EPIC),
@@ -1746,6 +1786,10 @@ public enum ItemType {
17461786

17471787
GREAT_WHITE_SHARK_TOOTH(Material.GHAST_TEAR, Rarity.LEGENDARY),
17481788

1789+
GREENHOUSE_BLUEPRINT(Material.PAPER, Rarity.RARE),
1790+
1791+
GREEN_BANDANA(Material.LIME_BANNER, Rarity.EPIC),
1792+
17491793
GREEN_BANNER(Material.GREEN_BANNER, Rarity.COMMON),
17501794

17511795
GREEN_BED(Material.GREEN_BED, Rarity.COMMON),
@@ -1772,6 +1816,8 @@ public enum ItemType {
17721816

17731817
GREEN_TERRACOTTA(Material.GREEN_TERRACOTTA, Rarity.COMMON),
17741818

1819+
GREEN_THUMB_I(Material.ENCHANTED_BOOK, Rarity.COMMON),
1820+
17751821
GREEN_WOOL(Material.GREEN_WOOL, Rarity.COMMON),
17761822

17771823
GRIFFIN_FEATHER(Material.FEATHER, Rarity.RARE),
@@ -1792,6 +1838,8 @@ public enum ItemType {
17921838

17931839
HARD_STONE_MINION(Material.PLAYER_HEAD, Rarity.COMMON),
17941840

1841+
HARVEST_HARBINGER_POTION(Material.POTION, Rarity.RARE),
1842+
17951843
HASTE_ARTIFACT(Material.PLAYER_HEAD, Rarity.EPIC),
17961844

17971845
HASTE_POTION_1(Material.POTION, Rarity.COMMON),
@@ -1864,6 +1912,8 @@ public enum ItemType {
18641912

18651913
HUNTER_TALISMAN(Material.PLAYER_HEAD, Rarity.UNCOMMON),
18661914

1915+
HYPERCHARGE_GARDEN_CHIP(Material.PLAYER_HEAD, Rarity.RARE),
1916+
18671917
HYPERION(Material.IRON_SWORD, Rarity.LEGENDARY),
18681918

18691919
HYPER_CATALYST_UPGRADER(Material.PLAYER_HEAD, Rarity.COMMON),
@@ -1902,6 +1952,8 @@ public enum ItemType {
19021952

19031953
INVISIBILITY_POTION(Material.POTION, Rarity.COMMON),
19041954

1955+
IRIDIUM(Material.PRISMARINE_CRYSTALS, Rarity.EPIC),
1956+
19051957
IRON_AXE(Material.IRON_AXE, Rarity.COMMON),
19061958

19071959
IRON_BARS(Material.IRON_BARS, Rarity.COMMON),
@@ -1940,6 +1992,8 @@ public enum ItemType {
19401992

19411993
JACK_O_LANTERN(Material.JACK_O_LANTERN, Rarity.COMMON),
19421994

1995+
JELLY(Material.SLIME_BALL, Rarity.COMMON),
1996+
19431997
JERRY_TALISMAN_BLUE(Material.PLAYER_HEAD, Rarity.RARE),
19441998

19451999
JERRY_TALISMAN_GOLDEN(Material.PLAYER_HEAD, Rarity.LEGENDARY),
@@ -2248,6 +2302,8 @@ public enum ItemType {
22482302

22492303
MANGROVE_WOOD(Material.MANGROVE_WOOD, Rarity.COMMON),
22502304

2305+
MANTID_CLAW(Material.RABBIT_FOOT, Rarity.RARE),
2306+
22512307
MASTER_SKULL_TIER_1(Material.PLAYER_HEAD, Rarity.COMMON),
22522308

22532309
MASTER_SKULL_TIER_2(Material.PLAYER_HEAD, Rarity.COMMON),
@@ -2264,6 +2320,8 @@ public enum ItemType {
22642320

22652321
MATRIARCHS_PERFUME(Material.RABBIT_STEW, Rarity.COMMON),
22662322

2323+
MECHAMIND_GARDEN_CHIP(Material.PLAYER_HEAD, Rarity.RARE),
2324+
22672325
MEDIUM_AGRONOMY_SACK(Material.PLAYER_HEAD, Rarity.RARE),
22682326

22692327
MEDIUM_BACKPACK(Material.PLAYER_HEAD, Rarity.COMMON),
@@ -2402,6 +2460,8 @@ public enum ItemType {
24022460

24032461
MYCELIUM(Material.MYCELIUM, Rarity.COMMON),
24042462

2463+
MYSTERIOUS_CROP(Material.DEAD_BUSH, Rarity.COMMON),
2464+
24052465
NECRONS_HANDLE(Material.STICK, Rarity.COMMON),
24062466

24072467
NETHERRACK(Material.NETHERRACK, Rarity.COMMON),
@@ -2524,8 +2584,12 @@ public enum ItemType {
25242584

25252585
ORANGE_WOOL(Material.ORANGE_WOOL, Rarity.COMMON),
25262586

2587+
OVERDRIVE_GARDEN_CHIP(Material.PLAYER_HEAD, Rarity.RARE),
2588+
25272589
OVERFLUX_CAPACITOR(Material.QUARTZ, Rarity.EPIC),
25282590

2591+
OVERGROWN_GRASS(Material.GRASS_BLOCK, Rarity.RARE),
2592+
25292593
OXEYE_DAISY(Material.OXEYE_DAISY, Rarity.COMMON),
25302594

25312595
PACKED_ICE(Material.PACKED_ICE, Rarity.COMMON),
@@ -2616,6 +2680,8 @@ public enum ItemType {
26162680

26172681
PESTHUNTER_RING(Material.PLAYER_HEAD, Rarity.RARE),
26182682

2683+
PET_CAKE(Material.CAKE, Rarity.COMMON),
2684+
26192685
PET_LUCK_POTION_1(Material.POTION, Rarity.COMMON),
26202686

26212687
PHANTOM_HOOK(Material.PLAYER_HEAD, Rarity.RARE),
@@ -2822,6 +2888,8 @@ public enum ItemType {
28222888

28232889
QUARTZ_STAIRS(Material.QUARTZ_STAIRS, Rarity.COMMON),
28242890

2891+
QUICKDRAW_GARDEN_CHIP(Material.PLAYER_HEAD, Rarity.RARE),
2892+
28252893
RABBIT(Material.RABBIT, Rarity.COMMON),
28262894

28272895
RABBIT_FOOT(Material.RABBIT_FOOT, Rarity.COMMON),
@@ -2834,6 +2902,8 @@ public enum ItemType {
28342902

28352903
RAIL(Material.RAIL, Rarity.COMMON),
28362904

2905+
RAREFINDER_GARDEN_CHIP(Material.PLAYER_HEAD, Rarity.RARE),
2906+
28372907
RAW_BEEF(Material.BEEF, Rarity.COMMON),
28382908

28392909
RAW_CHICKEN(Material.CHICKEN, Rarity.COMMON),
@@ -3266,6 +3336,12 @@ public enum ItemType {
32663336

32673337
SOUL_STRING(Material.STRING, Rarity.COMMON),
32683338

3339+
SOWDUST(Material.GREEN_DYE, Rarity.COMMON),
3340+
3341+
SOWLEDGE_GARDEN_CHIP(Material.PLAYER_HEAD, Rarity.RARE),
3342+
3343+
SPACE_HELMET(Material.PLAYER_HEAD, Rarity.SPECIAL),
3344+
32693345
SPEEDSTER_ROD(Material.FISHING_ROD, Rarity.UNCOMMON),
32703346

32713347
SPEEDY_LINE(Material.PLAYER_HEAD, Rarity.RARE),
@@ -3348,8 +3424,14 @@ public enum ItemType {
33483424

33493425
SPRUCE_WOOD(Material.SPRUCE_WOOD, Rarity.COMMON),
33503426

3427+
SQUASH(Material.PLAYER_HEAD, Rarity.RARE),
3428+
33513429
SQUASH_RING(Material.PLAYER_HEAD, Rarity.UNCOMMON),
33523430

3431+
SQUEAKY_MOUSEMAT(Material.GRAY_CARPET, Rarity.EPIC),
3432+
3433+
SQUEAKY_TOY(Material.RABBIT_FOOT, Rarity.RARE),
3434+
33533435
SQUIRE_BOOTS(Material.LEATHER_BOOTS, Rarity.COMMON),
33543436

33553437
SQUIRE_CHESTPLATE(Material.IRON_CHESTPLATE, Rarity.COMMON),
@@ -3484,8 +3566,14 @@ public enum ItemType {
34843566

34853567
SUMSUNG_GG_ABICASE(Material.PLAYER_HEAD, Rarity.COMMON),
34863568

3569+
SUNDER_I(Material.ENCHANTED_BOOK, Rarity.COMMON),
3570+
3571+
SUNDER_VI_BOOK(Material.ENCHANTED_BOOK, Rarity.RARE),
3572+
34873573
SUNFLOWER(Material.SUNFLOWER, Rarity.COMMON),
34883574

3575+
SUNFLOWER_OIL(Material.HONEY_BOTTLE, Rarity.UNCOMMON),
3576+
34893577
SUPERBOOM_TNT(Material.TNT, Rarity.RARE),
34903578

34913579
SUPERLITE_MOTOR(Material.PLAYER_HEAD, Rarity.COMMON),
@@ -3498,6 +3586,8 @@ public enum ItemType {
34983586

34993587
SWORD_OF_REVELATIONS(Material.WOODEN_SWORD, Rarity.EPIC),
35003588

3589+
SYNTHESIS_GARDEN_CHIP(Material.PLAYER_HEAD, Rarity.RARE),
3590+
35013591
SYNTHETIC_HEART(Material.PLAYER_HEAD, Rarity.COMMON),
35023592

35033593
TALL_GRASS(Material.TALL_GRASS, Rarity.COMMON),
@@ -3506,6 +3596,8 @@ public enum ItemType {
35063596

35073597
TARANTULA_WEB(Material.STRING, Rarity.UNCOMMON),
35083598

3599+
TASTY_CHEESE(Material.HONEYCOMB, Rarity.COMMON),
3600+
35093601
TENDER_WOOD(Material.PLAYER_HEAD, Rarity.COMMON),
35103602

35113603
TEPID_GREEN_TEA(Material.PLAYER_HEAD, Rarity.COMMON),
@@ -3582,6 +3674,8 @@ public enum ItemType {
35823674

35833675
VACCINE_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON),
35843676

3677+
VERMIN_VAPORIZER_GARDEN_CHIP(Material.PLAYER_HEAD, Rarity.RARE),
3678+
35853679
VILLAGE_AFFINITY_TALISMAN(Material.PLAYER_HEAD, Rarity.COMMON),
35863680

35873681
VINES(Material.VINE, Rarity.COMMON),
@@ -3682,6 +3776,8 @@ public enum ItemType {
36823776

36833777
WILD_ROSE(Material.ROSE_BUSH, Rarity.COMMON),
36843778

3779+
WILD_STRAWBERRY_DYE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
3780+
36853781
WILSON_ENGINEERING_PLANS(Material.PAPER, Rarity.LEGENDARY),
36863782

36873783
WINTER_ROD(Material.FISHING_ROD, Rarity.RARE),
@@ -3720,6 +3816,8 @@ public enum ItemType {
37203816

37213817
WORM_MEMBRANE(Material.ROTTEN_FLESH, Rarity.COMMON),
37223818

3819+
WRIGGLING_LARVA(Material.STRING, Rarity.RARE),
3820+
37233821
YELLOW_BANNER(Material.YELLOW_BANNER, Rarity.COMMON),
37243822

37253823
YELLOW_BED(Material.YELLOW_BED, Rarity.COMMON),

commons/src/main/java/net/swofty/commons/protocol/objects/jacobscontest/GetJacobContestScheduleProtocol.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package net.swofty.commons.protocol.objects.jacobscontest;
22

3-
import net.swofty.commons.protocol.ProtocolObject;
3+
import net.swofty.commons.protocol.RedisProtocol;
44
import net.swofty.commons.protocol.Serializer;
55
import org.json.JSONArray;
66
import org.json.JSONObject;
77

88
import java.util.ArrayList;
99
import java.util.List;
1010

11-
public class GetJacobContestScheduleProtocol extends ProtocolObject<
11+
public class GetJacobContestScheduleProtocol extends RedisProtocol<
1212
GetJacobContestScheduleProtocol.GetJacobContestScheduleMessage,
1313
GetJacobContestScheduleProtocol.GetJacobContestScheduleResponse> {
1414

0 commit comments

Comments
 (0)