From 32ac0711e41e86af52871aa9f657578bd22fce39 Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Thu, 23 Jan 2025 17:01:17 +0200 Subject: [PATCH] changed florian --- CHANGELOG | 3 ++- src/main/resources/assets/terraoriginum/lang/en_us.json | 4 ++-- src/main/resources/data/terraoriginum/origins/florian.json | 3 ++- src/main/resources/data/terraoriginum/origins/munch.json | 1 - .../too_tiny.json => florian-powers/passivemobs.json} | 0 5 files changed, 6 insertions(+), 5 deletions(-) rename src/main/resources/data/terraoriginum/powers/{munch-powers/too_tiny.json => florian-powers/passivemobs.json} (100%) diff --git a/CHANGELOG b/CHANGELOG index 541014a..20df753 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,4 +6,5 @@ - Added Item "Ghostly Cloth". - Renamed java class "sun_totem" to "sunTotem" to fit convention. - added robes -- added the munch \ No newline at end of file +- added the munch +- mobs are now passive to florian \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index a7fbe77..cb2847c 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -204,6 +204,8 @@ "power.terraoriginum.florian-powers/small.description": "You are quite small and have 5 hearts because of it.", "power.terraoriginum.florian-powers/weak.name": "Weak", "power.terraoriginum.florian-powers/weak.description": "Because you are a creature of nature, you cannot do much damage.", + "power.terraoriginum.munch-powers/passivemobs.name": "Passive Mobs", + "power.terraoriginum.munch-powers/passivemobs.description": "Mobs just don't care enough to attack you.", //-----Muckunde-----// "origin.terraoriginum.muckunde.name": "Muckunde", @@ -268,8 +270,6 @@ "power.terraoriginum.munch-powers/nimble.description": "You are immune to thorns and velocity based damage. You are not slowed by blocks such as sweet berry bushes or cobwebs. You can walk on powder snow.", "power.terraoriginum.munch-powers/better_health.name": "Better Healing", "power.terraoriginum.munch-powers/better_health.description": "You heal twice as fast as the average joe, must be compensating for something.", - "power.terraoriginum.munch-powers/too_tiny.name": "Too Tiny", - "power.terraoriginum.munch-powers/too_tiny.description": "You are so small, most mobs don't even feel threatened by you, and as such, they don't attack you.", "power.terraoriginum.munch-powers/short_arms.name": "Short Arms", "power.terraoriginum.munch-powers/short_arms.description": "You are small, therefore you can't reach as far as the average joe.", "power.terraoriginum.munch-powers/tiny_motion.name": "Sized Speed", diff --git a/src/main/resources/data/terraoriginum/origins/florian.json b/src/main/resources/data/terraoriginum/origins/florian.json index 34d6ff9..7d507a7 100644 --- a/src/main/resources/data/terraoriginum/origins/florian.json +++ b/src/main/resources/data/terraoriginum/origins/florian.json @@ -13,7 +13,8 @@ "terraoriginum:florian-powers/aura_of_growth", "terraoriginum:florian-powers/pocket_sand", "terraoriginum:florian-powers/weak", - "terraoriginum:florian-powers/five_hearts" + "terraoriginum:florian-powers/five_hearts", + "terraoriginum:florian-powers/passivemobs" ], "icon": "minecraft:rose_bush", "order": 1000, diff --git a/src/main/resources/data/terraoriginum/origins/munch.json b/src/main/resources/data/terraoriginum/origins/munch.json index a2e25d8..99e5126 100644 --- a/src/main/resources/data/terraoriginum/origins/munch.json +++ b/src/main/resources/data/terraoriginum/origins/munch.json @@ -7,7 +7,6 @@ "terraoriginum:munch-powers/little_health", "terraoriginum:munch-powers/better_health", "terraoriginum:munch-powers/tiny_appetite", - "terraoriginum:munch-powers/too_tiny", "terraoriginum:munch-powers/nimble", "terraoriginum:munch-powers/quiet", "terraoriginum:munch-powers/climbing", diff --git a/src/main/resources/data/terraoriginum/powers/munch-powers/too_tiny.json b/src/main/resources/data/terraoriginum/powers/florian-powers/passivemobs.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/munch-powers/too_tiny.json rename to src/main/resources/data/terraoriginum/powers/florian-powers/passivemobs.json