Fixed all advancements

MORES-TODO.txt

@@ -1,4 +1,2 @@
 check block xp values
-fix horse armor
-bronze armor trim?
-add vanilla mOres weapons
+fix horse armor

gradle.properties

@@ -14,16 +14,16 @@ maven_group=mod.leronus.mores
 archives_base_name=mores
 
 # Dependencies
-fabric_version=0.100.4+1.20.6
-sodium_version=mc1.20.6-0.5.9
+fabric_version=0.100.8+1.20.6
+sodium_version=mc1.20.6-0.5.11
 lithium_version=mc1.20.6-0.12.5
 
-iris_version=keLlmlCc
-indium_version=XPsoVC5n
+iris_version=1.7.2+1.20.6
+indium_version=1.0.34+mc1.20.1
 
-entity_culling_version=6U5rh26a
-continuity_version=hI13Vg85
-nvidium_version=Di2JxVAQ
+entity_culling_version=1.6.6
+continuity_version=3.0.0-beta.5+1.20.5
+nvidium_version=0.2.7-beta
 
 fabric_shield_lib_version=1.7.2-1.20.6
 midnightlib_version=1.5.5-fabric

src/main/java/mod/leronus/mores/item/ModToolMaterials.java

@@ -7,6 +7,7 @@
 import net.minecraft.item.ToolMaterial;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.registry.tag.TagKey;
 
 import java.util.function.Supplier;
@@ -16,11 +17,14 @@
  * @author Leronus
  */
 public enum ModToolMaterials implements ToolMaterial {
+    WOOD(BlockTags.INCORRECT_FOR_WOODEN_TOOL, 59, 2.0F, 0.0F, 15, () -> Ingredient.ofItems(Items.OAK_PLANKS)),
+    GOLD(BlockTags.INCORRECT_FOR_WOODEN_TOOL, 32, 12.0F, 0.0F, 22, () -> Ingredient.ofItems(Items.GOLD_INGOT)),
+    STONE(BlockTags.INCORRECT_FOR_STONE_TOOL, 131, 4.0F, 1.0F, 5, () -> Ingredient.ofItems(Items.COBBLESTONE)),
     TIN(BlockTags.INCORRECT_FOR_STONE_TOOL, 100, 4.8F, 1.5F, 6, () -> Ingredient.ofItems(ModItems.TIN_INGOT)),
     COPPER(BlockTags.INCORRECT_FOR_IRON_TOOL, 90, 5.0F, 1.5F, 4, () -> Ingredient.ofItems(Items.COPPER_INGOT)),
     SILVER(BlockTags.INCORRECT_FOR_IRON_TOOL, 230, 5.5F, 2.0F, 16, () -> Ingredient.ofItems(ModItems.SILVER_INGOT)),
     BRONZE(BlockTags.INCORRECT_FOR_IRON_TOOL, 270, 6.0F, 2.0F, 7, () -> Ingredient.ofItems(ModItems.BRONZE_INGOT)),
-    IRON(BlockTags.INCORRECT_FOR_IRON_TOOL, 250, 6.0F, 2.0F, 14, () -> Ingredient.ofItems(Items.DIAMOND)),
+    IRON(BlockTags.INCORRECT_FOR_IRON_TOOL, 250, 6.0F, 2.0F, 14, () -> Ingredient.ofItems(Items.IRON_INGOT)),
     STERLING(BlockTags.INCORRECT_FOR_IRON_TOOL, 320, 6.0F, 2.2F, 14, () -> Ingredient.ofItems(ModItems.STERLING_INGOT)),
     COBALT(BlockTags.INCORRECT_FOR_IRON_TOOL, 350, 6.5F, 2.2F, 12, () -> Ingredient.ofItems(ModItems.COBALT_INGOT)),
     STEEL(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 600, 6.5F, 2.5F, 18, () -> Ingredient.ofItems(ModItems.STEEL_INGOT)),
@@ -35,9 +39,9 @@ public enum ModToolMaterials implements ToolMaterial {
     RUBY(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 1601, 8.0F, 3.5F, 11,  () -> Ingredient.ofItems(ModItems.RUBY_GEM)),
     MOISSANITE(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 1723, 8.0F, 3.5F, 23, () -> Ingredient.ofItems(ModItems.MOISSANITE_GEM)),
     NETHERITE(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 2031, 9.0F, 4.0F, 15, () -> Ingredient.ofItems(Items.NETHERITE_INGOT)),
-    ONYX(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 2700, 9.5F, 4.0F, 14, () -> Ingredient.ofItems(ModItems.ONYX_GEM)),
+    ONYX(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 2700, 10.0F, 4.0F, 14, () -> Ingredient.ofItems(ModItems.ONYX_GEM)),
     TURQUOISE(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 2400, 9.0F, 4.0F, 14, () -> Ingredient.ofItems(ModItems.TURQUOISE_GEM)),
-    GRAPHENE(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 3569, 11.0F, 6.0F, 18, () -> Ingredient.ofItems(ModItems.GRAPHENE_GEM));
+    GRAPHENE(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 3569, 12.0F, 6.0F, 18, () -> Ingredient.ofItems(ModItems.GRAPHENE_GEM));
 
     private final TagKey<Block> inverseTag;
     private final int itemDurability;

src/main/resources/data/minecraft/advancements/husbandry/wax_off.json

@@ -1,24 +1,7 @@
 {
-  "display": {
-    "icon": {
-      "item": "minecraft:stone_axe",
-      "nbt": "{Damage:0}"
-    },
-    "title": {
-      "translate": "advancements.husbandry.wax_off.title"
-    },
-    "description": {
-      "translate": "advancements.husbandry.wax_off.description"
-    },
-    "frame": "task",
-    "show_toast": true,
-    "announce_to_chat": true,
-    "hidden": false
-  },
   "parent": "minecraft:husbandry/wax_on",
   "criteria": {
     "wax_off": {
-      "trigger": "minecraft:item_used_on_block",
       "conditions": {
         "location": [
           {
@@ -41,7 +24,27 @@
                   "minecraft:waxed_cut_copper_stairs",
                   "minecraft:waxed_exposed_cut_copper_stairs",
                   "minecraft:waxed_weathered_cut_copper_stairs",
-                  "minecraft:waxed_oxidized_cut_copper_stairs"
+                  "minecraft:waxed_oxidized_cut_copper_stairs",
+                  "minecraft:waxed_chiseled_copper",
+                  "minecraft:waxed_exposed_chiseled_copper",
+                  "minecraft:waxed_weathered_chiseled_copper",
+                  "minecraft:waxed_oxidized_chiseled_copper",
+                  "minecraft:waxed_copper_door",
+                  "minecraft:waxed_exposed_copper_door",
+                  "minecraft:waxed_weathered_copper_door",
+                  "minecraft:waxed_oxidized_copper_door",
+                  "minecraft:waxed_copper_trapdoor",
+                  "minecraft:waxed_exposed_copper_trapdoor",
+                  "minecraft:waxed_weathered_copper_trapdoor",
+                  "minecraft:waxed_oxidized_copper_trapdoor",
+                  "minecraft:waxed_copper_grate",
+                  "minecraft:waxed_exposed_copper_grate",
+                  "minecraft:waxed_weathered_copper_grate",
+                  "minecraft:waxed_oxidized_copper_grate",
+                  "minecraft:waxed_copper_bulb",
+                  "minecraft:waxed_exposed_copper_bulb",
+                  "minecraft:waxed_weathered_copper_bulb",
+                  "minecraft:waxed_oxidized_copper_bulb"
                 ]
               }
             }
@@ -79,7 +82,20 @@
             }
           }
         ]
-      }
+      },
+      "trigger": "minecraft:item_used_on_block"
+    }
+  },
+  "display": {
+    "description": {
+      "translate": "advancements.husbandry.wax_off.description"
+    },
+    "icon": {
+      "count": 1,
+      "id": "minecraft:stone_axe"
+    },
+    "title": {
+      "translate": "advancements.husbandry.wax_off.title"
     }
   },
   "requirements": [
@@ -88,4 +104,4 @@
     ]
   ],
   "sends_telemetry_event": true
