Added ruby and root advancements (#114)

RealYusufIsmail-Mc-Mods · Sep 24, 2023 · c72bcd9 · c72bcd9
1 parent f7d36c2
commit c72bcd9
Show file tree

Hide file tree

Showing 43 changed files with 725 additions and 146 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.20.1-1.0.3] - 2023-9-23
+
+### Add advancments for root and ruby. More to come in future.
+### Switched some recipies to use tags instead of specific items. This will allow for more flexability in future.
+
 ## [1.20.1-1.0.2]  - 2023-9-3
 
 ### Improved worlgen
@@ -42,7 +47,7 @@
 
 ## [1.19.4-1.0.0.beta.4] - 2023-4-30
 
-### Improve custom armour crafting table recipe book. Now shows different sections for each armour type.
+### Improve custom armor crafting table recipe book. Now shows different sections for each armour type.
 ### Updated forge and kotlin forge versions to latest.
 
 ## [1.19.4-1.0.0.beta.3] - 2023-4-25
@@ -63,7 +68,7 @@
 
 ### Added all armour item textures. Some are placeholders.
 ### Fixed issue where blocks could not be mined.
-### Ruby, and Rainbow ore now give off redstone signal when mined - colour current blue which is set to be changed in future.
+### Ruby, and Rainbow ore now give off redstone signal when mined - color current blue which is set to be changed in future.
 
 ## [1.19.3-1.0.0.alpha.8] - 2023-2-16
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 
 project.group = "io.github.realyusufismail"
 
-project.version = "1.20.1-1.0.2"
+project.version = "1.20.1-1.0.3"
 
 base.archivesName.set("armourandtoolsmod")
 

diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.20.1	2023-08-30T12:33:42.9625594	Recipes
+// 1.20.1	2023-09-23T23:05:20.644951	Recipes
 64b2fa52dbca9188c5fed6b3a1d1426c2b380ed1 data/armourandtoolsmod/advancements/recipes/building_blocks/aqumarine_block_recipe.json
 7d54606f53db4f400123dfb6907c02f087b53786 data/armourandtoolsmod/advancements/recipes/building_blocks/custom_armour_crafting_table_recipe.json
 9c72e5c5a44803c45a34320f73263008e4bada72 data/armourandtoolsmod/advancements/recipes/building_blocks/custom_tool_crafting_table_recipe.json
@@ -154,22 +154,22 @@ e9b479dce4a333e720dc29b6332122e7b592f0ca data/armourandtoolsmod/advancements/rec
 64fbc2a7192aa157444bfae3b1e41b9b8bd4c42e data/armourandtoolsmod/advancements/recipes/tools/amethyst_pickaxe.json
 d23584eced53cc0fa543f7749096db34a79e98e8 data/armourandtoolsmod/advancements/recipes/tools/amethyst_shovel.json
 b87e233ec8c74794186dd3debae7b4461486a409 data/armourandtoolsmod/advancements/recipes/tools/amethyst_sword.json
-f68e9a943893fb67b0f564b6e9d7d9d61255cbf5 data/armourandtoolsmod/advancements/recipes/tools/aqumarine_shield.json
-6eac8dae3a3283cc416749e6dc1f0262e3cc59e5 data/armourandtoolsmod/advancements/recipes/tools/aqumarine_trident.json
+5cd7d2417c9e4ece7300874497ecb79a009d3a0f data/armourandtoolsmod/advancements/recipes/tools/aqumarine_shield.json
+d3f4fac1cc4c3c387ea99311a58455684f5cea41 data/armourandtoolsmod/advancements/recipes/tools/aqumarine_trident.json
 ade7248ccfc70e02171c4e83bac6f8ce1c0da8a1 data/armourandtoolsmod/advancements/recipes/tools/enderite_axe.json
 afa30bf8d648696beb40316ae96d9b417c9b0000 data/armourandtoolsmod/advancements/recipes/tools/enderite_hoe.json
 bf51aa0688586b63f984c9d439054c995048cc22 data/armourandtoolsmod/advancements/recipes/tools/enderite_pickaxe.json
 6a977849effd37c6e745b3a04fdac602e51c2320 data/armourandtoolsmod/advancements/recipes/tools/enderite_shovel.json
 1257c4ee51ccdd562a046dd492053f53887f9703 data/armourandtoolsmod/advancements/recipes/tools/enderite_sword.json
