From f7e9bca61007c3b4e4a9f6a106f24a1193395bbf Mon Sep 17 00:00:00 2001 From: vodofrede Date: Fri, 8 Oct 2021 11:17:57 +0200 Subject: [PATCH] Fixed copper recipes, added recipe advancement --- build.gradle | 2 +- .../assets/immersivetools/lang/en_us.json | 5 ++++ .../advancements/recipes/copper_axe.json | 25 +++++++++++++++++++ .../advancements/recipes/copper_boots.json | 25 +++++++++++++++++++ .../recipes/copper_chestplate.json | 25 +++++++++++++++++++ .../advancements/recipes/copper_helmet.json | 25 +++++++++++++++++++ .../advancements/recipes/copper_hoe.json | 25 +++++++++++++++++++ .../advancements/recipes/copper_leggings.json | 25 +++++++++++++++++++ .../advancements/recipes/copper_pickaxe.json | 25 +++++++++++++++++++ .../advancements/recipes/copper_shovel.json | 25 +++++++++++++++++++ .../advancements/recipes/copper_sword.json | 25 +++++++++++++++++++ .../advancements/recipes/flint_axe.json | 25 +++++++++++++++++++ .../advancements/recipes/flint_hoe.json | 25 +++++++++++++++++++ .../advancements/recipes/flint_pickaxe.json | 25 +++++++++++++++++++ .../advancements/recipes/flint_shovel.json | 25 +++++++++++++++++++ .../advancements/recipes/flint_sword.json | 25 +++++++++++++++++++ .../immersivetools/recipes/copper_boots.json | 3 --- .../recipes/copper_chestplate.json | 3 --- .../immersivetools/recipes/copper_helmet.json | 3 --- .../recipes/copper_leggings.json | 3 --- .../data/levelz/item/copper_armor.json | 2 +- .../data/levelz/item/copper_axe.json | 2 +- .../data/levelz/item/copper_hoe.json | 2 +- .../data/levelz/item/copper_pickaxe.json | 2 +- .../data/levelz/item/copper_sword.json | 2 +- .../resources/data/levelz/item/flint_axe.json | 2 +- .../resources/data/levelz/item/flint_hoe.json | 2 +- 27 files changed, 363 insertions(+), 20 deletions(-) create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/copper_axe.json create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/copper_boots.json create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/copper_chestplate.json create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/copper_helmet.json create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/copper_hoe.json create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/copper_leggings.json create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/copper_pickaxe.json create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/copper_shovel.json create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/copper_sword.json create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/flint_axe.json create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/flint_hoe.json create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/flint_pickaxe.json create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/flint_shovel.json create mode 100644 src/main/resources/data/immersivetools/advancements/recipes/flint_sword.json diff --git a/build.gradle b/build.gradle index dca5c8b..5554f02 100644 --- a/build.gradle +++ b/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 { diff --git a/src/main/resources/assets/immersivetools/lang/en_us.json b/src/main/resources/assets/immersivetools/lang/en_us.json index 931d000..8832229 100644 --- a/src/main/resources/assets/immersivetools/lang/en_us.json +++ b/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", diff --git a/src/main/resources/data/immersivetools/advancements/recipes/copper_axe.json b/src/main/resources/data/immersivetools/advancements/recipes/copper_axe.json new file mode 100644 index 0000000..764a855 --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/advancements/recipes/copper_boots.json b/src/main/resources/data/immersivetools/advancements/recipes/copper_boots.json new file mode 100644 index 0000000..1dd23f6 --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/advancements/recipes/copper_chestplate.json b/src/main/resources/data/immersivetools/advancements/recipes/copper_chestplate.json new file mode 100644 index 0000000..9dd2f74 --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/advancements/recipes/copper_helmet.json b/src/main/resources/data/immersivetools/advancements/recipes/copper_helmet.json new file mode 100644 index 0000000..3549923 --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/advancements/recipes/copper_hoe.json b/src/main/resources/data/immersivetools/advancements/recipes/copper_hoe.json new file mode 100644 index 0000000..5e7cd8c --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/advancements/recipes/copper_leggings.json b/src/main/resources/data/immersivetools/advancements/recipes/copper_leggings.json new file mode 100644 index 0000000..ba2b510 --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/advancements/recipes/copper_pickaxe.json b/src/main/resources/data/immersivetools/advancements/recipes/copper_pickaxe.json new file mode 100644 index 0000000..2d5cd64 --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/advancements/recipes/copper_shovel.json b/src/main/resources/data/immersivetools/advancements/recipes/copper_shovel.json new file mode 100644 index 0000000..19c7d26 --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/advancements/recipes/copper_sword.json b/src/main/resources/data/immersivetools/advancements/recipes/copper_sword.json new file mode 100644 index 0000000..43c90ee --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/advancements/recipes/flint_axe.json b/src/main/resources/data/immersivetools/advancements/recipes/flint_axe.json new file mode 100644 index 0000000..e0fa1fe --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/advancements/recipes/flint_hoe.json b/src/main/resources/data/immersivetools/advancements/recipes/flint_hoe.json new file mode 100644 index 0000000..456a09d --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/advancements/recipes/flint_pickaxe.json b/src/main/resources/data/immersivetools/advancements/recipes/flint_pickaxe.json new file mode 100644 index 0000000..ca90f86 --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/advancements/recipes/flint_shovel.json b/src/main/resources/data/immersivetools/advancements/recipes/flint_shovel.json new file mode 100644 index 0000000..971a4fb --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/advancements/recipes/flint_sword.json b/src/main/resources/data/immersivetools/advancements/recipes/flint_sword.json new file mode 100644 index 0000000..a9e1e3e --- /dev/null +++ b/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"]] +} diff --git a/src/main/resources/data/immersivetools/recipes/copper_boots.json b/src/main/resources/data/immersivetools/recipes/copper_boots.json index f72d40f..53a1f7d 100644 --- a/src/main/resources/data/immersivetools/recipes/copper_boots.json +++ b/src/main/resources/data/immersivetools/recipes/copper_boots.json @@ -4,9 +4,6 @@ "key": { "C": { "item": "minecraft:copper_ingot" - }, - "S": { - "item": "minecraft:stick" } }, "result": { diff --git a/src/main/resources/data/immersivetools/recipes/copper_chestplate.json b/src/main/resources/data/immersivetools/recipes/copper_chestplate.json index 4120367..b6cd67b 100644 --- a/src/main/resources/data/immersivetools/recipes/copper_chestplate.json +++ b/src/main/resources/data/immersivetools/recipes/copper_chestplate.json @@ -4,9 +4,6 @@ "key": { "C": { "item": "minecraft:copper_ingot" - }, - "S": { - "item": "minecraft:stick" } }, "result": { diff --git a/src/main/resources/data/immersivetools/recipes/copper_helmet.json b/src/main/resources/data/immersivetools/recipes/copper_helmet.json index 77519c7..2aa0dcb 100644 --- a/src/main/resources/data/immersivetools/recipes/copper_helmet.json +++ b/src/main/resources/data/immersivetools/recipes/copper_helmet.json @@ -4,9 +4,6 @@ "key": { "C": { "item": "minecraft:copper_ingot" - }, - "S": { - "item": "minecraft:stick" } }, "result": { diff --git a/src/main/resources/data/immersivetools/recipes/copper_leggings.json b/src/main/resources/data/immersivetools/recipes/copper_leggings.json index b988a53..56b6eb5 100644 --- a/src/main/resources/data/immersivetools/recipes/copper_leggings.json +++ b/src/main/resources/data/immersivetools/recipes/copper_leggings.json @@ -4,9 +4,6 @@ "key": { "C": { "item": "minecraft:copper_ingot" - }, - "S": { - "item": "minecraft:stick" } }, "result": { diff --git a/src/main/resources/data/levelz/item/copper_armor.json b/src/main/resources/data/levelz/item/copper_armor.json index d83dabf..0b668b5 100644 --- a/src/main/resources/data/levelz/item/copper_armor.json +++ b/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" } diff --git a/src/main/resources/data/levelz/item/copper_axe.json b/src/main/resources/data/levelz/item/copper_axe.json index 49eeee1..fe0ae08 100644 --- a/src/main/resources/data/levelz/item/copper_axe.json +++ b/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" } diff --git a/src/main/resources/data/levelz/item/copper_hoe.json b/src/main/resources/data/levelz/item/copper_hoe.json index 08302ec..c2dd657 100644 --- a/src/main/resources/data/levelz/item/copper_hoe.json +++ b/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" } diff --git a/src/main/resources/data/levelz/item/copper_pickaxe.json b/src/main/resources/data/levelz/item/copper_pickaxe.json index 8ca08af..17762e8 100644 --- a/src/main/resources/data/levelz/item/copper_pickaxe.json +++ b/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" } diff --git a/src/main/resources/data/levelz/item/copper_sword.json b/src/main/resources/data/levelz/item/copper_sword.json index c702744..937875e 100644 --- a/src/main/resources/data/levelz/item/copper_sword.json +++ b/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" } diff --git a/src/main/resources/data/levelz/item/flint_axe.json b/src/main/resources/data/levelz/item/flint_axe.json index 1f40c8e..007051a 100644 --- a/src/main/resources/data/levelz/item/flint_axe.json +++ b/src/main/resources/data/levelz/item/flint_axe.json @@ -3,5 +3,5 @@ "skill": "farming", "level": 1, "item": "minecraft:axe", - "material": "flit" + "material": "flint" } diff --git a/src/main/resources/data/levelz/item/flint_hoe.json b/src/main/resources/data/levelz/item/flint_hoe.json index 4801270..cff359c 100644 --- a/src/main/resources/data/levelz/item/flint_hoe.json +++ b/src/main/resources/data/levelz/item/flint_hoe.json @@ -3,5 +3,5 @@ "skill": "farming", "level": 1, "item": "minecraft:hoe", - "material": "hoe" + "material": "flint" }