From 2f520ab7565513358117bc620a4d26e00de839f1 Mon Sep 17 00:00:00 2001 From: Cicopath <61031176+Cicopath@users.noreply.github.com> Date: Wed, 28 Aug 2024 20:25:43 -0400 Subject: [PATCH 1/5] JEED compat for Minecraft effects --- .../recipes/jeed_compat/minecraft/haste.json | 18 ++++++++++++++ .../jeed_compat/minecraft/invisibility.json | 18 ++++++++++++++ .../recipes/jeed_compat/minecraft/nausea.json | 18 ++++++++++++++ .../recipes/jeed_compat/minecraft/poison.json | 24 +++++++++++++++++++ .../jeed_compat/minecraft/regeneration.json | 18 ++++++++++++++ .../jeed_compat/minecraft/resistance.json | 24 +++++++++++++++++++ .../jeed_compat/minecraft/slowness.json | 21 ++++++++++++++++ .../recipes/jeed_compat/minecraft/speed.json | 24 +++++++++++++++++++ .../jeed_compat/minecraft/weakness.json | 18 ++++++++++++++ 9 files changed, 183 insertions(+) create mode 100644 src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/haste.json create mode 100644 src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/invisibility.json create mode 100644 src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/nausea.json create mode 100644 src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/poison.json create mode 100644 src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/regeneration.json create mode 100644 src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/resistance.json create mode 100644 src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/slowness.json create mode 100644 src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/speed.json create mode 100644 src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/weakness.json diff --git a/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/haste.json b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/haste.json new file mode 100644 index 0000000..efb48e7 --- /dev/null +++ b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/haste.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "type": "jeed:effect_provider", + "effect": "minecraft:haste", + "providers": [ + { + "item": "mcdar:death_cap_mushroom" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/invisibility.json b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/invisibility.json new file mode 100644 index 0000000..0a3bb07 --- /dev/null +++ b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/invisibility.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "type": "jeed:effect_provider", + "effect": "minecraft:invisibility", + "providers": [ + { + "item": "mcdar:ghost_cloak" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/nausea.json b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/nausea.json new file mode 100644 index 0000000..6b5fab9 --- /dev/null +++ b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/nausea.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "type": "jeed:effect_provider", + "effect": "minecraft:nausea", + "providers": [ + { + "item": "mcdar:satchel_of_elements" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/poison.json b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/poison.json new file mode 100644 index 0000000..444b359 --- /dev/null +++ b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/poison.json @@ -0,0 +1,24 @@ +{ + "replace": false, + "type": "jeed:effect_provider", + "effect": "minecraft:poison", + "providers": [ + { + "item": "mcdar:corrupted_seeds" + }, + { + "item": "mcdar:buzzy_nest" + }, + { + "item": "mcdar:enchanted_grass" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/regeneration.json b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/regeneration.json new file mode 100644 index 0000000..59646dc --- /dev/null +++ b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/regeneration.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "type": "jeed:effect_provider", + "effect": "minecraft:regeneration", + "providers": [ + { + "item": "mcdar:totem_of_regeneration" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/resistance.json b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/resistance.json new file mode 100644 index 0000000..a76369d --- /dev/null +++ b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/resistance.json @@ -0,0 +1,24 @@ +{ + "replace": false, + "type": "jeed:effect_provider", + "effect": "minecraft:resistance", + "providers": [ + { + "item": "mcdar:ghost_cloak" + }, + { + "item": "mcdar:iron_hide_amulet" + }, + { + "item": "mcdar:gong_of_weakening" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/slowness.json b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/slowness.json new file mode 100644 index 0000000..b61682d --- /dev/null +++ b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/slowness.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "type": "jeed:effect_provider", + "effect": "minecraft:slowness", + "providers": [ + { + "item": "mcdar:corrupted_seeds" + }, + { + "item": "mcdar:satchel_of_elements" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/speed.json b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/speed.json new file mode 100644 index 0000000..99a1020 --- /dev/null +++ b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/speed.json @@ -0,0 +1,24 @@ +{ + "replace": false, + "type": "jeed:effect_provider", + "effect": "minecraft:speed", + "providers": [ + { + "item": "mcdar:boots_of_swiftness" + }, + { + "item": "mcdar:death_cap_mushroom" + }, + { + "item": "mcdar:enchanted_grass" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/weakness.json b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/weakness.json new file mode 100644 index 0000000..e9db994 --- /dev/null +++ b/src/main/resources/data/mcdar/recipes/jeed_compat/minecraft/weakness.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "type": "jeed:effect_provider", + "effect": "minecraft:weakness", + "providers": [ + { + "item": "mcdar:gong_of_weakening" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} \ No newline at end of file From 6dfab78a9cbf15f97f519ab0993aba97fc0c2290 Mon Sep 17 00:00:00 2001 From: Cicopath <61031176+Cicopath@users.noreply.github.com> Date: Wed, 28 Aug 2024 20:27:17 -0400 Subject: [PATCH 2/5] Update and rename src/main/resources/data/mcdar/recipes/stunned.json to src/main/resources/data/mcdar/recipes/jeed_compat/mcdar/stunned.json --- .../data/mcdar/recipes/{ => jeed_compat/mcdar}/stunned.json | 3 +++ 1 file changed, 3 insertions(+) rename src/main/resources/data/mcdar/recipes/{ => jeed_compat/mcdar}/stunned.json (82%) diff --git a/src/main/resources/data/mcdar/recipes/stunned.json b/src/main/resources/data/mcdar/recipes/jeed_compat/mcdar/stunned.json similarity index 82% rename from src/main/resources/data/mcdar/recipes/stunned.json rename to src/main/resources/data/mcdar/recipes/jeed_compat/mcdar/stunned.json index 9c34224..c14d7ec 100644 --- a/src/main/resources/data/mcdar/recipes/stunned.json +++ b/src/main/resources/data/mcdar/recipes/jeed_compat/mcdar/stunned.json @@ -2,6 +2,9 @@ "type": "jeed:effect_provider", "effect": "mcdar:stunned", "providers": [ + { + "item": "mcdar:satchel_of_elements" + }, { "item": "mcdar:shock_powder" } From cf099cfecef94e0378e1823446a4c68261364a61 Mon Sep 17 00:00:00 2001 From: Cicopath <61031176+Cicopath@users.noreply.github.com> Date: Wed, 28 Aug 2024 20:35:31 -0400 Subject: [PATCH 3/5] Rename src/main/resources/data/mcdar/recipes/shielding.json to src/main/resources/data/mcdar/recipes/jeed_compat/mcdar/shielding.json --- .../data/mcdar/recipes/{ => jeed_compat/mcdar}/shielding.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/data/mcdar/recipes/{ => jeed_compat/mcdar}/shielding.json (100%) diff --git a/src/main/resources/data/mcdar/recipes/shielding.json b/src/main/resources/data/mcdar/recipes/jeed_compat/mcdar/shielding.json similarity index 100% rename from src/main/resources/data/mcdar/recipes/shielding.json rename to src/main/resources/data/mcdar/recipes/jeed_compat/mcdar/shielding.json From db94d0641d6c61fd7947741c6a85e2353728cf01 Mon Sep 17 00:00:00 2001 From: Cicopath <61031176+Cicopath@users.noreply.github.com> Date: Wed, 28 Aug 2024 20:37:04 -0400 Subject: [PATCH 4/5] Rename src/main/resources/data/mcdar/recipes/charmed.json to src/main/resources/data/mcdar/recipes/jeed_compat/mcdar/charmed.json --- .../data/mcdar/recipes/{ => jeed_compat/mcdar}/charmed.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/data/mcdar/recipes/{ => jeed_compat/mcdar}/charmed.json (100%) diff --git a/src/main/resources/data/mcdar/recipes/charmed.json b/src/main/resources/data/mcdar/recipes/jeed_compat/mcdar/charmed.json similarity index 100% rename from src/main/resources/data/mcdar/recipes/charmed.json rename to src/main/resources/data/mcdar/recipes/jeed_compat/mcdar/charmed.json From 47500bae8569bc71ea21e4096e57be4a440fe475 Mon Sep 17 00:00:00 2001 From: Cicopath <61031176+Cicopath@users.noreply.github.com> Date: Wed, 28 Aug 2024 20:40:17 -0400 Subject: [PATCH 5/5] Rename src/main/resources/data/mcdar/recipes/soul_protection.json to src/main/resources/data/mcdar/recipes/jeed_compat/mcdar/soul_protection.json --- .../mcdar/recipes/{ => jeed_compat/mcdar}/soul_protection.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/data/mcdar/recipes/{ => jeed_compat/mcdar}/soul_protection.json (100%) diff --git a/src/main/resources/data/mcdar/recipes/soul_protection.json b/src/main/resources/data/mcdar/recipes/jeed_compat/mcdar/soul_protection.json similarity index 100% rename from src/main/resources/data/mcdar/recipes/soul_protection.json rename to src/main/resources/data/mcdar/recipes/jeed_compat/mcdar/soul_protection.json