-d6db87dff21dae96cb849dc73abb7bde54b45002 data/armourandtoolsmod/advancements/recipes/tools/graphite_shield.json
-43b85df078eea92776641abade324d3cb5bc602b data/armourandtoolsmod/advancements/recipes/tools/rainbow_shield.json
-0a992114b33c8b8d37cf8b7497c2bb249ca7a2c2 data/armourandtoolsmod/advancements/recipes/tools/ruby_axe.json
-b6b2fefb4e74dc69a49f17bfedf4f5e40614ae08 data/armourandtoolsmod/advancements/recipes/tools/ruby_hoe.json
-cc5f00e3873a4f8451c76157adbc5c38214d19ce data/armourandtoolsmod/advancements/recipes/tools/ruby_pickaxe.json
-4d8e783f2180f404d692f5283ac6ab45a551e5a6 data/armourandtoolsmod/advancements/recipes/tools/ruby_shield.json
-b5e712c3e077123f8871456be39256a865d5a913 data/armourandtoolsmod/advancements/recipes/tools/ruby_shovel.json
-a31c5cabe3ddd468f7e195fec1da6f7ed190fbec data/armourandtoolsmod/advancements/recipes/tools/ruby_sword.json
-1fe632b3259504f6bceb0e4a72ddff92273f7bee data/armourandtoolsmod/advancements/recipes/tools/sapphire_shield.json
+d20438d6632aaa0e31ae4ad6ee9af2595dfd2bf8 data/armourandtoolsmod/advancements/recipes/tools/graphite_shield.json
+aa1edd9262dfc43253edef429a1dda3be6705e24 data/armourandtoolsmod/advancements/recipes/tools/rainbow_shield.json
+cb4451ef3aafb1a17926203b75bc3bb85c156667 data/armourandtoolsmod/advancements/recipes/tools/ruby_axe.json
+d7395d76ae997531eb308841d393de9cb4062585 data/armourandtoolsmod/advancements/recipes/tools/ruby_hoe.json
+e0a2d46e6a562d46dccc42eedcda00b89d3a7cd2 data/armourandtoolsmod/advancements/recipes/tools/ruby_pickaxe.json
+3209f918eb86bebe3a16a1344863b0247ba31d6e data/armourandtoolsmod/advancements/recipes/tools/ruby_shield.json
+8eb669e829e5a81651b5691926c209d16e317be4 data/armourandtoolsmod/advancements/recipes/tools/ruby_shovel.json
+afaa0f79973970a20fc6ad1a6b628e40e73b2ae7 data/armourandtoolsmod/advancements/recipes/tools/ruby_sword.json
+406cfeb511bd6a34d4fcf0a30868e5fa7073bd25 data/armourandtoolsmod/advancements/recipes/tools/sapphire_shield.json
 78da516c72de91179803d7068271bcde9500cee8 data/armourandtoolsmod/recipes/amethyst_axe.json
 36968ac2704b6aba42cbae8bd74269a8ca416f6a data/armourandtoolsmod/recipes/amethyst_boots.json
 f6ab1e0d36c50e07935b2072de4731f32e2b9c64 data/armourandtoolsmod/recipes/amethyst_chestplate.json
@@ -183,8 +183,8 @@ c618893ff6ccca28aec74287c696afc2f7a86756 data/armourandtoolsmod/recipes/amethyst
 56c467a68cefbaba0f6fa802ddd58a3a5714aa94 data/armourandtoolsmod/recipes/aqumarine_chestplate.json
 bf5789d99692fb32c86d6aec74abdf0d21dfa061 data/armourandtoolsmod/recipes/aqumarine_helmet.json
 ba37b1887d6824c88a39f8dd7fae6f9e4caa544a data/armourandtoolsmod/recipes/aqumarine_leggings.json