-}
+}

src/main/resources/data/minecraft/advancements/story/smelt_iron.json

@@ -1,28 +1,27 @@
 {
-  "display": {
-    "icon": {
-      "item": "minecraft:iron_ingot"
-    },
-    "title": {
-      "translate": "advancements.story.smelt_iron.title"
-    },
-    "description": {
-      "translate": "advancements.story.smelt_iron.description"
-    }
-  },
   "parent": "minecraft:story/upgrade_tools",
   "criteria": {
     "iron": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:iron_ingot"
-            ]
+            "items": "minecraft:iron_ingot"
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "display": {
+    "description": {
+      "translate": "advancements.story.smelt_iron.description"
+    },
+    "icon": {
+      "count": 1,
+      "id": "minecraft:iron_ingot"
+    },
+    "title": {
+      "translate": "advancements.story.smelt_iron.title"
     }
   },
   "requirements": [
@@ -36,4 +35,4 @@
     ]
   },
   "sends_telemetry_event": true
-}
+}

src/main/resources/data/mores/advancements/acquire_hardware.json

@@ -1,7 +1,8 @@
 {
   "display": {
     "icon": {
-      "item": "minecraft:iron_ingot"
+      "count": 1,
+      "id": "minecraft:iron_ingot"
     },
     "title": "Acquire Hardware",
     "description": "Smelt an iron ingot",
@@ -18,9 +19,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:iron_ingot"
-            ]
+            "items": "minecraft:iron_ingot"
           }
         ]
       }

src/main/resources/data/mores/advancements/craft_all_battleaxes.json

