diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cd46eb4..1f8218b1 100644 --- 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 index 95faab5b..2ad9c5e2 100644 --- 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 index bc63df45..ba34c55c 100644 --- 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 index b61dff1f..9fb6c207 100644 --- 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 new file mode 100644 index 00000000..5e253766 --- /dev/null +++ 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 index 33b3b37d..94af331f 100644 --- 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/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/aqumarine_shield.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/aqumarine_shield.json index 53bb6184..e83ef239 100644 --- a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/aqumarine_shield.json +++ b/src/generated/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/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/aqumarine_trident.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/aqumarine_trident.json index 8d9e3dc4..9677b033 100644 --- a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/aqumarine_trident.json +++ b/src/generated/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/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/graphite_shield.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/graphite_shield.json index 7d5bb248..ca6e2675 100644 --- a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/graphite_shield.json +++ b/src/generated/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/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/rainbow_shield.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/rainbow_shield.json index 0ad5f99c..8d1887a6 100644 --- a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/rainbow_shield.json +++ b/src/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 index 79eacf97..1671259f 100644 --- 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 index c6622d14..617630df 100644 --- 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 index b2b5589f..180ad960 100644 --- 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 index e2baa29d..9ad9c14b 100644 --- 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 index bf228af2..a65e29f6 100644 --- 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 index 57a2db64..b47e2521 100644 --- 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/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/sapphire_shield.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/sapphire_shield.json index f1bf8406..55255a1f 100644 --- a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/sapphire_shield.json +++ b/src/generated/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 new file mode 100644 index 00000000..6d7d5384 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/ruby_armour.json b/src/generated/resources/data/armourandtoolsmod/advancements/ruby_armour.json new file mode 100644 index 00000000..d36b3c1d --- /dev/null +++ b/src/generated/resources/data/armourandtoolsmod/advancements/ruby_armour.json @@ -0,0 +1,78 @@ +{ + "parent": "armourandtoolsmod:ruby_ingot", + "criteria": { + "ruby_boots": { + "conditions": { + "items": [ + { + "items": [ + "armourandtoolsmod:ruby_boots" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "ruby_chestplate": { + "conditions": { + "items": [ + { + "items": [ + "armourandtoolsmod:ruby_chestplate" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "ruby_helmet": { + "conditions": { + "items": [ + { + "items": [ + "armourandtoolsmod:ruby_helmet" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "ruby_leggings": { + "conditions": { + "items": [ + { + "items": [ + "armourandtoolsmod:ruby_leggings" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "advancements.armourandtoolsmod.ruby_armour.description" + }, + "frame": "goal", + "hidden": false, + "icon": { + "item": "armourandtoolsmod:ruby_helmet", + "nbt": "{Damage:0}" + }, + "show_toast": true, + "title": { + "translate": "advancements.armourandtoolsmod.ruby_armour.title" + } + }, + "requirements": [ + [ + "ruby_helmet", + "ruby_chestplate", + "ruby_leggings", + "ruby_boots" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/ruby_block.json b/src/generated/resources/data/armourandtoolsmod/advancements/ruby_block.json new file mode 100644 index 00000000..7d66baaa --- /dev/null +++ b/src/generated/resources/data/armourandtoolsmod/advancements/ruby_block.json @@ -0,0 +1,36 @@ +{ + "parent": "armourandtoolsmod:ruby_ingot", + "criteria": { + "get_block": { + "conditions": { + "items": [ + { + "tag": "forge:storage_blocks/ruby" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "advancements.armourandtoolsmod.ruby_block.description" + }, + "frame": "goal", + "hidden": false, + "icon": { + "item": "armourandtoolsmod:ruby_block" + }, + "show_toast": true, + "title": { + "translate": "advancements.armourandtoolsmod.ruby_block.title" + } + }, + "requirements": [ + [ + "get_block" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/ruby_ingot.json b/src/generated/resources/data/armourandtoolsmod/advancements/ruby_ingot.json new file mode 100644 index 00000000..d1454cd7 --- /dev/null +++ b/src/generated/resources/data/armourandtoolsmod/advancements/ruby_ingot.json @@ -0,0 +1,36 @@ +{ + "parent": "armourandtoolsmod:ruby_ore", + "criteria": { + "get_scrap": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/ruby" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "advancements.armourandtoolsmod.ruby_ingot.description" + }, + "frame": "goal", + "hidden": false, + "icon": { + "item": "armourandtoolsmod:ruby" + }, + "show_toast": true, + "title": { + "translate": "advancements.armourandtoolsmod.ruby_ingot.title" + } + }, + "requirements": [ + [ + "get_scrap" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/ruby_ore.json b/src/generated/resources/data/armourandtoolsmod/advancements/ruby_ore.json new file mode 100644 index 00000000..9c26bea4 --- /dev/null +++ b/src/generated/resources/data/armourandtoolsmod/advancements/ruby_ore.json @@ -0,0 +1,36 @@ +{ + "parent": "armourandtoolsmod:root", + "criteria": { + "get_ore": { + "conditions": { + "items": [ + { + "tag": "forge:ores/ruby_ores" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "advancements.armourandtoolsmod.ruby_ore.description" + }, + "frame": "goal", + "hidden": false, + "icon": { + "item": "armourandtoolsmod:ruby_ore" + }, + "show_toast": true, + "title": { + "translate": "advancements.armourandtoolsmod.ruby_ore.title" + } + }, + "requirements": [ + [ + "get_ore" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/ruby_tools.json b/src/generated/resources/data/armourandtoolsmod/advancements/ruby_tools.json new file mode 100644 index 00000000..032f82c8 --- /dev/null +++ b/src/generated/resources/data/armourandtoolsmod/advancements/ruby_tools.json @@ -0,0 +1,91 @@ +{ + "parent": "armourandtoolsmod:ruby_ingot", + "criteria": { + "ruby_axe": { + "conditions": { + "items": [ + { + "items": [ + "armourandtoolsmod:ruby_axe" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "ruby_hoe": { + "conditions": { + "items": [ + { + "items": [ + "armourandtoolsmod:ruby_hoe" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "ruby_pickaxe": { + "conditions": { + "items": [ + { + "items": [ + "armourandtoolsmod:ruby_pickaxe" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "ruby_shovel": { + "conditions": { + "items": [ + { + "items": [ + "armourandtoolsmod:ruby_shovel" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "ruby_sword": { + "conditions": { + "items": [ + { + "items": [ + "armourandtoolsmod:ruby_sword" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "advancements.armourandtoolsmod.ruby_tools.description" + }, + "frame": "goal", + "hidden": false, + "icon": { + "item": "armourandtoolsmod:ruby_sword", + "nbt": "{Damage:0}" + }, + "show_toast": true, + "title": { + "translate": "advancements.armourandtoolsmod.ruby_tools.title" + } + }, + "requirements": [ + [ + "ruby_sword", + "ruby_pickaxe", + "ruby_axe", + "ruby_shovel", + "ruby_hoe" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/aqumarine_shield.json b/src/generated/resources/data/armourandtoolsmod/recipes/aqumarine_shield.json index 133265b6..023b4f87 100644 --- a/src/generated/resources/data/armourandtoolsmod/recipes/aqumarine_shield.json +++ b/src/generated/resources/data/armourandtoolsmod/recipes/aqumarine_shield.json @@ -3,7 +3,7 @@ "category": "shield", "key": { "A": { - "item": "armourandtoolsmod:aqumarine" + "tag": "forge:ingots/aqumarine" }, "I": { "item": "minecraft:iron_ingot" diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/aqumarine_trident.json b/src/generated/resources/data/armourandtoolsmod/recipes/aqumarine_trident.json index 1c7a1e70..65bd1291 100644 --- a/src/generated/resources/data/armourandtoolsmod/recipes/aqumarine_trident.json +++ b/src/generated/resources/data/armourandtoolsmod/recipes/aqumarine_trident.json @@ -3,7 +3,7 @@ "category": "trident", "key": { "A": { - "item": "armourandtoolsmod:aqumarine" + "tag": "forge:ingots/aqumarine" }, "S": { "item": "minecraft:stick" diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/graphite_shield.json b/src/generated/resources/data/armourandtoolsmod/recipes/graphite_shield.json index 13993a99..b9d814aa 100644 --- a/src/generated/resources/data/armourandtoolsmod/recipes/graphite_shield.json +++ b/src/generated/resources/data/armourandtoolsmod/recipes/graphite_shield.json @@ -3,7 +3,7 @@ "category": "shield", "key": { "A": { - "item": "armourandtoolsmod:graphite" + "tag": "forge:ingots/graphite" }, "I": { "item": "minecraft:iron_ingot" diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/rainbow_shield.json b/src/generated/resources/data/armourandtoolsmod/recipes/rainbow_shield.json index b9fbfcd4..f26c8bd2 100644 --- a/src/generated/resources/data/armourandtoolsmod/recipes/rainbow_shield.json +++ b/src/generated/resources/data/armourandtoolsmod/recipes/rainbow_shield.json @@ -3,7 +3,7 @@ "category": "shield", "key": { "A": { - "item": "armourandtoolsmod:rainbow" + "tag": "forge:ingots/rainbow" }, "I": { "item": "minecraft:iron_ingot" diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/ruby_axe.json b/src/generated/resources/data/armourandtoolsmod/recipes/ruby_axe.json index 3c5f00db..19f3ba51 100644 --- a/src/generated/resources/data/armourandtoolsmod/recipes/ruby_axe.json +++ b/src/generated/resources/data/armourandtoolsmod/recipes/ruby_axe.json @@ -3,7 +3,7 @@ "category": "axe", "key": { "A": { - "item": "armourandtoolsmod:ruby" + "tag": "forge:ingots/ruby" }, "S": { "item": "minecraft:stick" diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/ruby_hoe.json b/src/generated/resources/data/armourandtoolsmod/recipes/ruby_hoe.json index d4f08f8d..65daa05c 100644 --- a/src/generated/resources/data/armourandtoolsmod/recipes/ruby_hoe.json +++ b/src/generated/resources/data/armourandtoolsmod/recipes/ruby_hoe.json @@ -3,7 +3,7 @@ "category": "hoe", "key": { "A": { - "item": "armourandtoolsmod:ruby" + "tag": "forge:ingots/ruby" }, "S": { "item": "minecraft:stick" diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/ruby_pickaxe.json b/src/generated/resources/data/armourandtoolsmod/recipes/ruby_pickaxe.json index 5ad75f8d..e7973936 100644 --- a/src/generated/resources/data/armourandtoolsmod/recipes/ruby_pickaxe.json +++ b/src/generated/resources/data/armourandtoolsmod/recipes/ruby_pickaxe.json @@ -3,7 +3,7 @@ "category": "pickaxe", "key": { "A": { - "item": "armourandtoolsmod:ruby" + "tag": "forge:ingots/ruby" }, "S": { "item": "minecraft:stick" diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/ruby_shield.json b/src/generated/resources/data/armourandtoolsmod/recipes/ruby_shield.json index 0c6a4452..7d1a7b80 100644 --- a/src/generated/resources/data/armourandtoolsmod/recipes/ruby_shield.json +++ b/src/generated/resources/data/armourandtoolsmod/recipes/ruby_shield.json @@ -3,7 +3,7 @@ "category": "shield", "key": { "A": { - "item": "armourandtoolsmod:ruby" + "tag": "forge:ingots/ruby" }, "I": { "item": "minecraft:iron_ingot" diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/ruby_shovel.json b/src/generated/resources/data/armourandtoolsmod/recipes/ruby_shovel.json index b5eb0724..9f610e63 100644 --- a/src/generated/resources/data/armourandtoolsmod/recipes/ruby_shovel.json +++ b/src/generated/resources/data/armourandtoolsmod/recipes/ruby_shovel.json @@ -3,7 +3,7 @@ "category": "shovel", "key": { "A": { - "item": "armourandtoolsmod:ruby" + "tag": "forge:ingots/ruby" }, "S": { "item": "minecraft:stick" diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/ruby_sword.json b/src/generated/resources/data/armourandtoolsmod/recipes/ruby_sword.json index 5a588db4..6dc95bbd 100644 --- a/src/generated/resources/data/armourandtoolsmod/recipes/ruby_sword.json +++ b/src/generated/resources/data/armourandtoolsmod/recipes/ruby_sword.json @@ -3,7 +3,7 @@ "category": "sword", "key": { "A": { - "item": "armourandtoolsmod:ruby" + "tag": "forge:ingots/ruby" }, "S": { "item": "minecraft:stick" diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/sapphire_shield.json b/src/generated/resources/data/armourandtoolsmod/recipes/sapphire_shield.json index d480c87d..ed7d5459 100644 --- a/src/generated/resources/data/armourandtoolsmod/recipes/sapphire_shield.json +++ b/src/generated/resources/data/armourandtoolsmod/recipes/sapphire_shield.json @@ -3,7 +3,7 @@ "category": "shield", "key": { "A": { - "item": "armourandtoolsmod:sapphire" + "tag": "forge:ingots/sapphire" }, "I": { "item": "minecraft:iron_ingot" diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/init/CreativeModeTabInit.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/init/CreativeModeTabInit.kt index 5f10d0c1..c60ae1df 100644 --- a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/init/CreativeModeTabInit.kt +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/init/CreativeModeTabInit.kt @@ -48,7 +48,7 @@ object CreativeModeTabInit { .map { item: RegistryObject -> item.get().asItem() } .forEach { pItem: Item -> output.accept(pItem) } } - .icon { ItemStack(ItemInit.AQUMARINE.get()) } + .icon { ItemStack(ItemInit.SAPPHIRE.get()) } .title(Component.translatable("creativetab.armourandtoolsmod")) .build() } diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/init/TagsInit.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/init/TagsInit.kt index feeba13b..19507067 100644 --- a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/init/TagsInit.kt +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/init/TagsInit.kt @@ -18,6 +18,7 @@ */ package io.github.realyusufismail.armourandtoolsmod.core.init +import java.util.* import net.minecraft.resources.ResourceLocation import net.minecraft.tags.BlockTags import net.minecraft.tags.ItemTags @@ -28,55 +29,55 @@ import net.minecraft.world.level.block.Block object TagsInit { object BlockTagsInit { - val ORES_RUBY_ORES: TagKey = + val ORES_RUBY: TagKey = ResourceLocation.tryParse("forge:ores/ruby_ores")?.let { BlockTags.create(it) } ?: throw Exception("Failed to create tag") - val ORES_RAINBOW_ORES: TagKey = + val ORES_RAINBOW: TagKey = ResourceLocation.tryParse("forge:ores/rainbow_ores")?.let { BlockTags.create(it) } ?: throw Exception("Failed to create tag") - val ORES_SAPPHIRE_ORES: TagKey = + val ORES_SAPPHIRE: TagKey = ResourceLocation.tryParse("forge:ores/sapphire_ores")?.let { BlockTags.create(it) } ?: throw Exception("Failed to create tag") - val ORES_GRAPHITE_ORES: TagKey = + val ORES_GRAPHITE: TagKey = ResourceLocation.tryParse("forge:ores/graphite_ores")?.let { BlockTags.create(it) } ?: throw Exception("Failed to create tag") - val ORES_AQUMARINE_ORES: TagKey = + val ORES_AQUMARINE: TagKey = ResourceLocation.tryParse("forge:ores/aqumarine_ores")?.let { BlockTags.create(it) } ?: throw Exception("Failed to create tag") - val ORES_ENDERITE_ORES: TagKey = + val ORES_ENDERITE: TagKey = ResourceLocation.tryParse("forge:ores/enderite_ores")?.let { BlockTags.create(it) } ?: throw Exception("Failed to create tag") - val DEEPSLATE_ORES_RUBY_ORES: TagKey = + val DEEPSLATE_ORES_RUBY: TagKey = ResourceLocation.tryParse("forge:deepslate_ores/ruby_ores")?.let { BlockTags.create(it) } ?: throw Exception("Failed to create tag") - val DEEPSLATE_ORES_RAINBOW_ORES: TagKey = + val DEEPSLATE_ORES_RAINBOW: TagKey = ResourceLocation.tryParse("forge:deepslate_ores/rainbow_ores")?.let { BlockTags.create(it) } ?: throw Exception("Failed to create tag") - val DEEPSLATE_ORES_SAPPHIRE_ORES: TagKey = + val DEEPSLATE_ORES_SAPPHIRE: TagKey = ResourceLocation.tryParse("forge:deepslate_ores/sapphire_ores")?.let { BlockTags.create(it) } ?: throw Exception("Failed to create tag") - val DEEPSLATE_ORES_GRAPHITE_ORES: TagKey = + val DEEPSLATE_ORES_GRAPHITE: TagKey = ResourceLocation.tryParse("forge:deepslate_ores/graphite_ores")?.let { BlockTags.create(it) } ?: throw Exception("Failed to create tag") - val DEEPSLATE_ORES_AQUMARINE_ORES: TagKey = + val DEEPSLATE_ORES_AQUMARINE: TagKey = ResourceLocation.tryParse("forge:deepslate_ores/aqumarine_ores")?.let { BlockTags.create(it) } @@ -110,57 +111,57 @@ object TagsInit { } object ItemTagsInit { - val ORES_RUBY_ORES: TagKey = + val ORES_RUBY: TagKey = ItemTags.create( ResourceLocation.tryParse("forge:ores/ruby_ores") ?: throw Exception("Failed to create tag")) - val ORES_RAINBOW_ORES: TagKey = + val ORES_RAINBOW: TagKey = ItemTags.create( ResourceLocation.tryParse("forge:ores/rainbow_ores") ?: throw Exception("Failed to create tag")) - val ORES_SAPPHIRE_ORES: TagKey = + val ORES_SAPPHIRE: TagKey = ItemTags.create( ResourceLocation.tryParse("forge:ores/sapphire_ores") ?: throw Exception("Failed to create tag")) - val ORES_GRAPHITE_ORES: TagKey = + val ORES_GRAPHITE: TagKey = ItemTags.create( ResourceLocation.tryParse("forge:ores/graphite_ores") ?: throw Exception("Failed to create tag")) - val ORES_AQUMARINE_ORES: TagKey = + val ORES_AQUMARINE: TagKey = ItemTags.create( ResourceLocation.tryParse("forge:ores/aqumarine_ores") ?: throw Exception("Failed to create tag")) - val ORES_ENDERITE_ORES: TagKey = + val ORES_ENDERITE: TagKey = ItemTags.create( ResourceLocation.tryParse("forge:ores/enderite_ores") ?: throw Exception("Failed to create tag")) - val DEEPSLATE_ORES_RUBY_ORES: TagKey = + val DEEPSLATE_ORES_RUBY: TagKey = ItemTags.create( ResourceLocation.tryParse("forge:deepslate_ores/ruby_ores") ?: throw Exception("Failed to create tag")) - val DEEPSLATE_ORES_RAINBOW_ORES: TagKey = + val DEEPSLATE_ORES_RAINBOW: TagKey = ItemTags.create( ResourceLocation.tryParse("forge:deepslate_ores/rainbow_ores") ?: throw Exception("Failed to create tag")) - val DEEPSLATE_ORES_SAPPHIRE_ORES: TagKey = + val DEEPSLATE_ORES_SAPPHIRE: TagKey = ItemTags.create( ResourceLocation.tryParse("forge:deepslate_ores/sapphire_ores") ?: throw Exception("Failed to create tag")) - val DEEPSLATE_ORES_GRAPHITE_ORES: TagKey = + val DEEPSLATE_ORES_GRAPHITE: TagKey = ItemTags.create( ResourceLocation.tryParse("forge:deepslate_ores/graphite_ores") ?: throw Exception("Failed to create tag")) - val DEEPSLATE_ORES_AQUMARINE_ORES: TagKey = + val DEEPSLATE_ORES_AQUMARINE: TagKey = ItemTags.create( ResourceLocation.tryParse("forge:deepslate_ores/aqumarine_ores") ?: throw Exception("Failed to create tag")) diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/DataGenerators.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/DataGenerators.kt index e3e86c8a..25e1ca90 100644 --- a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/DataGenerators.kt +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/DataGenerators.kt @@ -19,6 +19,7 @@ package io.github.realyusufismail.armourandtoolsmod.datagen import io.github.realyusufismail.armourandtoolsmod.ArmourAndToolsMod.ArmorAndToolsMod.logger +import io.github.realyusufismail.armourandtoolsmod.datagen.advancment.ModAdvancementProvider import io.github.realyusufismail.armourandtoolsmod.datagen.lang.ModEnLangProvider import io.github.realyusufismail.armourandtoolsmod.datagen.loot.ModLootTables import io.github.realyusufismail.armourandtoolsmod.datagen.recipe.MainModRecipeProvider @@ -64,7 +65,8 @@ object DataGenerators { gen.addProvider(true, ModWorldGenProvider(gen.packOutput, lookup)) gen.addProvider( true, ArmourAndTollsModSpriteSourceProvider(gen.packOutput, existingFileHelper)) - + gen.addProvider( + true, ModAdvancementProvider(gen.packOutput, lookup, existingFileHelper)) gen.addProvider(true, PackMetadataGenerator(gen.packOutput)) .add( PackMetadataSection.TYPE, diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/advancment/Advancements.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/advancment/Advancements.kt new file mode 100644 index 00000000..a2866a03 --- /dev/null +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/advancment/Advancements.kt @@ -0,0 +1,205 @@ +/* + * Copyright 2022 RealYusufIsmail. + * + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * + * you may not use this file except in compliance with the License. + * + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.github.realyusufismail.armourandtoolsmod.datagen.advancment + +import io.github.realyusufismail.armourandtoolsmod.ArmourAndToolsMod +import io.github.realyusufismail.armourandtoolsmod.core.init.BlockInit +import io.github.realyusufismail.armourandtoolsmod.core.init.ItemInit +import io.github.realyusufismail.armourandtoolsmod.core.init.TagsInit +import java.util.function.Consumer +import net.minecraft.advancements.Advancement +import net.minecraft.advancements.CriterionTriggerInstance +import net.minecraft.advancements.FrameType +import net.minecraft.advancements.RequirementsStrategy +import net.minecraft.advancements.critereon.* +import net.minecraft.core.HolderLookup +import net.minecraft.network.chat.Component +import net.minecraft.resources.ResourceLocation +import net.minecraft.tags.TagKey +import net.minecraft.world.item.Item +import net.minecraft.world.item.ItemStack +import net.minecraft.world.item.Items +import net.minecraft.world.level.ItemLike +import net.minecraftforge.common.data.ExistingFileHelper +import net.minecraftforge.common.data.ForgeAdvancementProvider + +class Advancements : ForgeAdvancementProvider.AdvancementGenerator { + private fun simpleGetItem( + consumer: Consumer, + item: ItemLike, + parent: Advancement + ): Advancement { + return simpleGetItem(consumer, item, parent, item.asItem().toString()) + } + + private fun simpleGetItem( + consumer: Consumer, + item: ItemLike, + parent: Advancement, + key: String + ): Advancement { + return simpleGetItem(consumer, item, ItemStack(item), parent, key) + } + + private fun simpleGetItem( + consumer: Consumer, + item: ItemLike, + icon: ItemStack, + parent: Advancement, + key: String + ): Advancement { + return Advancement.Builder.advancement() + .parent(parent) + .display(icon, title(key), description(key), null, FrameType.TASK, true, true, false) + .addCriterion("get_item", getItem(item)) + .save(consumer, id(key)) + } + + private fun id(path: String): String { + return ArmourAndToolsMod.getModIdAndName(path).toString() + } + + private fun getItem(vararg items: ItemLike): CriterionTriggerInstance { + return InventoryChangeTrigger.TriggerInstance.hasItems(*items) + } + + private fun getItem(tag: TagKey): CriterionTriggerInstance { + return InventoryChangeTrigger.TriggerInstance.hasItems( + ItemPredicate( + tag, + null, + MinMaxBounds.Ints.ANY, + MinMaxBounds.Ints.ANY, + EnchantmentPredicate.NONE, + EnchantmentPredicate.NONE, + null, + NbtPredicate.ANY)) + } + + private fun title(key: String): Component { + return Component.translatable("advancements." + ArmourAndToolsMod.MOD_ID + ".$key.title") + } + + private fun description(key: String): Component { + return Component.translatable( + "advancements." + ArmourAndToolsMod.MOD_ID + ".$key.description") + } + + override fun generate( + registries: HolderLookup.Provider, + consumer: Consumer, + existingFileHelper: ExistingFileHelper + ) { + val rootIcon = ItemStack(ItemInit.AMETHYST_SWORD.get()) + val root = + Advancement.Builder.advancement() + .display( + rootIcon, + title("root"), + description("root"), + ResourceLocation("minecraft:textures/block/light_blue_wool.png"), + FrameType.TASK, + true, + false, + false) + .addCriterion("get_item", getItem(Items.CRAFTING_TABLE)) + .save(consumer, id("root")) + + val rubyOre = + Advancement.Builder.advancement() + .parent(root) + .display( + BlockInit.RUBY_ORE.get(), + title("ruby_ore"), + description("ruby_ore"), + null, + FrameType.GOAL, + true, + true, + false) + .addCriterion("get_ore", getItem(TagsInit.ItemTagsInit.ORES_RUBY)) + .save(consumer, id("ruby_ore")) + + val rubyIngot = + Advancement.Builder.advancement() + .parent(rubyOre) + .display( + ItemInit.RUBY.get(), + title("ruby_ingot"), + description("ruby_ingot"), + null, + FrameType.GOAL, + true, + true, + false) + .addCriterion("get_scrap", getItem(TagsInit.ItemTagsInit.INGOTS_RUBY)) + .save(consumer, id("ruby_ingot")) + + Advancement.Builder.advancement() + .parent(rubyIngot) + .display( + BlockInit.RUBY_BLOCK.get(), + title("ruby_block"), + description("ruby_block"), + null, + FrameType.GOAL, + true, + true, + false) + .addCriterion("get_block", getItem(TagsInit.ItemTagsInit.STORAGE_RUBY)) + .save(consumer, id("ruby_block")) + + Advancement.Builder.advancement() + .parent(rubyIngot) + .display( + ItemInit.RUBY_HELMET.get(), + title("ruby_armour"), + description("ruby_armour"), + null, + FrameType.GOAL, + true, + true, + false) + .addCriterion("ruby_helmet", getItem(ItemInit.RUBY_HELMET.get())) + .addCriterion("ruby_chestplate", getItem(ItemInit.RUBY_CHESTPLATE.get())) + .addCriterion("ruby_leggings", getItem(ItemInit.RUBY_LEGGINGS.get())) + .addCriterion("ruby_boots", getItem(ItemInit.RUBY_BOOTS.get())) + .requirements(RequirementsStrategy.OR) + .save(consumer, id("ruby_armour")) + + Advancement.Builder.advancement() + .parent(rubyIngot) + .display( + ItemInit.RUBY_SWORD.get(), + title("ruby_tools"), + description("ruby_tools"), + null, + FrameType.GOAL, + true, + true, + false) + .addCriterion("ruby_sword", getItem(ItemInit.RUBY_SWORD.get())) + .addCriterion("ruby_pickaxe", getItem(ItemInit.RUBY_PICKAXE.get())) + .addCriterion("ruby_axe", getItem(ItemInit.RUBY_AXE.get())) + .addCriterion("ruby_shovel", getItem(ItemInit.RUBY_SHOVEL.get())) + .addCriterion("ruby_hoe", getItem(ItemInit.RUBY_HOE.get())) + .requirements(RequirementsStrategy.OR) + .save(consumer, id("ruby_tools")) + } +} diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/advancment/ModAdvancementProvider.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/advancment/ModAdvancementProvider.kt new file mode 100644 index 00000000..d6141f2a --- /dev/null +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/advancment/ModAdvancementProvider.kt @@ -0,0 +1,31 @@ +/* + * Copyright 2022 RealYusufIsmail. + * + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * + * you may not use this file except in compliance with the License. + * + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.github.realyusufismail.armourandtoolsmod.datagen.advancment + +import java.util.concurrent.CompletableFuture +import net.minecraft.core.HolderLookup +import net.minecraft.data.PackOutput +import net.minecraftforge.common.data.ExistingFileHelper +import net.minecraftforge.common.data.ForgeAdvancementProvider + +class ModAdvancementProvider( + output: PackOutput, + registries: CompletableFuture, + existingFileHelper: ExistingFileHelper +) : ForgeAdvancementProvider(output, registries, existingFileHelper, listOf(Advancements())) diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/lang/ModEnLangProvider.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/lang/ModEnLangProvider.kt index 6334d9c0..e7c02cbc 100644 --- a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/lang/ModEnLangProvider.kt +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/lang/ModEnLangProvider.kt @@ -138,6 +138,26 @@ class ModEnLangProvider(gen: DataGenerator) : ModEnLangProviderSupport(gen, MOD_ add("container.custom_armour_crafting_table.description", "Craft your own custom armour!") add("container.custom_tool_crafting_table", "Tool Crafting Table") add("container.custom_tool_crafting_table.description", "Craft your own custom tools!") + + // advancements + addAdvancement( + "root", + "Download Armour and Tools Mod", + "Thanks for downloading Armour and Tools Mod! Enjoy!") + addAdvancement( + "ruby_ore", "That rare crimson ore", "Now smelt the ruby ore to get a ruby ingot!") + addAdvancement( + "ruby_ingot", + "That crimson gem", + "Now use the ruby ingot to craft ruby armour and tools!") + addAdvancement( + "ruby_block", + "That crimson sparkling block", + "Well that's a way to show off your wealth!") + addAdvancement( + "ruby_armour", "That crimson armour", "Well done! You are now increasing your defence!") + addAdvancement( + "ruby_tools", "That crimson tools", "Way to go! You are now increasing your attack!") } override fun item(entry: RegistryObject, name: String) { @@ -155,4 +175,9 @@ class ModEnLangProvider(gen: DataGenerator) : ModEnLangProviderSupport(gen, MOD_ override fun add(translatableComponent: Component, lang: String) { super.add(translatableComponent.string, lang) } + + private fun addAdvancement(advancement: String, title: String, description: String) { + add(Component.translatable("advancements.$MOD_ID.$advancement.title"), title) + add(Component.translatable("advancements.$MOD_ID.$advancement.description"), description) + } } diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/recipe/provider/ToolCraftingTableRecipeProvider.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/recipe/provider/ToolCraftingTableRecipeProvider.kt index a0fecbf9..7065b56d 100644 --- a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/recipe/provider/ToolCraftingTableRecipeProvider.kt +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/recipe/provider/ToolCraftingTableRecipeProvider.kt @@ -41,56 +41,56 @@ class ToolCraftingTableRecipeProvider( CustomToolsCraftingBookCategory.SWORD, RecipeCategory.TOOLS, ItemInit.RUBY_SWORD.get()) - .define('A', ItemInit.RUBY.get()) + .define('A', TagsInit.ItemTagsInit.INGOTS_RUBY) .define('S', Items.STICK) .pattern(" A ") .pattern(" A ") .pattern(" S ") - .unlockedBy(hasItem, has(ItemInit.RUBY.get())) + .unlockedBy(hasItem, has(TagsInit.ItemTagsInit.INGOTS_RUBY)) .save(consumer, modId("ruby_sword")) CustomToolCraftingTableRecipeBuilder.shaped( CustomToolsCraftingBookCategory.PICKAXE, RecipeCategory.TOOLS, ItemInit.RUBY_PICKAXE.get()) - .define('A', ItemInit.RUBY.get()) + .define('A', TagsInit.ItemTagsInit.INGOTS_RUBY) .define('S', Items.STICK) .pattern("AAA") .pattern(" S ") .pattern(" S ") - .unlockedBy(hasItem, has(ItemInit.RUBY.get())) + .unlockedBy(hasItem, has(TagsInit.ItemTagsInit.INGOTS_RUBY)) .save(consumer, modId("ruby_pickaxe")) CustomToolCraftingTableRecipeBuilder.shaped( CustomToolsCraftingBookCategory.AXE, RecipeCategory.TOOLS, ItemInit.RUBY_AXE.get()) - .define('A', ItemInit.RUBY.get()) + .define('A', TagsInit.ItemTagsInit.INGOTS_RUBY) .define('S', Items.STICK) .pattern(" AA") .pattern(" SA") .pattern(" S ") - .unlockedBy(hasItem, has(ItemInit.RUBY.get())) + .unlockedBy(hasItem, has(TagsInit.ItemTagsInit.INGOTS_RUBY)) .save(consumer, modId("ruby_axe")) CustomToolCraftingTableRecipeBuilder.shaped( CustomToolsCraftingBookCategory.SHOVEL, RecipeCategory.TOOLS, ItemInit.RUBY_SHOVEL.get()) - .define('A', ItemInit.RUBY.get()) + .define('A', TagsInit.ItemTagsInit.INGOTS_RUBY) .define('S', Items.STICK) .pattern(" A ") .pattern(" S ") .pattern(" S ") - .unlockedBy(hasItem, has(ItemInit.RUBY.get())) + .unlockedBy(hasItem, has(TagsInit.ItemTagsInit.INGOTS_RUBY)) .save(consumer, modId("ruby_shovel")) CustomToolCraftingTableRecipeBuilder.shaped( CustomToolsCraftingBookCategory.HOE, RecipeCategory.TOOLS, ItemInit.RUBY_HOE.get()) - .define('A', ItemInit.RUBY.get()) + .define('A', TagsInit.ItemTagsInit.INGOTS_RUBY) .define('S', Items.STICK) .pattern("AA ") .pattern(" S ") .pattern(" S ") - .unlockedBy(hasItem, has(ItemInit.RUBY.get())) + .unlockedBy(hasItem, has(TagsInit.ItemTagsInit.INGOTS_RUBY)) .save(consumer, modId("ruby_hoe")) // ENDERITE TOOLS @@ -210,65 +210,65 @@ class ToolCraftingTableRecipeProvider( CustomToolsCraftingBookCategory.SHIELD, RecipeCategory.TOOLS, ItemInit.RUBY_SHIELD.get()) - .define('A', ItemInit.RUBY.get()) + .define('A', TagsInit.ItemTagsInit.INGOTS_RUBY) .define('I', Items.IRON_INGOT) .define('S', Items.SHIELD) .pattern(" A ") .pattern("SIS") .pattern("SSS") - .unlockedBy(hasItem, has(ItemInit.RUBY.get())) + .unlockedBy(hasItem, has(TagsInit.ItemTagsInit.INGOTS_RUBY)) .save(consumer, modId("ruby_shield")) CustomToolCraftingTableRecipeBuilder.shaped( CustomToolsCraftingBookCategory.SHIELD, RecipeCategory.TOOLS, ItemInit.SAPPHIRE_SHIELD.get()) - .define('A', ItemInit.SAPPHIRE.get()) + .define('A', TagsInit.ItemTagsInit.INGOTS_SAPPHIRE) .define('I', Items.IRON_INGOT) .define('S', Items.SHIELD) .pattern(" A ") .pattern("SIS") .pattern("SSS") - .unlockedBy(hasItem, has(ItemInit.SAPPHIRE.get())) + .unlockedBy(hasItem, has(TagsInit.ItemTagsInit.INGOTS_SAPPHIRE)) .save(consumer, modId("sapphire_shield")) CustomToolCraftingTableRecipeBuilder.shaped( CustomToolsCraftingBookCategory.SHIELD, RecipeCategory.TOOLS, ItemInit.GRAPHITE_SHIELD.get()) - .define('A', ItemInit.GRAPHITE.get()) + .define('A', TagsInit.ItemTagsInit.INGOTS_GRAPHITE) .define('I', Items.IRON_INGOT) .define('S', Items.SHIELD) .pattern(" A ") .pattern("SIS") .pattern("SSS") - .unlockedBy(hasItem, has(ItemInit.GRAPHITE.get())) + .unlockedBy(hasItem, has(TagsInit.ItemTagsInit.INGOTS_GRAPHITE)) .save(consumer, modId("graphite_shield")) CustomToolCraftingTableRecipeBuilder.shaped( CustomToolsCraftingBookCategory.SHIELD, RecipeCategory.TOOLS, ItemInit.AQUMARINE_SHIELD.get()) - .define('A', ItemInit.AQUMARINE.get()) + .define('A', TagsInit.ItemTagsInit.INGOTS_AQUMARINE) .define('I', Items.IRON_INGOT) .define('S', Items.SHIELD) .pattern(" A ") .pattern("SIS") .pattern("SSS") - .unlockedBy(hasItem, has(ItemInit.AQUMARINE.get())) + .unlockedBy(hasItem, has(TagsInit.ItemTagsInit.INGOTS_AQUMARINE)) .save(consumer, modId("aqumarine_shield")) CustomToolCraftingTableRecipeBuilder.shaped( CustomToolsCraftingBookCategory.SHIELD, RecipeCategory.TOOLS, ItemInit.RAINBOW_SHIELD.get()) - .define('A', ItemInit.RAINBOW.get()) + .define('A', TagsInit.ItemTagsInit.INGOTS_RAINBOW) .define('I', Items.IRON_INGOT) .define('S', Items.SHIELD) .pattern(" A ") .pattern("SIS") .pattern("SSS") - .unlockedBy(hasItem, has(ItemInit.RAINBOW.get())) + .unlockedBy(hasItem, has(TagsInit.ItemTagsInit.INGOTS_RAINBOW)) .save(consumer, modId("rainbow_shield")) // TODO: In the future make it drop of a future custom mob @@ -276,12 +276,12 @@ class ToolCraftingTableRecipeProvider( CustomToolsCraftingBookCategory.TRIDENT, RecipeCategory.TOOLS, ItemInit.AQUMARINE_TRIDENT.get()) - .define('A', ItemInit.AQUMARINE.get()) + .define('A', TagsInit.ItemTagsInit.INGOTS_AQUMARINE) .define('S', Items.STICK) .pattern(" AA") .pattern(" SA") .pattern(" S ") - .unlockedBy(hasItem, has(ItemInit.AQUMARINE.get())) + .unlockedBy(hasItem, has(TagsInit.ItemTagsInit.INGOTS_AQUMARINE)) .save(consumer, modId("aqumarine_trident")) } } diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/tags/ModBlockTagsProvider.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/tags/ModBlockTagsProvider.kt index ef73e504..368c3b38 100644 --- a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/tags/ModBlockTagsProvider.kt +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/tags/ModBlockTagsProvider.kt @@ -43,21 +43,21 @@ class ModBlockTagsProvider( val netheriteTag = createForgeTag("forge:needs_netherite_tool") // ores - tag(TagsInit.BlockTagsInit.ORES_RUBY_ORES).add(BlockInit.RUBY_ORE.get()) - tag(TagsInit.BlockTagsInit.ORES_RAINBOW_ORES).add(BlockInit.RAINBOW_ORE.get()) - tag(TagsInit.BlockTagsInit.ORES_SAPPHIRE_ORES).add(BlockInit.SAPPHIRE_ORE.get()) - tag(TagsInit.BlockTagsInit.ORES_GRAPHITE_ORES).add(BlockInit.GRAPHITE_ORE.get()) - tag(TagsInit.BlockTagsInit.ORES_AQUMARINE_ORES).add(BlockInit.AQUMARINE_ORE.get()) - tag(TagsInit.BlockTagsInit.ORES_ENDERITE_ORES).add(BlockInit.ENDERITE_ORE.get()) + tag(TagsInit.BlockTagsInit.ORES_RUBY).add(BlockInit.RUBY_ORE.get()) + tag(TagsInit.BlockTagsInit.ORES_RAINBOW).add(BlockInit.RAINBOW_ORE.get()) + tag(TagsInit.BlockTagsInit.ORES_SAPPHIRE).add(BlockInit.SAPPHIRE_ORE.get()) + tag(TagsInit.BlockTagsInit.ORES_GRAPHITE).add(BlockInit.GRAPHITE_ORE.get()) + tag(TagsInit.BlockTagsInit.ORES_AQUMARINE).add(BlockInit.AQUMARINE_ORE.get()) + tag(TagsInit.BlockTagsInit.ORES_ENDERITE).add(BlockInit.ENDERITE_ORE.get()) // deepslate ores - tag(TagsInit.BlockTagsInit.DEEPSLATE_ORES_RUBY_ORES).add(BlockInit.DEEPSLATE_RUBY_ORE.get()) - tag(TagsInit.BlockTagsInit.DEEPSLATE_ORES_RAINBOW_ORES) + tag(TagsInit.BlockTagsInit.DEEPSLATE_ORES_RUBY).add(BlockInit.DEEPSLATE_RUBY_ORE.get()) + tag(TagsInit.BlockTagsInit.DEEPSLATE_ORES_RAINBOW) .add(BlockInit.DEEPSLATE_RAINBOW_ORE.get()) - tag(TagsInit.BlockTagsInit.DEEPSLATE_ORES_SAPPHIRE_ORES) + tag(TagsInit.BlockTagsInit.DEEPSLATE_ORES_SAPPHIRE) .add(BlockInit.DEEPSLATE_SAPPHIRE_ORE.get()) - tag(TagsInit.BlockTagsInit.DEEPSLATE_ORES_GRAPHITE_ORES) + tag(TagsInit.BlockTagsInit.DEEPSLATE_ORES_GRAPHITE) .add(BlockInit.DEEPSLATE_GRAPHITE_ORE.get()) - tag(TagsInit.BlockTagsInit.DEEPSLATE_ORES_AQUMARINE_ORES) + tag(TagsInit.BlockTagsInit.DEEPSLATE_ORES_AQUMARINE) .add(BlockInit.DEEPSLATE_AQUMARINE_ORE.get()) // storage blocks tag(TagsInit.BlockTagsInit.STORAGE_RUBY).add(BlockInit.RUBY_BLOCK.get()) diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/tags/ModItemTagsProvider.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/tags/ModItemTagsProvider.kt index 145e91dd..5701663d 100644 --- a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/tags/ModItemTagsProvider.kt +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/tags/ModItemTagsProvider.kt @@ -43,28 +43,26 @@ class ModItemTagsProvider( override fun addTags(pProvider: HolderLookup.Provider) { // ores - copy(TagsInit.BlockTagsInit.ORES_RUBY_ORES, TagsInit.ItemTagsInit.ORES_RUBY_ORES) - copy(TagsInit.BlockTagsInit.ORES_RAINBOW_ORES, TagsInit.ItemTagsInit.ORES_RAINBOW_ORES) - copy(TagsInit.BlockTagsInit.ORES_SAPPHIRE_ORES, TagsInit.ItemTagsInit.ORES_SAPPHIRE_ORES) - copy(TagsInit.BlockTagsInit.ORES_GRAPHITE_ORES, TagsInit.ItemTagsInit.ORES_GRAPHITE_ORES) - copy(TagsInit.BlockTagsInit.ORES_AQUMARINE_ORES, TagsInit.ItemTagsInit.ORES_AQUMARINE_ORES) - copy(TagsInit.BlockTagsInit.ORES_ENDERITE_ORES, TagsInit.ItemTagsInit.ORES_ENDERITE_ORES) + copy(TagsInit.BlockTagsInit.ORES_RUBY, TagsInit.ItemTagsInit.ORES_RUBY) + copy(TagsInit.BlockTagsInit.ORES_RAINBOW, TagsInit.ItemTagsInit.ORES_RAINBOW) + copy(TagsInit.BlockTagsInit.ORES_SAPPHIRE, TagsInit.ItemTagsInit.ORES_SAPPHIRE) + copy(TagsInit.BlockTagsInit.ORES_GRAPHITE, TagsInit.ItemTagsInit.ORES_GRAPHITE) + copy(TagsInit.BlockTagsInit.ORES_AQUMARINE, TagsInit.ItemTagsInit.ORES_AQUMARINE) + copy(TagsInit.BlockTagsInit.ORES_ENDERITE, TagsInit.ItemTagsInit.ORES_ENDERITE) // deepslate ores + copy(TagsInit.BlockTagsInit.DEEPSLATE_ORES_RUBY, TagsInit.ItemTagsInit.DEEPSLATE_ORES_RUBY) copy( - TagsInit.BlockTagsInit.DEEPSLATE_ORES_RUBY_ORES, - TagsInit.ItemTagsInit.DEEPSLATE_ORES_RUBY_ORES) + TagsInit.BlockTagsInit.DEEPSLATE_ORES_RAINBOW, + TagsInit.ItemTagsInit.DEEPSLATE_ORES_RAINBOW) copy( - TagsInit.BlockTagsInit.DEEPSLATE_ORES_RAINBOW_ORES, - TagsInit.ItemTagsInit.DEEPSLATE_ORES_RAINBOW_ORES) + TagsInit.BlockTagsInit.DEEPSLATE_ORES_SAPPHIRE, + TagsInit.ItemTagsInit.DEEPSLATE_ORES_SAPPHIRE) copy( - TagsInit.BlockTagsInit.DEEPSLATE_ORES_SAPPHIRE_ORES, - TagsInit.ItemTagsInit.DEEPSLATE_ORES_SAPPHIRE_ORES) + TagsInit.BlockTagsInit.DEEPSLATE_ORES_GRAPHITE, + TagsInit.ItemTagsInit.DEEPSLATE_ORES_GRAPHITE) copy( - TagsInit.BlockTagsInit.DEEPSLATE_ORES_GRAPHITE_ORES, - TagsInit.ItemTagsInit.DEEPSLATE_ORES_GRAPHITE_ORES) - copy( - TagsInit.BlockTagsInit.DEEPSLATE_ORES_AQUMARINE_ORES, - TagsInit.ItemTagsInit.DEEPSLATE_ORES_AQUMARINE_ORES) + TagsInit.BlockTagsInit.DEEPSLATE_ORES_AQUMARINE, + TagsInit.ItemTagsInit.DEEPSLATE_ORES_AQUMARINE) // storage blocks copy(TagsInit.BlockTagsInit.STORAGE_RUBY, TagsInit.ItemTagsInit.STORAGE_RUBY) copy(TagsInit.BlockTagsInit.STORAGE_RAINBOW, TagsInit.ItemTagsInit.STORAGE_RAINBOW)