-300e7603345cda9a428dfb60f9a2a0f15c7951e8 data/armourandtoolsmod/recipes/aqumarine_shield.json
-39b15692c2dba88d4ec0aa38b740d2c79c710a18 data/armourandtoolsmod/recipes/aqumarine_trident.json
+28c662a1094ddf09d17102824038329b734f484c data/armourandtoolsmod/recipes/aqumarine_shield.json
+f8df4ff77f201dad064bbc0de65898c32e2700c7 data/armourandtoolsmod/recipes/aqumarine_trident.json
 3ba9b5664117242513a4dbed09829d10b55c3023 data/armourandtoolsmod/recipes/blasting_aqumarine_boots.json
 527e99a8f5b27206e1b01e6445378ed02e5838b8 data/armourandtoolsmod/recipes/blasting_aqumarine_chestplate.json
 68b3798d90f0228ec1b16505d79f19da75695706 data/armourandtoolsmod/recipes/blasting_aqumarine_helmet.json
@@ -259,31 +259,31 @@ a5933be44721356f09a3aca47deb959b77260ddc data/armourandtoolsmod/recipes/graphite
 08fb673cfd9e3a5fb9875ace57bf976de1bea061 data/armourandtoolsmod/recipes/graphite_chestplate.json
 adf63b0d9c8b2e333a5e4769a2fc0183f483544e data/armourandtoolsmod/recipes/graphite_helmet.json
 2e3deec619c89fe5e2f3df072bbb7174c36b877b data/armourandtoolsmod/recipes/graphite_leggings.json
-bd4c483e30f362d57859ec2bbc8c80ebdc4c86fc data/armourandtoolsmod/recipes/graphite_shield.json
+b790592cbe2e046b1e8169e2fb4a8da1483a8dfb data/armourandtoolsmod/recipes/graphite_shield.json
 0399917d7fdda6f9af410c709805dfb149b2451c data/armourandtoolsmod/recipes/rainbow_block_recipe.json
 5caa6184a7c066fac3bbc8e3869ae712171fe202 data/armourandtoolsmod/recipes/rainbow_boots.json
 cc01dc105a026c1a42db2e4a7bea9ca208ef22e2 data/armourandtoolsmod/recipes/rainbow_chestplate.json
 c06bee816a8ccbfbb3df44571a3cd62be6a40634 data/armourandtoolsmod/recipes/rainbow_helmet.json
 40643e166ec04b182edea9889fe6b78c2f6cf22a data/armourandtoolsmod/recipes/rainbow_leggings.json
-7495fff4c4e4ca76c92cc89e2db3c8eff13f314d data/armourandtoolsmod/recipes/rainbow_shield.json
-75c3e3bd87f821fb9c73abf78fab10d17963724f data/armourandtoolsmod/recipes/ruby_axe.json
+0f170ab606065f65d8f20e4770e587407ca052a8 data/armourandtoolsmod/recipes/rainbow_shield.json
+07246a55e091f3235af14f2e99e3d0344c6b3e58 data/armourandtoolsmod/recipes/ruby_axe.json
 4553256d555f24b2023b17f5ea6578d10366bd28 data/armourandtoolsmod/recipes/ruby_block_recipe.json
 01b99ff51fb6524549b41d3de822b980efd208eb data/armourandtoolsmod/recipes/ruby_boots.json
 dcd276aec63316a21ee202aba544078d29bb8b0a data/armourandtoolsmod/recipes/ruby_chestplate.json
 adcdbe114c0865e328f69c71552f6c3da79836a8 data/armourandtoolsmod/recipes/ruby_helmet.json
 332481d945739b2bc2f7a57a445f098effe087ae data/armourandtoolsmod/recipes/ruby_helmet_smithing_trim.json
-b2e0037c3c191a056d1e81a1f5a77475bf3a7943 data/armourandtoolsmod/recipes/ruby_hoe.json
+fc9a09728c9ec94ab9f747cf641e2d1ee6c6bbf9 data/armourandtoolsmod/recipes/ruby_hoe.json
 7ea74b3ea626590af6dba5bf10353b9f00ab7c11 data/armourandtoolsmod/recipes/ruby_leggings.json
