Fixed copper recipes, added recipe advancement

build.gradle

@@ -51,7 +51,7 @@ tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = "UTF-8"
 
 	// Minecraft 1.17 (21w19a) upwards uses Java 16.
-	it.options.release = 17
+	it.options.release = 16
 }
 
 java {

src/main/resources/assets/immersivetools/lang/en_us.json

@@ -5,6 +5,11 @@
 	"item.immersivetools.copper_hoe": "Copper Hoe",
 	"item.immersivetools.copper_sword": "Copper Sword",
 
+	"item.immersivetools.copper_helmet": "Copper Helmet",
+	"item.immersivetools.copper_chestplate": "Copper Chestplate",
+	"item.immersivetools.copper_leggings": "Copper Leggings",
+	"item.immersivetools.copper_boots": "Copper Boots",
+
 	"item.immersivetools.flint_pickaxe": "Flint Pickaxe",
 	"item.immersivetools.flint_axe": "Flint Axe",
 	"item.immersivetools.flint_shovel": "Flint Shovel",

src/main/resources/data/immersivetools/advancements/recipes/copper_axe.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:copper_axe"]
+	},
+	"criteria": {
+		"has_copper": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:copper_ingot"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:copper_axe"
+			}
+		}
+	},
+	"requirements": [["has_copper", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/advancements/recipes/copper_boots.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:copper_boots"]
+	},
+	"criteria": {
+		"has_copper": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:copper_ingot"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:copper_boots"
+			}
+		}
+	},
+	"requirements": [["has_copper", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/advancements/recipes/copper_chestplate.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:copper_chestplate"]
+	},
+	"criteria": {
+		"has_copper": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:copper_ingot"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:copper_chestplate"
+			}
+		}
+	},
+	"requirements": [["has_copper", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/advancements/recipes/copper_helmet.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:copper_helmet"]
+	},
+	"criteria": {
+		"has_copper": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:copper_ingot"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:copper_helmet"
+			}
+		}
+	},
+	"requirements": [["has_copper", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/advancements/recipes/copper_hoe.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:copper_hoe"]
+	},
+	"criteria": {
+		"has_copper": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:copper_ingot"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:copper_hoe"
+			}
+		}
+	},
+	"requirements": [["has_copper", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/advancements/recipes/copper_leggings.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:copper_leggings"]
+	},
+	"criteria": {
+		"has_copper": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:copper_ingot"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:copper_leggings"
+			}
+		}
+	},
+	"requirements": [["has_copper", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/advancements/recipes/copper_pickaxe.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:copper_pickaxe"]
+	},
+	"criteria": {
+		"has_copper": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:copper_ingot"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:copper_pickaxe"
+			}
+		}
+	},
+	"requirements": [["has_copper", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/advancements/recipes/copper_shovel.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:copper_shovel"]
+	},
+	"criteria": {
+		"has_copper": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:copper_ingot"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:copper_shovel"
+			}
+		}
+	},
+	"requirements": [["has_copper", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/advancements/recipes/copper_sword.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:copper_sword"]
+	},
+	"criteria": {
+		"has_copper": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:copper_ingot"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:copper_sword"
+			}
+		}
+	},
+	"requirements": [["has_copper", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/advancements/recipes/flint_axe.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:flint_axe"]
+	},
+	"criteria": {
+		"has_flint": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:flint"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:flint_axe"
+			}
+		}
+	},
+	"requirements": [["has_flint", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/advancements/recipes/flint_hoe.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:flint_hoe"]
+	},
+	"criteria": {
+		"has_flint": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:flint"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:flint_hoe"
+			}
+		}
+	},
+	"requirements": [["has_flint", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/advancements/recipes/flint_pickaxe.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:flint_pickaxe"]
+	},
+	"criteria": {
+		"has_flint": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:flint"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:flint_pickaxe"
+			}
+		}
+	},
+	"requirements": [["has_flint", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/advancements/recipes/flint_shovel.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:flint_shovel"]
+	},
+	"criteria": {
+		"has_flint": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:flint"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:flint_shovel"
+			}
+		}
+	},
+	"requirements": [["has_flint", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/advancements/recipes/flint_sword.json

@@ -0,0 +1,25 @@
+{
+	"parent": "minecraft:recipes/root",
+	"rewards": {
+		"recipes": ["immersivetools:flint_sword"]
+	},
+	"criteria": {
+		"has_flint": {
+			"trigger": "minecraft:inventory_changed",
+			"conditions": {
+				"items": [
+					{
+						"item": "minecraft:flint"
+					}
+				]
+			}
+		},
+		"has_the_recipe": {
+			"trigger": "minecraft:recipe_unlocked",
+			"conditions": {
+				"recipe": "minecraft:flint_sword"
+			}
+		}
+	},
+	"requirements": [["has_flint", "has_the_recipe"]]
+}

src/main/resources/data/immersivetools/recipes/copper_boots.json

@@ -4,9 +4,6 @@
 	"key": {
 		"C": {
 			"item": "minecraft:copper_ingot"
-		},
-		"S": {
-			"item": "minecraft:stick"
 		}
 	},
 	"result": {

src/main/resources/data/immersivetools/recipes/copper_chestplate.json

@@ -4,9 +4,6 @@
 	"key": {
 		"C": {
 			"item": "minecraft:copper_ingot"
-		},
-		"S": {
-			"item": "minecraft:stick"
 		}
 	},
 	"result": {

src/main/resources/data/immersivetools/recipes/copper_helmet.json

@@ -4,9 +4,6 @@
 	"key": {
 		"C": {
 			"item": "minecraft:copper_ingot"
-		},
-		"S": {
-			"item": "minecraft:stick"
 		}
 	},
 	"result": {

src/main/resources/data/immersivetools/recipes/copper_leggings.json

@@ -4,9 +4,6 @@
 	"key": {
 		"C": {
 			"item": "minecraft:copper_ingot"
-		},
-		"S": {
-			"item": "minecraft:stick"
 		}
 	},
 	"result": {

src/main/resources/data/levelz/item/copper_armor.json

@@ -1,7 +1,7 @@
 {
 	"replace": false,
 	"skill": "defense",
-	"level": 2,
+	"level": 3,
 	"item": "minecraft:armor",
 	"material": "copper"
 }

src/main/resources/data/levelz/item/copper_axe.json

@@ -1,7 +1,7 @@
 {
 	"replace": false,
 	"skill": "farming",
-	"level": 2,
+	"level": 3,
 	"item": "minecraft:axe",
 	"material": "copper"
 }

src/main/resources/data/levelz/item/copper_hoe.json

@@ -1,7 +1,7 @@
 {
 	"replace": false,
 	"skill": "farming",
-	"level": 2,
+	"level": 3,
 	"item": "minecraft:hoe",
 	"material": "copper"
 }

src/main/resources/data/levelz/item/copper_pickaxe.json

@@ -1,7 +1,7 @@
 {
 	"replace": false,
 	"skill": "mining",
-	"level": 2,
+	"level": 3,
 	"item": "minecraft:tool",
 	"material": "copper"
 }

src/main/resources/data/levelz/item/copper_sword.json

@@ -1,7 +1,7 @@
 {
 	"replace": false,
 	"skill": "strength",
-	"level": 2,
+	"level": 3,
 	"item": "minecraft:sword",
 	"material": "copper"
 }

src/main/resources/data/levelz/item/flint_axe.json

@@ -3,5 +3,5 @@
 	"skill": "farming",
 	"level": 1,
 	"item": "minecraft:axe",
-	"material": "flit"
+	"material": "flint"
 }

src/main/resources/data/levelz/item/flint_hoe.json

@@ -3,5 +3,5 @@
 	"skill": "farming",
 	"level": 1,
 	"item": "minecraft:hoe",
-	"material": "hoe"
+	"material": "flint"
 }