Merge pull request #847 from ArikSquad/refactor/move-skyblock-names-to-config

feat: move skyblock names to config

Author: Swofty-Developments

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Swofty-Developments

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

@@ -172,7 +172,7 @@ public enum ItemType {
 
   AWKWARD_POTION(Material.POTION, Rarity.COMMON),
 
-  AXE_OF_THE_SHREDDED(Material.DIAMOND_AXE, Rarity.LEGENDARY),
+  AXE_OF_THE_SHREDDED(Material.DIAMOND_SWORD, Rarity.LEGENDARY),
 
   AZALEA(Material.AZALEA, Rarity.COMMON),
 
@@ -3738,6 +3738,8 @@ public enum ItemType {
 
   SILVER_BLOBFISH(Material.PLAYER_HEAD, Rarity.COMMON),
 
+  SILVER_FANG(Material.IRON_SWORD, Rarity.RARE),
+
   SILVER_FLYFISH(Material.PLAYER_HEAD, Rarity.COMMON),
 
   SILVER_GOLDEN_FISH(Material.PLAYER_HEAD, Rarity.COMMON),

configuration/i18n/en_US/items.properties

@@ -1,6 +1,7 @@
 items:
   - id: ACTUALLY_BLUE_ABICASE
     material: PLAYER_HEAD
+    name: "Actually Blue Abicase"
     rarity: COMMON
     components:
       - id: CUSTOM_DISPLAY_NAME
@@ -11,6 +12,7 @@ items:
 
   - id: BLUE_BUT_GREEN_ABICASE
     material: PLAYER_HEAD
+    name: "Blue But Green Abicase"
     rarity: COMMON
     components:
       - id: CUSTOM_DISPLAY_NAME
@@ -21,6 +23,7 @@ items:
 
   - id: BLUE_BUT_RED_ABICASE
     material: PLAYER_HEAD
+    name: "Blue But Red Abicase"
     rarity: COMMON
     components:
       - id: CUSTOM_DISPLAY_NAME
@@ -31,6 +34,7 @@ items:
 
   - id: BLUE_BUT_YELLOW_ABICASE
     material: PLAYER_HEAD
+    name: "Blue But Yellow Abicase"
     rarity: COMMON
     components:
       - id: CUSTOM_DISPLAY_NAME
@@ -41,6 +45,7 @@ items:
 
   - id: LIGHTER_BLUE_ABICASE
     material: PLAYER_HEAD
+    name: "Lighter Blue Abicase"
     rarity: COMMON
     components:
       - id: CUSTOM_DISPLAY_NAME
@@ -51,6 +56,7 @@ items:
 
   - id: REZAR_ABICASE
     material: PLAYER_HEAD
+    name: "Rezar Abicase"
     rarity: COMMON
     components:
       - id: CUSTOM_DISPLAY_NAME
@@ -61,6 +67,7 @@ items:
 
   - id: SUMSUNG_G3_ABICASE
     material: PLAYER_HEAD
+    name: "Sumsung G3 Abicase"
     rarity: COMMON
     components:
       - id: CUSTOM_DISPLAY_NAME
@@ -71,6 +78,7 @@ items:
 
   - id: SUMSUNG_GG_ABICASE
     material: PLAYER_HEAD
+    name: "Sumsung Gg Abicase"
     rarity: COMMON
     components:
       - id: CUSTOM_DISPLAY_NAME

configuration/skyblock/items/accessories/abicases.yml

@@ -1,13 +1,15 @@
 items:
   - id: BITS_TALISMAN
     material: PLAYER_HEAD
+    name: "Bits Talisman"
     rarity: RARE
     components:
       - id: SKULL_HEAD
         texture: 2ebadb1725aa85bb2810d0b73bf7cd74db3d9d8fc61c4cf9e543dbcc199187cc
       - id: TALISMAN
   - id: FARMING_TALISMAN
     material: PLAYER_HEAD
+    name: "Farming Talisman"
     rarity: COMMON
     default_statistics:
       speed: 10.0
@@ -38,6 +40,7 @@ items:
         value: 25.0
   - id: FIRE_TALISMAN
     material: PLAYER_HEAD
+    name: "Fire Talisman"
     rarity: COMMON
     components:
       - id: SKULL_HEAD
@@ -47,6 +50,7 @@ items:
         value: 6480.0
   - id: LAVA_TALISMAN
     material: PLAYER_HEAD
+    name: "Lava Talisman"
     rarity: UNCOMMON
     components:
       - id: SKULL_HEAD
@@ -56,6 +60,7 @@ items:
         value: 5800.0
   - id: MINE_AFFINITY_TALISMAN
     material: PLAYER_HEAD
+    name: "Mine Affinity Talisman"
     rarity: COMMON
     default_statistics:
       speed: 10.0
@@ -65,6 +70,7 @@ items:
       - id: TALISMAN
   - id: POTATO_TALISMAN
     material: PLAYER_HEAD
+    name: "Potato Talisman"
     rarity: COMMON
     default_statistics:
       speed: 1.0
@@ -74,6 +80,7 @@ items:
       - id: TALISMAN
   - id: VILLAGE_AFFINITY_TALISMAN
     material: PLAYER_HEAD
+    name: "Village Affinity Talisman"
     rarity: COMMON
     default_statistics:
       speed: 10.0
@@ -84,12 +91,14 @@ items:
   - id: SKELETON_TALISMAN
     rarity: COMMON
     material: SKELETON_SKULL
+    name: "Skeleton Talisman"
     components:
       - id: SELLABLE
         value: 50.0
   - id: BLUE_RING
     rarity: RARE
     material: PLAYER_HEAD
+    name: "Blue Ring"
     components:
       - id: SELLABLE
         value: 25000.0
@@ -98,18 +107,21 @@ items:
   - id: ARCHFIEND_DICE
     rarity: EPIC
     material: PLAYER_HEAD
+    name: "Archfiend Dice"
     components:
       - id: SKULL_HEAD
         texture: 8ff7c410a4a8b4b518b94d21402d2892fcc8fa68c3028417dd4eaa8b7e35c568
   - id: HIGH_CLASS_ARCHFIEND_DICE
     rarity: LEGENDARY
     material: PLAYER_HEAD
+    name: "High Class Archfiend Dice"
     components:
       - id: SKULL_HEAD
         texture: 8ff7c410a4a8b4b518b94d21402d2892fcc8fa68c3028417dd4eaa8b7e35c568
   - id: SINFUL_DICE
     rarity: EPIC
     material: PLAYER_HEAD
+    name: "Sinful Dice"
     components:
       - id: SKULL_HEAD
         texture: c32ded1b5bd7e0a52050aa6eca4658fd8bb9d48c3bc50a00994643b128a23de3

configuration/skyblock/items/accessories/accessories.yml

@@ -1,6 +1,7 @@
 items:
   - id: AGARIMOO_TALISMAN
     material: PLAYER_HEAD
+    name: "Agarimoo Talisman"
     rarity: COMMON
     default_statistics:
       fishing_speed: 1
@@ -14,6 +15,7 @@ items:
 
   - id: AGARIMOO_RING
     material: PLAYER_HEAD
+    name: "Agarimoo Ring"
     rarity: UNCOMMON
     default_statistics:
       fishing_speed: 2
@@ -28,6 +30,7 @@ items:
 
   - id: AGARIMOO_ARTIFACT
     material: PLAYER_HEAD
+    name: "Agarimoo Artifact"
     rarity: RARE
     default_statistics:
       fishing_speed: 3

configuration/skyblock/items/accessories/agarimoo.yml

@@ -1,6 +1,7 @@
 items:
   - id: ANGUISH_TALISMAN
     material: PLAYER_HEAD
+    name: "Anguish Talisman"
     rarity: RARE
     lore:
       - '%%dark_gray%%%%italic%%Why are we still here? Just to suffer?'
@@ -17,6 +18,7 @@ items:
 
   - id: ANGUISH_RING
     material: PLAYER_HEAD
+    name: "Anguish Ring"
     rarity: EPIC
     lore:
       - '%%dark_gray%%%%italic%%Why are we still here? Just to suffer?'
@@ -33,6 +35,7 @@ items:
 
   - id: ANGUISH_ARTIFACT
     material: PLAYER_HEAD
+    name: "Anguish Artifact"
     rarity: LEGENDARY
     lore:
       - '%%dark_gray%%%%italic%%Why are we still here? Just to suffer?'

configuration/skyblock/items/accessories/anguish.yml

@@ -1,6 +1,7 @@
 items:
   - id: ANITA_TALISMAN
     material: PLAYER_HEAD
+    name: "Anita Talisman"
     rarity: COMMON
     components:
       - id: CUSTOM_DISPLAY_NAME
@@ -12,6 +13,7 @@ items:
 
   - id: ANITA_RING
     material: PLAYER_HEAD
+    name: "Anita Ring"
     rarity: UNCOMMON
     components:
       - id: CUSTOM_DISPLAY_NAME
@@ -23,6 +25,7 @@ items:
 
   - id: ANITA_ARTIFACT
     material: PLAYER_HEAD
+    name: "Anita Artifact"
     rarity: RARE
     components:
       - id: CUSTOM_DISPLAY_NAME

configuration/skyblock/items/accessories/anita.yml

@@ -1,6 +1,7 @@
 items:
   - id: BAT_TALISMAN
     material: PLAYER_HEAD
+    name: "Bat Talisman"
     rarity: RARE
     default_statistics:
       health: 1
@@ -16,6 +17,7 @@ items:
 
   - id: BAT_RING
     material: PLAYER_HEAD
+    name: "Bat Ring"
     rarity: EPIC
     default_statistics:
       health: 3
@@ -31,6 +33,7 @@ items:
 
   - id: BAT_ARTIFACT
     material: PLAYER_HEAD
+    name: "Bat Artifact"
     rarity: LEGENDARY
     default_statistics:
       health: 5

configuration/skyblock/items/accessories/bat.yml

@@ -1,6 +1,7 @@
 items:
   - id: BAT_PERSON_TALISMAN
     material: PLAYER_HEAD
+    name: "Bat Person Talisman"
     components:
       - id: CUSTOM_DISPLAY_NAME
         display_name: Bat Person Talisman
@@ -11,6 +12,7 @@ items:
 
   - id: BAT_PERSON_RING
     material: PLAYER_HEAD
+    name: "Bat Person Ring"
     rarity: UNCOMMON
     components:
       - id: CUSTOM_DISPLAY_NAME
@@ -22,6 +24,7 @@ items:
 
   - id: BAT_PERSON_ARTIFACT
     material: PLAYER_HEAD
+    name: "Bat Person Artifact"
     rarity: RARE
     components:
       - id: CUSTOM_DISPLAY_NAME