diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talismans.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talismans.java index 4e68264..1fcee9e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talismans.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talismans.java @@ -8,6 +8,7 @@ import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; import com.willfp.talismans.talismans.talismans.CreeperTalisman; import com.willfp.talismans.talismans.talismans.EndTalisman; import com.willfp.talismans.talismans.talismans.FeatherTalisman; +import com.willfp.talismans.talismans.talismans.FlameTalisman; import com.willfp.talismans.talismans.talismans.NetherTalisman; import com.willfp.talismans.talismans.talismans.RaidTalisman; import com.willfp.talismans.talismans.talismans.SkeletonTalisman; @@ -39,6 +40,7 @@ public class Talismans { public static final Talisman NETHER_TALISMAN = new NetherTalisman(); public static final Talisman END_TALISMAN = new EndTalisman(); public static final Talisman FEATHER_TALISMAN = new FeatherTalisman(); + public static final Talisman FLAME_TALISMAN = new FlameTalisman(); /** * Get all registered {@link Talisman}s. diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FlameTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FlameTalisman.java new file mode 100644 index 0000000..70f5c47 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FlameTalisman.java @@ -0,0 +1,23 @@ +package com.willfp.talismans.talismans.talismans; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.EntityDamageEvent; +import org.jetbrains.annotations.NotNull; + +public class FlameTalisman extends Talisman { + public FlameTalisman() { + super("flame_talisman"); + } + + @Override + public void onDamage(@NotNull final Player victim, + @NotNull final EntityDamageEvent event) { + if (event.getCause() != EntityDamageEvent.DamageCause.FIRE && event.getCause() != EntityDamageEvent.DamageCause.FIRE_TICK) { + return; + } + + event.setDamage(event.getDamage() * this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "multiplier")); + } +} diff --git a/eco-core/core-plugin/src/main/resources/talismans/feathertalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/feathertalisman.yml index 02c8c69..36d3107 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/feathertalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/feathertalisman.yml @@ -1,5 +1,5 @@ name: "Feather Talisman" -description: Take 50% less fall damage. +description: Take 25% less fall damage. enabled: true obtaining: @@ -21,7 +21,7 @@ obtaining: general-config: disabled-in-worlds: [] # Texture is base64, https://minecraft-heads.com has a list of skulls. - texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjQyNTQ4MzhjMzNlYTIyN2ZmY2EyMjNkZGRhYWJmZTBiMDIxNWY3MGRhNjQ5ZTk0NDQ3N2Y0NDM3MGNhNjk1MiJ9fX0= + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODY4NmQ5NmFkOGU1OGE4NmE1YTI4MzI2Yzk5ZmRlOWQ0OTgxZTQ2YzA5ZWFlNTFlN2E5ODYxOTBjZDM2YjBmIn19fQ== config: multiplier: 0.5 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/flametalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/flametalisman.yml new file mode 100644 index 0000000..18d2a5d --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/flametalisman.yml @@ -0,0 +1,27 @@ +name: "Flame Talisman" +description: Take 25% less fire damage. +enabled: true + +obtaining: + # Recipes are left-right, top-bottom + # The first item is the top left, the second is top middle, and so on. The last is bottom right. + recipe: + - blaze_powder + - blaze_powder + - blaze_powder + + - blaze_powder + - diamond_block + - blaze_powder + + - blaze_powder + - blaze_powder + - blaze_powder + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzBhNDRkNTFlY2M3OWY2OTRjZmQ2MDIyOGM4ODQyODg0OGNhNjE4ZTM2YTY1OWE0MTZlOTI0NmQ4NDFhZWM4In19fQ== + +config: + multiplier: 0.5 \ No newline at end of file