-32ee96ad4656db85267d6ea0550247858c10c7aa data/armourandtoolsmod/recipes/ruby_pickaxe.json
-d41b63349942f3e0e3e23382f1c41ac2e2f6ba20 data/armourandtoolsmod/recipes/ruby_shield.json
-697e3e33c49578f3eb0eaa33e54d68ff9cd93e3f data/armourandtoolsmod/recipes/ruby_shovel.json
-ea61fee5c1ee6b8e8f7808c443a6485c22c79857 data/armourandtoolsmod/recipes/ruby_sword.json
+4dbf949fe5541d795af6c011281a62c684a164d2 data/armourandtoolsmod/recipes/ruby_pickaxe.json
+c1fc52067865c6662daaed01546834191a6437a2 data/armourandtoolsmod/recipes/ruby_shield.json
+2aaf25d72e5d0cdb626af9c6c9fa1a8cf814a50a data/armourandtoolsmod/recipes/ruby_shovel.json
+3611ee8560e4b90001986fbbb4a360a86c2ae608 data/armourandtoolsmod/recipes/ruby_sword.json
 89491cb4c6a2c38b52171d225e847b0857290162 data/armourandtoolsmod/recipes/sapphire_block_recipe.json
 917cccfc27989ce512fbbc8952d0153adf30f3b0 data/armourandtoolsmod/recipes/sapphire_boots.json
 2929a4bd84b4f6593f98c25af26e6057a166ef9e data/armourandtoolsmod/recipes/sapphire_chestplate.json
 154035ec444e32191d130b14aa18f98755556f65 data/armourandtoolsmod/recipes/sapphire_helmet.json
 981acf7506bb5eb37bf50933abeec496f2b7eae0 data/armourandtoolsmod/recipes/sapphire_leggings.json
-21e1e018d560b4d8905b9f7e5ff162023a88be9c data/armourandtoolsmod/recipes/sapphire_shield.json
+920f4232fd13a4f0f31e3e3b083c97ff65a76b1b data/armourandtoolsmod/recipes/sapphire_shield.json
 f8cf7f6bb5b6e5a9ce5a17bed676f409889ef231 data/armourandtoolsmod/recipes/smelting_aqumarine_boots.json
 e368772b68e458c259c10eb88b7d15869e726987 data/armourandtoolsmod/recipes/smelting_aqumarine_chestplate.json
 95a71b575cef57e97e65c445689855a53dfc79be data/armourandtoolsmod/recipes/smelting_aqumarine_helmet.json

diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
@@ -1,2 +1,2 @@
-// 1.20.1	2023-08-30T12:33:42.9741275	Languages: en_us
-601874194d902031d40fcc5bf0372a7391ae9381 assets/armourandtoolsmod/lang/en_us.json
+// 1.20.1	2023-09-23T22:25:34.491149	Languages: en_us
+690efaf5484f80cfa19b78007a4cba3936b182c9 assets/armourandtoolsmod/lang/en_us.json
diff --git a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0
@@ -0,0 +1,7 @@
+// 1.20.1	2023-09-23T23:05:20.651697	Advancements
+e147657cab8a15ee7168ef89b384b6a085481fee data/armourandtoolsmod/advancements/root.json
+9af5b955ffcb35aad96b6662a1674a4aeea105a2 data/armourandtoolsmod/advancements/ruby_armour.json
+c7283efe8a10721cc12d6f75e20159542ceb7083 data/armourandtoolsmod/advancements/ruby_block.json
+d5250527b9881cecbda67fbb2daa0b4d5f829dfb data/armourandtoolsmod/advancements/ruby_ingot.json
+a1ebe95e005b5b589e0450811e7d29f0ac2a8f8d data/armourandtoolsmod/advancements/ruby_ore.json
+840aeebcb2077081d0bcdbf48fcfdfaaff564a5a data/armourandtoolsmod/advancements/ruby_tools.json
diff --git a/src/generated/resources/assets/armourandtoolsmod/lang/en_us.json b/src/generated/resources/assets/armourandtoolsmod/lang/en_us.json
@@ -1,4 +1,16 @@
 {
+  "advancements.armourandtoolsmod.root.description": "Thanks for downloading Armour and Tools Mod! Enjoy!",
+  "advancements.armourandtoolsmod.root.title": "Download Armour and Tools Mod",
+  "advancements.armourandtoolsmod.ruby_armour.description": "Well done! You are now increasing your defence!",
+  "advancements.armourandtoolsmod.ruby_armour.title": "That crimson armour",
+  "advancements.armourandtoolsmod.ruby_block.description": "Well that's a way to show off your wealth!",
+  "advancements.armourandtoolsmod.ruby_block.title": "That crimson sparkling block",
+  "advancements.armourandtoolsmod.ruby_ingot.description": "Now use the ruby ingot to craft ruby armour and tools!",
+  "advancements.armourandtoolsmod.ruby_ingot.title": "That crimson gem",
+  "advancements.armourandtoolsmod.ruby_ore.description": "Now smelt the ruby ore to get a ruby ingot!",
+  "advancements.armourandtoolsmod.ruby_ore.title": "That rare crimson ore",
+  "advancements.armourandtoolsmod.ruby_tools.description": "Way to go! You are now increasing your attack!",
+  "advancements.armourandtoolsmod.ruby_tools.title": "That crimson tools",
   "block.armourandtoolsmod.aqumarine_block": "Aqumarine Block",
   "block.armourandtoolsmod.aqumarine_ore": "Aqumarine Ore",
   "block.armourandtoolsmod.custom_armour_crafting_table": "Custom Armour Crafting Table",

diff --git a/...nerated/resources/data/armourandtoolsmod/advancements/recipes/tools/aqumarine_shield.json b/...nerated/resources/data/armourandtoolsmod/advancements/recipes/tools/aqumarine_shield.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "armourandtoolsmod:aqumarine"
-            ]
+            "tag": "forge:ingots/aqumarine"
           }
         ]
       },

