diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a72e60d..59b870f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: variables: name: "EpicEnchants" path: "/builds/$CI_PROJECT_PATH" - version: "1_B8" + version: "1_RC1" build: stage: build diff --git a/src/main/java/com/songoda/epicenchants/command/CommandManager.java b/src/main/java/com/songoda/epicenchants/command/CommandManager.java index e355327..b9382d1 100644 --- a/src/main/java/com/songoda/epicenchants/command/CommandManager.java +++ b/src/main/java/com/songoda/epicenchants/command/CommandManager.java @@ -28,7 +28,7 @@ public class CommandManager implements CommandExecutor { addCommand(new CommandSettings(commandEpicEnchants)); addCommand(new CommandReload(commandEpicEnchants)); addCommand(new CommandApply(commandEpicEnchants)); - addCommand(new CommandInfo(commandEpicEnchants)); + addCommand(new CommandList(commandEpicEnchants)); addCommand(new CommandGiveBook(commandEpicEnchants)); addCommand(new CommandGiveItemDust(commandEpicEnchants)); addCommand(new CommandGiveScroll(commandEpicEnchants)); diff --git a/src/main/java/com/songoda/epicenchants/command/commands/CommandInfo.java b/src/main/java/com/songoda/epicenchants/command/commands/CommandList.java similarity index 83% rename from src/main/java/com/songoda/epicenchants/command/commands/CommandInfo.java rename to src/main/java/com/songoda/epicenchants/command/commands/CommandList.java index a2060b4..c2f36ca 100644 --- a/src/main/java/com/songoda/epicenchants/command/commands/CommandInfo.java +++ b/src/main/java/com/songoda/epicenchants/command/commands/CommandList.java @@ -16,13 +16,12 @@ import java.util.Optional; import static com.songoda.epicenchants.enums.EnchantResult.BROKEN_FAILURE; import static com.songoda.epicenchants.utils.single.GeneralUtils.getMessageFromResult; -public class CommandInfo extends AbstractCommand { +public class CommandList extends AbstractCommand { - public CommandInfo(AbstractCommand parent) { - super(parent, true, "info"); + public CommandList(AbstractCommand parent) { + super(parent, true, "list"); } - //ee apply [enchant] [level] @Override protected ReturnType runCommand(EpicEnchants instance, CommandSender sender, String... args) { instance.getInfoManager().getMainInfoMenu().open((Player)sender); @@ -36,12 +35,12 @@ public class CommandInfo extends AbstractCommand { @Override public String getPermissionNode() { - return "epicenchants.info"; + return "epicenchants.list"; } @Override public String getSyntax() { - return "/ee info"; + return "/ee list"; } @Override diff --git a/src/main/resources/enchants/elite/AntiGravity.yml b/src/main/resources/enchants/elite/AntiGravity.yml index ee2c5e4..23767fa 100644 --- a/src/main/resources/enchants/elite/AntiGravity.yml +++ b/src/main/resources/enchants/elite/AntiGravity.yml @@ -7,7 +7,7 @@ max-level: 3 # The group of this enchant. Configure the groups in the groups.yml file. group: ELITE -#Description +# Description description: - "Permanent jump boost." diff --git a/src/main/resources/enchants/elite/Frozen.yml b/src/main/resources/enchants/elite/Frozen.yml index 4531bae..20e5212 100644 --- a/src/main/resources/enchants/elite/Frozen.yml +++ b/src/main/resources/enchants/elite/Frozen.yml @@ -7,7 +7,7 @@ max-level: 3 # The group of this enchant. Configure the groups in the groups.yml file. group: ELITE -#Description +# Description description: - "Slow your enemies down when" - "you are attacked." diff --git a/src/main/resources/enchants/elite/RocketEscape.yml b/src/main/resources/enchants/elite/RocketEscape.yml index 522b541..a079304 100644 --- a/src/main/resources/enchants/elite/RocketEscape.yml +++ b/src/main/resources/enchants/elite/RocketEscape.yml @@ -7,7 +7,7 @@ max-level: 3 # The group of this enchant. Configure the groups in the groups.yml file. group: ELITE -#Description +# Description description: - "Blast off into the air at low HP." diff --git a/src/main/resources/enchants/elite/Shockwave.yml b/src/main/resources/enchants/elite/Shockwave.yml index 9353281..f6e14fe 100644 --- a/src/main/resources/enchants/elite/Shockwave.yml +++ b/src/main/resources/enchants/elite/Shockwave.yml @@ -7,7 +7,7 @@ max-level: 5 # The group of this enchant. Configure the groups in the groups.yml file. group: ELITE -#Description +# Description description: - "Push your attackers backwards" - "when you are attacked." @@ -16,13 +16,15 @@ description: item-whitelist: - "CHESTPLATES" -# For a full list of effects, please visit: https://docs.songoda.com/epic-series/epicenchants/tutorials +# For a full list of effects, please visit: https://wiki.songoda.com/display/SON/EpicEnchants effects: THROW: # The trigger that will fire this effect. trigger: "DEFENSE_PLAYER_MELEE, DEFENSE_PLAYER_RANGE" # The direction of the throw. direction: BACKWARD + # Who should this effect be ran on. + who: OPPONENT # Magnitude of the throw. magnitude: "{level} * 0.2" # Chance of the effect firing. diff --git a/src/main/resources/enchants/elite/Wither.yml b/src/main/resources/enchants/elite/Wither.yml index efc8bfc..ebcf1b1 100644 --- a/src/main/resources/enchants/elite/Wither.yml +++ b/src/main/resources/enchants/elite/Wither.yml @@ -7,7 +7,7 @@ max-level: 5 # The group of this enchant. Configure the groups in the groups.yml file. group: ELITE -#Description +# Description description: - "Infect your enemies with a wither" - "effect when you are attacked." diff --git a/src/main/resources/enchants/legendary/DeathBringer.yml b/src/main/resources/enchants/legendary/DeathBringer.yml index 1742ef8..78ea844 100644 --- a/src/main/resources/enchants/legendary/DeathBringer.yml +++ b/src/main/resources/enchants/legendary/DeathBringer.yml @@ -7,9 +7,9 @@ max-level: 1 # The group of this enchant. Configure the groups in the groups.yml file. group: LEGENDARY -#Description +# Description description: - - "Chance to gain Strengh for a short time." + - "Chance to gain Strength for a short time." # What items this enchant can be applied to. item-whitelist: diff --git a/src/main/resources/enchants/legendary/DeathGod.yml b/src/main/resources/enchants/legendary/DeathGod.yml index 41e5dcf..7bbf58b 100644 --- a/src/main/resources/enchants/legendary/DeathGod.yml +++ b/src/main/resources/enchants/legendary/DeathGod.yml @@ -7,7 +7,7 @@ max-level: 3 # The group of this enchant. Configure the groups in the groups.yml file. group: LEGENDARY -#Description +# Description description: - "Chance of regain a lot of hearts" - "when under 2 hearts." diff --git a/src/main/resources/enchants/legendary/Enlightened.yml b/src/main/resources/enchants/legendary/Enlightened.yml index be9babf..b055a70 100644 --- a/src/main/resources/enchants/legendary/Enlightened.yml +++ b/src/main/resources/enchants/legendary/Enlightened.yml @@ -7,7 +7,7 @@ max-level: 3 # The group of this enchant. Configure the groups in the groups.yml file. group: LEGENDARY -#Description +# Description description: - "Chance to heal while damaged." diff --git a/src/main/resources/enchants/legendary/Gears.yml b/src/main/resources/enchants/legendary/Gears.yml index 1b65306..915af7a 100644 --- a/src/main/resources/enchants/legendary/Gears.yml +++ b/src/main/resources/enchants/legendary/Gears.yml @@ -7,7 +7,7 @@ max-level: 3 # The group of this enchant. Configure the groups in the groups.yml file. group: LEGENDARY -#Description +# Description description: - "Gain speed when equipped." diff --git a/src/main/resources/enchants/legendary/LifeSteal.yml b/src/main/resources/enchants/legendary/LifeSteal.yml index 8a451c3..e064ee4 100644 --- a/src/main/resources/enchants/legendary/LifeSteal.yml +++ b/src/main/resources/enchants/legendary/LifeSteal.yml @@ -7,7 +7,7 @@ max-level: 5 # The group of this enchant. Configure the groups in the groups.yml file. group: LEGENDARY -#Description +# Description description: - "Chance to steal life from your opponent." diff --git a/src/main/resources/enchants/legendary/Overload.yml b/src/main/resources/enchants/legendary/Overload.yml index 5c58413..ec36eab 100644 --- a/src/main/resources/enchants/legendary/Overload.yml +++ b/src/main/resources/enchants/legendary/Overload.yml @@ -7,7 +7,7 @@ max-level: 3 # The group of this enchant. Configure the groups in the groups.yml file. group: LEGENDARY -#Description +# Description description: - "Grants permanent extra health." diff --git a/src/main/resources/enchants/legendary/SkillSwipe.yml b/src/main/resources/enchants/legendary/SkillSwipe.yml index 2691bef..b87799b 100644 --- a/src/main/resources/enchants/legendary/SkillSwipe.yml +++ b/src/main/resources/enchants/legendary/SkillSwipe.yml @@ -7,7 +7,7 @@ max-level: 5 # The group of this enchant. Configure the groups in the groups.yml file. group: LEGENDARY -#Description +# Description description: - "Chance to steal EXP from your opponent." diff --git a/src/main/resources/enchants/simple/Aquatic.yml b/src/main/resources/enchants/simple/Aquatic.yml index 720c197..04969ed 100644 --- a/src/main/resources/enchants/simple/Aquatic.yml +++ b/src/main/resources/enchants/simple/Aquatic.yml @@ -7,7 +7,7 @@ max-level: 1 # The group of this enchant. Configure the groups in the groups.yml file. group: SIMPLE -#Description +# Description description: - "Gives permanent water breathing." diff --git a/src/main/resources/enchants/simple/Confusion.yml b/src/main/resources/enchants/simple/Confusion.yml index a251f14..1bc487a 100644 --- a/src/main/resources/enchants/simple/Confusion.yml +++ b/src/main/resources/enchants/simple/Confusion.yml @@ -7,7 +7,7 @@ max-level: 3 # The group of this enchant. Configure the groups in the groups.yml file. group: SIMPLE -#Description +# Description description: - "A chance to deal" - "nauseau to your victim." diff --git a/src/main/resources/enchants/simple/Experience.yml b/src/main/resources/enchants/simple/Experience.yml index fd002ec..6d26691 100644 --- a/src/main/resources/enchants/simple/Experience.yml +++ b/src/main/resources/enchants/simple/Experience.yml @@ -7,7 +7,7 @@ max-level: 5 # The group of this enchant. Configure the groups in the groups.yml file. group: SIMPLE -#Description +# Description description: - "A chance to receive" - "more EXP when mining blocks." diff --git a/src/main/resources/enchants/simple/Glowing.yml b/src/main/resources/enchants/simple/Glowing.yml index 666344e..70b5d30 100644 --- a/src/main/resources/enchants/simple/Glowing.yml +++ b/src/main/resources/enchants/simple/Glowing.yml @@ -7,7 +7,7 @@ max-level: 1 # The group of this enchant. Configure the groups in the groups.yml file. group: SIMPLE -#Description +# Description description: - "Gives you permanent night vision" diff --git a/src/main/resources/enchants/simple/Haste.yml b/src/main/resources/enchants/simple/Haste.yml index 323a853..71b91c0 100644 --- a/src/main/resources/enchants/simple/Haste.yml +++ b/src/main/resources/enchants/simple/Haste.yml @@ -7,7 +7,7 @@ max-level: 3 # The group of this enchant. Configure the groups in the groups.yml file. group: SIMPLE -#Description +# Description description: - "Permanent haste effect when" - "holding a tool with this enchant." diff --git a/src/main/resources/enchants/simple/Insomnia.yml b/src/main/resources/enchants/simple/Insomnia.yml index ab1a971..def562c 100644 --- a/src/main/resources/enchants/simple/Insomnia.yml +++ b/src/main/resources/enchants/simple/Insomnia.yml @@ -7,7 +7,7 @@ max-level: 7 # The group of this enchant. Configure the groups in the groups.yml file. group: SIMPLE -#Description +# Description description: - "A chance to give your opponent" - "slowness, slow swinging and confusion." diff --git a/src/main/resources/enchants/simple/Obliterate.yml b/src/main/resources/enchants/simple/Obliterate.yml index 9bb2c68..a62498c 100644 --- a/src/main/resources/enchants/simple/Obliterate.yml +++ b/src/main/resources/enchants/simple/Obliterate.yml @@ -7,7 +7,7 @@ max-level: 3 # The group of this enchant. Configure the groups in the groups.yml file. group: SIMPLE -#Description +# Description description: - "A chance to deal extreme knockback" diff --git a/src/main/resources/enchants/ultimate/Blind.yml b/src/main/resources/enchants/ultimate/Blind.yml index 4bb7529..2dfc502 100644 --- a/src/main/resources/enchants/ultimate/Blind.yml +++ b/src/main/resources/enchants/ultimate/Blind.yml @@ -7,7 +7,7 @@ max-level: 5 # The group of this enchant. Configure the groups in the groups.yml file. group: ULTIMATE -#Description +# Description description: - "Chance to give the blindness on" - "effect to your opponent on attack." diff --git a/src/main/resources/enchants/ultimate/Dodge.yml b/src/main/resources/enchants/ultimate/Dodge.yml index 34bcab6..523aa42 100644 --- a/src/main/resources/enchants/ultimate/Dodge.yml +++ b/src/main/resources/enchants/ultimate/Dodge.yml @@ -7,7 +7,7 @@ max-level: 5 # The group of this enchant. Configure the groups in the groups.yml file. group: ULTIMATE -#Description +# Description description: - "Chance to dodge melee attacks," - "increased chance when sneaking." @@ -22,5 +22,5 @@ effects: # The trigger that will fire this effect trigger: "DEFENSE_PLAYER_MELEE,DEFENSE_MOB_MELEE" # Chance that this effect wil fire. - chance: "user_is_sneaking ? (8 * {level}) : (4 * {level})" + chance: "{user_is_sneaking} ? (8 * {level}) : (4 * {level})" \ No newline at end of file diff --git a/src/main/resources/enchants/ultimate/IceAspect.yml b/src/main/resources/enchants/ultimate/IceAspect.yml index 1ee4f5f..e92a2e0 100644 --- a/src/main/resources/enchants/ultimate/IceAspect.yml +++ b/src/main/resources/enchants/ultimate/IceAspect.yml @@ -16,12 +16,12 @@ item-whitelist: - "SWORDS" - "AXES" -# For a full list of effects, please visit: https://docs.songoda.com/epic-series/epicenchants/tutorials +# For a full list of effects, please visit: https://wiki.songoda.com/display/SON/EpicEnchants effects: POTION: trigger: 'ATTACK_PLAYER_MELEE,ATTACK_PLAYER_RANGE,ATTACK_MOB_MELEE,ATTACK_MOB_RANGE' - potion-type: SLOWNESS + potion-type: SLOW duration: '10*{level}' amplifier: '{level}' who: OPPONENT - chance: '15*{level}' + chance: '15*{level}' \ No newline at end of file diff --git a/src/main/resources/enchants/ultimate/StormFall.yml b/src/main/resources/enchants/ultimate/StormFall.yml index dd1697f..8eb2e46 100644 --- a/src/main/resources/enchants/ultimate/StormFall.yml +++ b/src/main/resources/enchants/ultimate/StormFall.yml @@ -7,7 +7,7 @@ max-level: 3 # The group of this enchant. Configure the groups in the groups.yml file. group: ULTIMATE -#Description +# Description description: - "Summon Lightnings at your Opponnent." diff --git a/src/main/resources/enchants/unique/Berserk.yml b/src/main/resources/enchants/unique/Berserk.yml index fe90e4c..b3f7c74 100644 --- a/src/main/resources/enchants/unique/Berserk.yml +++ b/src/main/resources/enchants/unique/Berserk.yml @@ -7,7 +7,7 @@ max-level: 5 # The group of this enchant. Configure the groups in the groups.yml file. group: UNIQUE -#Description +# Description description: - "A chance to receive strength." - "and mining fatique." diff --git a/src/main/resources/enchants/unique/Explosive.yml b/src/main/resources/enchants/unique/Explosive.yml index d405965..3aee665 100644 --- a/src/main/resources/enchants/unique/Explosive.yml +++ b/src/main/resources/enchants/unique/Explosive.yml @@ -7,7 +7,7 @@ max-level: 5 # The group of this enchant. Configure the groups in the groups.yml file. group: UNIQUE -#Description +# Description description: - "A chance for your arrows to" - "blow up on impact." diff --git a/src/main/resources/enchants/unique/FeatherWeight.yml b/src/main/resources/enchants/unique/FeatherWeight.yml index 612056d..e8c6522 100644 --- a/src/main/resources/enchants/unique/FeatherWeight.yml +++ b/src/main/resources/enchants/unique/FeatherWeight.yml @@ -7,7 +7,7 @@ max-level: 3 # The group of this enchant. Configure the groups in the groups.yml file. group: UNIQUE -#Description +# Description description: - "A chance to give a burst of haste." diff --git a/src/main/resources/enchants/unique/ObsidianDestroyer.yml b/src/main/resources/enchants/unique/ObsidianDestroyer.yml index 9d5cb15..a76c547 100644 --- a/src/main/resources/enchants/unique/ObsidianDestroyer.yml +++ b/src/main/resources/enchants/unique/ObsidianDestroyer.yml @@ -7,7 +7,7 @@ max-level: 5 # The group of this enchant. Configure the groups in the groups.yml file. group: SIMPLE -#Description +# Description description: - "A chance to instantly break obsidian." diff --git a/src/main/resources/enchants/unique/PlagueCarrier.yml b/src/main/resources/enchants/unique/PlagueCarrier.yml index a82f40c..47d3b36 100644 --- a/src/main/resources/enchants/unique/PlagueCarrier.yml +++ b/src/main/resources/enchants/unique/PlagueCarrier.yml @@ -7,7 +7,7 @@ max-level: 8 # The group of this enchant. Configure the groups in the groups.yml file. group: UNIQUE -#Description +# Description description: - "When near death summon creepers" - "to avenge you." diff --git a/src/main/resources/enchants/unique/Ragdoll.yml b/src/main/resources/enchants/unique/Ragdoll.yml index 78e2341..d2b175f 100644 --- a/src/main/resources/enchants/unique/Ragdoll.yml +++ b/src/main/resources/enchants/unique/Ragdoll.yml @@ -7,7 +7,7 @@ max-level: 4 # The group of this enchant. Configure the groups in the groups.yml file. group: UNIQUE -#Description +# Description description: - "A chance to be pushed back when." - "you take damage." diff --git a/src/main/resources/enchants/unique/SelfDestruct.yml b/src/main/resources/enchants/unique/SelfDestruct.yml index ffec811..a94bb4d 100644 --- a/src/main/resources/enchants/unique/SelfDestruct.yml +++ b/src/main/resources/enchants/unique/SelfDestruct.yml @@ -7,7 +7,7 @@ max-level: 3 # The group of this enchant. Configure the groups in the groups.yml file. group: UNIQUE -#Description +# Description description: - "When near death spawns tnt around you."