Merge pull request #1 from Provismet/1.20

Final Pre-Release Updates
Provismet · Feb 15, 2024 · fc523ab · fc523ab
2 parents 5345de0 + f2077f8
commit fc523ab
Show file tree

Hide file tree

Showing 67 changed files with 192 additions and 156 deletions.
diff --git 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.2
-yarn_mappings=1.20.2+build.4
-loader_version=0.15.6
+minecraft_version=1.20.1
+yarn_mappings=1.20.1+build.10
+loader_version=0.15.3
 
 # 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.6+1.20.2
+fabric_version=0.91.0+1.20.1
 fabric_asm_version=v2.3
-combatplus_version=0.7.0-mc1.20.1
+combatplus_version=1.0.0-mc1.20.1
 lilylib_version=1.1.3-mc1.20
diff --git a/src/main/generated/assets/additional-armoury/lang/en_us.json b/src/main/generated/assets/additional-armoury/lang/en_us.json
@@ -147,6 +147,7 @@
   "item.additional-armoury.golden_dagger.effect.water": "Wet Golden Dagger",
   "item.additional-armoury.golden_dagger.effect.water_breathing": "Water Breathing-Tipped Golden Dagger",
   "item.additional-armoury.golden_dagger.effect.weakness": "Weakness-Tipped Golden Dagger",
+  "item.additional-armoury.golden_mace": "Golden Mace",
   "item.additional-armoury.iron_dagger": "Iron Dagger",
   "item.additional-armoury.iron_dagger.effect.awkward": "Iron Dagger",
   "item.additional-armoury.iron_dagger.effect.fire_resistance": "Fire Resistance-Tipped Iron Dagger",

diff --git a/...rated/data/additional-armoury/advancements/recipes/building_blocks/endernether_block.json b/...rated/data/additional-armoury/advancements/recipes/building_blocks/endernether_block.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_endernether_ingot"
+      "has_endernether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...erated/data/additional-armoury/advancements/recipes/building_blocks/overnether_block.json b/...erated/data/additional-armoury/advancements/recipes/building_blocks/overnether_block.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_overnether_ingot"
+      "has_overnether_ingot",
+      "has_the_recipe"
     ]
   ],
   "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
@@ -32,9 +32,9 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
       "has_stick",
-      "has_diamond"
+      "has_diamond",
+      "has_the_recipe"
     ]
   ],
   "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
@@ -32,9 +32,9 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
       "has_stick",
-      "has_diamond"
+      "has_diamond",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...nerated/data/additional-armoury/advancements/recipes/combat/endernether_axe_smithing.json b/...nerated/data/additional-armoury/advancements/recipes/combat/endernether_axe_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_endernether_ingot"
+      "has_endernether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...rated/data/additional-armoury/advancements/recipes/combat/endernether_boots_smithing.json b/...rated/data/additional-armoury/advancements/recipes/combat/endernether_boots_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_endernether_ingot"
+      "has_endernether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/.../data/additional-armoury/advancements/recipes/combat/endernether_chestplate_smithing.json b/.../data/additional-armoury/advancements/recipes/combat/endernether_chestplate_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_endernether_ingot"
+      "has_endernether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...ated/data/additional-armoury/advancements/recipes/combat/endernether_dagger_smithing.json b/...ated/data/additional-armoury/advancements/recipes/combat/endernether_dagger_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_endernether_ingot"
+      "has_endernether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...ated/data/additional-armoury/advancements/recipes/combat/endernether_helmet_smithing.json b/...ated/data/additional-armoury/advancements/recipes/combat/endernether_helmet_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_endernether_ingot"
+      "has_endernether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...nerated/data/additional-armoury/advancements/recipes/combat/endernether_hoe_smithing.json b/...nerated/data/additional-armoury/advancements/recipes/combat/endernether_hoe_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_endernether_ingot"
+      "has_endernether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...ed/data/additional-armoury/advancements/recipes/combat/endernether_leggings_smithing.json b/...ed/data/additional-armoury/advancements/recipes/combat/endernether_leggings_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_endernether_ingot"
+      "has_endernether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...erated/data/additional-armoury/advancements/recipes/combat/endernether_mace_smithing.json b/...erated/data/additional-armoury/advancements/recipes/combat/endernether_mace_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_endernether_ingot"
+      "has_endernether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...ted/data/additional-armoury/advancements/recipes/combat/endernether_pickaxe_smithing.json b/...ted/data/additional-armoury/advancements/recipes/combat/endernether_pickaxe_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_endernether_ingot"
+      "has_endernether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...ated/data/additional-armoury/advancements/recipes/combat/endernether_shovel_smithing.json b/...ated/data/additional-armoury/advancements/recipes/combat/endernether_shovel_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_endernether_ingot"
+      "has_endernether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...rated/data/additional-armoury/advancements/recipes/combat/endernether_sword_smithing.json b/...rated/data/additional-armoury/advancements/recipes/combat/endernether_sword_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_endernether_ingot"
+      "has_endernether_ingot",
+      "has_the_recipe"
     ]
   ],
   "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
