From 23f6a657c07984b17a95d50cb528ecb9c1054ed7 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 25 Feb 2021 21:48:42 +0000 Subject: [PATCH] Added barrier, villager, anger, and nautlius artifacts --- .../ecoenchants/enchantments/EcoEnchants.java | 6 +++ .../ecoenchants/artifact/AngerArtifact.java | 18 +++++++ .../artifact/NautilusArtifact.java | 18 +++++++ .../ecoenchants/artifact/SweepArtifact.java | 18 +++++++ .../artifact/VillagerArtifact.java | 18 +++++++ .../enchants/artifact/angerartifact.yml | 47 +++++++++++++++++++ .../enchants/artifact/nautilusartifact.yml | 47 +++++++++++++++++++ .../enchants/artifact/sweepartifact.yml | 47 +++++++++++++++++++ .../enchants/artifact/villagerartifact.yml | 47 +++++++++++++++++++ 9 files changed, 266 insertions(+) create mode 100644 eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/AngerArtifact.java create mode 100644 eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/NautilusArtifact.java create mode 100644 eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SweepArtifact.java create mode 100644 eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/VillagerArtifact.java create mode 100644 eco-core/core-plugin/src/main/resources/enchants/artifact/angerartifact.yml create mode 100644 eco-core/core-plugin/src/main/resources/enchants/artifact/nautilusartifact.yml create mode 100644 eco-core/core-plugin/src/main/resources/enchants/artifact/sweepartifact.yml create mode 100644 eco-core/core-plugin/src/main/resources/enchants/artifact/villagerartifact.yml diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java index d7ce5551..2f42eda9 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java @@ -5,6 +5,7 @@ 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.ecoenchants.enchantments.ecoenchants.artifact.AngerArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.AshArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.BarrierArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.CloudsArtifact; @@ -24,6 +25,7 @@ import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.LimeArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.MagicArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.MagmaArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.MusicArtifact; +import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.NautilusArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.NetherArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.RedstoneArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.SmokeArtifact; @@ -33,6 +35,7 @@ import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.SoulFireArtifact import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.SparkleArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.TearArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.TotemArtifact; +import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.VillagerArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.WarpedArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.WaterArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.WitchArtifact; @@ -478,6 +481,9 @@ public class EcoEnchants { public static final EcoEnchant AVERSION = new Aversion(); public static final EcoEnchant INTROVERSION = new Introversion(); public static final EcoEnchant BARRIER_ARTIFACT = new BarrierArtifact(); + public static final EcoEnchant VILLAGER_ARTIFACT = new VillagerArtifact(); + public static final EcoEnchant ANGER_ARTIFACT = new AngerArtifact(); + public static final EcoEnchant NAUTILUS_ARTIFACT = new NautilusArtifact(); /** * Get all registered {@link EcoEnchant}s. diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/AngerArtifact.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/AngerArtifact.java new file mode 100644 index 00000000..d60ed683 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/AngerArtifact.java @@ -0,0 +1,18 @@ +package com.willfp.ecoenchants.enchantments.ecoenchants.artifact; + +import com.willfp.ecoenchants.enchantments.itemtypes.Artifact; +import org.bukkit.Particle; +import org.jetbrains.annotations.NotNull; + +public class AngerArtifact extends Artifact { + public AngerArtifact() { + super( + "anger_artifact" + ); + } + + @Override + public @NotNull Particle getParticle() { + return Particle.VILLAGER_ANGRY; + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/NautilusArtifact.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/NautilusArtifact.java new file mode 100644 index 00000000..3a8b2ce4 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/NautilusArtifact.java @@ -0,0 +1,18 @@ +package com.willfp.ecoenchants.enchantments.ecoenchants.artifact; + +import com.willfp.ecoenchants.enchantments.itemtypes.Artifact; +import org.bukkit.Particle; +import org.jetbrains.annotations.NotNull; + +public class NautilusArtifact extends Artifact { + public NautilusArtifact() { + super( + "nautilus_artifact" + ); + } + + @Override + public @NotNull Particle getParticle() { + return Particle.NAUTILUS; + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SweepArtifact.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SweepArtifact.java new file mode 100644 index 00000000..c3cbc353 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SweepArtifact.java @@ -0,0 +1,18 @@ +package com.willfp.ecoenchants.enchantments.ecoenchants.artifact; + +import com.willfp.ecoenchants.enchantments.itemtypes.Artifact; +import org.bukkit.Particle; +import org.jetbrains.annotations.NotNull; + +public class SweepArtifact extends Artifact { + public SweepArtifact() { + super( + "sweep_artifact" + ); + } + + @Override + public @NotNull Particle getParticle() { + return Particle.SWEEP_ATTACK; + } +} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/VillagerArtifact.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/VillagerArtifact.java new file mode 100644 index 00000000..f6d76fd6 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/VillagerArtifact.java @@ -0,0 +1,18 @@ +package com.willfp.ecoenchants.enchantments.ecoenchants.artifact; + +import com.willfp.ecoenchants.enchantments.itemtypes.Artifact; +import org.bukkit.Particle; +import org.jetbrains.annotations.NotNull; + +public class VillagerArtifact extends Artifact { + public VillagerArtifact() { + super( + "villager_artifact" + ); + } + + @Override + public @NotNull Particle getParticle() { + return Particle.VILLAGER_HAPPY; + } +} diff --git a/eco-core/core-plugin/src/main/resources/enchants/artifact/angerartifact.yml b/eco-core/core-plugin/src/main/resources/enchants/artifact/angerartifact.yml new file mode 100644 index 00000000..4eb50523 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/artifact/angerartifact.yml @@ -0,0 +1,47 @@ +# +# Anger Artifact EcoEnchant +# + +name: "Anger Artifact" +description: Creates angry villager particles. +enabled: true + +obtaining: + table: true + villager: true + loot: true + rarity: epic + +general-config: + targets: + - pickaxe + - sword + - axe + - elytra + - bow + - crossbow + - trident + grindstoneable: true + disabled-in-worlds: [] + conflicts: [] + +config: + # For Attack + radius: 1 + y-delta: 0.07 + radius-multiplier: 5 + use-double-helix: false + + # For Arrows + Tridents + particle-tick-delay: 2 + + # For Pickaxes + amount: 10 + on-blocks: + - diamond_ore + - gold_ore + - lapis_ore + - redstone_ore + - iron_ore + - obsidian + - ancient_debris \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/enchants/artifact/nautilusartifact.yml b/eco-core/core-plugin/src/main/resources/enchants/artifact/nautilusartifact.yml new file mode 100644 index 00000000..6a930bdd --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/artifact/nautilusartifact.yml @@ -0,0 +1,47 @@ +# +# Nautilus Artifact EcoEnchant +# + +name: "Nautilus Artifact" +description: Creates nautilus particles. +enabled: true + +obtaining: + table: true + villager: true + loot: true + rarity: epic + +general-config: + targets: + - pickaxe + - sword + - axe + - elytra + - bow + - crossbow + - trident + grindstoneable: true + disabled-in-worlds: [] + conflicts: [] + +config: + # For Attack + radius: 1 + y-delta: 0.07 + radius-multiplier: 5 + use-double-helix: false + + # For Arrows + Tridents + particle-tick-delay: 2 + + # For Pickaxes + amount: 10 + on-blocks: + - diamond_ore + - gold_ore + - lapis_ore + - redstone_ore + - iron_ore + - obsidian + - ancient_debris \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/enchants/artifact/sweepartifact.yml b/eco-core/core-plugin/src/main/resources/enchants/artifact/sweepartifact.yml new file mode 100644 index 00000000..47a7e60e --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/artifact/sweepartifact.yml @@ -0,0 +1,47 @@ +# +# Sweep Artifact EcoEnchant +# + +name: "Sweep Artifact" +description: Creates sweep attack particles. +enabled: true + +obtaining: + table: true + villager: true + loot: true + rarity: epic + +general-config: + targets: + - pickaxe + - sword + - axe + - elytra + - bow + - crossbow + - trident + grindstoneable: true + disabled-in-worlds: [] + conflicts: [] + +config: + # For Attack + radius: 1 + y-delta: 0.07 + radius-multiplier: 5 + use-double-helix: false + + # For Arrows + Tridents + particle-tick-delay: 2 + + # For Pickaxes + amount: 10 + on-blocks: + - diamond_ore + - gold_ore + - lapis_ore + - redstone_ore + - iron_ore + - obsidian + - ancient_debris \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/resources/enchants/artifact/villagerartifact.yml b/eco-core/core-plugin/src/main/resources/enchants/artifact/villagerartifact.yml new file mode 100644 index 00000000..d6d0ffb3 --- /dev/null +++ b/eco-core/core-plugin/src/main/resources/enchants/artifact/villagerartifact.yml @@ -0,0 +1,47 @@ +# +# Villager Artifact EcoEnchant +# + +name: "Villager Artifact" +description: Creates happy villager particles. +enabled: true + +obtaining: + table: true + villager: true + loot: true + rarity: epic + +general-config: + targets: + - pickaxe + - sword + - axe + - elytra + - bow + - crossbow + - trident + grindstoneable: true + disabled-in-worlds: [] + conflicts: [] + +config: + # For Attack + radius: 1 + y-delta: 0.07 + radius-multiplier: 5 + use-double-helix: false + + # For Arrows + Tridents + particle-tick-delay: 2 + + # For Pickaxes + amount: 10 + on-blocks: + - diamond_ore + - gold_ore + - lapis_ore + - redstone_ore + - iron_ore + - obsidian + - ancient_debris \ No newline at end of file