overall changes

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

@@ -582,7 +582,7 @@ public enum ItemType {
 	PUMPKIN_BOOTS(Material.LEATHER_BOOTS, Rarity.COMMON),
 	LAPIS_ARMOR_HELMET(Material.SEA_LANTERN, Rarity.UNCOMMON),
 	LAPIS_ARMOR_CHESTPLATE(Material.LEATHER_CHESTPLATE, Rarity.UNCOMMON),
-	LAPIS_ARMOR_LEGGINGS(Material.SEA_LANTERN, Rarity.UNCOMMON),
+	LAPIS_ARMOR_LEGGINGS(Material.LEATHER_LEGGINGS, Rarity.UNCOMMON),
 	LAPIS_ARMOR_BOOTS(Material.LEATHER_BOOTS, Rarity.UNCOMMON),
 	MINER_ARMOR_HELMET(Material.IRON_HELMET, Rarity.RARE),
 	MINER_ARMOR_CHESTPLATE(Material.IRON_CHESTPLATE, Rarity.RARE),
@@ -665,41 +665,66 @@ public enum ItemType {
 	/**
 	 * Mining Materials
 	 */
-	ROUGH_AMBER_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
-	ROUGH_TOPAZ_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
-	ROUGH_SAPPHIRE_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
-	ROUGH_AMETHYST_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
-	ROUGH_JASPER_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
-	ROUGH_RUBY_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
-	ROUGH_JADE_GEMSTONE(Material.PLAYER_HEAD, Rarity.COMMON),
-	FLAWED_AMBER_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
-	FLAWED_TOPAZ_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
-	FLAWED_SAPPHIRE_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
-	FLAWED_AMETHYST_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
-	FLAWED_JASPER_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
-	FLAWED_RUBY_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
-	FLAWED_JADE_GEMSTONE(Material.PLAYER_HEAD, Rarity.UNCOMMON),
-	FINE_AMBER_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
-	FINE_TOPAZ_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
-	FINE_SAPPHIRE_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
-	FINE_AMETHYST_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
-	FINE_JASPER_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
-	FINE_RUBY_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
-	FINE_JADE_GEMSTONE(Material.PLAYER_HEAD, Rarity.RARE),
-	FLAWLESS_AMBER_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
-	FLAWLESS_TOPAZ_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
-	FLAWLESS_SAPPHIRE_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
-	FLAWLESS_AMETHYST_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
-	FLAWLESS_JASPER_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
-	FLAWLESS_RUBY_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
-	FLAWLESS_JADE_GEMSTONE(Material.PLAYER_HEAD, Rarity.EPIC),
-	PERFECT_AMBER_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
-	PERFECT_TOPAZ_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
-	PERFECT_SAPPHIRE_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
-	PERFECT_AMETHYST_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
-	PERFECT_JASPER_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
-	PERFECT_RUBY_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
-	PERFECT_JADE_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+	ROUGH_AMBER_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
+	ROUGH_TOPAZ_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
+	ROUGH_SAPPHIRE_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
+	ROUGH_AMETHYST_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
+	ROUGH_JASPER_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
+	ROUGH_RUBY_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
+	ROUGH_JADE_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
+	ROUGH_OPAL_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
+	ROUGH_AQUAMARINE_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
+	ROUGH_CITRINE_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
+	ROUGH_PERIDOT_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
+	ROUGH_ONYX_GEM(Material.PLAYER_HEAD, Rarity.COMMON),
+	FLAWED_AMBER_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
+	FLAWED_TOPAZ_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
+	FLAWED_SAPPHIRE_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
+	FLAWED_AMETHYST_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
+	FLAWED_JASPER_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
+	FLAWED_RUBY_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
+	FLAWED_JADE_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
+	FLAWED_OPAL_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
+	FLAWED_AQUAMARINE_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
+	FLAWED_CITRINE_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
+	FLAWED_PERIDOT_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
+	FLAWED_ONYX_GEM(Material.PLAYER_HEAD, Rarity.UNCOMMON),
+	FINE_AMBER_GEM(Material.PLAYER_HEAD, Rarity.RARE),
+	FINE_TOPAZ_GEM(Material.PLAYER_HEAD, Rarity.RARE),
+	FINE_SAPPHIRE_GEM(Material.PLAYER_HEAD, Rarity.RARE),
+	FINE_AMETHYST_GEM(Material.PLAYER_HEAD, Rarity.RARE),
+	FINE_JASPER_GEM(Material.PLAYER_HEAD, Rarity.RARE),
+	FINE_RUBY_GEM(Material.PLAYER_HEAD, Rarity.RARE),
+	FINE_JADE_GEM(Material.PLAYER_HEAD, Rarity.RARE),
+	FINE_OPAL_GEM(Material.PLAYER_HEAD, Rarity.RARE),
+	FINE_AQUAMARINE_GEM(Material.PLAYER_HEAD, Rarity.RARE),
+	FINE_CITRINE_GEM(Material.PLAYER_HEAD, Rarity.RARE),
+	FINE_PERIDOT_GEM(Material.PLAYER_HEAD, Rarity.RARE),
+	FINE_ONYX_GEM(Material.PLAYER_HEAD, Rarity.RARE),
+	FLAWLESS_AMBER_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
+	FLAWLESS_TOPAZ_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
+	FLAWLESS_SAPPHIRE_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
+	FLAWLESS_AMETHYST_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
+	FLAWLESS_JASPER_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
+	FLAWLESS_RUBY_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
+	FLAWLESS_JADE_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
+	FLAWLESS_OPAL_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
+	FLAWLESS_AQUAMARINE_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
+	FLAWLESS_CITRINE_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
+	FLAWLESS_PERIDOT_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
+	FLAWLESS_ONYX_GEM(Material.PLAYER_HEAD, Rarity.EPIC),
+	PERFECT_AMBER_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+	PERFECT_TOPAZ_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+	PERFECT_SAPPHIRE_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+	PERFECT_AMETHYST_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+	PERFECT_JASPER_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+	PERFECT_RUBY_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+	PERFECT_JADE_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+	PERFECT_OPAL_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+	PERFECT_AQUAMARINE_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+	PERFECT_CITRINE_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+	PERFECT_PERIDOT_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
+	PERFECT_ONYX_GEM(Material.PLAYER_HEAD, Rarity.LEGENDARY),
 	HARD_STONE(Material.STONE, Rarity.COMMON),
 	ENCHANTED_HARD_STONE(Material.STONE, Rarity.UNCOMMON),
 	MITHRIL(Material.PRISMARINE_CRYSTALS, Rarity.COMMON),

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

@@ -12,6 +12,7 @@ public enum Rarity {
     EPIC("§5"),
     LEGENDARY("§6"),
     MYTHIC("§d"),
+    DIVINE("§b"),
     SPECIAL("§c", false),
     VERY_SPECIAL("§c", false),
     ADMIN("§4", false),

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

@@ -20,7 +20,7 @@ public enum ItemStatistic {
     ABILITY_DAMAGE("Ability Damage", "§c", "§c", true, "๑"),
     TRUE_DEFENSE("True Defense", "§a", "§f", false, "❂"),
     FEROCITY("Ferocity", "§a", "§c", false, "⫽"),
-    HEALTH_REGEN("Health Regen", "§a", "§c",
+    HEALTH_REGENERATION("Health Regen", "§a", "§c",
             false, "❣", 100D, 1D),
     VITALITY("Vitality", "§a", "§4",
             false, "♨", 100D, 1D),

configuration/skyblock/collections/mining.yml

@@ -702,7 +702,7 @@ collections:
     - type: XP
       data:
         xp: 4
-- itemType: FINE_JASPER_GEMSTONE
+- itemType: FINE_JASPER_GEM
   rewards:
   - amount: 100
     rewards:
@@ -716,10 +716,10 @@ collections:
         xp: 4
     - type: SPECIAL_UNLOCK
       data:
-        unlockedItemType: FLAWED_RUBY_GEMSTONE
+        unlockedItemType: FLAWED_RUBY_GEM
         isEnchantedRecipe: true
         recipeType: MINING
-        craftingMaterial: ROUGH_RUBY_GEMSTONE
+        craftingMaterial: ROUGH_RUBY_GEM
   - amount: 1000
     rewards:
     - type: XP
@@ -737,10 +737,10 @@ collections:
         xp: 4
     - type: SPECIAL_UNLOCK
       data:
-        unlockedItemType: FINE_RUBY_GEMSTONE
+        unlockedItemType: FINE_RUBY_GEM
         isEnchantedRecipe: true
         recipeType: MINING
-        craftingMaterial: FLAWED_RUBY_GEMSTONE
+        craftingMaterial: FLAWED_RUBY_GEM
   - amount: 25000
     rewards:
     - type: XP
@@ -763,10 +763,10 @@ collections:
         xp: 4
     - type: SPECIAL_UNLOCK
       data:
-        unlockedItemType: FLAWLESS_RUBY_GEMSTONE
+        unlockedItemType: FLAWLESS_RUBY_GEM
         isEnchantedRecipe: true
         recipeType: MINING
-        craftingMaterial: FINE_RUBY_GEMSTONE
+        craftingMaterial: FINE_RUBY_GEM
   - amount: 1000000
     rewards:
     - type: XP

configuration/skyblock/items/armor/lapis.yml

@@ -1,5 +1,5 @@
 items:
-  - id: LAPIS_HELMET
+  - id: LAPIS_ARMOR_HELMET
     rarity: COMMON
     default_statistics:
       defense: 25
@@ -15,11 +15,13 @@ items:
         g: '121'
         b: '100'
       - id: SELLABLE
-        value: 1000.0
+        value: 1000
       - id: TRACKED_UNIQUE
       - id: MUSEUM
         museum_category: ARMOR_SETS
-  - id: LAPIS_CHESTPLATE
+        game_stage: AMATEUR
+        donation_xp: 3
+  - id: LAPIS_ARMOR_CHESTPLATE
     rarity: COMMON
     default_statistics:
       defense: 40
@@ -31,15 +33,17 @@ items:
       - id: STANDARD_ITEM
         standard_item_type: CHESTPLATE
       - id: LEATHER_COLOR
-        r: '122'
-        g: '121'
-        b: '100'
+        r: '0'
+        g: '0'
+        b: '255'
       - id: SELLABLE
-        value: 2000.0
+        value: 2000
       - id: TRACKED_UNIQUE
       - id: MUSEUM
         museum_category: ARMOR_SETS
-  - id: LAPIS_LEGGINGS
+        game_stage: AMATEUR
+        donation_xp: 3
+  - id: LAPIS_ARMOR_LEGGINGS
     rarity: COMMON
     default_statistics:
       defense: 35
@@ -51,15 +55,17 @@ items:
       - id: STANDARD_ITEM
         standard_item_type: LEGGINGS
       - id: LEATHER_COLOR
-        r: '122'
-        g: '121'
-        b: '100'
+        r: '0'
+        g: '0'
+        b: '255'
       - id: SELLABLE
-        value: 1750.0
+        value: 1750
       - id: TRACKED_UNIQUE
       - id: MUSEUM
         museum_category: ARMOR_SETS
-  - id: LAPIS_BOOTS
+        game_stage: AMATEUR
+        donation_xp: 3
+  - id: LAPIS_ARMOR_BOOTS
     rarity: COMMON
     default_statistics:
       defense: 20
@@ -71,11 +77,13 @@ items:
       - id: STANDARD_ITEM
         standard_item_type: BOOTS
       - id: LEATHER_COLOR
-        r: '122'
-        g: '121'
-        b: '100'
+        r: '0'
+        g: '0'
+        b: '255'
       - id: SELLABLE
-        value: 1000.0
+        value: 1000
       - id: TRACKED_UNIQUE
       - id: MUSEUM
         museum_category: ARMOR_SETS
+        game_stage: AMATEUR
+        donation_xp: 3

configuration/skyblock/items/armor/mineroutfit.yml → configuration/skyblock/items/armor/prospecting.yml

@@ -1,73 +1,92 @@
 items:
-  - id: MINERS_OUTFIT_BOOTS
-    rarity: COMMON
+  - id: MINER_OUTFIT_HELMET
+    material: LEATHER_HELMET
+    rarity: UNCOMMON
     default_statistics:
-      defense: 15.0
+      defense: 15
+      mining_speed: 15
     components:
       - id: CUSTOM_DISPLAY_NAME
-        display_name: Miner's Outfit Boots
+        display_name: Prospecting Helmet
       - id: STANDARD_ITEM
-        standard_item_type: BOOTS
+        standard_item_type: HELMET
+      - id: SELLABLE
+        value: 400
+      - id: MUSEUM
+        museum_category: ARMOR_SETS
+        game_stage: STARTER
+        donation_xp: 3
       - id: LEATHER_COLOR
         r: '122'
         g: '121'
         b: '100'
-      - id: SELLABLE
-        value: 320.0
-      - id: TRACKED_UNIQUE
-      - id: MUSEUM
-        museum_category: ARMOR_SETS
-  - id: MINERS_OUTFIT_CHESTPLATE
-    rarity: COMMON
+      - id: NOT_FINISHED_YET
+
+  - id: MINER_OUTFIT_CHESTPLATE
+    material: LEATHER_CHESTPLATE
+    rarity: UNCOMMON
     default_statistics:
-      defense: 40.0
+      defense: 40
+      mining_speed: 15
     components:
       - id: CUSTOM_DISPLAY_NAME
-        display_name: Miner's Outfit Chestplate
+        display_name: Prospecting Chestplate
       - id: STANDARD_ITEM
         standard_item_type: CHESTPLATE
+      - id: SELLABLE
+        value: 640
+      - id: MUSEUM
+        museum_category: ARMOR_SETS
+        game_stage: STARTER
+        donation_xp: 3
       - id: LEATHER_COLOR
         r: '122'
         g: '121'
         b: '100'
-      - id: SELLABLE
-        value: 640.0
-      - id: TRACKED_UNIQUE
-      - id: MUSEUM
-        museum_category: ARMOR_SETS
-  - id: MINERS_OUTFIT_HELMET
-    rarity: COMMON
+      - id: NOT_FINISHED_YET
+
+  - id: MINER_OUTFIT_LEGGINGS
+    material: LEATHER_LEGGINGS
+    rarity: UNCOMMON
     default_statistics:
-      defense: 15.0
+      defense: 30
+      mining_speed: 15
     components:
       - id: CUSTOM_DISPLAY_NAME
-        display_name: Miner's Outfit Helmet
+        display_name: Prospecting Leggings
       - id: STANDARD_ITEM
-        standard_item_type: HELMET
+        standard_item_type: LEGGINGS
+      - id: SELLABLE
+        value: 560
+      - id: MUSEUM
+        museum_category: ARMOR_SETS
+        game_stage: STARTER
+        donation_xp: 3
       - id: LEATHER_COLOR
         r: '122'
         g: '121'
         b: '100'
-      - id: SELLABLE
-        value: 400.0
-      - id: TRACKED_UNIQUE
-      - id: MUSEUM
-        museum_category: ARMOR_SETS
-  - id: MINERS_OUTFIT_LEGGINGS
-    rarity: COMMON
+      - id: NOT_FINISHED_YET
+
+  - id: MINER_OUTFIT_BOOTS
+    material: LEATHER_BOOTS
+    rarity: UNCOMMON
     default_statistics:
-      defense: 30.0
+      defense: 15
+      mining_speed: 15
     components:
       - id: CUSTOM_DISPLAY_NAME
-        display_name: Miner's Outfit Leggings
+        display_name: Prospecting Boots
       - id: STANDARD_ITEM
-        standard_item_type: LEGGINGS
+        standard_item_type: BOOTS
+      - id: SELLABLE
+        value: 320
+      - id: MUSEUM
+        museum_category: ARMOR_SETS
+        game_stage: STARTER
+        donation_xp: 3
       - id: LEATHER_COLOR
         r: '122'
         g: '121'
         b: '100'
-      - id: SELLABLE
-        value: 560.0
-      - id: TRACKED_UNIQUE
-      - id: MUSEUM
-        museum_category: ARMOR_SETS
+      - id: NOT_FINISHED_YET