From 9d2eae4e5148f2a53d8fa772f91c6d321bc15d53 Mon Sep 17 00:00:00 2001 From: chronosacaria Date: Mon, 19 Aug 2024 00:56:39 -0400 Subject: [PATCH] Rearranged JEED Compat - Moved content from JEED Compat datapack into the `data` directory to allow for automatic support --- src/main/resources/assets/mcdar/lang/en_us.json | 13 +++++++++---- .../jeed_compat => data}/mcdar/recipes/charmed.json | 0 .../mcdar/recipes/shielding.json | 0 .../mcdar/recipes/soul_protection.json | 0 .../jeed_compat => data}/mcdar/recipes/stunned.json | 0 .../resources/datapacks/jeed_compat/pack.mcmeta | 6 ------ 6 files changed, 9 insertions(+), 10 deletions(-) rename src/main/resources/{datapacks/jeed_compat => data}/mcdar/recipes/charmed.json (100%) rename src/main/resources/{datapacks/jeed_compat => data}/mcdar/recipes/shielding.json (100%) rename src/main/resources/{datapacks/jeed_compat => data}/mcdar/recipes/soul_protection.json (100%) rename src/main/resources/{datapacks/jeed_compat => data}/mcdar/recipes/stunned.json (100%) delete mode 100644 src/main/resources/datapacks/jeed_compat/pack.mcmeta diff --git a/src/main/resources/assets/mcdar/lang/en_us.json b/src/main/resources/assets/mcdar/lang/en_us.json index caeae02..6ddbee8 100644 --- a/src/main/resources/assets/mcdar/lang/en_us.json +++ b/src/main/resources/assets/mcdar/lang/en_us.json @@ -50,10 +50,15 @@ "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." + "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.", + + "effect.mcdar.shielding.desc": "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.desc": "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.desc": "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.desc": "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", diff --git a/src/main/resources/datapacks/jeed_compat/mcdar/recipes/charmed.json b/src/main/resources/data/mcdar/recipes/charmed.json similarity index 100% rename from src/main/resources/datapacks/jeed_compat/mcdar/recipes/charmed.json rename to src/main/resources/data/mcdar/recipes/charmed.json diff --git a/src/main/resources/datapacks/jeed_compat/mcdar/recipes/shielding.json b/src/main/resources/data/mcdar/recipes/shielding.json similarity index 100% rename from src/main/resources/datapacks/jeed_compat/mcdar/recipes/shielding.json rename to src/main/resources/data/mcdar/recipes/shielding.json diff --git a/src/main/resources/datapacks/jeed_compat/mcdar/recipes/soul_protection.json b/src/main/resources/data/mcdar/recipes/soul_protection.json similarity index 100% rename from src/main/resources/datapacks/jeed_compat/mcdar/recipes/soul_protection.json rename to src/main/resources/data/mcdar/recipes/soul_protection.json diff --git a/src/main/resources/datapacks/jeed_compat/mcdar/recipes/stunned.json b/src/main/resources/data/mcdar/recipes/stunned.json similarity index 100% rename from src/main/resources/datapacks/jeed_compat/mcdar/recipes/stunned.json rename to src/main/resources/data/mcdar/recipes/stunned.json diff --git a/src/main/resources/datapacks/jeed_compat/pack.mcmeta b/src/main/resources/datapacks/jeed_compat/pack.mcmeta deleted file mode 100644 index 61a1580..0000000 --- a/src/main/resources/datapacks/jeed_compat/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "description": "MCDAR JEED compatibility", - "pack_format": 15 - } -}