From ce0a28c39192136c1421bec03db970c10e58812e Mon Sep 17 00:00:00 2001 From: Leclowndu93150 Date: Sun, 21 Jul 2024 12:25:54 +0200 Subject: [PATCH] 1.2.0 update --- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 30 ++++- .../recipes/misc/shapeless/bat_wings.json | 32 +++++ .../misc/shapeless/big_dragon_wings.json | 32 +++++ .../misc/shapeless/blue_dragon_wings.json | 32 +++++ .../misc/shapeless/butterfly_wings.json | 32 +++++ .../recipes/misc/shapeless/dragon_wings.json | 32 +++++ .../recipes/misc/shapeless/gold_wings.json | 32 +++++ .../recipes/misc/shapeless/golden_wings.json | 32 +++++ .../recipes/misc/smithing/bat_ring.json | 32 +++++ .../misc/smithing/big_dragon_ring.json | 32 +++++ .../misc/smithing/blue_dragon_ring.json | 32 +++++ .../recipes/misc/smithing/butterfly_ring.json | 32 +++++ .../recipes/misc/smithing/dragon_ring.json | 32 +++++ .../recipes/misc/smithing/gold_ring.json | 32 +++++ .../recipes/misc/smithing/golden_ring.json | 32 +++++ .../recipe/shapeless/bat_wings.json | 19 +++ .../recipe/shapeless/big_dragon_wings.json | 19 +++ .../recipe/shapeless/blue_dragon_wings.json | 19 +++ .../recipe/shapeless/butterfly_wings.json | 19 +++ .../recipe/shapeless/dragon_wings.json | 22 ++++ .../recipe/shapeless/gold_wings.json | 16 +++ .../recipe/shapeless/golden_wings.json | 19 +++ .../recipe/smithing/bat_ring.json | 20 ++++ .../recipe/smithing/big_dragon_ring.json | 20 ++++ .../recipe/smithing/blue_dragon_ring.json | 20 ++++ .../recipe/smithing/butterfly_ring.json | 20 ++++ .../recipe/smithing/dragon_ring.json | 20 ++++ .../recipe/smithing/gold_ring.json | 20 ++++ .../recipe/smithing/golden_ring.json | 20 ++++ .../recipes/ModularRingRecipes.java | 109 ++++++++++++++++++ .../registry/CreativeTabRegistry.java | 9 ++ .../registry/ItemRegistry.java | 7 ++ .../assets/modular_angelring/lang/en_us.json | 9 +- .../models/item/angel_ring.json | 20 +++- .../models/item/bat_ring.json | 6 + .../models/item/bat_wings.json | 7 ++ .../models/item/big_dragon_ring.json | 6 + .../models/item/big_dragon_wings.json | 7 ++ .../models/item/blue_dragon_ring.json | 6 + .../models/item/blue_dragon_wings.json | 7 ++ .../models/item/butterfly_ring.json | 6 + .../models/item/butterfly_wings.json | 7 ++ .../models/item/dragon_ring.json | 6 + .../models/item/dragon_wings.json | 7 ++ .../models/item/gold_ring2.json | 6 + .../models/item/gold_wings.json | 7 ++ .../models/item/golden_ring.json | 6 + .../models/item/golden_wings.json | 7 ++ .../textures/item/bat_ring.png | Bin 0 -> 584 bytes .../textures/item/bat_wings.png | Bin 0 -> 407 bytes .../textures/item/big_dragon_ring.png | Bin 0 -> 680 bytes .../textures/item/big_dragon_wings.png | Bin 0 -> 585 bytes .../textures/item/blue_dragon_ring.png | Bin 0 -> 617 bytes .../textures/item/blue_dragon_wings.png | Bin 0 -> 465 bytes .../textures/item/butterfly_ring.png | Bin 0 -> 660 bytes .../textures/item/butterfly_wings.png | Bin 0 -> 519 bytes .../textures/item/dragon_ring.png | Bin 0 -> 559 bytes .../textures/item/dragon_wings.png | Bin 0 -> 425 bytes .../textures/item/gold_ring2.png | Bin 0 -> 545 bytes .../textures/item/gold_wings.png | Bin 0 -> 378 bytes .../textures/item/golden_ring.png | Bin 0 -> 596 bytes .../textures/item/golden_wings.png | Bin 0 -> 470 bytes 62 files changed, 988 insertions(+), 8 deletions(-) create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/bat_wings.json create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/big_dragon_wings.json create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/blue_dragon_wings.json create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/butterfly_wings.json create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/dragon_wings.json create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/gold_wings.json create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/shapeless/golden_wings.json create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/bat_ring.json create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/big_dragon_ring.json create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/blue_dragon_ring.json create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/butterfly_ring.json create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/dragon_ring.json create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/gold_ring.json create mode 100644 src/generated/resources/data/modular_angelring/advancement/recipes/misc/smithing/golden_ring.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/shapeless/bat_wings.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/shapeless/big_dragon_wings.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/shapeless/blue_dragon_wings.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/shapeless/butterfly_wings.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/shapeless/dragon_wings.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/shapeless/gold_wings.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/shapeless/golden_wings.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/smithing/bat_ring.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/smithing/big_dragon_ring.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/smithing/blue_dragon_ring.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/smithing/butterfly_ring.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/smithing/dragon_ring.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/smithing/gold_ring.json create mode 100644 src/generated/resources/data/modular_angelring/recipe/smithing/golden_ring.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/bat_ring.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/bat_wings.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/big_dragon_ring.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/big_dragon_wings.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/blue_dragon_ring.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/blue_dragon_wings.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/butterfly_ring.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/butterfly_wings.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/dragon_ring.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/dragon_wings.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/gold_ring2.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/gold_wings.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/golden_ring.json create mode 100644 src/main/resources/assets/modular_angelring/models/item/golden_wings.json create mode 100644 src/main/resources/assets/modular_angelring/textures/item/bat_ring.png create mode 100644 src/main/resources/assets/modular_angelring/textures/item/bat_wings.png create mode 100644 src/main/resources/assets/modular_angelring/textures/item/big_dragon_ring.png create mode 100644 src/main/resources/assets/modular_angelring/textures/item/big_dragon_wings.png create mode 100644 src/main/resources/assets/modular_angelring/textures/item/blue_dragon_ring.png create mode 100644 src/main/resources/assets/modular_angelring/textures/item/blue_dragon_wings.png create mode 100644 src/main/resources/assets/modular_angelring/textures/item/butterfly_ring.png create mode 100644 src/main/resources/assets/modular_angelring/textures/item/butterfly_wings.png create mode 100644 src/main/resources/assets/modular_angelring/textures/item/dragon_ring.png create mode 100644 src/main/resources/assets/modular_angelring/textures/item/dragon_wings.png create mode 100644 src/main/resources/assets/modular_angelring/textures/item/gold_ring2.png create mode 100644 src/main/resources/assets/modular_angelring/textures/item/gold_wings.png create mode 100644 src/main/resources/assets/modular_angelring/textures/item/golden_ring.png create mode 100644 src/main/resources/assets/modular_angelring/textures/item/golden_wings.png 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 0000000000000000000000000000000000000000..3c41893d8153db352e7a54a058883c6ac9bd0194 GIT binary patch literal 584 zcmV-O0=NB%P)Px%0!c(cR5*>*lg&;OVHAd+Z~9HY&I~_o(o&$cOiYv&L|vI^!pemS8^aP7UV;~3 zVobaMufVW?Wy1x?){P5g#f~mW+ejeTf=uV@Oy{^jv?$TFZ*r2ec%So=lLP;~R4K@l z(=Gtob@_7A`ztV8E|Mk*0HZWP7mOjcR*dIUFhQ9|J7v4e=ai?_Hq zd@r}xKLe1_#5roy+TE0TRV(}P8^$Ouq9Mlf(ZD5a1%T&|`x36dq_usYPkRmk5AJ1D zm&-idJC%2UwL;+MIX(r)4kD}-j8WJ2y@G$w0gO>tE7(DV1CWjqTsQaA;2gEtKNzA^ zrj*Lm{=x8C0oToujxI0Z0O*|iN4JeNjff*6j%=)Hf|*su3tcg~UYloPLeuLHFrLr; z!I0MOCe`IKPnRK>StYC1X>Gr`9N+Wl^#>HEJ?gc2bi30f@IwIVC9P6-#8xwv4NiXa z+5}*$nUcCn)k`@nNRo_bce-ff`2e&#U8W`{(TUKgDYey1Wqj{OO{v3(FPL0v4kH0000Px$QAtEWR5*>*lHF?CKoCaHu68ui+B69yG)>YU^8OE%7TXOZ5W5h`t6gb&AyNuO zZf`rcALsBfGw|P!yI9p!K>!FMJU;JF0@s)4l$-$=OUB0-8B4YxVvQ=-m**$pMwK99 zW69R261uLlFP}aG@crq@O3rRcP;%x7_TlOZfQN5i&1)MeV@B1H`VO;cv4Pn{>N`~3 z%(M{?u!=P)835BbE(+eVl#ErZ0r08sNXbxLZ2rfnI#M!H-^~rmm=US|Ss+qT#`zK+ zAXM@z^wqNH_w0@FcegjJ*Ma?^N85;Veo^3@N88B$(6e3#?rv}Jo9&LA=jAlDxFE79 z2qHAKIDni-HrpLu+X%pByThjGPx%Vo5|nR5*>rlgmp~aTLctzn^!;nJeD8Gmei@%h6&id@xN&5*6(va1lr=T}6L^ zi&jw-t@;}ZTC+a+$)8eLSweP?W&f@zx-*foE|1Ndd z+zs}SXxRcF5#1v8eB}gi_GX0Sf(1Y_WASADEdUx|*o?E|Es@Mvl8A1}#LWI*P7^cx zB%)iA%viGHEir7y-3hL?U!ietpC+dy*;c5Xn&tAffa<+dJSp(h!<$!|k~<%x`3o$C z4Ylm|p;fWSvfn4!Rw#x#sr1DNT{;IK$6qKBq|z6o80sY33d??<=t3StJRb3`uhG^H z(}gr=Z(AzX^-09KD(aMr7(%vznhyOIs+<+Dx88utp4ko_5#>RO4BNzTT8X z2k$XIc7f!ic9$A2Q{Nrt)a0^wQfJr*RMXSG&Fk-=8>|BwTTJZD?Gu>~$$$0$_U1N? zEhY`tfqMnCiEW3E0D3h`DqTRSvQnz7Qt84;0Xq!Z{C&nIJ%~+Ii5Qdj;L>Ir=`GKrsCK? z0mwNTJHM!AGk#Gb)P{@7tHcF8O0;lfrxXv~FYvE=crgm%A{B5ync*kFI_9351&ePx%14%?dR5*>rlTAw-Q51%sdo!7tOzmV6M`|M_X+VQ$siX*9D7bXlU*L~$(Pc}! z>_YIL6#qeYLTRv2C`yC`n;KBbry-L`a=I8(DTC|Y)#04?ea;75_}@>>g14DX%K0t; zQ)LlNcz5<{D_MHv-=9o&|m2#mg$EU+sr{mKh0&JJIX!r(pPo$O$IXvpnzI9@N_N~L=QHNSC#O{eSe1q-M7KR=L{7%^-&-;Yg zbu1gI&6^mY+SFL~3SoAgU;N;5Y>Ns*rKhGPX6uGxHb6$_G>d6v81pfJVa(Gkrj?A& zDP{xA)(w(OiU!y$K|B4J zAi;#SqD$k-1YmHjdEs6w?GZ4WVtI8)x7}eb6+h)%O4Dt3SY93e?Y?C6?^Y0{8b56j zrSP6ys5Z}HfM6Kl4KLJLJtazn1wT}#lISyiEa#D#QYqeltHl5SA6^weBBcV}RqFf! X2Y0^78IGag00000NkvXXu0mjf@VF1D literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b88f0b44121812724c98b1efbc5efc49fd0ec5ef GIT binary patch literal 617 zcmV-v0+#)WP)Px%BS}O-R5*>*lHW^{Q5eTR=k;w{o10TNr#M&UO$f7AyBZb*-dNswlQ`(Qe?Sn5 zZi1k@uDl(n6vQsA8zG3Xt4b@_Mf6JkO1DhkUwh|;{fvfibg!_Y#zu|Ce2`Sn5tpQaCaxFZCWywN%OJz zjiF>5fV6jBUYTA2z$K4T-h$a?rkRaWj)mjPv5wV=hlW zVr?uzSY@F4Er>qs?{k_I_~kJp|;wQ00000NkvXXu0mjf DZc-l^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..68c6e2b621c6beca130fb9432719e96b7dad2b31 GIT binary patch literal 465 zcmV;?0WSWDP)Px$i%CR5R5*>*lTAv)Kp2Lf8MW5drj4~o7cSh1;3Cjf&fo<+fp`JID|mt83G@JZ z0TD0Y)-I%CY_aXkr1?`!T*QjS2G@R@f%kpC=bIk}{(T96!;|iucyV^TFuW)y4o|vN z>lT4F8Nj+_3$H)n>UZA}Q7-oGpHP1I=b4os(z}1caXU z2J*GuvPDs2y=9A^Szm)RS`kGdaTGEb4l!f(>jD9;&W|x;#b7ujjzXd+#AwCx&rmoX zuv)bWx1Pi?NnqwQ31Ivw<+Td6Mhj8+1|Tx1HCmL{Dj0v714`wxSV~hW8(RRZlvWD? zGq19-#ZsEGQYr~4GB8@Px%PDw;TR5*>rlV3!A5rrgN(Ml*bldLf!9QfK=YDYD@H?O1 z_j}Hd-+})f0$@NJK9IbZy;Be_#3=*XFu`ISKmsz8|Nc+6-7^WuV6o1CHjH{g^J8tT z%l>c=*WO;|v{sAtsI;KK!$F;u>>_vTZu4OIi3}F&Liv>aBKyNVj4w>mr$;CWuHmU{ z+IQMp9-mH0aE(4a!uY}@{ox+0t#zpah~5lW8!i(uM!3{>lph~o$&+16064@^(wijb zr=|atPdt8RU<}z?p`ZQt!G!a<+!WWd(rRutQmODW2tb63&tj zZR0Y%04OOt!Pw~3q4(|;|GnRfvC%0~b^-+;fR51{qt341QB7~MYS{?k2q7G?YT5gR zb#^^QZ;Sx?4hzr`Z6ttB=TP&$TX&m^l!}y6k=<=79$yQqmQCkSGXZouqKyEk?wpOw z^wJS+WMXiJ<4rcn`Dx0kOKGkKkFN!%teoWREdVC&&u}Gr5tr%3owHH>{&Ep9Mx+tB zNy<)eEL|mH@%OTuZ@ZVC1|SyC@iSc|Qg%YROfL~*gsRG*P&dAQ#_i-;nacq1!7Ac> ztq`$zPX5`n%775_Z;Aj|nakkL*;t$Fh<2rw3N6G&)|3Fh6ql&E@cQr=0!uH>am2|> ufC?=nHnQfPx$!AV3xR5*>rlRZl#K^Vt>GfTvTT}c@(Q3g_^O(h8V0%9ux%f!l%CLn|~wnso% z(Gx4vC|D>6g5SW8V6&`Y7joPk2S>ytSB(2|#Tt)87t4FPng7f4f1Y9Bf0qDgo4tQ7 zzf3>BOMZ_h+h&h)UID~FJPv=Qc6-5MATH+>ZL^0g=M}?8KWZR)nOJ*QVnL&gl*N~;O>Z4wZXUPk5~eT=9t~?4yV4IDxTM= zZ?oIoK{UqzNC3mJ2rEfv@3)&Oo?~HUg5g++fu~*e`zNm?D_UY>Ve^f6V__33T6#V2 z_fPP&nNO_vDNai;kx%ieUc+vlQ$+n8p+2ZlM6uOf|8NIe-F1p6>VsNh zkP9@1V^JT}I6OZ4(BSa+jQXI4;aKDXja*qNi;lgA;aGUuWl>~Bns`xUg{NH%$D(8J zQ7Dvz9Deo51)BTo8MpfCjrdky@f^+oxW68g3pAsj-;tRpWZA5Ui-&#^iPRk; ziOB_;i-$hTW<_M85P2EhFq%4$d@PZP!c>D7OaNjub-0Xf_yf32wY=p>=#&5e002ov JPDHLkV1nGM>x=*Z literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..442443ce8ac6322a4619fec98dee771abb13fb66 GIT binary patch literal 559 zcmV+~0?_@5P)Px$=}AOER5*>*lfP>dVI0Ok@7=|Vrj)4Zr45%5EP|ko&HV=sQiN_Dn@uPrgCGv= z(6Nhyi$ekqk|D(@;I4mxLmG($K`w|5`DM`t50<4C0VfP)B*g^oi@5roW z01!7Np~T$@ae6{VlDIkc$XW(=-;t|f9j$dbl3B~(eX|FEdCTDYr&sdY_7MO+Wt47{ z#_OWIYU<*+>C$Sq$yzHEDm|%9##>Z9>fRN0Z+2vId!NQ(no3mxz*_f-rXnm=zsR~5 z=8pG`*jb+fkgMqoJay*1ljc9~6SG`RKNrZaIXwLuCuk(bV7E!#9wLM6SxTmay~NLwN{|r1{6wVmkcLolp+A7 zvI_(lcq%tcgF>Z8Y#|`D&p+JhIJvh0HVhv}YNAwjCBKy;HL+p%a_^nOOLL61PDg(y xvGWsgec5F(Je$TrU*$tbV>vjR#DD$^zW`@(#?c>g65Rj*002ovPDHLkV1lHp`CtG5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ecd583aea9817814f9f9babb1f7f21987ca13632 GIT binary patch literal 425 zcmV;a0apHrP)Px$V@X6oR5*>*lg&y3Q5c4w`LVIGae_KBS{96pTC~uc@InGX7p=R1uAoIiSJAqQ zFv5s7Vo|A0K`}^bc04U=M#Q8RZTjGB-ap>&91i^Z(Ev*M)C72Z_VBIvJDpz2r|=vL zKz*H`MghumEK2zly60FlUIwaM5WlWnE(jVg1C>t1&_napoew~uVl#~)*J`&Z7X+>D zQ0XCQ8Px$+et)0R5*>*lf7?JQ5eR5@0Hlp3$(*6IA}jGf<#08h>LV}FzLo%VsYbNFkN)g z#rQ9DXp|1dbav?`bn}Cu)MB`%w+xhE16*xWr1y2eUZtYDCppP^o;=Sv&pGFP;lCdO zppD!wBC_;P!%1yG8#%PuLacFBr!D~1yfxH(A=^ZqIx=}ywb>GF?!gY?Q z<}J+0+W`9eG$YgfjYmh&LJ6_P)&2Ml(MC?Uo_+?vN`8^=@eupYrp6ZD1K_cWv0KAl zTjoGVWWqd8YtX)1W+|p)zEAvfEk&mTtI-vC1T>P;PcZJB7w z;!X<8$UI*39QMi+0B&9hDRlfq;@S6*;2HlX0AAW}$z}orHIQHJaW{6u$BD%mwEb1& zXJx4tN&|++FFp<6NB1udV40f*5CcG)Es?p|J~?JedE1rbR8Z)bx+JH9Qr>ojG1J#+ jvn4R37vS&xFiiIY@|Vzno{A(O00000NkvXXu0mjfh*SWi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..441da9418b526e719d6bb28611117b23f20350c5 GIT binary patch literal 378 zcmV-=0fqjFP)Px$G)Y83R5*>*lf7yJQ4oc{Srl2L?n0J;jifSyg_TY8aeRe5gzu1N@F_ICg`hTu zEkckhtgbP{sFOmoiNBjRryS0i`Q~y5{=Ec1$Bm!D&Ev(uq1V!J12qAFs{a~0apzGr z0XlAAh5a|gb5+}2LVq34Y^Tt67x7$O`0rTR(v=RHBZi$EY)LN51jv1vL32d9U~2-P zSepUx(zj#tp-GaR^tgK{17HCRJ2{4(99i!(o?tTF((Yt^6BKJRLX-RxL9sSNpL)jx zZhpz8RXrQtw5quIW#k9gdjmixeoD^L`zfvqANtFWrPH}cy%Ke`oz+Q-O{he|u^z3GxkZ&y$gh}0_zp#5jTOi%CNIU=Q7jWV8ld<$^?9!~kb Y04m9mK^%-A1^@s607*qoM6N<$g2J7pYXATM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d59ec57437141f80096bb09ca6cb0f20c894495b GIT binary patch literal 596 zcmV-a0;~OrP)Px%4oO5oR5*>*kWWa{VHn3h?|wg7IFQlgH_PE<;=!2979xZMvk0J^jwrv5@rbM}2b(Zc}%Vuu4f9eIqHoS4Si5Mev-lwP}!L|hTq zujy+Bd`+Km!(Ngz@hPkg5wV?jqB9#dEAYa+p5mF{wC*;5tgcgOrg$b;nAhXA``FGq zrL`e~n)%)?y>=e}R!f1c&3f6|`URVN6@W4UbeTO;%YM1FsbIAf00pnz$4q=msu$~p zLnXR<722~3t?uWf=57&*>Hu(dl`%USxf=aOcdt_M0_dv$SZ6d<`V08)zS?sspl^7T z%*O8T$IKpyWDz0CLWr_RB#RXwv$0Fx@aW}$aHz!j$r=YoYGs;dNJUDWlu{=>Ln;Q% zMIu?`;7H~CWQ}mB1b_-~$EEQ)c$eILFUqrrq?Y}d9gXxmz@WJ(n=Pc~UIFl7aFOuh zF;85dNrXUcwuD7&B`upeS4AOs1yfH4vw?N#;rP#zegI|zKhb(RL^k+|rp_P4R?^be z_E8A`J2$D02hz6wMm%!OF+OOdrCG4EFJ<+yTAGE}*_Vth<)~)Fi{#si>1EqJ0LBN6 i)Y8~e4uERrpY;o)dDVsIXW%pd0000Px$kV!;AR5*>*kG)GmQ5eR5=b9fBNFm&UgbPK3U}Ql{H3UtWOOr#xjTRTDprOA( zaIQsa2nxa}ZbQ&ylVDwn1Op)q{HTbGT;g&XN-^pLjXm2r@B4e6=Y@YS0gz5*n9wZ% zBDzIjvGwEf<8dz+jVJ(iBg*>58d^G)!SENb8&Mh2EqQ(AQl?#BxrpeNv>Q=r_zR>{ z88pLR;I=s>&2W;#eJ{;t$+kK04c;~fXg*60_q~|mB)82eIoNlD)`kI$V2itoTdEq| zRov1Dew=59lhj|wq}Cqha}LvU>iTU>&$-CwoX%V89=iJj%+5PP1<%eq!rdSE^4Bp~ zNNiFsRq%Kn61z{|;Kc3|9muz4g{ci_@% literal 0 HcmV?d00001