From 970a0a5cc97aa7ddc930df3e34c1532949113abe Mon Sep 17 00:00:00 2001 From: Provismet <17149901+Provismet@users.noreply.github.com> Date: Thu, 15 Feb 2024 16:13:40 +0000 Subject: [PATCH] Update codebase to 1.20.2 --- gradle.properties | 8 ++++---- .../assets/additional-armoury/lang/en_us.json | 2 ++ .../building_blocks/endernether_block.json | 4 ++-- .../building_blocks/overnether_block.json | 4 ++-- .../recipes/combat/diamond_dagger.json | 4 ++-- .../recipes/combat/diamond_mace.json | 4 ++-- .../combat/endernether_axe_smithing.json | 4 ++-- .../combat/endernether_boots_smithing.json | 4 ++-- .../endernether_chestplate_smithing.json | 4 ++-- .../combat/endernether_dagger_smithing.json | 4 ++-- .../combat/endernether_helmet_smithing.json | 4 ++-- .../combat/endernether_hoe_smithing.json | 4 ++-- .../combat/endernether_leggings_smithing.json | 4 ++-- .../combat/endernether_mace_smithing.json | 4 ++-- .../combat/endernether_pickaxe_smithing.json | 4 ++-- .../combat/endernether_shovel_smithing.json | 4 ++-- .../combat/endernether_sword_smithing.json | 4 ++-- .../recipes/combat/golden_dagger.json | 4 ++-- .../recipes/combat/golden_mace.json | 4 ++-- .../recipes/combat/iron_dagger.json | 4 ++-- .../recipes/combat/iron_mace.json | 4 ++-- .../combat/netherite_dagger_smithing.json | 4 ++-- .../combat/netherite_mace_smithing.json | 4 ++-- .../combat/overnether_axe_smithing.json | 4 ++-- .../combat/overnether_boots_smithing.json | 4 ++-- .../overnether_chestplate_smithing.json | 4 ++-- .../combat/overnether_dagger_smithing.json | 4 ++-- .../combat/overnether_helmet_smithing.json | 4 ++-- .../combat/overnether_hoe_smithing.json | 4 ++-- .../combat/overnether_leggings_smithing.json | 4 ++-- .../combat/overnether_mace_smithing.json | 4 ++-- .../combat/overnether_pickaxe_smithing.json | 4 ++-- .../combat/overnether_shovel_smithing.json | 4 ++-- .../combat/overnether_sword_smithing.json | 4 ++-- .../recipes/combat/stone_dagger.json | 4 ++-- .../recipes/combat/stone_mace.json | 4 ++-- .../recipes/combat/wooden_dagger.json | 4 ++-- .../recipes/combat/wooden_mace.json | 4 ++-- .../recipes/misc/endernether_ingot.json | 4 ++-- .../misc/endernether_ingot_decompressed.json | 4 ++-- ...endernether_upgrade_smithing_template.json | 4 ++-- .../recipes/misc/overnether_ingot.json | 4 ++-- .../misc/overnether_ingot_decompressed.json | 4 ++-- .../overnether_upgrade_smithing_template.json | 4 ++-- .../Crafting/TippedDaggerRecipe.java | 5 ++--- .../staff/ExplosionEnchantment.java | 4 ++-- .../AdvancementGenerator.java | 19 ++++++++++-------- .../AdditionalArmoury/LanguageGenerator.java | 2 ++ .../AdditionalArmoury/RecipeGenerator.java | 20 +++++++++---------- src/main/resources/fabric.mod.json | 2 +- 50 files changed, 117 insertions(+), 113 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9a75262..0a33490 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.10 -loader_version=0.15.3 +minecraft_version=1.20.2 +yarn_mappings=1.20.2+build.4 +loader_version=0.15.6 # Mod Properties mod_version=1.0.0 @@ -15,7 +15,7 @@ archives_base_name=additional-armoury modid=additional-armoury #Fabric api -fabric_version=0.91.0+1.20.1 +fabric_version=0.91.6+1.20.2 fabric_asm_version=v2.3 combatplus_version=1.0.0-mc1.20.1 lilylib_version=1.1.3-mc1.20 \ No newline at end of file diff --git a/src/main/generated/assets/additional-armoury/lang/en_us.json b/src/main/generated/assets/additional-armoury/lang/en_us.json index 7a9f328..f65a9da 100644 --- a/src/main/generated/assets/additional-armoury/lang/en_us.json +++ b/src/main/generated/assets/additional-armoury/lang/en_us.json @@ -123,6 +123,7 @@ "item.additional-armoury.endernether_sword": "Endernether Sword", "item.additional-armoury.endernether_upgrade.addition": "Add Endernether Ingot", "item.additional-armoury.endernether_upgrade.ingredients": "Endernether Ingot", + "item.additional-armoury.endernether_upgrade_smithing_template": "Smithing Template", "item.additional-armoury.fireball_spell": "Fireball", "item.additional-armoury.frostball_spell": "Frostball", "item.additional-armoury.ghostly_orb_spell": "Ghostly Orb", @@ -227,6 +228,7 @@ "item.additional-armoury.overnether_sword": "Overnether Sword", "item.additional-armoury.overnether_upgrade.addition": "Add Overnether Ingot", "item.additional-armoury.overnether_upgrade.ingredients": "Overnether Ingot", + "item.additional-armoury.overnether_upgrade_smithing_template": "Smithing Template", "item.additional-armoury.staff": "Unenchanted Staff", "item.additional-armoury.staff.enchanted": "Enchanted Staff", "item.additional-armoury.stone_dagger": "Stone Dagger", diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/endernether_block.json b/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/endernether_block.json index c79b579..21eac69 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/endernether_block.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/endernether_block.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_endernether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/overnether_block.json b/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/overnether_block.json index 094bead..f330e8b 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/overnether_block.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/overnether_block.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_overnether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_dagger.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_dagger.json index 70e5fc0..d323209 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_dagger.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_dagger.json @@ -32,9 +32,9 @@ }, "requirements": [ [ + "has_the_recipe", "has_stick", - "has_diamond", - "has_the_recipe" + "has_diamond" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_mace.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_mace.json index 38cee48..42b8fc4 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_mace.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_mace.json @@ -32,9 +32,9 @@ }, "requirements": [ [ + "has_the_recipe", "has_stick", - "has_diamond", - "has_the_recipe" + "has_diamond" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_axe_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_axe_smithing.json index 798ee98..984a0a2 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_axe_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_axe_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_endernether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_boots_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_boots_smithing.json index 9d2c509..01bb252 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_boots_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_boots_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_endernether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_chestplate_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_chestplate_smithing.json index 57615bb..73df909 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_chestplate_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_chestplate_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_endernether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_dagger_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_dagger_smithing.json index 1f44693..0c00d4d 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_dagger_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_dagger_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_endernether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_helmet_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_helmet_smithing.json index 2c86952..5233968 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_helmet_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_helmet_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_endernether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_hoe_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_hoe_smithing.json index 5037aec..07037c3 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_hoe_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_hoe_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_endernether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_leggings_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_leggings_smithing.json index 48baa82..f7a4b5a 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_leggings_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_leggings_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_endernether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_mace_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_mace_smithing.json index 842df48..880f579 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_mace_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_mace_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_endernether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_pickaxe_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_pickaxe_smithing.json index 5f0f97a..bd63e4b 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_pickaxe_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_pickaxe_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_endernether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_shovel_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_shovel_smithing.json index 2f6f927..a0c5774 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_shovel_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_shovel_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_endernether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_sword_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_sword_smithing.json index 342dbff..1745e9c 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_sword_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_sword_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_endernether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_dagger.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_dagger.json index 3cdc31a..50f4591 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_dagger.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_dagger.json @@ -32,9 +32,9 @@ }, "requirements": [ [ + "has_the_recipe", "has_stick", - "has_gold_ingot", - "has_the_recipe" + "has_gold_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_mace.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_mace.json index bbe99f8..8013d5b 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_mace.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_mace.json @@ -32,9 +32,9 @@ }, "requirements": [ [ + "has_the_recipe", "has_stick", - "has_gold_ingot", - "has_the_recipe" + "has_gold_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_dagger.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_dagger.json index 90de4df..460fafd 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_dagger.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_dagger.json @@ -32,9 +32,9 @@ }, "requirements": [ [ + "has_the_recipe", "has_stick", - "has_iron_ingot", - "has_the_recipe" + "has_iron_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_mace.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_mace.json index 21c6874..c9efb66 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_mace.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_mace.json @@ -32,9 +32,9 @@ }, "requirements": [ [ + "has_the_recipe", "has_stick", - "has_iron_ingot", - "has_the_recipe" + "has_iron_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_dagger_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_dagger_smithing.json index fe364bb..4cf31b8 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_dagger_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_dagger_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_netherite_ingot", - "has_the_recipe" + "has_the_recipe", + "has_netherite_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_mace_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_mace_smithing.json index e4e7310..2a006fc 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_mace_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_mace_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_netherite_ingot", - "has_the_recipe" + "has_the_recipe", + "has_netherite_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_axe_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_axe_smithing.json index 7c3a869..2648c40 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_axe_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_axe_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_overnether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_boots_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_boots_smithing.json index 4009750..aa27096 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_boots_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_boots_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_overnether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_chestplate_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_chestplate_smithing.json index b7c5cd7..3acd183 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_chestplate_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_chestplate_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_overnether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_dagger_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_dagger_smithing.json index 5da533e..8ad5188 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_dagger_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_dagger_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_overnether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_helmet_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_helmet_smithing.json index e2a6afa..d81486b 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_helmet_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_helmet_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_overnether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_hoe_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_hoe_smithing.json index b97f31a..dcc4108 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_hoe_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_hoe_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_overnether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_leggings_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_leggings_smithing.json index bd511b3..c7c1eef 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_leggings_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_leggings_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_overnether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_mace_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_mace_smithing.json index e13e11d..a349aa6 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_mace_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_mace_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_overnether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_pickaxe_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_pickaxe_smithing.json index c7e9610..2d6c29c 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_pickaxe_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_pickaxe_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_overnether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_shovel_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_shovel_smithing.json index 7b67e43..9893b0b 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_shovel_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_shovel_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_overnether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_sword_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_sword_smithing.json index ada2d11..cee4657 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_sword_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_sword_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_ingot", - "has_the_recipe" + "has_the_recipe", + "has_overnether_ingot" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_dagger.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_dagger.json index 6fbcc0c..f30df52 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_dagger.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_dagger.json @@ -32,9 +32,9 @@ }, "requirements": [ [ + "has_the_recipe", "has_stick", - "has_cobblestone", - "has_the_recipe" + "has_cobblestone" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_mace.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_mace.json index 9f3a4bd..186227b 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_mace.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_mace.json @@ -32,9 +32,9 @@ }, "requirements": [ [ + "has_the_recipe", "has_stick", - "has_cobblestone", - "has_the_recipe" + "has_cobblestone" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_dagger.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_dagger.json index 7934eae..1bfb0c2 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_dagger.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_dagger.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_stick", - "has_the_recipe" + "has_the_recipe", + "has_stick" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_mace.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_mace.json index 7b78fe6..efcc5c6 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_mace.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_mace.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_stick", - "has_the_recipe" + "has_the_recipe", + "has_stick" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot.json b/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot.json index f245842..ce9f766 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot.json @@ -34,9 +34,9 @@ }, "requirements": [ [ + "has_the_recipe", "has_netherite_scrap", - "has_popped_chorus_fruit", - "has_the_recipe" + "has_popped_chorus_fruit" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot_decompressed.json b/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot_decompressed.json index 39402cc..3f8f3b3 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot_decompressed.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot_decompressed.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_block", - "has_the_recipe" + "has_the_recipe", + "has_endernether_block" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_upgrade_smithing_template.json b/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_upgrade_smithing_template.json index a4519bf..c278dbe 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_upgrade_smithing_template.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_upgrade_smithing_template.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_endernether_upgrade_smithing_template", - "has_the_recipe" + "has_the_recipe", + "has_endernether_upgrade_smithing_template" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot.json b/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot.json index 70cf857..68795e9 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot.json @@ -34,9 +34,9 @@ }, "requirements": [ [ + "has_the_recipe", "has_netherite_scrap", - "has_echo_shard", - "has_the_recipe" + "has_echo_shard" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot_decompressed.json b/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot_decompressed.json index e185569..c208e60 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot_decompressed.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot_decompressed.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_block", - "has_the_recipe" + "has_the_recipe", + "has_overnether_block" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_upgrade_smithing_template.json b/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_upgrade_smithing_template.json index 09d99f2..402fce8 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_upgrade_smithing_template.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_upgrade_smithing_template.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_overnether_upgrade_smithing_template", - "has_the_recipe" + "has_the_recipe", + "has_overnether_upgrade_smithing_template" ] ], "rewards": { diff --git a/src/main/java/com/provismet/AdditionalArmoury/Crafting/TippedDaggerRecipe.java b/src/main/java/com/provismet/AdditionalArmoury/Crafting/TippedDaggerRecipe.java index 451451a..f1dd63a 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/Crafting/TippedDaggerRecipe.java +++ b/src/main/java/com/provismet/AdditionalArmoury/Crafting/TippedDaggerRecipe.java @@ -12,12 +12,11 @@ import net.minecraft.recipe.SpecialCraftingRecipe; import net.minecraft.recipe.book.CraftingRecipeCategory; import net.minecraft.registry.DynamicRegistryManager; -import net.minecraft.util.Identifier; import net.minecraft.world.World; public class TippedDaggerRecipe extends SpecialCraftingRecipe { - public TippedDaggerRecipe (Identifier id, CraftingRecipeCategory category) { - super(id, category); + public TippedDaggerRecipe (CraftingRecipeCategory category) { + super(category); } @Override diff --git a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/ExplosionEnchantment.java b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/ExplosionEnchantment.java index db41db8..8d48b2e 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/ExplosionEnchantment.java +++ b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/ExplosionEnchantment.java @@ -3,7 +3,7 @@ import com.provismet.AdditionalArmoury.AdditionalArmouryMain; import com.provismet.AdditionalArmoury.particles.effects.SpellRingParticleEffect; -import net.minecraft.advancement.Advancement; +import net.minecraft.advancement.AdvancementEntry; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; @@ -26,7 +26,7 @@ public boolean castSpell (ItemStack stack, LivingEntity user) { if (user instanceof ServerPlayerEntity serverPlayer) { try { // I don't expect this to break, and it never has in testing. But I have no idea how advancements work. - Advancement archWizard = MinecraftClient.getInstance().getServer().getAdvancementLoader().get(AdditionalArmouryMain.identifier("story/explosion_magic")); + AdvancementEntry archWizard = MinecraftClient.getInstance().getServer().getAdvancementLoader().get(AdditionalArmouryMain.identifier("story/explosion_magic")); for (String criterion : serverPlayer.getAdvancementTracker().getProgress(archWizard).getUnobtainedCriteria()) { serverPlayer.getAdvancementTracker().grantCriterion(archWizard, criterion); } diff --git a/src/main/java/com/provismet/datagen/AdditionalArmoury/AdvancementGenerator.java b/src/main/java/com/provismet/datagen/AdditionalArmoury/AdvancementGenerator.java index a7dabde..e43655b 100644 --- a/src/main/java/com/provismet/datagen/AdditionalArmoury/AdvancementGenerator.java +++ b/src/main/java/com/provismet/datagen/AdditionalArmoury/AdvancementGenerator.java @@ -1,5 +1,6 @@ package com.provismet.datagen.AdditionalArmoury; +import java.util.Optional; import java.util.function.Consumer; import com.provismet.AdditionalArmoury.AdditionalArmouryMain; @@ -9,8 +10,11 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricAdvancementProvider; import net.minecraft.advancement.Advancement; +import net.minecraft.advancement.AdvancementCriterion; +import net.minecraft.advancement.AdvancementEntry; import net.minecraft.advancement.AdvancementFrame; import net.minecraft.advancement.AdvancementRewards; +import net.minecraft.advancement.criterion.Criteria; import net.minecraft.advancement.criterion.EnchantedItemCriterion; import net.minecraft.advancement.criterion.ImpossibleCriterion; import net.minecraft.advancement.criterion.InventoryChangedCriterion; @@ -19,7 +23,6 @@ import net.minecraft.potion.PotionUtil; import net.minecraft.potion.Potions; import net.minecraft.predicate.NumberRange; -import net.minecraft.predicate.entity.LootContextPredicate; import net.minecraft.predicate.item.ItemPredicate; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -30,16 +33,16 @@ protected AdvancementGenerator (FabricDataOutput output) { } @Override - public void generateAdvancement (Consumer consumer) { + public void generateAdvancement (Consumer consumer) { ItemStack enchantedStaff = AAItems.STAFF.getDefaultStack(); enchantedStaff.addEnchantment(AAEnchantments.BOOST, 1); ItemStack bakuretsu = AAItems.STAFF.getDefaultStack(); bakuretsu.addEnchantment(AAEnchantments.EXPLOSION, 1); - EnchantedItemCriterion.Conditions staffCondition = new EnchantedItemCriterion.Conditions(LootContextPredicate.EMPTY, ItemPredicate.Builder.create().items(AAItems.STAFF).build(), NumberRange.IntRange.ANY); - Advancement enchanter = Advancement.Builder.create().build(new Identifier("story/enchant_item")); - Advancement enchantStaff = Advancement.Builder.create().parent(enchanter) + AdvancementCriterion staffCondition = Criteria.ENCHANTED_ITEM.create(new EnchantedItemCriterion.Conditions(Optional.empty(), Optional.of(ItemPredicate.Builder.create().items(AAItems.STAFF).build()), NumberRange.IntRange.ANY)); + AdvancementEntry enchanter = Advancement.Builder.create().build(new Identifier("story/enchant_item")); + AdvancementEntry enchantStaff = Advancement.Builder.create().parent(enchanter) .display( enchantedStaff, this.buildTranslationKey("enchant_staff.title"), @@ -64,10 +67,10 @@ public void generateAdvancement (Consumer consumer) { true, false ) - .criterion("used_explosion_magic", new ImpossibleCriterion.Conditions()) + .criterion("used_explosion_magic", Criteria.IMPOSSIBLE.create(new ImpossibleCriterion.Conditions())) .build(consumer, AdditionalArmouryMain.identifier("story/explosion_magic").toString()); - Advancement dragonBreath = Advancement.Builder.create().build(new Identifier("end/dragon_breath")); + AdvancementEntry dragonBreath = Advancement.Builder.create().build(new Identifier("end/dragon_breath")); Advancement.Builder.create().parent(dragonBreath) .display( PotionUtil.setPotion(AAItems.DIAMOND_DAGGER.getDefaultStack(), Potions.POISON), @@ -82,7 +85,7 @@ public void generateAdvancement (Consumer consumer) { .criterion("crafted_tipped_dagger", RecipeCraftedCriterion.Conditions.create(AdditionalArmouryMain.identifier("tipped_dagger"))) .build(consumer, AdditionalArmouryMain.identifier("end/craft_tipped_dagger").toString()); - Advancement ancientDebris = Advancement.Builder.create().build(new Identifier("nether/obtain_ancient_debris")); + AdvancementEntry ancientDebris = Advancement.Builder.create().build(new Identifier("nether/obtain_ancient_debris")); Advancement.Builder.create().parent(ancientDebris) .display( AAItems.OVERNETHER_CHESTPLATE, diff --git a/src/main/java/com/provismet/datagen/AdditionalArmoury/LanguageGenerator.java b/src/main/java/com/provismet/datagen/AdditionalArmoury/LanguageGenerator.java index ac30ded..3014429 100644 --- a/src/main/java/com/provismet/datagen/AdditionalArmoury/LanguageGenerator.java +++ b/src/main/java/com/provismet/datagen/AdditionalArmoury/LanguageGenerator.java @@ -32,10 +32,12 @@ public void generateTranslations (TranslationBuilder translationBuilder) { translationBuilder.add(AAItems.OVERNETHER_BLOCK, "Overnether Block"); translationBuilder.add(AAItems.ENDERNETHER_BLOCK, "Endernether Block"); + translationBuilder.add(AAItems.OVERNETHER_UPGRADE_SMITHING_TEMPLATE, "Smithing Template"); translationBuilder.add("upgrade.additional-armoury.overnether_upgrade", "Overnether Upgrade"); translationBuilder.add("item.additional-armoury.overnether_upgrade.ingredients", "Overnether Ingot"); translationBuilder.add("item.additional-armoury.overnether_upgrade.addition", "Add Overnether Ingot"); + translationBuilder.add(AAItems.ENDERNETHER_UPGRADE_SMITHING_TEMPLATE, "Smithing Template"); translationBuilder.add("upgrade.additional-armoury.endernether_upgrade", "Endernether Upgrade"); translationBuilder.add("item.additional-armoury.endernether_upgrade.ingredients", "Endernether Ingot"); translationBuilder.add("item.additional-armoury.endernether_upgrade.addition", "Add Endernether Ingot"); diff --git a/src/main/java/com/provismet/datagen/AdditionalArmoury/RecipeGenerator.java b/src/main/java/com/provismet/datagen/AdditionalArmoury/RecipeGenerator.java index 49fca9f..dddba25 100644 --- a/src/main/java/com/provismet/datagen/AdditionalArmoury/RecipeGenerator.java +++ b/src/main/java/com/provismet/datagen/AdditionalArmoury/RecipeGenerator.java @@ -1,7 +1,5 @@ package com.provismet.datagen.AdditionalArmoury; -import java.util.function.Consumer; - import com.provismet.AdditionalArmoury.AdditionalArmouryMain; import com.provismet.AdditionalArmoury.items.DaggerItem; import com.provismet.AdditionalArmoury.items.MaceItem; @@ -12,7 +10,7 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; import net.minecraft.data.server.recipe.ComplexRecipeJsonBuilder; -import net.minecraft.data.server.recipe.RecipeJsonProvider; +import net.minecraft.data.server.recipe.RecipeExporter; import net.minecraft.data.server.recipe.RecipeProvider; import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; @@ -33,7 +31,7 @@ public RecipeGenerator (FabricDataOutput output) { } @Override - public void generate (Consumer exporter) { + public void generate (RecipeExporter exporter) { RecipeGenerator.offerOvernetherUpgradeRecipe(exporter, Items.DIAMOND_SWORD, RecipeCategory.COMBAT, AAItems.OVERNETHER_SWORD); RecipeGenerator.offerEndernetherUpgradeRecipe(exporter, Items.DIAMOND_SWORD, RecipeCategory.COMBAT, AAItems.ENDERNETHER_SWORD); RecipeGenerator.offerOvernetherUpgradeRecipe(exporter, Items.DIAMOND_AXE, RecipeCategory.COMBAT, AAItems.OVERNETHER_AXE); @@ -94,7 +92,7 @@ public void generate (Consumer exporter) { RecipeGenerator.offerReversibleCompactingRecipe(exporter, AAItems.ENDERNETHER_INGOT, AAItems.ENDERNETHER_BLOCK); } - public static void offerDaggerRecipe (DaggerItem dagger, Item material, Consumer exporter) { + public static void offerDaggerRecipe (DaggerItem dagger, Item material, RecipeExporter exporter) { ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, dagger) .pattern("i") .pattern("s") @@ -114,7 +112,7 @@ public static ShapedRecipeJsonBuilder createDaggerRecipe (DaggerItem dagger, Tag .criterion(FabricRecipeProvider.hasItem(Items.STICK), FabricRecipeProvider.conditionsFromItem(Items.STICK)); } - public static void offerDaggerRecipe (DaggerItem dagger, TagKey tag, ItemConvertible baseTagItem, Consumer exporter) { + public static void offerDaggerRecipe (DaggerItem dagger, TagKey tag, ItemConvertible baseTagItem, RecipeExporter exporter) { ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, dagger) .pattern("i") .pattern("s") @@ -125,7 +123,7 @@ public static void offerDaggerRecipe (DaggerItem dagger, TagKey tag, ItemC .offerTo(exporter); } - public static void offerMaceRecipe (MaceItem mace, Item material, Consumer exporter) { + public static void offerMaceRecipe (MaceItem mace, Item material, RecipeExporter exporter) { ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, mace) .pattern(" i ") .pattern("isi") @@ -137,7 +135,7 @@ public static void offerMaceRecipe (MaceItem mace, Item material, Consumer tag, ItemConvertible baseTagItem, Consumer exporter) { + public static void offerMaceRecipe (MaceItem mace, TagKey tag, ItemConvertible baseTagItem, RecipeExporter exporter) { ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, mace) .pattern(" i ") .pattern("isi") @@ -159,19 +157,19 @@ public static ShapedRecipeJsonBuilder createMaceRecipe (MaceItem mace, TagKey exporter, Item input, RecipeCategory category, Item result) { + public static void offerOvernetherUpgradeRecipe(RecipeExporter exporter, Item input, RecipeCategory category, Item result) { SmithingTransformRecipeJsonBuilder.create(Ingredient.ofItems(AAItems.OVERNETHER_UPGRADE_SMITHING_TEMPLATE), Ingredient.ofItems(input), Ingredient.ofItems(AAItems.OVERNETHER_INGOT), category, result) .criterion(FabricRecipeProvider.hasItem(AAItems.OVERNETHER_INGOT), FabricRecipeProvider.conditionsFromItem(AAItems.OVERNETHER_INGOT)) .offerTo(exporter, RecipeProvider.getItemPath(result) + "_smithing"); } - public static void offerEndernetherUpgradeRecipe(Consumer exporter, Item input, RecipeCategory category, Item result) { + public static void offerEndernetherUpgradeRecipe(RecipeExporter exporter, Item input, RecipeCategory category, Item result) { SmithingTransformRecipeJsonBuilder.create(Ingredient.ofItems(AAItems.ENDERNETHER_UPGRADE_SMITHING_TEMPLATE), Ingredient.ofItems(input), Ingredient.ofItems(AAItems.ENDERNETHER_INGOT), category, result) .criterion(FabricRecipeProvider.hasItem(AAItems.ENDERNETHER_INGOT), FabricRecipeProvider.conditionsFromItem(AAItems.ENDERNETHER_INGOT)) .offerTo(exporter, RecipeProvider.getItemPath(result) + "_smithing"); } - private static void offerReversibleCompactingRecipe (Consumer exporter, Item input, Item result) { + private static void offerReversibleCompactingRecipe (RecipeExporter exporter, Item input, Item result) { ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, result) .input(input, 9) .criterion(FabricRecipeProvider.hasItem(input), FabricRecipeProvider.conditionsFromItem(input)) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ccbfb60..16b5f76 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -34,7 +34,7 @@ ], "depends": { "fabricloader": ">=0.15.0", - "minecraft": "~1.20 <1.20.2", + "minecraft": "1.20.2", "java": ">=17", "fabric-api": "*", "combat-plus": "*"