From 448535c0d26d7bd1f8bce118879efee59bb39f96 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 1 Jan 2021 20:36:34 +0000 Subject: [PATCH] Added poseidon talisman --- .../willfp/talismans/talismans/Talismans.java | 2 ++ .../talismans/talismans/PoseidonTalisman.java | 22 +++++++++++++++ .../resources/talismans/poseidontalisman.yml | 27 +++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/PoseidonTalisman.java create mode 100644 eco-core/core-plugin/src/main/resources/talismans/poseidontalisman.yml 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 6c12a99..99698d0 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 @@ -11,6 +11,7 @@ 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.PoseidonTalisman; import com.willfp.talismans.talismans.talismans.RaidTalisman; import com.willfp.talismans.talismans.talismans.SkeletonTalisman; import com.willfp.talismans.talismans.talismans.SpiderTalisman; @@ -43,6 +44,7 @@ public class Talismans { public static final Talisman FEATHER_TALISMAN = new FeatherTalisman(); public static final Talisman FLAME_TALISMAN = new FlameTalisman(); public static final Talisman ARCHERY_TALISMAN = new ArcheryTalisman(); + public static final Talisman POSEIDON_TALISMAN = new PoseidonTalisman(); /** * Get all registered {@link Talisman}s. diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/PoseidonTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/PoseidonTalisman.java new file mode 100644 index 0000000..3bdb630 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/PoseidonTalisman.java @@ -0,0 +1,22 @@ +package com.willfp.talismans.talismans.talismans; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.entity.Trident; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.jetbrains.annotations.NotNull; + +public class PoseidonTalisman extends Talisman { + public PoseidonTalisman() { + super("poseidon_talisman"); + } + @Override + public void onTridentDamage(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final Trident trident, + @NotNull final EntityDamageByEntityEvent event) { + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } +} diff --git a/eco-core/core-plugin/src/main/resources/talismans/poseidontalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/poseidontalisman.yml new file mode 100644 index 0000000..89dd021 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/poseidontalisman.yml @@ -0,0 +1,27 @@ +name: "Poseidon Talisman" +description: Deal 10% more damage with tridents. +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: + - arrow + - arrow + - arrow + + - arrow + - coal_block + - arrow + + - arrow + - arrow + - arrow + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjQ4NGFhNWJlZTg5OGE2ZTg5NjBhM2Y5YTk5NzU5YjFmMzlmOWRjYjMyMTA1MGY3MTRjZDcyYjNkOGE4MDQxIn19fQ== + +config: + percent-more-damage: 10 \ No newline at end of file