@@ -32,9 +32,9 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
       "has_stick",
-      "has_gold_ingot"
+      "has_gold_ingot",
+      "has_the_recipe"
     ]
   ],
   "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
@@ -32,9 +32,9 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
       "has_stick",
-      "has_gold_ingot"
+      "has_gold_ingot",
+      "has_the_recipe"
     ]
   ],
   "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
@@ -32,9 +32,9 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
       "has_stick",
-      "has_iron_ingot"
+      "has_iron_ingot",
+      "has_the_recipe"
     ]
   ],
   "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
@@ -32,9 +32,9 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
       "has_stick",
-      "has_iron_ingot"
+      "has_iron_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...erated/data/additional-armoury/advancements/recipes/combat/netherite_dagger_smithing.json b/...erated/data/additional-armoury/advancements/recipes/combat/netherite_dagger_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_netherite_ingot"
+      "has_netherite_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...enerated/data/additional-armoury/advancements/recipes/combat/netherite_mace_smithing.json b/...enerated/data/additional-armoury/advancements/recipes/combat/netherite_mace_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_netherite_ingot"
+      "has_netherite_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...enerated/data/additional-armoury/advancements/recipes/combat/overnether_axe_smithing.json b/...enerated/data/additional-armoury/advancements/recipes/combat/overnether_axe_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_overnether_ingot"
+      "has_overnether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...erated/data/additional-armoury/advancements/recipes/combat/overnether_boots_smithing.json b/...erated/data/additional-armoury/advancements/recipes/combat/overnether_boots_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_overnether_ingot"
+      "has_overnether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...d/data/additional-armoury/advancements/recipes/combat/overnether_chestplate_smithing.json b/...d/data/additional-armoury/advancements/recipes/combat/overnether_chestplate_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_overnether_ingot"
+      "has_overnether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...rated/data/additional-armoury/advancements/recipes/combat/overnether_dagger_smithing.json b/...rated/data/additional-armoury/advancements/recipes/combat/overnether_dagger_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_overnether_ingot"
+      "has_overnether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...rated/data/additional-armoury/advancements/recipes/combat/overnether_helmet_smithing.json b/...rated/data/additional-armoury/advancements/recipes/combat/overnether_helmet_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_overnether_ingot"
+      "has_overnether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...enerated/data/additional-armoury/advancements/recipes/combat/overnether_hoe_smithing.json b/...enerated/data/additional-armoury/advancements/recipes/combat/overnether_hoe_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_overnether_ingot"
+      "has_overnether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...ted/data/additional-armoury/advancements/recipes/combat/overnether_leggings_smithing.json b/...ted/data/additional-armoury/advancements/recipes/combat/overnether_leggings_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_overnether_ingot"
+      "has_overnether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...nerated/data/additional-armoury/advancements/recipes/combat/overnether_mace_smithing.json b/...nerated/data/additional-armoury/advancements/recipes/combat/overnether_mace_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_overnether_ingot"
+      "has_overnether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...ated/data/additional-armoury/advancements/recipes/combat/overnether_pickaxe_smithing.json b/...ated/data/additional-armoury/advancements/recipes/combat/overnether_pickaxe_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_overnether_ingot"
+      "has_overnether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...rated/data/additional-armoury/advancements/recipes/combat/overnether_shovel_smithing.json b/...rated/data/additional-armoury/advancements/recipes/combat/overnether_shovel_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_overnether_ingot"
+      "has_overnether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {

diff --git a/...erated/data/additional-armoury/advancements/recipes/combat/overnether_sword_smithing.json b/...erated/data/additional-armoury/advancements/recipes/combat/overnether_sword_smithing.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_the_recipe",
-      "has_overnether_ingot"
+      "has_overnether_ingot",
+      "has_the_recipe"
     ]
   ],
   "rewards": {