@@ -3,7 +3,8 @@
     "title": "God Of War",
     "description": "Craft all battleaxes. Absolute warrior god.",
     "icon": {
-      "item": "mores:emerald_battleaxe"
+      "count": 1,
+      "id": "mores:emerald_battleaxe"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_all_daggers.json

@@ -3,7 +3,8 @@
     "title": "Shanks Longer Than 20cm",
     "description": "You sure like fookin shanks don't ye - Craft all daggers",
     "icon": {
-      "item": "mores:emerald_dagger"
+      "count": 1,
+      "id": "mores:emerald_dagger"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_all_horse_armors.json

@@ -3,7 +3,8 @@
     "title": "Give it a lick",
     "description": "Tastes just like raisins - Craft all horse armor",
     "icon": {
-      "item": "mores:graphene_horse_armor"
+      "count": 1,
+      "id": "mores:graphene_horse_armor"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_all_maces.json

@@ -3,7 +3,8 @@
     "title": "Amacing",
     "description": "Craft all maces in the game. Whack 'em champ!",
     "icon": {
-      "item": "mores:steel_mace"
+      "count": 1,
+      "id": "mores:steel_mace"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_bronze_pickaxe.json

@@ -3,7 +3,8 @@
     "title": "Time To Dig Deeper",
     "description": "Craft a bronze pickaxe",
     "icon": {
-      "item": "mores:bronze_pickaxe"
+      "count": 1,
+      "id": "mores:bronze_pickaxe"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_chain.json

@@ -3,7 +3,8 @@
     "title": "What Is This Kinky Stuff??",
     "description": "Craft metal wire for chainmail",
     "icon": {
-      "item": "mores:chain"
+      "count": 1,
+      "id": "mores:chain"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_copper_pickaxe.json

@@ -3,7 +3,8 @@
     "title": "Toss A Coin To This Miner",
     "description": "Craft a copper pickaxe",
     "icon": {
-      "item": "mores:copper_pickaxe"
+      "count": 1,
+      "id": "mores:copper_pickaxe"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_emerald_gear.json

@@ -3,7 +3,8 @@
     "title": "The Villagers Love Me",
     "description": "Craft all emerald gear",
     "icon": {
-      "item": "mores:emerald_sword"
+      "count": 1,
+      "id": "mores:emerald_sword"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_full_chainmail_armor.json

@@ -3,7 +3,8 @@
     "title": "Just Because I Can",
     "description": "Craft full chainmail armor",
     "icon": {
-      "item": "minecraft:chainmail_chestplate"
+      "count": 1,
+      "id": "mores:chainmail_chestplate"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_full_emerald_armor.json

@@ -3,7 +3,8 @@
     "title": "Feeling Lucky",
     "description": "Craft full emerald armor",
     "icon": {
-      "item": "mores:emerald_chestplate"
+      "count": 1,
+      "id": "mores:emerald_chestplate"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_full_graphene_armor.json

@@ -3,7 +3,8 @@
     "title": "Overpowered",
     "description": "Craft full graphene armor",
     "icon": {
-      "item": "mores:graphene_chestplate"
+      "count": 1,
+      "id": "mores:graphene_chestplate"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_full_moissanite_armor.json

@@ -3,7 +3,8 @@
     "title": "What Are You Doing In My Swamp",
     "description": "Craft full moissanite armor",
     "icon": {
-      "item": "mores:moissanite_chestplate"
+      "count": 1,
+      "id": "mores:moissanite_chestplate"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_full_obsidian_armor.json

@@ -3,7 +3,8 @@
     "title": "Immovable",
     "description": "Craft full obsidian armor",
     "icon": {
-      "item": "mores:obsidian_chestplate"
+      "count": 1,
+      "id": "mores:obsidian_chestplate"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_full_onyx_armor.json

@@ -3,7 +3,8 @@
     "title": "The Dark Knight",
     "description": "Craft full onyx armor",
     "icon": {
-      "item": "mores:onyx_helmet"
+      "count": 1,
+      "id": "mores:onyx_helmet"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_full_ruby_armor.json

@@ -3,7 +3,8 @@
     "title": "Hi Elmo",
     "description": "Craft full ruby armor",
     "icon": {
-      "item": "mores:ruby_helmet"
+      "count": 1,
+      "id": "mores:ruby_helmet"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_full_ruby_gear.json

@@ -3,7 +3,8 @@
     "title": "Pyromaniac",
     "description": "Craft all ruby tools as well as full ruby fire resistant armor",
     "icon": {
-      "item": "mores:ruby_axe"
+      "count": 1,
+      "id": "mores:ruby_axe"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",

src/main/resources/data/mores/advancements/craft_full_sapphire_armor.json

@@ -3,7 +3,8 @@
     "title": "I'm Blue",
     "description": "Craft full sapphire armor",
     "icon": {
-      "item": "mores:sapphire_helmet"
+      "count": 1,
+      "id": "mores:sapphire_helmet"
     },
     "background": "minecraft:textures/gui/advancements/backgrounds/stone.png",
     "frame": "task",