Skip to content

Commit a7f4acf

Browse files
ItzKatzeItzKatze
committed
overall changes
1 parent 4170bf3 commit a7f4acf

40 files changed

Lines changed: 1828 additions & 744 deletions

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

Lines changed: 61 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ public enum ItemType {
582582
PUMPKIN_BOOTS(Material.LEATHER_BOOTS, Rarity.COMMON),
583583
LAPIS_ARMOR_HELMET(Material.SEA_LANTERN, Rarity.UNCOMMON),
584584
LAPIS_ARMOR_CHESTPLATE(Material.LEATHER_CHESTPLATE, Rarity.UNCOMMON),
585-
LAPIS_ARMOR_LEGGINGS(Material.SEA_LANTERN, Rarity.UNCOMMON),
585+
LAPIS_ARMOR_LEGGINGS(Material.LEATHER_LEGGINGS, Rarity.UNCOMMON),
586586
LAPIS_ARMOR_BOOTS(Material.LEATHER_BOOTS, Rarity.UNCOMMON),
587587
MINER_ARMOR_HELMET(Material.IRON_HELMET, Rarity.RARE),
588588
MINER_ARMOR_CHESTPLATE(Material.IRON_CHESTPLATE, Rarity.RARE),
@@ -665,41 +665,66 @@ public enum ItemType {
665665
/**
666666
* Mining Materials
667667
*/
668-
ROUGH_AMBER_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
669-
ROUGH_TOPAZ_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
670-
ROUGH_SAPPHIRE_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
671-
ROUGH_AMETHYST_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
672-
ROUGH_JASPER_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
673-
ROUGH_RUBY_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
674-
ROUGH_JADE_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
675-
FLAWED_AMBER_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
676-
FLAWED_TOPAZ_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
677-
FLAWED_SAPPHIRE_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
678-
FLAWED_AMETHYST_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
679-
FLAWED_JASPER_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
680-
FLAWED_RUBY_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
681-
FLAWED_JADE_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
682-
FINE_AMBER_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
683-
FINE_TOPAZ_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
684-
FINE_SAPPHIRE_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
685-
FINE_AMETHYST_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
686-
FINE_JASPER_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
687-
FINE_RUBY_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
688-
FINE_JADE_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
689-
FLAWLESS_AMBER_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
690-
FLAWLESS_TOPAZ_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
691-
FLAWLESS_SAPPHIRE_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
692-
FLAWLESS_AMETHYST_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
693-
FLAWLESS_JASPER_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
694-
FLAWLESS_RUBY_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
695-
FLAWLESS_JADE_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
696-
PERFECT_AMBER_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
697-
PERFECT_TOPAZ_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
698-
PERFECT_SAPPHIRE_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
699-
PERFECT_AMETHYST_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
700-
PERFECT_JASPER_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
701-
PERFECT_RUBY_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
702-
PERFECT_JADE_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
668+
ROUGH_AMBER_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
669+
ROUGH_TOPAZ_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
670+
ROUGH_SAPPHIRE_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
671+
ROUGH_AMETHYST_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
672+
ROUGH_JASPER_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
673+
ROUGH_RUBY_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
674+
ROUGH_JADE_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
675+
ROUGH_OPAL_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
676+
ROUGH_AQUAMARINE_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
677+
ROUGH_CITRINE_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
678+
ROUGH_PERIDOT_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
679+
ROUGH_ONYX_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
680+
FLAWED_AMBER_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
681+
FLAWED_TOPAZ_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
682+
FLAWED_SAPPHIRE_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
683+
FLAWED_AMETHYST_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
684+
FLAWED_JASPER_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
685+
FLAWED_RUBY_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
686+
FLAWED_JADE_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
687+
FLAWED_OPAL_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
688+
FLAWED_AQUAMARINE_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
689+
FLAWED_CITRINE_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
690+
FLAWED_PERIDOT_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
691+
FLAWED_ONYX_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
692+
FINE_AMBER_GEM(Material.PLAYER_HEAD, Rarity.RARE),
693+
FINE_TOPAZ_GEM(Material.PLAYER_HEAD, Rarity.RARE),
694+
FINE_SAPPHIRE_GEM(Material.PLAYER_HEAD, Rarity.RARE),
695+
FINE_AMETHYST_GEM(Material.PLAYER_HEAD, Rarity.RARE),
696+
FINE_JASPER_GEM(Material.PLAYER_HEAD, Rarity.RARE),
697+
FINE_RUBY_GEM(Material.PLAYER_HEAD, Rarity.RARE),
698+
FINE_JADE_GEM(Material.PLAYER_HEAD, Rarity.RARE),
699+
FINE_OPAL_GEM(Material.PLAYER_HEAD, Rarity.RARE),
700+
FINE_AQUAMARINE_GEM(Material.PLAYER_HEAD, Rarity.RARE),
701+
FINE_CITRINE_GEM(Material.PLAYER_HEAD, Rarity.RARE),
702+
FINE_PERIDOT_GEM(Material.PLAYER_HEAD, Rarity.RARE),
703+
FINE_ONYX_GEM(Material.PLAYER_HEAD, Rarity.RARE),
704+
FLAWLESS_AMBER_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
705+
FLAWLESS_TOPAZ_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
706+
FLAWLESS_SAPPHIRE_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
707+
FLAWLESS_AMETHYST_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
708+
FLAWLESS_JASPER_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
709+
FLAWLESS_RUBY_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
710+
FLAWLESS_JADE_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
711+
FLAWLESS_OPAL_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
712+
FLAWLESS_AQUAMARINE_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
713+
FLAWLESS_CITRINE_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
714+
FLAWLESS_PERIDOT_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
715+
FLAWLESS_ONYX_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
716+
PERFECT_AMBER_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
717+
PERFECT_TOPAZ_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
718+
PERFECT_SAPPHIRE_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
719+
PERFECT_AMETHYST_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
720+
PERFECT_JASPER_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
721+
PERFECT_RUBY_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
722+
PERFECT_JADE_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
723+
PERFECT_OPAL_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
724+
PERFECT_AQUAMARINE_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
725+
PERFECT_CITRINE_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
726+
PERFECT_PERIDOT_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
727+
PERFECT_ONYX_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
703728
HARD_STONE(Material.STONE, Rarity.COMMON),
704729
ENCHANTED_HARD_STONE(Material.STONE, Rarity.UNCOMMON),
705730
MITHRIL(Material.PRISMARINE_CRYSTALS, Rarity.COMMON),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public enum Rarity {
1212
EPIC("§5"),
1313
LEGENDARY("§6"),
1414
MYTHIC("§d"),
15+
DIVINE("§b"),
1516
SPECIAL("§c", false),
1617
VERY_SPECIAL("§c", false),
1718
ADMIN("§4", false),

‎commons/src/main/java/net/swofty/commons/skyblock/statistics/ItemStatistic.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public enum ItemStatistic {
2020
ABILITY_DAMAGE("Ability Damage", "§c", "§c", true, "๑"),
2121
TRUE_DEFENSE("True Defense", "§a", "§f", false, "❂"),
2222
FEROCITY("Ferocity", "§a", "§c", false, "⫽"),
23-
HEALTH_REGEN("Health Regen", "§a", "§c",
23+
HEALTH_REGENERATION("Health Regen", "§a", "§c",
2424
false, "❣", 100D, 1D),
2525
VITALITY("Vitality", "§a", "§4",
2626
false, "♨", 100D, 1D),

‎configuration/skyblock/collections/mining.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ collections:
702702
- type: XP
703703
data:
704704
xp: 4
705-
- itemType: FINE_JASPER_GEMSTONE
705+
- itemType: FINE_JASPER_GEM
706706
rewards:
707707
- amount: 100
708708
rewards:
@@ -716,10 +716,10 @@ collections:
716716
xp: 4
717717
- type: SPECIAL_UNLOCK
718718
data:
719-
unlockedItemType: FLAWED_RUBY_GEMSTONE
719+
unlockedItemType: FLAWED_RUBY_GEM
720720
isEnchantedRecipe: true
721721
recipeType: MINING
722-
craftingMaterial: ROUGH_RUBY_GEMSTONE
722+
craftingMaterial: ROUGH_RUBY_GEM
723723
- amount: 1000
724724
rewards:
725725
- type: XP
@@ -737,10 +737,10 @@ collections:
737737
xp: 4
738738
- type: SPECIAL_UNLOCK
739739
data:
740-
unlockedItemType: FINE_RUBY_GEMSTONE
740+
unlockedItemType: FINE_RUBY_GEM
741741
isEnchantedRecipe: true
742742
recipeType: MINING
743-
craftingMaterial: FLAWED_RUBY_GEMSTONE
743+
craftingMaterial: FLAWED_RUBY_GEM
744744
- amount: 25000
745745
rewards:
746746
- type: XP
@@ -763,10 +763,10 @@ collections:
763763
xp: 4
764764
- type: SPECIAL_UNLOCK
765765
data:
766-
unlockedItemType: FLAWLESS_RUBY_GEMSTONE
766+
unlockedItemType: FLAWLESS_RUBY_GEM
767767
isEnchantedRecipe: true
768768
recipeType: MINING
769-
craftingMaterial: FINE_RUBY_GEMSTONE
769+
craftingMaterial: FINE_RUBY_GEM
770770
- amount: 1000000
771771
rewards:
772772
- type: XP

‎configuration/skyblock/items/armor/lapis.yml‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
items:
2-
- id: LAPIS_HELMET
2+
- id: LAPIS_ARMOR_HELMET
33
rarity: COMMON
44
default_statistics:
55
defense: 25
@@ -15,11 +15,13 @@ items:
1515
g: '121'
1616
b: '100'
1717
- id: SELLABLE
18-
value: 1000.0
18+
value: 1000
1919
- id: TRACKED_UNIQUE
2020
- id: MUSEUM
2121
museum_category: ARMOR_SETS
22-
- id: LAPIS_CHESTPLATE
22+
game_stage: AMATEUR
23+
donation_xp: 3
24+
- id: LAPIS_ARMOR_CHESTPLATE
2325
rarity: COMMON
2426
default_statistics:
2527
defense: 40
@@ -31,15 +33,17 @@ items:
3133
- id: STANDARD_ITEM
3234
standard_item_type: CHESTPLATE
3335
- id: LEATHER_COLOR
34-
r: '122'
35-
g: '121'
36-
b: '100'
36+
r: '0'
37+
g: '0'
38+
b: '255'
3739
- id: SELLABLE
38-
value: 2000.0
40+
value: 2000
3941
- id: TRACKED_UNIQUE
4042
- id: MUSEUM
4143
museum_category: ARMOR_SETS
42-
- id: LAPIS_LEGGINGS
44+
game_stage: AMATEUR
45+
donation_xp: 3
46+
- id: LAPIS_ARMOR_LEGGINGS
4347
rarity: COMMON
4448
default_statistics:
4549
defense: 35
@@ -51,15 +55,17 @@ items:
5155
- id: STANDARD_ITEM
5256
standard_item_type: LEGGINGS
5357
- id: LEATHER_COLOR
54-
r: '122'
55-
g: '121'
56-
b: '100'
58+
r: '0'
59+
g: '0'
60+
b: '255'
5761
- id: SELLABLE
58-
value: 1750.0
62+
value: 1750
5963
- id: TRACKED_UNIQUE
6064
- id: MUSEUM
6165
museum_category: ARMOR_SETS
62-
- id: LAPIS_BOOTS
66+
game_stage: AMATEUR
67+
donation_xp: 3
68+
- id: LAPIS_ARMOR_BOOTS
6369
rarity: COMMON
6470
default_statistics:
6571
defense: 20
@@ -71,11 +77,13 @@ items:
7177
- id: STANDARD_ITEM
7278
standard_item_type: BOOTS
7379
- id: LEATHER_COLOR
74-
r: '122'
75-
g: '121'
76-
b: '100'
80+
r: '0'
81+
g: '0'
82+
b: '255'
7783
- id: SELLABLE
78-
value: 1000.0
84+
value: 1000
7985
- id: TRACKED_UNIQUE
8086
- id: MUSEUM
8187
museum_category: ARMOR_SETS
88+
game_stage: AMATEUR
89+
donation_xp: 3

configuration/skyblock/items/armor/mineroutfit.yml renamed to configuration/skyblock/items/armor/prospecting.yml

Lines changed: 58 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,92 @@
11
items:
2-
- id: MINERS_OUTFIT_BOOTS
3-
rarity: COMMON
2+
- id: MINER_OUTFIT_HELMET
3+
material: LEATHER_HELMET
4+
rarity: UNCOMMON
45
default_statistics:
5-
defense: 15.0
6+
defense: 15
7+
mining_speed: 15
68
components:
79
- id: CUSTOM_DISPLAY_NAME
8-
display_name: Miner's Outfit Boots
10+
display_name: Prospecting Helmet
911
- id: STANDARD_ITEM
10-
standard_item_type: BOOTS
12+
standard_item_type: HELMET
13+
- id: SELLABLE
14+
value: 400
15+
- id: MUSEUM
16+
museum_category: ARMOR_SETS
17+
game_stage: STARTER
18+
donation_xp: 3
1119
- id: LEATHER_COLOR
1220
r: '122'
1321
g: '121'
1422
b: '100'
15-
- id: SELLABLE
16-
value: 320.0
17-
- id: TRACKED_UNIQUE
18-
- id: MUSEUM
19-
museum_category: ARMOR_SETS
20-
- id: MINERS_OUTFIT_CHESTPLATE
21-
rarity: COMMON
23+
- id: NOT_FINISHED_YET
24+
25+
- id: MINER_OUTFIT_CHESTPLATE
26+
material: LEATHER_CHESTPLATE
27+
rarity: UNCOMMON
2228
default_statistics:
23-
defense: 40.0
29+
defense: 40
30+
mining_speed: 15
2431
components:
2532
- id: CUSTOM_DISPLAY_NAME
26-
display_name: Miner's Outfit Chestplate
33+
display_name: Prospecting Chestplate
2734
- id: STANDARD_ITEM
2835
standard_item_type: CHESTPLATE
36+
- id: SELLABLE
37+
value: 640
38+
- id: MUSEUM
39+
museum_category: ARMOR_SETS
40+
game_stage: STARTER
41+
donation_xp: 3
2942
- id: LEATHER_COLOR
3043
r: '122'
3144
g: '121'
3245
b: '100'
33-
- id: SELLABLE
34-
value: 640.0
35-
- id: TRACKED_UNIQUE
36-
- id: MUSEUM
37-
museum_category: ARMOR_SETS
38-
- id: MINERS_OUTFIT_HELMET
39-
rarity: COMMON
46+
- id: NOT_FINISHED_YET
47+
48+
- id: MINER_OUTFIT_LEGGINGS
49+
material: LEATHER_LEGGINGS
50+
rarity: UNCOMMON
4051
default_statistics:
41-
defense: 15.0
52+
defense: 30
53+
mining_speed: 15
4254
components:
4355
- id: CUSTOM_DISPLAY_NAME
44-
display_name: Miner's Outfit Helmet
56+
display_name: Prospecting Leggings
4557
- id: STANDARD_ITEM
46-
standard_item_type: HELMET
58+
standard_item_type: LEGGINGS
59+
- id: SELLABLE
60+
value: 560
61+
- id: MUSEUM
62+
museum_category: ARMOR_SETS
63+
game_stage: STARTER
64+
donation_xp: 3
4765
- id: LEATHER_COLOR
4866
r: '122'
4967
g: '121'
5068
b: '100'
51-
- id: SELLABLE
52-
value: 400.0
53-
- id: TRACKED_UNIQUE
54-
- id: MUSEUM
55-
museum_category: ARMOR_SETS
56-
- id: MINERS_OUTFIT_LEGGINGS
57-
rarity: COMMON
69+
- id: NOT_FINISHED_YET
70+
71+
- id: MINER_OUTFIT_BOOTS
72+
material: LEATHER_BOOTS
73+
rarity: UNCOMMON
5874
default_statistics:
59-
defense: 30.0
75+
defense: 15
76+
mining_speed: 15
6077
components:
6178
- id: CUSTOM_DISPLAY_NAME
62-
display_name: Miner's Outfit Leggings
79+
display_name: Prospecting Boots
6380
- id: STANDARD_ITEM
64-
standard_item_type: LEGGINGS
81+
standard_item_type: BOOTS
82+
- id: SELLABLE
83+
value: 320
84+
- id: MUSEUM
85+
museum_category: ARMOR_SETS
86+
game_stage: STARTER
87+
donation_xp: 3
6588
- id: LEATHER_COLOR
6689
r: '122'
6790
g: '121'
6891
b: '100'
69-
- id: SELLABLE
70-
value: 560.0
71-
- id: TRACKED_UNIQUE
72-
- id: MUSEUM
73-
museum_category: ARMOR_SETS
92+
- id: NOT_FINISHED_YET

0 commit comments

Comments
 (0)