diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java index fd640e0..66e6906 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java @@ -52,7 +52,7 @@ public class TalismansPlugin extends AbstractEcoPlugin { this.getLog().info(""); this.getLog().info(Talismans.values().size() + " Talismans Loaded:"); - this.getLog().info(Talismans.values().stream().map(Talisman::getName).collect(Collectors.joining(", "))); + this.getLog().info(Talismans.values().stream().map(Talisman::getFormattedName).collect(Collectors.joining(", "))); } /** diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java index 22c65a1..f5a334c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java @@ -91,7 +91,7 @@ public class TalismanDisplay { ProxyUtils.getProxy(SkullProxy.class).setTalismanTexture(meta, talisman.getSkullBase64()); - meta.setDisplayName(talisman.getName()); + meta.setDisplayName(talisman.getFormattedName()); List lore = new ArrayList<>(); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java index c4fd3ed..01d72d5 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java @@ -138,7 +138,7 @@ public abstract class Talisman implements Listener, Watcher { * This can be overridden but may lead to unexpected behavior. */ public void update() { - name = StringUtils.translate("&e" + config.getString("name")); + name = StringUtils.translate(config.getString("name")); description = StringUtils.translate(config.getString("description")); skullBase64 = config.getString(Talismans.GENERAL_LOCATION + "texture"); disabledWorldNames.clear(); @@ -183,6 +183,15 @@ public abstract class Talisman implements Listener, Watcher { // Unused as some talismans may have postUpdate tasks, however most won't. } + /** + * Get the name of the talisman, formatted with color. + * + * @return The name. + */ + public String getFormattedName() { + return this.getStrength().getColor() + this.getName(); + } + @Override public String toString() { return "Talisman{" 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 69f2ddb..5a18b00 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,6 +5,28 @@ 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.relic.ArcheryRelic; +import com.willfp.talismans.talismans.talismans.relic.EndRelic; +import com.willfp.talismans.talismans.talismans.relic.ExperienceRelic; +import com.willfp.talismans.talismans.talismans.relic.ExtractionRelic; +import com.willfp.talismans.talismans.talismans.relic.FeatherRelic; +import com.willfp.talismans.talismans.talismans.relic.FlameRelic; +import com.willfp.talismans.talismans.talismans.relic.NetherRelic; +import com.willfp.talismans.talismans.talismans.relic.PoseidonRelic; +import com.willfp.talismans.talismans.talismans.relic.ResistanceRelic; +import com.willfp.talismans.talismans.talismans.relic.SharpnessRelic; +import com.willfp.talismans.talismans.talismans.relic.StrengthRelic; +import com.willfp.talismans.talismans.talismans.ring.ArcheryRing; +import com.willfp.talismans.talismans.talismans.ring.EndRing; +import com.willfp.talismans.talismans.talismans.ring.ExperienceRing; +import com.willfp.talismans.talismans.talismans.ring.ExtractionRing; +import com.willfp.talismans.talismans.talismans.ring.FeatherRing; +import com.willfp.talismans.talismans.talismans.ring.FlameRing; +import com.willfp.talismans.talismans.talismans.ring.NetherRing; +import com.willfp.talismans.talismans.talismans.ring.PoseidonRing; +import com.willfp.talismans.talismans.talismans.ring.ResistanceRing; +import com.willfp.talismans.talismans.talismans.ring.SharpnessRing; +import com.willfp.talismans.talismans.talismans.ring.StrengthRing; import com.willfp.talismans.talismans.talismans.talisman.ArcheryTalisman; import com.willfp.talismans.talismans.talismans.talisman.CreeperTalisman; import com.willfp.talismans.talismans.talismans.talisman.EndTalisman; @@ -59,6 +81,29 @@ public class Talismans { public static final Talisman SPIDER_RESISTANCE_TALISMAN = new SpiderResistanceTalisman(); public static final Talisman RESISTANCE_TALISMAN = new ResistanceTalisman(); public static final Talisman STRENGTH_TALISMAN = new StrengthTalisman(); + public static final Talisman ARCHERY_RING = new ArcheryRing(); + public static final Talisman END_RING = new EndRing(); + public static final Talisman EXPERIENCE_RING = new ExperienceRing(); + public static final Talisman EXTRACTION_RING = new ExtractionRing(); + public static final Talisman FEATHER_RING = new FeatherRing(); + public static final Talisman FLAME_RING = new FlameRing(); + public static final Talisman NETHER_RING = new NetherRing(); + public static final Talisman POSEIDON_RING = new PoseidonRing(); + public static final Talisman RESISTANCE_RING = new ResistanceRing(); + public static final Talisman SHARPNESS_RING = new SharpnessRing(); + public static final Talisman STRENGTH_RING = new StrengthRing(); + public static final Talisman ARCHERY_RELIC = new ArcheryRelic(); + public static final Talisman END_RELIC = new EndRelic(); + public static final Talisman EXPERIENCE_RELIC = new ExperienceRelic(); + public static final Talisman EXTRACTION_RELIC = new ExtractionRelic(); + public static final Talisman FEATHER_RELIC = new FeatherRelic(); + public static final Talisman FLAME_RELIC = new FlameRelic(); + public static final Talisman NETHER_RELIC = new NetherRelic(); + public static final Talisman POSEIDON_RELIC = new PoseidonRelic(); + public static final Talisman RESISTANCE_RELIC = new ResistanceRelic(); + public static final Talisman SHARPNESS_RELIC = new SharpnessRelic(); + public static final Talisman STRENGTH_RELIC = new StrengthRelic(); + /** * Get all registered {@link Talisman}s. diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/meta/TalismanStrength.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/meta/TalismanStrength.java index f0da828..1edeb8f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/meta/TalismanStrength.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/meta/TalismanStrength.java @@ -1,6 +1,7 @@ package com.willfp.talismans.talismans.meta; import com.willfp.eco.util.config.Configs; +import lombok.Getter; import org.jetbrains.annotations.NotNull; import java.util.function.Supplier; @@ -10,6 +11,7 @@ public enum TalismanStrength { RING(() -> Configs.CONFIG.getString("strengths.ring.color")), RELIC(() -> Configs.CONFIG.getString("strengths.relic.color")); + @Getter private String color; private final Supplier colorSupplier; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/ArcheryRelic.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/ArcheryRelic.java new file mode 100644 index 0000000..2103444 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/ArcheryRelic.java @@ -0,0 +1,23 @@ +package com.willfp.talismans.talismans.talismans.relic; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.jetbrains.annotations.NotNull; + +public class ArcheryRelic extends Talisman { + public ArcheryRelic() { + super("archery_relic", TalismanStrength.RELIC); + } + @Override + public void onArrowDamage(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final Arrow arrow, + @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/java/com/willfp/talismans/talismans/talismans/relic/EndRelic.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/EndRelic.java new file mode 100644 index 0000000..b44f346 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/EndRelic.java @@ -0,0 +1,53 @@ +package com.willfp.talismans.talismans.talismans.relic; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.World; +import org.bukkit.entity.Arrow; +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 EndRelic extends Talisman { + public EndRelic() { + super("end_relic", TalismanStrength.RELIC); + } + + @Override + public void onMeleeAttack(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final EntityDamageByEntityEvent event) { + if (attacker.getWorld().getEnvironment() != World.Environment.THE_END) { + return; + } + + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } + + @Override + public void onArrowDamage(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final Arrow arrow, + @NotNull final EntityDamageByEntityEvent event) { + if (attacker.getWorld().getEnvironment() != World.Environment.THE_END) { + return; + } + + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } + + @Override + public void onTridentDamage(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final Trident trident, + @NotNull final EntityDamageByEntityEvent event) { + if (attacker.getWorld().getEnvironment() != World.Environment.THE_END) { + return; + } + + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/ExperienceRelic.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/ExperienceRelic.java new file mode 100644 index 0000000..550944d --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/ExperienceRelic.java @@ -0,0 +1,35 @@ +package com.willfp.talismans.talismans.talismans.relic; + +import com.willfp.eco.util.events.naturalexpgainevent.NaturalExpGainEvent; +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import com.willfp.talismans.talismans.util.TalismanChecks; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.jetbrains.annotations.NotNull; + +public class ExperienceRelic extends Talisman { + public ExperienceRelic() { + super("experience_relic", TalismanStrength.RELIC); + } + + @EventHandler + public void onExpChange(@NotNull final NaturalExpGainEvent event) { + Player player = event.getExpChangeEvent().getPlayer(); + + if (event.getExpChangeEvent().getAmount() < 0) { + return; + } + + if (!TalismanChecks.hasTalisman(player, this)) { + return; + } + + if (this.getDisabledWorlds().contains(player.getWorld())) { + return; + } + + event.getExpChangeEvent().setAmount((int) Math.ceil(event.getExpChangeEvent().getAmount() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percentage-bonus") / 100)))); + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/ExtractionRelic.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/ExtractionRelic.java new file mode 100644 index 0000000..977c851 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/ExtractionRelic.java @@ -0,0 +1,31 @@ +package com.willfp.talismans.talismans.talismans.relic; + +import com.willfp.eco.util.drops.DropQueue; +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import com.willfp.talismans.talismans.util.TalismanUtils; +import org.bukkit.block.Block; +import org.bukkit.entity.Player; +import org.bukkit.event.block.BlockBreakEvent; +import org.jetbrains.annotations.NotNull; + +public class ExtractionRelic extends Talisman { + public ExtractionRelic() { + super("extraction_relic", TalismanStrength.RELIC); + } + + @Override + public void onBlockBreak(@NotNull final Player player, + @NotNull final Block block, + @NotNull final BlockBreakEvent event) { + if (!TalismanUtils.passedChance(this)) { + return; + } + + new DropQueue(player) + .addXP(this.getConfig().getInt(Talismans.CONFIG_LOCATION + "xp-amount")) + .setLocation(block.getLocation()) + .push(); + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/FeatherRelic.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/FeatherRelic.java new file mode 100644 index 0000000..dcd5736 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/FeatherRelic.java @@ -0,0 +1,24 @@ +package com.willfp.talismans.talismans.talismans.relic; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.EntityDamageEvent; +import org.jetbrains.annotations.NotNull; + +public class FeatherRelic extends Talisman { + public FeatherRelic() { + super("feather_relic", TalismanStrength.RELIC); + } + + @Override + public void onDamage(@NotNull final Player victim, + @NotNull final EntityDamageEvent event) { + if (event.getCause() != EntityDamageEvent.DamageCause.FALL) { + return; + } + + event.setDamage(event.getDamage() * this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "multiplier")); + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/FlameRelic.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/FlameRelic.java new file mode 100644 index 0000000..55dea38 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/FlameRelic.java @@ -0,0 +1,24 @@ +package com.willfp.talismans.talismans.talismans.relic; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.EntityDamageEvent; +import org.jetbrains.annotations.NotNull; + +public class FlameRelic extends Talisman { + public FlameRelic() { + super("flame_relic", TalismanStrength.RELIC); + } + + @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/java/com/willfp/talismans/talismans/talismans/relic/NetherRelic.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/NetherRelic.java new file mode 100644 index 0000000..6a19c67 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/NetherRelic.java @@ -0,0 +1,53 @@ +package com.willfp.talismans.talismans.talismans.relic; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.World; +import org.bukkit.entity.Arrow; +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 NetherRelic extends Talisman { + public NetherRelic() { + super("nether_relic", TalismanStrength.RELIC); + } + + @Override + public void onMeleeAttack(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final EntityDamageByEntityEvent event) { + if (attacker.getWorld().getEnvironment() != World.Environment.NETHER) { + return; + } + + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } + + @Override + public void onArrowDamage(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final Arrow arrow, + @NotNull final EntityDamageByEntityEvent event) { + if (attacker.getWorld().getEnvironment() != World.Environment.NETHER) { + return; + } + + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } + + @Override + public void onTridentDamage(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final Trident trident, + @NotNull final EntityDamageByEntityEvent event) { + if (attacker.getWorld().getEnvironment() != World.Environment.NETHER) { + return; + } + + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/PoseidonRelic.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/PoseidonRelic.java new file mode 100644 index 0000000..e13f412 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/PoseidonRelic.java @@ -0,0 +1,23 @@ +package com.willfp.talismans.talismans.talismans.relic; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +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 PoseidonRelic extends Talisman { + public PoseidonRelic() { + super("poseidon_relic", TalismanStrength.RELIC); + } + @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/java/com/willfp/talismans/talismans/talismans/relic/ResistanceRelic.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/ResistanceRelic.java new file mode 100644 index 0000000..1737a43 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/ResistanceRelic.java @@ -0,0 +1,20 @@ +package com.willfp.talismans.talismans.talismans.relic; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.EntityDamageEvent; +import org.jetbrains.annotations.NotNull; + +public class ResistanceRelic extends Talisman { + public ResistanceRelic() { + super("resistance_relic", TalismanStrength.RELIC); + } + + @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/relic/SharpnessRelic.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/SharpnessRelic.java new file mode 100644 index 0000000..2643d85 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/SharpnessRelic.java @@ -0,0 +1,22 @@ +package com.willfp.talismans.talismans.talismans.relic; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.jetbrains.annotations.NotNull; + +public class SharpnessRelic extends Talisman { + public SharpnessRelic() { + super("sharpness_relic", TalismanStrength.RELIC); + } + + @Override + public void onMeleeAttack(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @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/java/com/willfp/talismans/talismans/talismans/relic/StrengthRelic.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/StrengthRelic.java new file mode 100644 index 0000000..b568a8a --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/relic/StrengthRelic.java @@ -0,0 +1,40 @@ +package com.willfp.talismans.talismans.talismans.relic; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.entity.Arrow; +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 StrengthRelic extends Talisman { + public StrengthRelic() { + super("strength_relic", TalismanStrength.RELIC); + } + + @Override + public void onMeleeAttack(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final EntityDamageByEntityEvent event) { + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } + + @Override + public void onArrowDamage(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final Arrow arrow, + @NotNull final EntityDamageByEntityEvent event) { + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } + + @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/java/com/willfp/talismans/talismans/talismans/ring/ArcheryRing.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/ArcheryRing.java new file mode 100644 index 0000000..574867b --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/ArcheryRing.java @@ -0,0 +1,23 @@ +package com.willfp.talismans.talismans.talismans.ring; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.jetbrains.annotations.NotNull; + +public class ArcheryRing extends Talisman { + public ArcheryRing() { + super("archery_ring", TalismanStrength.RING); + } + @Override + public void onArrowDamage(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final Arrow arrow, + @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/java/com/willfp/talismans/talismans/talismans/ring/EndRing.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/EndRing.java new file mode 100644 index 0000000..afc48dd --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/EndRing.java @@ -0,0 +1,53 @@ +package com.willfp.talismans.talismans.talismans.ring; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.World; +import org.bukkit.entity.Arrow; +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 EndRing extends Talisman { + public EndRing() { + super("end_ring", TalismanStrength.RING); + } + + @Override + public void onMeleeAttack(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final EntityDamageByEntityEvent event) { + if (attacker.getWorld().getEnvironment() != World.Environment.THE_END) { + return; + } + + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } + + @Override + public void onArrowDamage(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final Arrow arrow, + @NotNull final EntityDamageByEntityEvent event) { + if (attacker.getWorld().getEnvironment() != World.Environment.THE_END) { + return; + } + + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } + + @Override + public void onTridentDamage(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final Trident trident, + @NotNull final EntityDamageByEntityEvent event) { + if (attacker.getWorld().getEnvironment() != World.Environment.THE_END) { + return; + } + + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/ExperienceRing.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/ExperienceRing.java new file mode 100644 index 0000000..f3c498a --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/ExperienceRing.java @@ -0,0 +1,35 @@ +package com.willfp.talismans.talismans.talismans.ring; + +import com.willfp.eco.util.events.naturalexpgainevent.NaturalExpGainEvent; +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import com.willfp.talismans.talismans.util.TalismanChecks; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.jetbrains.annotations.NotNull; + +public class ExperienceRing extends Talisman { + public ExperienceRing() { + super("experience_ring", TalismanStrength.RING); + } + + @EventHandler + public void onExpChange(@NotNull final NaturalExpGainEvent event) { + Player player = event.getExpChangeEvent().getPlayer(); + + if (event.getExpChangeEvent().getAmount() < 0) { + return; + } + + if (!TalismanChecks.hasTalisman(player, this)) { + return; + } + + if (this.getDisabledWorlds().contains(player.getWorld())) { + return; + } + + event.getExpChangeEvent().setAmount((int) Math.ceil(event.getExpChangeEvent().getAmount() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percentage-bonus") / 100)))); + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/ExtractionRing.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/ExtractionRing.java new file mode 100644 index 0000000..a98b7a3 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/ExtractionRing.java @@ -0,0 +1,31 @@ +package com.willfp.talismans.talismans.talismans.ring; + +import com.willfp.eco.util.drops.DropQueue; +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import com.willfp.talismans.talismans.util.TalismanUtils; +import org.bukkit.block.Block; +import org.bukkit.entity.Player; +import org.bukkit.event.block.BlockBreakEvent; +import org.jetbrains.annotations.NotNull; + +public class ExtractionRing extends Talisman { + public ExtractionRing() { + super("extraction_ring", TalismanStrength.RING); + } + + @Override + public void onBlockBreak(@NotNull final Player player, + @NotNull final Block block, + @NotNull final BlockBreakEvent event) { + if (!TalismanUtils.passedChance(this)) { + return; + } + + new DropQueue(player) + .addXP(this.getConfig().getInt(Talismans.CONFIG_LOCATION + "xp-amount")) + .setLocation(block.getLocation()) + .push(); + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/FeatherRing.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/FeatherRing.java new file mode 100644 index 0000000..ee5e563 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/FeatherRing.java @@ -0,0 +1,24 @@ +package com.willfp.talismans.talismans.talismans.ring; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.EntityDamageEvent; +import org.jetbrains.annotations.NotNull; + +public class FeatherRing extends Talisman { + public FeatherRing() { + super("feather_ring", TalismanStrength.RING); + } + + @Override + public void onDamage(@NotNull final Player victim, + @NotNull final EntityDamageEvent event) { + if (event.getCause() != EntityDamageEvent.DamageCause.FALL) { + return; + } + + event.setDamage(event.getDamage() * this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "multiplier")); + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/FlameRing.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/FlameRing.java new file mode 100644 index 0000000..050f9bf --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/FlameRing.java @@ -0,0 +1,24 @@ +package com.willfp.talismans.talismans.talismans.ring; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.EntityDamageEvent; +import org.jetbrains.annotations.NotNull; + +public class FlameRing extends Talisman { + public FlameRing() { + super("flame_ring", TalismanStrength.RING); + } + + @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/java/com/willfp/talismans/talismans/talismans/ring/NetherRing.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/NetherRing.java new file mode 100644 index 0000000..58f14b3 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/NetherRing.java @@ -0,0 +1,53 @@ +package com.willfp.talismans.talismans.talismans.ring; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.World; +import org.bukkit.entity.Arrow; +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 NetherRing extends Talisman { + public NetherRing() { + super("nether_ring", TalismanStrength.RING); + } + + @Override + public void onMeleeAttack(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final EntityDamageByEntityEvent event) { + if (attacker.getWorld().getEnvironment() != World.Environment.NETHER) { + return; + } + + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } + + @Override + public void onArrowDamage(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final Arrow arrow, + @NotNull final EntityDamageByEntityEvent event) { + if (attacker.getWorld().getEnvironment() != World.Environment.NETHER) { + return; + } + + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } + + @Override + public void onTridentDamage(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final Trident trident, + @NotNull final EntityDamageByEntityEvent event) { + if (attacker.getWorld().getEnvironment() != World.Environment.NETHER) { + return; + } + + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/PoseidonRing.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/PoseidonRing.java new file mode 100644 index 0000000..a032713 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/PoseidonRing.java @@ -0,0 +1,23 @@ +package com.willfp.talismans.talismans.talismans.ring; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +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 PoseidonRing extends Talisman { + public PoseidonRing() { + super("poseidon_ring", TalismanStrength.RING); + } + @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/java/com/willfp/talismans/talismans/talismans/ring/ResistanceRing.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/ResistanceRing.java new file mode 100644 index 0000000..524a0f7 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/ResistanceRing.java @@ -0,0 +1,20 @@ +package com.willfp.talismans.talismans.talismans.ring; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.EntityDamageEvent; +import org.jetbrains.annotations.NotNull; + +public class ResistanceRing extends Talisman { + public ResistanceRing() { + super("resistance_ring", TalismanStrength.RING); + } + + @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/ring/SharpnessRing.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/SharpnessRing.java new file mode 100644 index 0000000..7f3b3eb --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/SharpnessRing.java @@ -0,0 +1,22 @@ +package com.willfp.talismans.talismans.talismans.ring; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.jetbrains.annotations.NotNull; + +public class SharpnessRing extends Talisman { + public SharpnessRing() { + super("sharpness_ring", TalismanStrength.RING); + } + + @Override + public void onMeleeAttack(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @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/java/com/willfp/talismans/talismans/talismans/ring/StrengthRing.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/StrengthRing.java new file mode 100644 index 0000000..92aaebf --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ring/StrengthRing.java @@ -0,0 +1,40 @@ +package com.willfp.talismans.talismans.talismans.ring; + +import com.willfp.talismans.talismans.Talisman; +import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; +import org.bukkit.entity.Arrow; +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 StrengthRing extends Talisman { + public StrengthRing() { + super("strength_ring", TalismanStrength.RING); + } + + @Override + public void onMeleeAttack(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final EntityDamageByEntityEvent event) { + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } + + @Override + public void onArrowDamage(@NotNull final Player attacker, + @NotNull final LivingEntity victim, + @NotNull final Arrow arrow, + @NotNull final EntityDamageByEntityEvent event) { + event.setDamage(event.getDamage() * (1 + (this.getConfig().getDouble(Talismans.CONFIG_LOCATION + "percent-more-damage")) / 100)); + } + + @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/java/com/willfp/talismans/talismans/talismans/talisman/ArcheryTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ArcheryTalisman.java index e21a483..8c294df 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ArcheryTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ArcheryTalisman.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -10,7 +11,7 @@ import org.jetbrains.annotations.NotNull; public class ArcheryTalisman extends Talisman { public ArcheryTalisman() { - super("archery_talisman"); + super("archery_talisman", TalismanStrength.TALISMAN); } @Override public void onArrowDamage(@NotNull final Player attacker, diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/CreeperTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/CreeperTalisman.java index 0549850..4232685 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/CreeperTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/CreeperTalisman.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.entity.Arrow; import org.bukkit.entity.Creeper; import org.bukkit.entity.LivingEntity; @@ -12,7 +13,7 @@ import org.jetbrains.annotations.NotNull; public class CreeperTalisman extends Talisman { public CreeperTalisman() { - super("creeper_talisman"); + super("creeper_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/EndTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/EndTalisman.java index 65ea7b7..756a3a9 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/EndTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/EndTalisman.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.World; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; @@ -12,7 +13,7 @@ import org.jetbrains.annotations.NotNull; public class EndTalisman extends Talisman { public EndTalisman() { - super("end_talisman"); + super("end_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExperienceTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExperienceTalisman.java index 0dafbd4..81f99c7 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExperienceTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExperienceTalisman.java @@ -3,6 +3,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.eco.util.events.naturalexpgainevent.NaturalExpGainEvent; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import com.willfp.talismans.talismans.util.TalismanChecks; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -10,7 +11,7 @@ import org.jetbrains.annotations.NotNull; public class ExperienceTalisman extends Talisman { public ExperienceTalisman() { - super("experience_talisman"); + super("experience_talisman", TalismanStrength.TALISMAN); } @EventHandler diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExtractionTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExtractionTalisman.java index 71a092e..36bb69d 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExtractionTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ExtractionTalisman.java @@ -3,6 +3,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.eco.util.drops.DropQueue; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import com.willfp.talismans.talismans.util.TalismanUtils; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -11,7 +12,7 @@ import org.jetbrains.annotations.NotNull; public class ExtractionTalisman extends Talisman { public ExtractionTalisman() { - super("extraction_talisman"); + super("extraction_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/FeatherTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/FeatherTalisman.java index c2a04de..c59a5b2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/FeatherTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/FeatherTalisman.java @@ -2,13 +2,14 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; import org.jetbrains.annotations.NotNull; public class FeatherTalisman extends Talisman { public FeatherTalisman() { - super("feather_talisman"); + super("feather_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/FlameTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/FlameTalisman.java index ced56af..169af2c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/FlameTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/FlameTalisman.java @@ -2,13 +2,14 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; 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"); + super("flame_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/NetherTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/NetherTalisman.java index 23e7b4f..dbd70a9 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/NetherTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/NetherTalisman.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.World; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; @@ -12,7 +13,7 @@ import org.jetbrains.annotations.NotNull; public class NetherTalisman extends Talisman { public NetherTalisman() { - super("nether_talisman"); + super("nether_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/PoseidonTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/PoseidonTalisman.java index 487cf57..0cc8e37 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/PoseidonTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/PoseidonTalisman.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.entity.Trident; @@ -10,7 +11,7 @@ import org.jetbrains.annotations.NotNull; public class PoseidonTalisman extends Talisman { public PoseidonTalisman() { - super("poseidon_talisman"); + super("poseidon_talisman", TalismanStrength.TALISMAN); } @Override public void onTridentDamage(@NotNull final Player attacker, diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/RaidTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/RaidTalisman.java index 2854ad6..890b88b 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/RaidTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/RaidTalisman.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.entity.Arrow; import org.bukkit.entity.Illager; import org.bukkit.entity.LivingEntity; @@ -12,7 +13,7 @@ import org.jetbrains.annotations.NotNull; public class RaidTalisman extends Talisman { public RaidTalisman() { - super("raid_talisman"); + super("raid_talisman", TalismanStrength.TALISMAN); } @Override 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 index 9b98c24..279cf4c 100644 --- 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 @@ -2,13 +2,14 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; 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"); + super("resistance_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SharpnessTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SharpnessTalisman.java index 6ee88e5..719e15d 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SharpnessTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SharpnessTalisman.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -9,7 +10,7 @@ import org.jetbrains.annotations.NotNull; public class SharpnessTalisman extends Talisman { public SharpnessTalisman() { - super("sharpness_talisman"); + super("sharpness_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SkeletonTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SkeletonTalisman.java index 6b59b3d..bf0ebb8 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SkeletonTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SkeletonTalisman.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -12,7 +13,7 @@ import org.jetbrains.annotations.NotNull; public class SkeletonTalisman extends Talisman { public SkeletonTalisman() { - super("skeleton_talisman"); + super("skeleton_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderResistanceTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderResistanceTalisman.java index 7a4062b..e42f136 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderResistanceTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderResistanceTalisman.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.entity.Spider; @@ -10,7 +11,7 @@ import org.jetbrains.annotations.NotNull; public class SpiderResistanceTalisman extends Talisman { public SpiderResistanceTalisman() { - super("spider_resistance_talisman"); + super("spider_resistance_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderTalisman.java index 9a89a59..aa62dcf 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/SpiderTalisman.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -12,7 +13,7 @@ import org.jetbrains.annotations.NotNull; public class SpiderTalisman extends Talisman { public SpiderTalisman() { - super("spider_talisman"); + super("spider_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/StrengthTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/StrengthTalisman.java index 554e0ea..ab709bb 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/StrengthTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/StrengthTalisman.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -11,7 +12,7 @@ import org.jetbrains.annotations.NotNull; public class StrengthTalisman extends Talisman { public StrengthTalisman() { - super("strength_talisman"); + super("strength_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieResistanceTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieResistanceTalisman.java index 2b8f785..53d0b14 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieResistanceTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieResistanceTalisman.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.entity.Zombie; @@ -10,7 +11,7 @@ import org.jetbrains.annotations.NotNull; public class ZombieResistanceTalisman extends Talisman { public ZombieResistanceTalisman() { - super("zombie_resistance_talisman"); + super("zombie_resistance_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieTalisman.java index f84668b..0e1157a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/talisman/ZombieTalisman.java @@ -2,6 +2,7 @@ package com.willfp.talismans.talismans.talismans.talisman; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; +import com.willfp.talismans.talismans.meta.TalismanStrength; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -12,7 +13,7 @@ import org.jetbrains.annotations.NotNull; public class ZombieTalisman extends Talisman { public ZombieTalisman() { - super("zombie_talisman"); + super("zombie_talisman", TalismanStrength.TALISMAN); } @Override diff --git a/eco-core/core-plugin/src/main/resources/talismans/relic/archeryrelic.yml b/eco-core/core-plugin/src/main/resources/talismans/relic/archeryrelic.yml new file mode 100644 index 0000000..318f516 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/relic/archeryrelic.yml @@ -0,0 +1,27 @@ +name: "Archery Relic" +description: Deal 40% more damage with bows. +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: + - crossbow + - crossbow + - crossbow + + - crossbow + - nether_star + - crossbow + + - crossbow + - crossbow + - crossbow + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYmQ3NDk5NWQ2Y2RhMmI4YTI0NzcyYWY5NjllZjA3N2FlM2E4NWUyMzU3YzZmNjExOWI4YTI1MDYwNDFhNDQ4YiJ9fX0= + +config: + percent-more-damage: 40 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/relic/endrelic.yml b/eco-core/core-plugin/src/main/resources/talismans/relic/endrelic.yml new file mode 100644 index 0000000..1726ab2 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/relic/endrelic.yml @@ -0,0 +1,27 @@ +name: "End Relic" +description: Deal 40% more damage in the end. +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: + - shulker_shell + - shulker_shell + - shulker_shell + + - shulker_shell + - nether_star + - shulker_shell + + - shulker_shell + - shulker_shell + - shulker_shell + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzI3OWRjOTEzNzNiNDI3NzY5MDQzZmFlODg5Y2UyYWRkM2FlMzIxNjY0OTY1MzRhNGQ2YThhOGFhYTJkIn19fQ== + +config: + percent-more-damage: 40 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/relic/experiencerelic.yml b/eco-core/core-plugin/src/main/resources/talismans/relic/experiencerelic.yml new file mode 100644 index 0000000..a7099e0 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/relic/experiencerelic.yml @@ -0,0 +1,27 @@ +name: "Experience Relic" +description: Gain 40% more experience. +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: + - diamond_block + - diamond_block + - diamond_block + + - diamond_block + - nether_star + - diamond_block + + - diamond_block + - diamond_block + - diamond_block + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDQzNGY0MDA0OGI0YTM1ZGExYTA2YmRmMDVlZjJlZDJlMWRhOGRjZTNmOWRlYTg5NGM3ZDFlYjMzODIzMmJkMiJ9fX0= + +config: + percentage-bonus: 40 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/relic/extractionrelic.yml b/eco-core/core-plugin/src/main/resources/talismans/relic/extractionrelic.yml new file mode 100644 index 0000000..fdf3740 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/relic/extractionrelic.yml @@ -0,0 +1,28 @@ +name: "Extraction Relic" +description: Chance to get xp while mining. +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: + - emerald_block + - emerald_block + - emerald_block + + - emerald_block + - nether_star + - emerald_block + + - emerald_block + - emerald_block + - emerald_block + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZmQxZWUyYjYwYTlkODFlYTgyZWIyNTBjNzEyYjNhNmJhYmVkMDNkMjFkNmY4MTg3MDBjNzBlNDM4OGU2YTUxOCJ9fX0= + +config: + chance: 5 + xp-amount: 50 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/relic/featherrelic.yml b/eco-core/core-plugin/src/main/resources/talismans/relic/featherrelic.yml new file mode 100644 index 0000000..5f8b601 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/relic/featherrelic.yml @@ -0,0 +1,27 @@ +name: "Feather Relic" +description: Take 40% less fall 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: + - feather + - feather + - feather + + - feather + - nether_star + - feather + + - feather + - feather + - feather + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzVmZjI1MzIwYTg0MjUwOWI3ZWU1YTIzNjczZjY4NTI5MWM0NjcyYjgzNGQ5YjU3N2U4NjJhOTIwOTgzYzEwYiJ9fX0= + +config: + multiplier: 0.6 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/relic/flamerelic.yml b/eco-core/core-plugin/src/main/resources/talismans/relic/flamerelic.yml new file mode 100644 index 0000000..9382c03 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/relic/flamerelic.yml @@ -0,0 +1,27 @@ +name: "Flame Relic" +description: Take 40% 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_rod + - blaze_rod + - blaze_rod + + - blaze_rod + - nether_star + - blaze_rod + + - blaze_rod + - blaze_rod + - blaze_rod + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODI4N2IzOTdkYWY5NTE2YTBiZDc2ZjVmMWI3YmY5Nzk1MTVkZjNkNWQ4MzNlMDYzNWZhNjhiMzdlZTA4MjIxMiJ9fX0= + +config: + multiplier: 0.6 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/relic/netherrelic.yml b/eco-core/core-plugin/src/main/resources/talismans/relic/netherrelic.yml new file mode 100644 index 0000000..881674c --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/relic/netherrelic.yml @@ -0,0 +1,27 @@ +name: "Nether Relic" +description: Deal 40% more damage in the nether. +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: + - wither_skeleton_skull + - wither_skeleton_skull + - wither_skeleton_skull + + - wither_skeleton_skull + - nether_star + - wither_skeleton_skull + + - wither_skeleton_skull + - wither_skeleton_skull + - wither_skeleton_skull + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTJmOWU5N2Y0YmU1MzM2MzRiZDFiM2UzNjc5ZWRlYmZmZmI5ODQwMTNhMWQ1OTAyZmEzYzM1ZDM0MzViYzEwIn19fQ== + +config: + percent-more-damage: 40 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/relic/poseidonrelic.yml b/eco-core/core-plugin/src/main/resources/talismans/relic/poseidonrelic.yml new file mode 100644 index 0000000..235c5e9 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/relic/poseidonrelic.yml @@ -0,0 +1,27 @@ +name: "Poseidon Relic" +description: Deal 40% 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: + - trident + - trident + - trident + + - trident + - nether_star + - trident + + - trident + - trident + - trident + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjIyZTNhNTY5ZThkNTgxNDM3YzUwM2UyYWQxZDRiNTkxYmNiODI5MWE3MWVmN2IzNzM4OGVlYTNiMDhlNzIifX19 + +config: + percent-more-damage: 40 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/relic/resistancerelic.yml b/eco-core/core-plugin/src/main/resources/talismans/relic/resistancerelic.yml new file mode 100644 index 0000000..606032a --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/relic/resistancerelic.yml @@ -0,0 +1,27 @@ +name: "Resistance Relic" +description: Take 25% 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: + - obsidian + - obsidian + - obsidian + + - obsidian + - nether_star + - obsidian + + - obsidian + - obsidian + - obsidian + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODk0MDE0YWM1OGE5NmYxZDIzNjEzZGE3YTFlY2RiNmEyN2E0YTRkYjBiMTgwNTJjYTI2MjM1NmQyNGIxZiJ9fX0= + +config: + percent-less-damage: 25 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/relic/sharpnessrelic.yml b/eco-core/core-plugin/src/main/resources/talismans/relic/sharpnessrelic.yml new file mode 100644 index 0000000..6257401 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/relic/sharpnessrelic.yml @@ -0,0 +1,27 @@ +name: "Sharpness Relic" +description: Deal 40% more melee 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: + - diamond_sword + - diamond_sword + - diamond_sword + + - diamond_sword + - nether_star + - diamond_sword + + - diamond_sword + - diamond_sword + - diamond_sword + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTdlNTVkNzI2MGFhM2IwNGU2ZTAwNjhjMTYyM2E3NWMzNTc3ODI3NzRlZGQ0YWZmMWQwZDYyNWY3OWQ5ZDRkZSJ9fX0= + +config: + percent-more-damage: 40 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/relic/strengthrelic.yml b/eco-core/core-plugin/src/main/resources/talismans/relic/strengthrelic.yml new file mode 100644 index 0000000..7b887e9 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/relic/strengthrelic.yml @@ -0,0 +1,27 @@ +name: "Strength Relic" +description: Deal 25% more 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: + - nether_star + - trident + - nether_star + + - crossbow + - nether_star + - diamond_sword + + - nether_star + - dragon_head + - nether_star + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDkwMzIyMTEyNGUxYTI3NDAyMjc2YzNlMDE3NmJjOWY2MzIzOGQ3ZWE3NzEzZTliNTc5YTg3OGRhY2EyNDgxOSJ9fX0= + +config: + percent-more-damage: 25 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/ring/archeryring.yml b/eco-core/core-plugin/src/main/resources/talismans/ring/archeryring.yml new file mode 100644 index 0000000..0373ef9 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/ring/archeryring.yml @@ -0,0 +1,27 @@ +name: "Archery Ring" +description: Deal 25% more damage with bows. +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: + - bow + - crossbow + - bow + + - crossbow + - heart_of_the_sea + - crossbow + + - bow + - crossbow + - bow + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYmQ3NDk5NWQ2Y2RhMmI4YTI0NzcyYWY5NjllZjA3N2FlM2E4NWUyMzU3YzZmNjExOWI4YTI1MDYwNDFhNDQ4YiJ9fX0= + +config: + percent-more-damage: 25 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/ring/endring.yml b/eco-core/core-plugin/src/main/resources/talismans/ring/endring.yml new file mode 100644 index 0000000..d474ea5 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/ring/endring.yml @@ -0,0 +1,27 @@ +name: "End Ring" +description: Deal 25% more damage in the end. +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: + - end_stone + - shulker_shell + - end_stone + + - shulker_shell + - heart_of_the_sea + - shulker_shell + + - end_stone + - shulker_shell + - end_stone + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTZjMGIzNmQ1M2ZmZjY5YTQ5YzdkNmYzOTMyZjJiMGZlOTQ4ZTAzMjIyNmQ1ZTgwNDVlYzU4NDA4YTM2ZTk1MSJ9fX0= + +config: + percent-more-damage: 25 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/ring/experiencering.yml b/eco-core/core-plugin/src/main/resources/talismans/ring/experiencering.yml new file mode 100644 index 0000000..36e5494 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/ring/experiencering.yml @@ -0,0 +1,27 @@ +name: "Experience Ring" +description: Gain 25% more experience. +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: + - diamond + - diamond_block + - diamond + + - diamond_block + - heart_of_the_sea + - diamond_block + + - diamond + - diamond_block + - diamond + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzA1NGMyOWM3ODA5MDQ3MWMxZWEwNThiZDY0MTg5NzM5MWM5ZTQ2OTRhYTlkMTQwYWZiYmE4ZDBjYzQzNjM3In19fQ== + +config: + percentage-bonus: 25 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/ring/extractionring.yml b/eco-core/core-plugin/src/main/resources/talismans/ring/extractionring.yml new file mode 100644 index 0000000..31bba6d --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/ring/extractionring.yml @@ -0,0 +1,28 @@ +name: "Extraction Ring" +description: Chance to get xp while mining. +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: + - emerald + - emerald_block + - emerald + + - emerald_block + - heart_of_the_sea + - emerald_block + + - emerald + - emerald_block + - emerald + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZmQxZWUyYjYwYTlkODFlYTgyZWIyNTBjNzEyYjNhNmJhYmVkMDNkMjFkNmY4MTg3MDBjNzBlNDM4OGU2YTUxOCJ9fX0= + +config: + chance: 5 + xp-amount: 20 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/ring/featherring.yml b/eco-core/core-plugin/src/main/resources/talismans/ring/featherring.yml new file mode 100644 index 0000000..438b6fe --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/ring/featherring.yml @@ -0,0 +1,27 @@ +name: "Feather Ring" +description: Take 25% less fall 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: + - feather + - feather + - feather + + - feather + - heart_of_the_sea + - feather + + - feather + - feather + - feather + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODY4NmQ5NmFkOGU1OGE4NmE1YTI4MzI2Yzk5ZmRlOWQ0OTgxZTQ2YzA5ZWFlNTFlN2E5ODYxOTBjZDM2YjBmIn19fQ== + +config: + multiplier: 0.75 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/ring/flamering.yml b/eco-core/core-plugin/src/main/resources/talismans/ring/flamering.yml new file mode 100644 index 0000000..f349d7a --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/ring/flamering.yml @@ -0,0 +1,27 @@ +name: "Flame Ring" +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_rod + - blaze_powder + + - blaze_rod + - heart_of_the_sea + - blaze_rod + + - blaze_powder + - blaze_rod + - blaze_powder + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGJjYjFkZGZjOGRhODUyZDNmMjU4ZmNiODg1ZjJjYjVlNGIyNmE3ZWJjZmJkMGIzM2VjMTM3N2EyMzVmM2E0NSJ9fX0= + +config: + multiplier: 0.75 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/ring/netherring.yml b/eco-core/core-plugin/src/main/resources/talismans/ring/netherring.yml new file mode 100644 index 0000000..358351e --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/ring/netherring.yml @@ -0,0 +1,27 @@ +name: "Nether Ring" +description: Deal 25% more damage in the nether. +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: + - netherrack + - wither_skeleton_skull + - netherrack + + - wither_skeleton_skull + - heart_of_the_sea + - wither_skeleton_skull + + - netherrack + - wither_skeleton_skull + - netherrack + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjE2MTAyYmM0ZjYwOWMyMjQwNDM3MWFlZjZjNjQxYmI5NjQwOWJjNTAwN2RjYTQ0YWM2NjhlZGRlYmFiZTQ0NiJ9fX0= + +config: + percent-more-damage: 25 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/ring/poseidonring.yml b/eco-core/core-plugin/src/main/resources/talismans/ring/poseidonring.yml new file mode 100644 index 0000000..da35d62 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/ring/poseidonring.yml @@ -0,0 +1,27 @@ +name: "Poseidon Ring" +description: Deal 25% 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: + - nautilus_shell + - trident + - nautilus_shell + + - trident + - heart_of_the_sea + - trident + + - diamond_block + - trident + - diamond_block + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjIyZTNhNTY5ZThkNTgxNDM3YzUwM2UyYWQxZDRiNTkxYmNiODI5MWE3MWVmN2IzNzM4OGVlYTNiMDhlNzIifX19 + +config: + percent-more-damage: 25 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/ring/resistancering.yml b/eco-core/core-plugin/src/main/resources/talismans/ring/resistancering.yml new file mode 100644 index 0000000..312a167 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/ring/resistancering.yml @@ -0,0 +1,27 @@ +name: "Resistance Ring" +description: Take 10% 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: + - iron_block + - obsidian + - iron_block + + - obsidian + - heart_of_the_sea + - obsidian + + - iron_block + - obsidian + - iron_block + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjY5ZDBkNDcxMTE1M2EwODljNTU2N2E3NDliMjc4NzljNzY5ZDNiZGNlYTZmZGE5ZDZmNjZlOTNkZDhjNDUxMiJ9fX0= + +config: + percent-less-damage: 10 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/ring/sharpnessring.yml b/eco-core/core-plugin/src/main/resources/talismans/ring/sharpnessring.yml new file mode 100644 index 0000000..22ddfb8 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/ring/sharpnessring.yml @@ -0,0 +1,27 @@ +name: "Sharpness Ring" +description: Deal 25% more melee 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: + - iron_sword + - diamond_sword + - iron_sword + + - iron_sword + - heart_of_the_sea + - iron_sword + + - diamond_sword + - iron_sword + - diamond_sword + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjg4MWI1ZTkxZjliNGVlMGQ0YzUzMzk2MmJiNjhmYTczY2VkYjc1ZWNkMjY4ZWNiZGQ0NGNhMGY0MDkxNDhjMiJ9fX0= + +config: + percent-more-damage: 10 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/ring/strengthring.yml b/eco-core/core-plugin/src/main/resources/talismans/ring/strengthring.yml new file mode 100644 index 0000000..6449bc5 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/talismans/ring/strengthring.yml @@ -0,0 +1,27 @@ +name: "Strength Ring" +description: Deal 10% more 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: + - iron_block + - nether_star + - iron_block + + - nether_star + - heart_of_the_sea + - nether_star + + - iron_block + - nether_star + - iron_block + +general-config: + disabled-in-worlds: [] + # Texture is base64, https://minecraft-heads.com has a list of skulls. + texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDkwMzIyMTEyNGUxYTI3NDAyMjc2YzNlMDE3NmJjOWY2MzIzOGQ3ZWE3NzEzZTliNTc5YTg3OGRhY2EyNDgxOSJ9fX0= + +config: + percent-more-damage: 10 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/archerytalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/archerytalisman.yml index 1183e64..f8333dc 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/archerytalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/archerytalisman.yml @@ -6,17 +6,17 @@ 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 + - bow + - bow + - bow - - arrow - - coal_block - - arrow + - bow + - eye_of_ender + - bow - - arrow - - arrow - - arrow + - bow + - bow + - bow general-config: disabled-in-worlds: [] diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/creepertalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/creepertalisman.yml index 12748a0..588be22 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/creepertalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/creepertalisman.yml @@ -11,7 +11,7 @@ obtaining: - gunpowder - gunpowder - - iron_block + - eye_of_ender - gunpowder - gunpowder diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/endtalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/endtalisman.yml index fa8486d..e69e0ae 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/endtalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/endtalisman.yml @@ -11,7 +11,7 @@ obtaining: - end_stone - end_stone - - gold_block + - eye_of_ender - end_stone - end_stone diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/experiencetalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/experiencetalisman.yml index 424a7e5..0d69318 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/experiencetalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/experiencetalisman.yml @@ -1,22 +1,22 @@ name: "Experience Talisman" -description: Gain 25% more experience. +description: Gain 10% more experience. 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: - - rotten_flesh - - rotten_flesh - - rotten_flesh + - diamond + - diamond + - diamond - - rotten_flesh - - iron_block - - rotten_flesh + - diamond + - eye_of_ender + - diamond - - rotten_flesh - - rotten_flesh - - rotten_flesh + - diamond + - diamond + - diamond general-config: disabled-in-worlds: [] @@ -24,4 +24,4 @@ general-config: texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzA1NGMyOWM3ODA5MDQ3MWMxZWEwNThiZDY0MTg5NzM5MWM5ZTQ2OTRhYTlkMTQwYWZiYmE4ZDBjYzQzNjM3In19fQ== config: - percentage-bonus: 25 \ No newline at end of file + percentage-bonus: 10 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/extractiontalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/extractiontalisman.yml index 9291abe..4dbe20b 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/extractiontalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/extractiontalisman.yml @@ -6,17 +6,17 @@ 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: - - cobblestone - - stone - - cobblestone + - emerald + - emerald + - emerald - - stone - - gold_block - - stone + - emerald + - eye_of_ender + - emerald - - cobblestone - - stone - - cooblestone + - emerald + - emerald + - emerald general-config: disabled-in-worlds: [] diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/feathertalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/feathertalisman.yml index 36d3107..d0852ae 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/feathertalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/feathertalisman.yml @@ -1,5 +1,5 @@ name: "Feather Talisman" -description: Take 25% less fall damage. +description: Take 10% less fall damage. enabled: true obtaining: @@ -11,7 +11,7 @@ obtaining: - feather - feather - - diamond_block + - eye_of_ender - feather - feather @@ -24,4 +24,4 @@ general-config: texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODY4NmQ5NmFkOGU1OGE4NmE1YTI4MzI2Yzk5ZmRlOWQ0OTgxZTQ2YzA5ZWFlNTFlN2E5ODYxOTBjZDM2YjBmIn19fQ== config: - multiplier: 0.5 \ No newline at end of file + multiplier: 0.90 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/flametalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/flametalisman.yml index 18d2a5d..24749ae 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/flametalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/flametalisman.yml @@ -1,5 +1,5 @@ name: "Flame Talisman" -description: Take 25% less fire damage. +description: Take 10% less fire damage. enabled: true obtaining: @@ -11,7 +11,7 @@ obtaining: - blaze_powder - blaze_powder - - diamond_block + - eye_of_ender - blaze_powder - blaze_powder @@ -24,4 +24,4 @@ general-config: texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzBhNDRkNTFlY2M3OWY2OTRjZmQ2MDIyOGM4ODQyODg0OGNhNjE4ZTM2YTY1OWE0MTZlOTI0NmQ4NDFhZWM4In19fQ== config: - multiplier: 0.5 \ No newline at end of file + multiplier: 0.9 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/nethertalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/nethertalisman.yml index 4f18aad..8767a1a 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/nethertalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/nethertalisman.yml @@ -11,7 +11,7 @@ obtaining: - netherrack - netherrack - - gold_block + - eye_of_ender - netherrack - netherrack diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/poseidontalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/poseidontalisman.yml index 89dd021..383af5a 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/poseidontalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/poseidontalisman.yml @@ -6,17 +6,17 @@ 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 + - nautilus_shell + - nautilus_shell + - nautilus_shell - - arrow - - coal_block - - arrow + - nautilus_shell + - eye_of_ender + - nautilus_shell - - arrow - - arrow - - arrow + - nautilus_shell + - nautilus_shell + - nautilus_shell general-config: disabled-in-worlds: [] diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/raidtalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/raidtalisman.yml index c2485c7..7c77e76 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/raidtalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/raidtalisman.yml @@ -6,17 +6,17 @@ 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: - - rotten_flesh - - rotten_flesh - - rotten_flesh + - bell + - bell + - bell - - rotten_flesh - - iron_block - - rotten_flesh + - bell + - eye_of_ender + - bell - - rotten_flesh - - rotten_flesh - - rotten_flesh + - bell + - bell + - bell general-config: disabled-in-worlds: [] diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/resistancetalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/resistancetalisman.yml index 43f1917..731c850 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/resistancetalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/resistancetalisman.yml @@ -6,16 +6,16 @@ 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: - - iron_block - - iron_block - - iron_block - - iron_block - shield - iron_block + - shield + - eye_of_ender + - shield + - iron_block - - iron_block + - shield - iron_block general-config: diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/sharpnesstalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/sharpnesstalisman.yml index aafb23c..74d14ad 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/sharpnesstalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/sharpnesstalisman.yml @@ -6,17 +6,17 @@ 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: - - iron_ingot - - flint - - iron_ingot - - - flint - iron_sword - - flint + - iron_sword + - iron_sword - - iron_ingot - - flint - - iron_ingot + - iron_sword + - eye_of_ender + - iron_sword + + - iron_sword + - iron_sword + - iron_sword general-config: disabled-in-worlds: [] diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/skeletontalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/skeletontalisman.yml index c5c9ef8..211aac1 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/skeletontalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/skeletontalisman.yml @@ -11,7 +11,7 @@ obtaining: - bone - bone - - iron_block + - eye_of_ender - bone - bone diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/spiderresistancetalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/spiderresistancetalisman.yml index bcb9d67..8aa8dbc 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/spiderresistancetalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/spiderresistancetalisman.yml @@ -6,16 +6,16 @@ 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 + - shield + - eye_of_ender + - shield + - string - - string + - shield - string general-config: diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/spidertalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/spidertalisman.yml index 8c090e0..fb87476 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/spidertalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/spidertalisman.yml @@ -11,7 +11,7 @@ obtaining: - string - string - - iron_block + - eye_of_ender - string - string diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/strengthtalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/strengthtalisman.yml index f595593..d4b6924 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/strengthtalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/strengthtalisman.yml @@ -11,7 +11,7 @@ obtaining: - iron_block - iron_block - - iron_sword + - eye_of_ender - iron_block - iron_block @@ -24,4 +24,4 @@ general-config: texture: eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODQ4NTlkMGFkZmM5M2JlMTliYjQ0MWU2ZWRmZDQzZjZiZmU2OTEyNzIzMDMzZjk2M2QwMDlhMTFjNDgyNDUxMCJ9fX0= config: - percent-less-damage: 5 \ No newline at end of file + percent-more-damage: 5 \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/zombieresistancetalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/zombieresistancetalisman.yml index 642094b..36ba54c 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/zombieresistancetalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/zombieresistancetalisman.yml @@ -6,16 +6,16 @@ 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: - - rotten_flesh - - rotten_flesh - - rotten_flesh - - rotten_flesh - shield - rotten_flesh + - shield + - eye_of_ender + - shield + - rotten_flesh - - rotten_flesh + - shield - rotten_flesh general-config: diff --git a/eco-core/core-plugin/src/main/resources/talismans/talisman/zombietalisman.yml b/eco-core/core-plugin/src/main/resources/talismans/talisman/zombietalisman.yml index a0131ce..1c27d37 100644 --- a/eco-core/core-plugin/src/main/resources/talismans/talisman/zombietalisman.yml +++ b/eco-core/core-plugin/src/main/resources/talismans/talisman/zombietalisman.yml @@ -11,7 +11,7 @@ obtaining: - rotten_flesh - rotten_flesh - - iron_block + - eye_of_ender - rotten_flesh - rotten_flesh