From 97244cd4618ed0418c7a0b317daa3f6f57034b83 Mon Sep 17 00:00:00 2001 From: Talia-12 Date: Sun, 30 Jul 2023 16:30:12 +1000 Subject: [PATCH] fix added damage types --- .../hexcasting/common/lib/HexDamageTypes.java | 13 ++++--------- .../data/hexcasting/damage_type/overcast.json | 5 +++++ .../data/hexcasting/damage_type/shame.json | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 Common/src/main/resources/data/hexcasting/damage_type/overcast.json create mode 100644 Common/src/main/resources/data/hexcasting/damage_type/shame.json diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexDamageTypes.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexDamageTypes.java index e27ac183..e7ca5402 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexDamageTypes.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexDamageTypes.java @@ -1,17 +1,12 @@ package at.petrak.hexcasting.common.lib; import net.minecraft.core.registries.Registries; -import net.minecraft.data.worldgen.BootstapContext; import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.damagesource.DamageType; -public class HexDamageTypes { - public static final ResourceKey OVERCAST = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("overcast")); - public static final ResourceKey SHAME_ON_YOU = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("overcast")); +import static at.petrak.hexcasting.api.HexAPI.modLoc; - public static void bootstrap(BootstapContext context) { - context.register(OVERCAST, new DamageType("hexcasting.overcast", 0f)); - context.register(SHAME_ON_YOU, new DamageType("hexcasting.shame", 0f)); - } +public class HexDamageTypes { + public static final ResourceKey OVERCAST = ResourceKey.create(Registries.DAMAGE_TYPE, modLoc("overcast")); + public static final ResourceKey SHAME_ON_YOU = ResourceKey.create(Registries.DAMAGE_TYPE, modLoc("overcast")); } diff --git a/Common/src/main/resources/data/hexcasting/damage_type/overcast.json b/Common/src/main/resources/data/hexcasting/damage_type/overcast.json new file mode 100644 index 00000000..cc59d471 --- /dev/null +++ b/Common/src/main/resources/data/hexcasting/damage_type/overcast.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0, + "message_id": "hexcasting.overcast", + "scaling": "when_caused_by_living_non_player" +} \ No newline at end of file diff --git a/Common/src/main/resources/data/hexcasting/damage_type/shame.json b/Common/src/main/resources/data/hexcasting/damage_type/shame.json new file mode 100644 index 00000000..e7cd1eda --- /dev/null +++ b/Common/src/main/resources/data/hexcasting/damage_type/shame.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0, + "message_id": "hexcasting.shame", + "scaling": "when_caused_by_living_non_player" +} \ No newline at end of file