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 8b4f31f..ab63a96 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 @@ -5,22 +5,23 @@ import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableList; import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; -import com.willfp.talismans.talismans.talismans.ArcheryTalisman; -import com.willfp.talismans.talismans.talismans.CreeperTalisman; -import com.willfp.talismans.talismans.talismans.EndTalisman; -import com.willfp.talismans.talismans.talismans.ExperienceTalisman; -import com.willfp.talismans.talismans.talismans.ExtractionTalisman; -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.SharpnessTalisman; -import com.willfp.talismans.talismans.talismans.SkeletonTalisman; -import com.willfp.talismans.talismans.talismans.SpiderResistanceTalisman; -import com.willfp.talismans.talismans.talismans.SpiderTalisman; -import com.willfp.talismans.talismans.talismans.ZombieResistanceTalisman; -import com.willfp.talismans.talismans.talismans.ZombieTalisman; +import com.willfp.talismans.talismans.talismans.talisman.ArcheryTalisman; +import com.willfp.talismans.talismans.talismans.talisman.CreeperTalisman; +import com.willfp.talismans.talismans.talismans.talisman.EndTalisman; +import com.willfp.talismans.talismans.talismans.talisman.ExperienceTalisman; +import com.willfp.talismans.talismans.talismans.talisman.ExtractionTalisman; +import com.willfp.talismans.talismans.talismans.talisman.FeatherTalisman; +import com.willfp.talismans.talismans.talismans.talisman.FlameTalisman; +import com.willfp.talismans.talismans.talismans.talisman.NetherTalisman; +import com.willfp.talismans.talismans.talismans.talisman.PoseidonTalisman; +import com.willfp.talismans.talismans.talismans.talisman.RaidTalisman; +import com.willfp.talismans.talismans.talismans.talisman.ResistanceTalisman; +import com.willfp.talismans.talismans.talismans.talisman.SharpnessTalisman; +import com.willfp.talismans.talismans.talismans.talisman.SkeletonTalisman; +import com.willfp.talismans.talismans.talismans.talisman.SpiderResistanceTalisman; +import com.willfp.talismans.talismans.talismans.talisman.SpiderTalisman; +import com.willfp.talismans.talismans.talismans.talisman.ZombieResistanceTalisman; +import com.willfp.talismans.talismans.talismans.talisman.ZombieTalisman; import lombok.experimental.UtilityClass; import org.bukkit.NamespacedKey; import org.jetbrains.annotations.NotNull; @@ -55,6 +56,7 @@ public class Talismans { public static final Talisman SHARPNESS_TALISMAN = new SharpnessTalisman(); public static final Talisman ZOMBIE_RESISTANCE_TALISMAN = new ZombieResistanceTalisman(); public static final Talisman SPIDER_RESISTANCE_TALISMAN = new SpiderResistanceTalisman(); + public static final Talisman RESISTANCE_TALISMAN = new ResistanceTalisman(); /** * Get all registered {@link Talisman}s. diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ArcheryTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ArcheryTalisman.java similarity index 93% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ArcheryTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ArcheryTalisman.java index 41d3663..e21a483 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ArcheryTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ArcheryTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/CreeperTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/CreeperTalisman.java similarity index 97% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/CreeperTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/CreeperTalisman.java index 479a2f6..0549850 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/CreeperTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/CreeperTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/EndTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/EndTalisman.java similarity index 97% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/EndTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/EndTalisman.java index 98cbbe6..65ea7b7 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/EndTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/EndTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExperienceTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExperienceTalisman.java similarity index 94% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExperienceTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExperienceTalisman.java index 0d22d8c..0dafbd4 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExperienceTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExperienceTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.eco.util.events.naturalexpgainevent.NaturalExpGainEvent; import com.willfp.talismans.talismans.Talisman; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExtractionTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExtractionTalisman.java similarity index 94% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExtractionTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExtractionTalisman.java index bdcb480..71a092e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExtractionTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExtractionTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.eco.util.drops.DropQueue; import com.willfp.talismans.talismans.Talisman; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FeatherTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/FeatherTalisman.java similarity index 92% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FeatherTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/FeatherTalisman.java index 0e71ac8..c2a04de 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FeatherTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/FeatherTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; 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/talisman/FlameTalisman.java similarity index 92% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FlameTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/FlameTalisman.java index 70f5c47..ced56af 100644 --- 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/talisman/FlameTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/NetherTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/NetherTalisman.java similarity index 97% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/NetherTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/NetherTalisman.java index 3775a0e..23e7b4f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/NetherTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/NetherTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; 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/talisman/PoseidonTalisman.java similarity index 93% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/PoseidonTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/PoseidonTalisman.java index 3bdb630..487cf57 100644 --- 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/talisman/PoseidonTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/RaidTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/RaidTalisman.java similarity index 97% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/RaidTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/RaidTalisman.java index aeb17da..2854ad6 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/RaidTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/RaidTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ResistanceTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ResistanceTalisman.java new file mode 100644 index 0000000..9b98c24 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ResistanceTalisman.java @@ -0,0 +1,19 @@ +package com.willfp.talismans.talismans.talismans.talisman; + +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 ResistanceTalisman extends Talisman { + public ResistanceTalisman() { + super("resistance_talisman"); + } + + @Override + public void onDamage(@NotNull final Player victim, + @NotNull final EntityDamageEvent event) { + event.setDamage(event.getDamage() * (1 - (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-less-damage")) / 100)); + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SharpnessTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SharpnessTalisman.java similarity index 92% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SharpnessTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SharpnessTalisman.java index b70a2ca..6ee88e5 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SharpnessTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SharpnessTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SkeletonTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SkeletonTalisman.java similarity index 97% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SkeletonTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SkeletonTalisman.java index 20a4cc6..6b59b3d 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SkeletonTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SkeletonTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SpiderResistanceTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderResistanceTalisman.java similarity index 93% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SpiderResistanceTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderResistanceTalisman.java index 1c3d53b..7a4062b 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SpiderResistanceTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderResistanceTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SpiderTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderTalisman.java similarity index 97% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SpiderTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderTalisman.java index 2a0e81c..9a89a59 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SpiderTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ZombieResistanceTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieResistanceTalisman.java similarity index 93% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ZombieResistanceTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieResistanceTalisman.java index 28bfc43..2b8f785 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ZombieResistanceTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieResistanceTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ZombieTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieTalisman.java similarity index 97% rename from eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ZombieTalisman.java rename to eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieTalisman.java index c26b687..f84668b 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ZombieTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieTalisman.java @@ -1,4 +1,4 @@ -package com.willfp.talismans.talismans.talismans; +package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; diff --git a/eco-core/core-plugin/src/main/resources/talismans/resistancetalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/resistancetalisman.yml new file mode 100644 index 0000000..5a2e9d6 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/resistancetalisman.yml @@ -0,0 +1,27 @@ +name: "Resistance Talisman" +description: Take 5% less 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: + - string + - string + - string + + - string + - shield + - string + + - string + - string + - string + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2FiNGM0ZDZlZTY5YmMyNGJiYTJiOGZhZjY3YjlmNzA0YTA2YjAxYWE5M2YzZWZhNmFlZjdhOTY5NmM0ZmVlZiJ9fX0= + +config: + percent-less-damage: 5 \ No newline at end of file