diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 471475e..ebaa8ce 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,10 +1,38 @@ -// 1.21 2024-06-19T12:48:03.4647741 Recipes +// 1.21 2024-07-21T12:25:32.8076596 Recipes +f17592b4c061b661cf746015e75f22fcf01645b6 data/modular_angelring/advancement/recipes/misc/shapeless/bat_wings.json +60e10bfceda809b0d29bccfbf515bbc8108d0a36 data/modular_angelring/advancement/recipes/misc/shapeless/big_dragon_wings.json +77aaca00c49d23276780e641d94ace386e07d571 data/modular_angelring/advancement/recipes/misc/shapeless/blue_dragon_wings.json +04a06356d896629269e200ddbdf34d5e4af4299d data/modular_angelring/advancement/recipes/misc/shapeless/butterfly_wings.json +aa6d3293522b91fdd14f9a7eb7474be41355e17c data/modular_angelring/advancement/recipes/misc/shapeless/dragon_wings.json +687ed025f23a6adfacba4eae9c34b0b8cdbdae7c data/modular_angelring/advancement/recipes/misc/shapeless/golden_wings.json +65202209cc88b99ab965dc01f3f760800da0120e data/modular_angelring/advancement/recipes/misc/shapeless/gold_wings.json +00e147d4f016b3199064d4bfd84d7493e1232b37 data/modular_angelring/advancement/recipes/misc/smithing/bat_ring.json +4f655a562774fe3a1332f8dc87f6597706350a27 data/modular_angelring/advancement/recipes/misc/smithing/big_dragon_ring.json +2dacaefa20920ee8a0a84f0012869493fb66ccdf data/modular_angelring/advancement/recipes/misc/smithing/blue_dragon_ring.json +4ce2ea21e509be494bfe97fb18e5a63cfa6b2b1b data/modular_angelring/advancement/recipes/misc/smithing/butterfly_ring.json +c6c4decb45826dd77e59331251d5b79dd73f3ee5 data/modular_angelring/advancement/recipes/misc/smithing/dragon_ring.json +f92cd203cb2f209f45649bf11c5767900f9f412e data/modular_angelring/advancement/recipes/misc/smithing/golden_ring.json +3c49e4070752f43d72430b7853a509f4ccdc8fae data/modular_angelring/advancement/recipes/misc/smithing/gold_ring.json 029b5d630f07cd1c858cabae289779749780bb82 data/modular_angelring/advancement/recipes/misc/smithing/inertia_modifier.json c3a202cab90b96fcfbca1c361ecda50bab394319 data/modular_angelring/advancement/recipes/misc/smithing/inertia_module.json a0dc22764c73d9316bb0b85b29997d9365f7b45f data/modular_angelring/advancement/recipes/misc/smithing/mining_modifier.json 8237f8dcfbee2bdcb3d8e2b89edd7d5122120bfc data/modular_angelring/advancement/recipes/misc/smithing/mining_module.json c67e97befc317e7aa403b24548e0cb56bce37945 data/modular_angelring/advancement/recipes/misc/smithing/speed_modifier.json 60d0974c62d441b44fc6d767b4d0a3996c8bdbf3 data/modular_angelring/advancement/recipes/misc/smithing/speed_module.json +338211e946079ac219f667f012a1ec5407a1a021 data/modular_angelring/recipe/shapeless/bat_wings.json +26f324fa318e69fc366290b6b420d36cc8cb6422 data/modular_angelring/recipe/shapeless/big_dragon_wings.json +05a14336ea6244f3495c28f470f3dc7eb020243e data/modular_angelring/recipe/shapeless/blue_dragon_wings.json +c0f80736525f2a785fecc2676e0cd08369b2c16e data/modular_angelring/recipe/shapeless/butterfly_wings.json +1c4c361b74109b88806af2df77b19ba925e95785 data/modular_angelring/recipe/shapeless/dragon_wings.json +812a547bade21c6bb505ac8f1a3ac889459b4604 data/modular_angelring/recipe/shapeless/golden_wings.json +3b42d7b9986dfed67044555309f1de4ff0140669 data/modular_angelring/recipe/shapeless/gold_wings.json +7a40eeb1be907f2488bbcaa9144352ab72a55836 data/modular_angelring/recipe/smithing/bat_ring.json +1a54f7ac84c1294fdec1b1a20f8be1d6ae1cc78e data/modular_angelring/recipe/smithing/big_dragon_ring.json +157320876ad579ba776b5eeaf39410c1d8e2cc7b data/modular_angelring/recipe/smithing/blue_dragon_ring.json +1669692a6804987d19da46bb68b333bf32a736cf data/modular_angelring/recipe/smithing/butterfly_ring.json +af726588555948e0f0e6e4845b1dab4f6d49eb07 data/modular_angelring/recipe/smithing/dragon_ring.json +d6169c70ce43550d661b37da27a0fa0477721504 data/modular_angelring/recipe/smithing/golden_ring.json +4024587a665571a880a0a1ccad9dd4893952329b data/modular_angelring/recipe/smithing/gold_ring.json 4a64dbc2945e0dc540683f0887cabe80f44f6b84 data/modular_angelring/recipe/smithing/inertia_modifier.json c5dc2b2592e671c413a9a829934d4499e5d361a1 data/modular_angelring/recipe/smithing/inertia_module.json d1a7a0ceb72cb10c980a74abad99a4dc9763577a data/modular_angelring/recipe/smithing/mining_modifier.json diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/bat_wings.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/bat_wings.json new file mode 100644 index 0000000..320ef1a --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/bat_wings.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_wings" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:shapeless/bat_wings" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:shapeless/bat_wings" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/big_dragon_wings.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/big_dragon_wings.json new file mode 100644 index 0000000..68cf82f --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/big_dragon_wings.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_wings" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:shapeless/big_dragon_wings" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:shapeless/big_dragon_wings" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/blue_dragon_wings.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/blue_dragon_wings.json new file mode 100644 index 0000000..a37cb8e --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/blue_dragon_wings.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_wings" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:shapeless/blue_dragon_wings" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:shapeless/blue_dragon_wings" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/butterfly_wings.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/butterfly_wings.json new file mode 100644 index 0000000..6e9ecb9 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/butterfly_wings.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_wings" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:shapeless/butterfly_wings" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:shapeless/butterfly_wings" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/dragon_wings.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/dragon_wings.json new file mode 100644 index 0000000..3823f65 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/dragon_wings.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_wings" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:shapeless/dragon_wings" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:shapeless/dragon_wings" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/gold_wings.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/gold_wings.json new file mode 100644 index 0000000..81405c1 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/gold_wings.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_wings" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:shapeless/gold_wings" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:shapeless/gold_wings" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/golden_wings.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/golden_wings.json new file mode 100644 index 0000000..64eaf76 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/golden_wings.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_wings" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:shapeless/golden_wings" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:shapeless/golden_wings" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/bat_ring.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/bat_ring.json new file mode 100644 index 0000000..784eff6 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/bat_ring.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_ring" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:smithing/bat_ring" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:smithing/bat_ring" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/big_dragon_ring.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/big_dragon_ring.json new file mode 100644 index 0000000..66089a2 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/big_dragon_ring.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_ring" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:smithing/big_dragon_ring" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:smithing/big_dragon_ring" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/blue_dragon_ring.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/blue_dragon_ring.json new file mode 100644 index 0000000..43243af --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/blue_dragon_ring.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_ring" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:smithing/blue_dragon_ring" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:smithing/blue_dragon_ring" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/butterfly_ring.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/butterfly_ring.json new file mode 100644 index 0000000..51d0f73 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/butterfly_ring.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_ring" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:smithing/butterfly_ring" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:smithing/butterfly_ring" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/dragon_ring.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/dragon_ring.json new file mode 100644 index 0000000..9ba993f --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/dragon_ring.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_ring" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:smithing/dragon_ring" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:smithing/dragon_ring" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/gold_ring.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/gold_ring.json new file mode 100644 index 0000000..6b1c979 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/gold_ring.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_ring" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:smithing/gold_ring" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:smithing/gold_ring" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/golden_ring.json b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/golden_ring.json new file mode 100644 index 0000000..211b228 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/golden_ring.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "criteria": { + "conditions": { + "items": [ + { + "items": "modular_angelring:angel_ring" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modular_angelring:smithing/golden_ring" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "criteria" + ] + ], + "rewards": { + "recipes": [ + "modular_angelring:smithing/golden_ring" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/shapeless/bat_wings.json b/src/generated/resources/data/modular_angelring/recipe/shapeless/bat_wings.json new file mode 100644 index 0000000..43a683a --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/shapeless/bat_wings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "modular_angelring:angel_wings" + }, + { + "item": "minecraft:cocoa_beans" + }, + { + "item": "minecraft:phantom_membrane" + } + ], + "result": { + "count": 1, + "id": "modular_angelring:bat_wings" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/shapeless/big_dragon_wings.json b/src/generated/resources/data/modular_angelring/recipe/shapeless/big_dragon_wings.json new file mode 100644 index 0000000..da85295 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/shapeless/big_dragon_wings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "modular_angelring:angel_wings" + }, + { + "item": "minecraft:dragon_head" + }, + { + "item": "minecraft:ender_eye" + } + ], + "result": { + "count": 1, + "id": "modular_angelring:big_dragon_wings" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/shapeless/blue_dragon_wings.json b/src/generated/resources/data/modular_angelring/recipe/shapeless/blue_dragon_wings.json new file mode 100644 index 0000000..68a2cd7 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/shapeless/blue_dragon_wings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "modular_angelring:angel_wings" + }, + { + "item": "minecraft:dragon_head" + }, + { + "item": "minecraft:light_blue_dye" + } + ], + "result": { + "count": 1, + "id": "modular_angelring:blue_dragon_wings" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/shapeless/butterfly_wings.json b/src/generated/resources/data/modular_angelring/recipe/shapeless/butterfly_wings.json new file mode 100644 index 0000000..bdd154b --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/shapeless/butterfly_wings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "modular_angelring:angel_wings" + }, + { + "item": "minecraft:glowstone_dust" + }, + { + "item": "minecraft:purple_dye" + } + ], + "result": { + "count": 1, + "id": "modular_angelring:butterfly_wings" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/shapeless/dragon_wings.json b/src/generated/resources/data/modular_angelring/recipe/shapeless/dragon_wings.json new file mode 100644 index 0000000..070a3b4 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/shapeless/dragon_wings.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "modular_angelring:angel_wings" + }, + { + "item": "minecraft:dragon_head" + }, + { + "item": "minecraft:red_dye" + }, + { + "item": "minecraft:orange_dye" + } + ], + "result": { + "count": 1, + "id": "modular_angelring:dragon_wings" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/shapeless/gold_wings.json b/src/generated/resources/data/modular_angelring/recipe/shapeless/gold_wings.json new file mode 100644 index 0000000..faa4887 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/shapeless/gold_wings.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "modular_angelring:angel_wings" + }, + { + "item": "minecraft:gold_ingot" + } + ], + "result": { + "count": 1, + "id": "modular_angelring:gold_wings" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/shapeless/golden_wings.json b/src/generated/resources/data/modular_angelring/recipe/shapeless/golden_wings.json new file mode 100644 index 0000000..a727bfb --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/shapeless/golden_wings.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "modular_angelring:angel_wings" + }, + { + "item": "minecraft:gold_ingot" + }, + { + "item": "minecraft:diamond" + } + ], + "result": { + "count": 1, + "id": "modular_angelring:golden_wings" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/smithing/bat_ring.json b/src/generated/resources/data/modular_angelring/recipe/smithing/bat_ring.json new file mode 100644 index 0000000..6119923 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/smithing/bat_ring.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "modular_angelring:bat_wings" + }, + "base": { + "item": "modular_angelring:angel_ring" + }, + "result": { + "components": { + "minecraft:custom_model_data": 1, + "modular_angelring:wing_component": "BAT" + }, + "count": 1, + "id": "modular_angelring:angel_ring" + }, + "template": { + "item": "modular_angelring:angel_ring_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/smithing/big_dragon_ring.json b/src/generated/resources/data/modular_angelring/recipe/smithing/big_dragon_ring.json new file mode 100644 index 0000000..495cc4f --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/smithing/big_dragon_ring.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "modular_angelring:big_dragon_wings" + }, + "base": { + "item": "modular_angelring:angel_ring" + }, + "result": { + "components": { + "minecraft:custom_model_data": 2, + "modular_angelring:wing_component": "BIG_DRAGON" + }, + "count": 1, + "id": "modular_angelring:angel_ring" + }, + "template": { + "item": "modular_angelring:angel_ring_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/smithing/blue_dragon_ring.json b/src/generated/resources/data/modular_angelring/recipe/smithing/blue_dragon_ring.json new file mode 100644 index 0000000..f60dd97 --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/smithing/blue_dragon_ring.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "modular_angelring:blue_dragon_wings" + }, + "base": { + "item": "modular_angelring:angel_ring" + }, + "result": { + "components": { + "minecraft:custom_model_data": 3, + "modular_angelring:wing_component": "BLUE_DRAGON" + }, + "count": 1, + "id": "modular_angelring:angel_ring" + }, + "template": { + "item": "modular_angelring:angel_ring_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/smithing/butterfly_ring.json b/src/generated/resources/data/modular_angelring/recipe/smithing/butterfly_ring.json new file mode 100644 index 0000000..37d23ca --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/smithing/butterfly_ring.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "modular_angelring:butterfly_wings" + }, + "base": { + "item": "modular_angelring:angel_ring" + }, + "result": { + "components": { + "minecraft:custom_model_data": 4, + "modular_angelring:wing_component": "BUTTERFLY" + }, + "count": 1, + "id": "modular_angelring:angel_ring" + }, + "template": { + "item": "modular_angelring:angel_ring_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/smithing/dragon_ring.json b/src/generated/resources/data/modular_angelring/recipe/smithing/dragon_ring.json new file mode 100644 index 0000000..b5571ab --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/smithing/dragon_ring.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "modular_angelring:dragon_wings" + }, + "base": { + "item": "modular_angelring:angel_ring" + }, + "result": { + "components": { + "minecraft:custom_model_data": 5, + "modular_angelring:wing_component": "DRAGON" + }, + "count": 1, + "id": "modular_angelring:angel_ring" + }, + "template": { + "item": "modular_angelring:angel_ring_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/smithing/gold_ring.json b/src/generated/resources/data/modular_angelring/recipe/smithing/gold_ring.json new file mode 100644 index 0000000..995de0c --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/smithing/gold_ring.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "modular_angelring:gold_wings" + }, + "base": { + "item": "modular_angelring:angel_ring" + }, + "result": { + "components": { + "minecraft:custom_model_data": 6, + "modular_angelring:wing_component": "GOLD" + }, + "count": 1, + "id": "modular_angelring:angel_ring" + }, + "template": { + "item": "modular_angelring:angel_ring_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modular_angelring/recipe/smithing/golden_ring.json b/src/generated/resources/data/modular_angelring/recipe/smithing/golden_ring.json new file mode 100644 index 0000000..9bed4eb --- /dev/null +++ b/src/generated/resources/data/modular_angelring/recipe/smithing/golden_ring.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "modular_angelring:golden_wings" + }, + "base": { + "item": "modular_angelring:angel_ring" + }, + "result": { + "components": { + "minecraft:custom_model_data": 7, + "modular_angelring:wing_component": "GOLDEN" + }, + "count": 1, + "id": "modular_angelring:angel_ring" + }, + "template": { + "item": "modular_angelring:angel_ring_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/java/com/leclowndu93150/modular_angelring/recipes/ModularRingRecipes.java b/src/main/java/com/leclowndu93150/modular_angelring/recipes/ModularRingRecipes.java index 11e02e3..a1675a1 100644 --- a/src/main/java/com/leclowndu93150/modular_angelring/recipes/ModularRingRecipes.java +++ b/src/main/java/com/leclowndu93150/modular_angelring/recipes/ModularRingRecipes.java @@ -4,10 +4,13 @@ import com.leclowndu93150.modular_angelring.registry.DataComponentRegistry; import com.leclowndu93150.modular_angelring.registry.ItemRegistry; import net.minecraft.core.HolderLookup; +import net.minecraft.core.component.DataComponents; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.*; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.minecraft.world.item.component.CustomModelData; +import net.minecraft.world.item.crafting.CraftingRecipe; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.SmithingTransformRecipe; import net.neoforged.bus.api.SubscribeEvent; @@ -25,6 +28,7 @@ public ModularRingRecipes(PackOutput pOutput, CompletableFuture BLANK_MODULE = ITEMS.registerSimpleItem("blank_module"); public static final DeferredItem ANGEL_WINGS = ITEMS.registerSimpleItem("angel_wings"); + public static final DeferredItem BLUE_DRAGON_WINGS = ITEMS.registerSimpleItem("blue_dragon_wings"); + public static final DeferredItem BIG_DRAGON_WINGS = ITEMS.registerSimpleItem("big_dragon_wings"); + public static final DeferredItem DRAGON_WINGS = ITEMS.registerSimpleItem("dragon_wings"); + public static final DeferredItem BUTTERFLY_WINGS = ITEMS.registerSimpleItem("butterfly_wings"); + public static final DeferredItem BAT_WINGS = ITEMS.registerSimpleItem("bat_wings"); + public static final DeferredItem GOLDEN_WINGS = ITEMS.registerSimpleItem("golden_wings"); + public static final DeferredItem GOLD_WINGS = ITEMS.registerSimpleItem("gold_wings"); public static final DeferredItem ANGEL_WINGS_BOTH = ITEMS.registerSimpleItem("angel_wings_both"); diff --git a/src/main/resources/assets/modular_angelring/lang/en_us.json b/src/main/resources/assets/modular_angelring/lang/en_us.json index 338cdad..5115881 100644 --- a/src/main/resources/assets/modular_angelring/lang/en_us.json +++ b/src/main/resources/assets/modular_angelring/lang/en_us.json @@ -7,5 +7,12 @@ "item.modular_angelring.angel_wings": "Angel's Wings", "item.modular_angelring.speed_module": "Speed Module", "item.modular_angelring.blank_module": "Blank Module", - "item.modular_angelring.angel_ring_upgrade_smithing_template": "Angel's Smithing Template" + "item.modular_angelring.angel_ring_upgrade_smithing_template": "Angel's Smithing Template", + "item.modular_angelring.bat_wings": "Bat Wings", + "item.modular_angelring.dragon_wings": "Dragon Wings", + "item.modular_angelring.big_dragon_wings": "Big Dragon Wings", + "item.modular_angelring.blue_dragon_wings": "Blue Dragon Wings", + "item.modular_angelring.butterfly_wings": "Butterfly Wings", + "item.modular_angelring.gold_wings": "Gold Wings", + "item.modular_angelring.golden_wings": "Golden Wings" } \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/angel_ring.json b/src/main/resources/assets/modular_angelring/models/item/angel_ring.json index 7b732ad..fe1d763 100644 --- a/src/main/resources/assets/modular_angelring/models/item/angel_ring.json +++ b/src/main/resources/assets/modular_angelring/models/item/angel_ring.json @@ -1,7 +1,15 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "modular_angelring:item/angel_ring" - } - } - \ No newline at end of file + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/angel_ring" + }, + "overrides": [ + { "predicate": { "custom_model_data": 1 }, "model": "modular_angelring:item/bat_ring" }, + { "predicate": { "custom_model_data": 2 }, "model": "modular_angelring:item/big_dragon_ring" }, + { "predicate": { "custom_model_data": 3 }, "model": "modular_angelring:item/blue_dragon_ring" }, + { "predicate": { "custom_model_data": 4 }, "model": "modular_angelring:item/butterfly_ring" }, + { "predicate": { "custom_model_data": 5 }, "model": "modular_angelring:item/dragon_ring" }, + { "predicate": { "custom_model_data": 6 }, "model": "modular_angelring:item/gold_ring2" }, + { "predicate": { "custom_model_data": 7 }, "model": "modular_angelring:item/golden_ring" } + ] +} diff --git a/src/main/resources/assets/modular_angelring/models/item/bat_ring.json b/src/main/resources/assets/modular_angelring/models/item/bat_ring.json new file mode 100644 index 0000000..c9fc51a --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/bat_ring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/bat_ring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/bat_wings.json b/src/main/resources/assets/modular_angelring/models/item/bat_wings.json new file mode 100644 index 0000000..132d0bd --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/bat_wings.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/bat_wings" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/big_dragon_ring.json b/src/main/resources/assets/modular_angelring/models/item/big_dragon_ring.json new file mode 100644 index 0000000..ca1b77e --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/big_dragon_ring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/big_dragon_ring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/big_dragon_wings.json b/src/main/resources/assets/modular_angelring/models/item/big_dragon_wings.json new file mode 100644 index 0000000..96ac838 --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/big_dragon_wings.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/big_dragon_wings" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/blue_dragon_ring.json b/src/main/resources/assets/modular_angelring/models/item/blue_dragon_ring.json new file mode 100644 index 0000000..513590a --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/blue_dragon_ring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/blue_dragon_ring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/blue_dragon_wings.json b/src/main/resources/assets/modular_angelring/models/item/blue_dragon_wings.json new file mode 100644 index 0000000..dc36e38 --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/blue_dragon_wings.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/blue_dragon_wings" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/butterfly_ring.json b/src/main/resources/assets/modular_angelring/models/item/butterfly_ring.json new file mode 100644 index 0000000..30a310d --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/butterfly_ring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/butterfly_ring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/butterfly_wings.json b/src/main/resources/assets/modular_angelring/models/item/butterfly_wings.json new file mode 100644 index 0000000..2017cd7 --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/butterfly_wings.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/butterfly_wings" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/dragon_ring.json b/src/main/resources/assets/modular_angelring/models/item/dragon_ring.json new file mode 100644 index 0000000..1b17e4f --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/dragon_ring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/dragon_ring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/dragon_wings.json b/src/main/resources/assets/modular_angelring/models/item/dragon_wings.json new file mode 100644 index 0000000..dc93243 --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/dragon_wings.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/dragon_wings" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/gold_ring2.json b/src/main/resources/assets/modular_angelring/models/item/gold_ring2.json new file mode 100644 index 0000000..84ff3ee --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/gold_ring2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/gold_ring2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/gold_wings.json b/src/main/resources/assets/modular_angelring/models/item/gold_wings.json new file mode 100644 index 0000000..babe03c --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/gold_wings.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/gold_wings" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/golden_ring.json b/src/main/resources/assets/modular_angelring/models/item/golden_ring.json new file mode 100644 index 0000000..950f66f --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/golden_ring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/golden_ring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/models/item/golden_wings.json b/src/main/resources/assets/modular_angelring/models/item/golden_wings.json new file mode 100644 index 0000000..bf07ce4 --- /dev/null +++ b/src/main/resources/assets/modular_angelring/models/item/golden_wings.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modular_angelring:item/golden_wings" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/modular_angelring/textures/item/bat_ring.png b/src/main/resources/assets/modular_angelring/textures/item/bat_ring.png new file mode 100644 index 0000000..3c41893 Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/bat_ring.png differ diff --git a/src/main/resources/assets/modular_angelring/textures/item/bat_wings.png b/src/main/resources/assets/modular_angelring/textures/item/bat_wings.png new file mode 100644 index 0000000..987c767 Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/bat_wings.png differ diff --git a/src/main/resources/assets/modular_angelring/textures/item/big_dragon_ring.png b/src/main/resources/assets/modular_angelring/textures/item/big_dragon_ring.png new file mode 100644 index 0000000..fcdbfa0 Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/big_dragon_ring.png differ diff --git a/src/main/resources/assets/modular_angelring/textures/item/big_dragon_wings.png b/src/main/resources/assets/modular_angelring/textures/item/big_dragon_wings.png new file mode 100644 index 0000000..d1c73c9 Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/big_dragon_wings.png differ diff --git a/src/main/resources/assets/modular_angelring/textures/item/blue_dragon_ring.png b/src/main/resources/assets/modular_angelring/textures/item/blue_dragon_ring.png new file mode 100644 index 0000000..b88f0b4 Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/blue_dragon_ring.png differ diff --git a/src/main/resources/assets/modular_angelring/textures/item/blue_dragon_wings.png b/src/main/resources/assets/modular_angelring/textures/item/blue_dragon_wings.png new file mode 100644 index 0000000..68c6e2b Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/blue_dragon_wings.png differ diff --git a/src/main/resources/assets/modular_angelring/textures/item/butterfly_ring.png b/src/main/resources/assets/modular_angelring/textures/item/butterfly_ring.png new file mode 100644 index 0000000..314e68b Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/butterfly_ring.png differ diff --git a/src/main/resources/assets/modular_angelring/textures/item/butterfly_wings.png b/src/main/resources/assets/modular_angelring/textures/item/butterfly_wings.png new file mode 100644 index 0000000..75ad146 Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/butterfly_wings.png differ diff --git a/src/main/resources/assets/modular_angelring/textures/item/dragon_ring.png b/src/main/resources/assets/modular_angelring/textures/item/dragon_ring.png new file mode 100644 index 0000000..442443c Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/dragon_ring.png differ diff --git a/src/main/resources/assets/modular_angelring/textures/item/dragon_wings.png b/src/main/resources/assets/modular_angelring/textures/item/dragon_wings.png new file mode 100644 index 0000000..ecd583a Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/dragon_wings.png differ diff --git a/src/main/resources/assets/modular_angelring/textures/item/gold_ring2.png b/src/main/resources/assets/modular_angelring/textures/item/gold_ring2.png new file mode 100644 index 0000000..f63ab2e Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/gold_ring2.png differ diff --git a/src/main/resources/assets/modular_angelring/textures/item/gold_wings.png b/src/main/resources/assets/modular_angelring/textures/item/gold_wings.png new file mode 100644 index 0000000..441da94 Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/gold_wings.png differ diff --git a/src/main/resources/assets/modular_angelring/textures/item/golden_ring.png b/src/main/resources/assets/modular_angelring/textures/item/golden_ring.png new file mode 100644 index 0000000..d59ec57 Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/golden_ring.png differ diff --git a/src/main/resources/assets/modular_angelring/textures/item/golden_wings.png b/src/main/resources/assets/modular_angelring/textures/item/golden_wings.png new file mode 100644 index 0000000..50e57f9 Binary files /dev/null and b/src/main/resources/assets/modular_angelring/textures/item/golden_wings.png differ