From a96e3f0d4172f375639bcf989a6fe1d1c28d9498 Mon Sep 17 00:00:00 2001 From: Cicopath <61031176+Cicopath@users.noreply.github.com> Date: Sat, 17 Aug 2024 06:40:38 -0400 Subject: [PATCH 1/7] Create charmed.json --- .../jeed_compat/mcdar/recipes/charmed.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/main/resources/datapacks/jeed_compat/mcdar/recipes/charmed.json diff --git a/src/main/resources/datapacks/jeed_compat/mcdar/recipes/charmed.json b/src/main/resources/datapacks/jeed_compat/mcdar/recipes/charmed.json new file mode 100644 index 0000000..5e60bd0 --- /dev/null +++ b/src/main/resources/datapacks/jeed_compat/mcdar/recipes/charmed.json @@ -0,0 +1,17 @@ +{ + "type": "jeed:effect_provider", + "effect": "mcdar:charmed", + "providers": [ + { + "item": "mcdar:love_medallion" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} From ddfcf4d7e56264abe7164e493a26c04c661fc313 Mon Sep 17 00:00:00 2001 From: Cicopath <61031176+Cicopath@users.noreply.github.com> Date: Sat, 17 Aug 2024 06:41:23 -0400 Subject: [PATCH 2/7] Create stunned.json --- .../jeed_compat/mcdar/recipes/stunned.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/main/resources/datapacks/jeed_compat/mcdar/recipes/stunned.json diff --git a/src/main/resources/datapacks/jeed_compat/mcdar/recipes/stunned.json b/src/main/resources/datapacks/jeed_compat/mcdar/recipes/stunned.json new file mode 100644 index 0000000..9c34224 --- /dev/null +++ b/src/main/resources/datapacks/jeed_compat/mcdar/recipes/stunned.json @@ -0,0 +1,17 @@ +{ + "type": "jeed:effect_provider", + "effect": "mcdar:stunned", + "providers": [ + { + "item": "mcdar:shock_powder" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} From a7a742381e306023f2e367f95d5c91af164009e8 Mon Sep 17 00:00:00 2001 From: Cicopath <61031176+Cicopath@users.noreply.github.com> Date: Sat, 17 Aug 2024 06:41:52 -0400 Subject: [PATCH 3/7] Create soul_protection.json --- .../mcdar/recipes/soul_protection.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/main/resources/datapacks/jeed_compat/mcdar/recipes/soul_protection.json diff --git a/src/main/resources/datapacks/jeed_compat/mcdar/recipes/soul_protection.json b/src/main/resources/datapacks/jeed_compat/mcdar/recipes/soul_protection.json new file mode 100644 index 0000000..925c4ab --- /dev/null +++ b/src/main/resources/datapacks/jeed_compat/mcdar/recipes/soul_protection.json @@ -0,0 +1,17 @@ +{ + "type": "jeed:effect_provider", + "effect": "mcdar:soul_protection", + "providers": [ + { + "item": "mcdar:totem_of_soul_protection" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} From aa01e1422661c9c1fc3f449d17088f4c02ab76d1 Mon Sep 17 00:00:00 2001 From: Cicopath <61031176+Cicopath@users.noreply.github.com> Date: Sat, 17 Aug 2024 06:42:24 -0400 Subject: [PATCH 4/7] Create shielding.json --- .../jeed_compat/mcdar/recipes/shielding.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/main/resources/datapacks/jeed_compat/mcdar/recipes/shielding.json diff --git a/src/main/resources/datapacks/jeed_compat/mcdar/recipes/shielding.json b/src/main/resources/datapacks/jeed_compat/mcdar/recipes/shielding.json new file mode 100644 index 0000000..3578ca2 --- /dev/null +++ b/src/main/resources/datapacks/jeed_compat/mcdar/recipes/shielding.json @@ -0,0 +1,17 @@ +{ + "type": "jeed:effect_provider", + "effect": "mcdar:shielding", + "providers": [ + { + "item": "mcdar:totem_of_shielding" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} From 254c7d13b3d0214b1f44531ddfc68e0c5b434282 Mon Sep 17 00:00:00 2001 From: Cicopath <61031176+Cicopath@users.noreply.github.com> Date: Sat, 17 Aug 2024 06:45:46 -0400 Subject: [PATCH 5/7] Create pack.mcmeta --- src/main/resources/datapacks/jeed_compat/pack.mcmeta | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/main/resources/datapacks/jeed_compat/pack.mcmeta diff --git a/src/main/resources/datapacks/jeed_compat/pack.mcmeta b/src/main/resources/datapacks/jeed_compat/pack.mcmeta new file mode 100644 index 0000000..6677e33 --- /dev/null +++ b/src/main/resources/datapacks/jeed_compat/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "MCDAR JEED compatibility", + "pack_format": 26 + } +} From 1ee425cddca9f93b50870641a7b71dabbec77903 Mon Sep 17 00:00:00 2001 From: Cicopath <61031176+Cicopath@users.noreply.github.com> Date: Sat, 17 Aug 2024 06:47:16 -0400 Subject: [PATCH 6/7] Update pack.mcmeta --- src/main/resources/datapacks/jeed_compat/pack.mcmeta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/datapacks/jeed_compat/pack.mcmeta b/src/main/resources/datapacks/jeed_compat/pack.mcmeta index 6677e33..61a1580 100644 --- a/src/main/resources/datapacks/jeed_compat/pack.mcmeta +++ b/src/main/resources/datapacks/jeed_compat/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "MCDAR JEED compatibility", - "pack_format": 26 + "pack_format": 15 } } From 9099902cc05f121d8168165efe11ffb2f6671bc9 Mon Sep 17 00:00:00 2001 From: Cicopath <61031176+Cicopath@users.noreply.github.com> Date: Sat, 17 Aug 2024 07:00:21 -0400 Subject: [PATCH 7/7] Update en_us.json --- src/main/resources/assets/mcdar/lang/en_us.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/mcdar/lang/en_us.json b/src/main/resources/assets/mcdar/lang/en_us.json index 0450198..caeae02 100644 --- a/src/main/resources/assets/mcdar/lang/en_us.json +++ b/src/main/resources/assets/mcdar/lang/en_us.json @@ -48,6 +48,12 @@ "effect.mcdar.shielding": "Shielding", "effect.mcdar.soul_protection": "Soul Protection", "effect.mcdar.stunned": "Stunned", + "effect.mcdar.chrmed": "Charmed", + + "effect.mcdar.shielding.description": "Protects you against all projectiles, similar to a Shield. \n\nThis effect is obtained by standing in a lingering cloud of Shielding created by a Totem of Shielding." + "effect.mcdar.soul_protection.description": "Shields you against all forms of lethal damage, similar to a Totem of Undying. When taking a lethal blow, the effect will instead prevent death and provide Absorption II, Regeneration II, and Fire Resistance II. \n\nThis effect is obtained by standing in a lingering cloud of Soul Protection created by a Totem of Soul Protection." + "effect.mcdar.stunned.description": "Completely freezes the acceleration and animation of mobs; and disables most actions, including attacking and picking up items. \n\nSome mobs can resist the effect: Witches will still be able to drink potions and players will still be able to drop items." + "effect.mcdar.charmed.description": "Inflicted neutral and hostile mobs will seek out other entities to attack. \n\nCharmed entities can attack each other, and they may also attack their inflicter. Once the effect expires, the entity will take damage. \n\nThis effect can only be inflicted onto entities." "enchantment.mcdar.beast_boss": "Beast Boss", "enchantment.mcdar.beast_burst": "Beast Burst", @@ -194,4 +200,4 @@ "tooltip_info_item.mcdar.wonderful_wheat_1": "This item has the faint smell of an", "tooltip_info_item.mcdar.wonderful_wheat_2": "open field, baked bread, and freshly", "tooltip_info_item.mcdar.wonderful_wheat_3": "cut crops." -} \ No newline at end of file +}