fix: various crafting issues

Took 42 minutes

Author: Swofty-Developments

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

@@ -295,6 +295,9 @@ public enum ItemType {
     POLISHED_PUMPKIN(Material.PLAYER_HEAD, Rarity.RARE),
     BOX_OF_SEEDS(Material.PLAYER_HEAD, Rarity.RARE),
     ENCHANTED_BOOKSHELF(Material.BOOKSHELF, Rarity.UNCOMMON),
+    ENCHANTED_COOKED_FISH(Material.COOKED_COD, Rarity.RARE),
+    ENCHANTED_RAW_FISH(Material.COD, Rarity.RARE),
+    ENCHANTED_IRON_INGOT(Material.IRON_INGOT, Rarity.RARE),
     TIGHTLY_TIED_HAY_BALE(Material.PLAYER_HEAD, Rarity.RARE),
     COMPOST(Material.PLAYER_HEAD, Rarity.UNCOMMON),
     COMPOST_BUNDLE(Material.PLAYER_HEAD, Rarity.RARE),
@@ -661,6 +664,7 @@ public enum ItemType {
     PERFECT_RUBY_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
     PERFECT_JADE_GEMSTONE(Material.PLAYER_HEAD, Rarity.LEGENDARY),
     HARD_STONE(Material.STONE, Rarity.COMMON),
+    ENCHANTED_HARD_STONE(Material.STONE, Rarity.UNCOMMON),
     MITHRIL(Material.PRISMARINE_CRYSTALS, Rarity.COMMON),
     TITANIUM(Material.PLAYER_HEAD, Rarity.RARE),
     SULPHUR(Material.GLOWSTONE_DUST, Rarity.UNCOMMON),
@@ -1456,7 +1460,6 @@ public enum ItemType {
     ENCHANTED_GOLD_BLOCK(Material.GOLD_BLOCK, Rarity.RARE),
     ENCHANTED_JUNGLE_LOG(Material.JUNGLE_LOG, Rarity.UNCOMMON),
     ENCHANTED_GUNPOWDER(Material.GUNPOWDER, Rarity.UNCOMMON),
-    ENCHANTED_IRON_INGOT(Material.IRON_INGOT, Rarity.UNCOMMON),
     ENCHANTED_IRON_BLOCK(Material.IRON_BLOCK, Rarity.RARE),
     ENCHANTED_LEATHER(Material.LEATHER, Rarity.UNCOMMON),
     ENCHANTED_OAK_LOG(Material.OAK_LOG, Rarity.UNCOMMON),
@@ -1476,7 +1479,7 @@ public enum ItemType {
     ENCHANTED_RED_MUSHROOM(Material.RED_MUSHROOM, Rarity.UNCOMMON),
     ENCHANTED_CACTUS_GREEN(Material.GREEN_DYE, Rarity.UNCOMMON),
     ENCHANTED_CACTUS(Material.CACTUS, Rarity.RARE),
-    ENCHANTED_ENDSTONE(Material.END_STONE, Rarity.UNCOMMON),
+    ENCHANTED_END_STONE(Material.END_STONE, Rarity.UNCOMMON),
     ENCHANTED_EYE_OF_ENDER(Material.ENDER_EYE, Rarity.UNCOMMON),
     ENCHANTED_ICE(Material.ICE, Rarity.UNCOMMON),
     ENCHANTED_MAGMA_CREAM(Material.MAGMA_CREAM, Rarity.UNCOMMON),
@@ -1503,7 +1506,6 @@ public enum ItemType {
     ENCHANTED_GOLDEN_CARROT(Material.GOLDEN_CARROT, Rarity.UNCOMMON),
     ENCHANTED_PORK(Material.PORKCHOP, Rarity.UNCOMMON),
     ENCHANTED_GRILLED_PORK(Material.COOKED_PORKCHOP, Rarity.RARE),
-    ENCHANTED_HARD_STONE(Material.STONE, Rarity.UNCOMMON),
     ENCHANTED_HAY_BALE(Material.HAY_BLOCK, Rarity.UNCOMMON),
     ENCHANTED_ANCIENT_CLAW(Material.FLINT, Rarity.EPIC),
     ENCHANTED_COAL_BLOCK(Material.COAL_BLOCK, Rarity.RARE),

configuration/collections/combat.yml

@@ -27,7 +27,7 @@ collections:
         unlockedItemType: ENCHANTED_BLAZE_POWDER
         isEnchantedRecipe: true
         recipeType: COMBAT
-        resultType: BLAZE_ROD
+        craftingMaterial: BLAZE_ROD
   - amount: 2500
     rewards:
     - type: XP
@@ -48,7 +48,7 @@ collections:
         unlockedItemType: ENCHANTED_BLAZE_ROD
         isEnchantedRecipe: true
         recipeType: COMBAT
-        resultType: ENCHANTED_BLAZE_POWDER
+        craftingMaterial: ENCHANTED_BLAZE_POWDER
   - amount: 25000
     rewards:
     - type: XP
@@ -93,7 +93,7 @@ collections:
         unlockedItemType: ENCHANTED_STRING
         isEnchantedRecipe: true
         recipeType: COMBAT
-        resultType: STRING
+        craftingMaterial: STRING
   - amount: 2500
     rewards:
     - type: XP
@@ -177,7 +177,7 @@ collections:
     - type: RECIPE
       data:
         recipeType: COMBAT
-        resultType: ASPECT_OF_THE_END
+        craftingMaterial: ASPECT_OF_THE_END
         resultAmount: 1
         pattern:
           - A
@@ -231,7 +231,7 @@ collections:
         unlockedItemType: ENCHANTED_BONE
         isEnchantedRecipe: true
         recipeType: COMBAT
-        resultType: BONE
+        craftingMaterial: BONE
   - amount: 5000
     rewards:
     - type: XP
@@ -262,7 +262,7 @@ collections:
         unlockedItemType: ENCHANTED_BONE_BLOCK
         isEnchantedRecipe: true
         recipeType: COMBAT
-        resultType: ENCHANTED_BONE
+        craftingMaterial: ENCHANTED_BONE
 - itemType: CHILI_PEPPER
   rewards:
   - amount: 10
@@ -300,7 +300,7 @@ collections:
         unlockedItemType: STUFFED_CHILI_PEPPER
         isEnchantedRecipe: true
         recipeType: COMBAT
-        resultType: CHILI_PEPPER
+        craftingMaterial: CHILI_PEPPER
   - amount: 5000
     rewards:
     - type: XP
@@ -350,7 +350,7 @@ collections:
     - type: RECIPE
       data:
         recipeType: NONE
-        resultType: SILVER_FANG
+        craftingMaterial: SILVER_FANG
         resultAmount: 1
         pattern:
           - OAO
@@ -404,7 +404,7 @@ collections:
         unlockedItemType: ENCHANTED_GUNPOWDER
         isEnchantedRecipe: true
         recipeType: COMBAT
-        resultType: GUNPOWDER
+        craftingMaterial: GUNPOWDER
   - amount: 2500
     rewards:
     - type: XP
@@ -456,7 +456,7 @@ collections:
         unlockedItemType: ENCHANTED_MAGMA_CREAM
         isEnchantedRecipe: true
         recipeType: COMBAT
-        resultType: MAGMA_CREAM
+        craftingMaterial: MAGMA_CREAM
   - amount: 2500
     rewards:
     - type: XP
@@ -487,7 +487,7 @@ collections:
         unlockedItemType: WHIPPED_MAGMA_CREAM
         isEnchantedRecipe: true
         recipeType: COMBAT
-        resultType: ENCHANTED_MAGMA_CREAM
+        craftingMaterial: ENCHANTED_MAGMA_CREAM
 - itemType: ROTTEN_FLESH
   rewards:
   - amount: 50
@@ -522,7 +522,7 @@ collections:
         unlockedItemType: ENCHANTED_ROTTEN_FLESH
         isEnchantedRecipe: true
         recipeType: COMBAT
-        resultType: ROTTEN_FLESH
+        craftingMaterial: ROTTEN_FLESH
   - amount: 2500
     rewards:
     - type: XP
@@ -536,7 +536,7 @@ collections:
     - type: RECIPE
       data:
         recipeType: SLAYER
-        resultType: ZOMBIE_HEART
+        craftingMaterial: ZOMBIE_HEART
         resultAmount: 1
         pattern:
           - AAA
@@ -605,7 +605,7 @@ collections:
         unlockedItemType: ENCHANTED_SLIMEBALL
         isEnchantedRecipe: true
         recipeType: COMBAT
-        resultType: SLIME_BALL
+        craftingMaterial: SLIME_BALL
   - amount: 5000
     rewards:
     - type: XP
@@ -626,7 +626,7 @@ collections:
         unlockedItemType: ENCHANTED_SLIME_BLOCK
         isEnchantedRecipe: true
         recipeType: COMBAT
-        resultType: ENCHANTED_SLIMEBALL
+        craftingMaterial: ENCHANTED_SLIMEBALL
   - amount: 50000
     rewards:
     - type: XP
@@ -663,7 +663,7 @@ collections:
         unlockedItemType: ENCHANTED_SPIDER_EYE
         isEnchantedRecipe: true
         recipeType: COMBAT
-        resultType: SPIDER_EYE
+        craftingMaterial: SPIDER_EYE
   - amount: 2500
     rewards:
     - type: XP