From 1bb305693e06ff09fec272d726919e9c2f78dea0 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 24 Sep 2020 21:02:19 +0200 Subject: [PATCH] Change the death message when using too much magic --- .../java/com/minelittlepony/unicopia/entity/player/Pony.java | 4 ++-- .../com/minelittlepony/unicopia/util/MagicalDamageSource.java | 1 + src/main/resources/assets/unicopia/lang/en_us.json | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java index 755b90f3..23f97325 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java @@ -26,13 +26,13 @@ import com.minelittlepony.unicopia.network.MsgOtherPlayerCapabilities; import com.minelittlepony.unicopia.network.MsgRequestCapabilities; import com.minelittlepony.unicopia.network.Transmittable; import com.minelittlepony.unicopia.util.Copieable; +import com.minelittlepony.unicopia.util.MagicalDamageSource; import com.minelittlepony.common.util.animation.LinearInterpolator; import com.minelittlepony.common.util.animation.Interpolator; import com.mojang.authlib.GameProfile; import net.minecraft.entity.Entity; import net.minecraft.entity.attribute.DefaultAttributeContainer; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.data.TrackedDataHandlerRegistry; @@ -290,7 +290,7 @@ public class Pony implements Caster, Equine, Transmi if (food < 0) { entity.getHungerManager().add(-entity.getHungerManager().getFoodLevel(), 0); - entity.damage(DamageSource.MAGIC, -food/2); + entity.damage(MagicalDamageSource.EXHAUSTION, -food/2); } else { entity.getHungerManager().add((int)-foodSubtract, 0); } diff --git a/src/main/java/com/minelittlepony/unicopia/util/MagicalDamageSource.java b/src/main/java/com/minelittlepony/unicopia/util/MagicalDamageSource.java index 77c78ba7..cf09d5cf 100644 --- a/src/main/java/com/minelittlepony/unicopia/util/MagicalDamageSource.java +++ b/src/main/java/com/minelittlepony/unicopia/util/MagicalDamageSource.java @@ -15,6 +15,7 @@ import net.minecraft.text.TranslatableText; public class MagicalDamageSource extends EntityDamageSource { + public static final DamageSource EXHAUSTION = new MagicalDamageSource("magical_exhaustion", true, true); public static final DamageSource FOOD_POISONING = mundane("food_poisoning"); public static final DamageSource ZAP_APPLE = create("zap"); diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 003037b0..cb8e0635 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -184,6 +184,7 @@ "unicopia.power.feed": "Primary Changeling ability", "unicopia.power.disguise": "Secondary Changeling ability", + "death.attack.magical_exhaustion": "%1$s exhausted themselves", "death.attack.alicorn_amulet": "%1$s was driven insane", "death.attack.darkness": "%1$s went missing", "death.attack.feed": "%1$s was drained of all life",