diff --git a/...erated/resources/data/armourandtoolsmod/advancements/recipes/tools/aqumarine_trident.json b/...erated/resources/data/armourandtoolsmod/advancements/recipes/tools/aqumarine_trident.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "armourandtoolsmod:aqumarine"
-            ]
+            "tag": "forge:ingots/aqumarine"
           }
         ]
       },

diff --git a/...enerated/resources/data/armourandtoolsmod/advancements/recipes/tools/graphite_shield.json b/...enerated/resources/data/armourandtoolsmod/advancements/recipes/tools/graphite_shield.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "armourandtoolsmod:graphite"
-            ]
+            "tag": "forge:ingots/graphite"
           }
         ]
       },

diff --git a/...generated/resources/data/armourandtoolsmod/advancements/recipes/tools/rainbow_shield.json b/...generated/resources/data/armourandtoolsmod/advancements/recipes/tools/rainbow_shield.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "armourandtoolsmod:rainbow"
-            ]
+            "tag": "forge:ingots/rainbow"
           }
         ]
       },

diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/ruby_axe.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/ruby_axe.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "armourandtoolsmod:ruby"
-            ]
+            "tag": "forge:ingots/ruby"
           }
         ]
       },

diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/ruby_hoe.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/ruby_hoe.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "armourandtoolsmod:ruby"
-            ]
+            "tag": "forge:ingots/ruby"
           }
         ]
       },

diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/ruby_pickaxe.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/ruby_pickaxe.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "armourandtoolsmod:ruby"
-            ]
+            "tag": "forge:ingots/ruby"
           }
         ]
       },

diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/ruby_shield.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/ruby_shield.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "armourandtoolsmod:ruby"
-            ]
+            "tag": "forge:ingots/ruby"
           }
         ]
       },

diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/ruby_shovel.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/ruby_shovel.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "armourandtoolsmod:ruby"
-            ]
+            "tag": "forge:ingots/ruby"
           }
         ]
       },

diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/ruby_sword.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/ruby_sword.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "armourandtoolsmod:ruby"
-            ]
+            "tag": "forge:ingots/ruby"
           }
         ]
       },

diff --git a/...enerated/resources/data/armourandtoolsmod/advancements/recipes/tools/sapphire_shield.json b/...enerated/resources/data/armourandtoolsmod/advancements/recipes/tools/sapphire_shield.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "armourandtoolsmod:sapphire"
-            ]
+            "tag": "forge:ingots/sapphire"
           }
         ]
       },

diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/root.json b/src/generated/resources/data/armourandtoolsmod/advancements/root.json
@@ -0,0 +1,38 @@
+{
+  "criteria": {
+    "get_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:crafting_table"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "display": {
+    "announce_to_chat": false,
+    "background": "minecraft:textures/block/light_blue_wool.png",
+    "description": {
+      "translate": "advancements.armourandtoolsmod.root.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "armourandtoolsmod:aqumarine"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.armourandtoolsmod.root.title"
+    }
+  },
+  "requirements": [
+    [
+      "get_item"
+    ]
+  ],
+  "sends_telemetry_event": true
+}