This commit is contained in:
Brianna 2019-08-05 20:06:08 -04:00
parent 721dfa1179
commit 5e97f18bbe
33 changed files with 44 additions and 43 deletions

View File

@ -4,7 +4,7 @@ stages:
variables: variables:
name: "EpicEnchants" name: "EpicEnchants"
path: "/builds/$CI_PROJECT_PATH" path: "/builds/$CI_PROJECT_PATH"
version: "1_B8" version: "1_RC1"
build: build:
stage: build stage: build

View File

@ -28,7 +28,7 @@ public class CommandManager implements CommandExecutor {
addCommand(new CommandSettings(commandEpicEnchants)); addCommand(new CommandSettings(commandEpicEnchants));
addCommand(new CommandReload(commandEpicEnchants)); addCommand(new CommandReload(commandEpicEnchants));
addCommand(new CommandApply(commandEpicEnchants)); addCommand(new CommandApply(commandEpicEnchants));
addCommand(new CommandInfo(commandEpicEnchants)); addCommand(new CommandList(commandEpicEnchants));
addCommand(new CommandGiveBook(commandEpicEnchants)); addCommand(new CommandGiveBook(commandEpicEnchants));
addCommand(new CommandGiveItemDust(commandEpicEnchants)); addCommand(new CommandGiveItemDust(commandEpicEnchants));
addCommand(new CommandGiveScroll(commandEpicEnchants)); addCommand(new CommandGiveScroll(commandEpicEnchants));

View File

@ -16,13 +16,12 @@ import java.util.Optional;
import static com.songoda.epicenchants.enums.EnchantResult.BROKEN_FAILURE; import static com.songoda.epicenchants.enums.EnchantResult.BROKEN_FAILURE;
import static com.songoda.epicenchants.utils.single.GeneralUtils.getMessageFromResult; import static com.songoda.epicenchants.utils.single.GeneralUtils.getMessageFromResult;
public class CommandInfo extends AbstractCommand { public class CommandList extends AbstractCommand {
public CommandInfo(AbstractCommand parent) { public CommandList(AbstractCommand parent) {
super(parent, true, "info"); super(parent, true, "list");
} }
//ee apply [enchant] [level] <success-rate> <destroy-rate>
@Override @Override
protected ReturnType runCommand(EpicEnchants instance, CommandSender sender, String... args) { protected ReturnType runCommand(EpicEnchants instance, CommandSender sender, String... args) {
instance.getInfoManager().getMainInfoMenu().open((Player)sender); instance.getInfoManager().getMainInfoMenu().open((Player)sender);
@ -36,12 +35,12 @@ public class CommandInfo extends AbstractCommand {
@Override @Override
public String getPermissionNode() { public String getPermissionNode() {
return "epicenchants.info"; return "epicenchants.list";
} }
@Override @Override
public String getSyntax() { public String getSyntax() {
return "/ee info"; return "/ee list";
} }
@Override @Override

View File

@ -7,7 +7,7 @@ max-level: 3
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: ELITE group: ELITE
#Description # Description
description: description:
- "Permanent jump boost." - "Permanent jump boost."

View File

@ -7,7 +7,7 @@ max-level: 3
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: ELITE group: ELITE
#Description # Description
description: description:
- "Slow your enemies down when" - "Slow your enemies down when"
- "you are attacked." - "you are attacked."

View File

@ -7,7 +7,7 @@ max-level: 3
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: ELITE group: ELITE
#Description # Description
description: description:
- "Blast off into the air at low HP." - "Blast off into the air at low HP."

View File

@ -7,7 +7,7 @@ max-level: 5
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: ELITE group: ELITE
#Description # Description
description: description:
- "Push your attackers backwards" - "Push your attackers backwards"
- "when you are attacked." - "when you are attacked."
@ -16,13 +16,15 @@ description:
item-whitelist: item-whitelist:
- "CHESTPLATES" - "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: effects:
THROW: THROW:
# The trigger that will fire this effect. # The trigger that will fire this effect.
trigger: "DEFENSE_PLAYER_MELEE, DEFENSE_PLAYER_RANGE" trigger: "DEFENSE_PLAYER_MELEE, DEFENSE_PLAYER_RANGE"
# The direction of the throw. # The direction of the throw.
direction: BACKWARD direction: BACKWARD
# Who should this effect be ran on.
who: OPPONENT
# Magnitude of the throw. # Magnitude of the throw.
magnitude: "{level} * 0.2" magnitude: "{level} * 0.2"
# Chance of the effect firing. # Chance of the effect firing.

View File

@ -7,7 +7,7 @@ max-level: 5
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: ELITE group: ELITE
#Description # Description
description: description:
- "Infect your enemies with a wither" - "Infect your enemies with a wither"
- "effect when you are attacked." - "effect when you are attacked."

View File

@ -7,9 +7,9 @@ max-level: 1
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: LEGENDARY group: LEGENDARY
#Description # 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. # What items this enchant can be applied to.
item-whitelist: item-whitelist:

View File

@ -7,7 +7,7 @@ max-level: 3
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: LEGENDARY group: LEGENDARY
#Description # Description
description: description:
- "Chance of regain a lot of hearts" - "Chance of regain a lot of hearts"
- "when under 2 hearts." - "when under 2 hearts."

View File

@ -7,7 +7,7 @@ max-level: 3
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: LEGENDARY group: LEGENDARY
#Description # Description
description: description:
- "Chance to heal while damaged." - "Chance to heal while damaged."

View File

@ -7,7 +7,7 @@ max-level: 3
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: LEGENDARY group: LEGENDARY
#Description # Description
description: description:
- "Gain speed when equipped." - "Gain speed when equipped."

View File

@ -7,7 +7,7 @@ max-level: 5
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: LEGENDARY group: LEGENDARY
#Description # Description
description: description:
- "Chance to steal life from your opponent." - "Chance to steal life from your opponent."

View File

@ -7,7 +7,7 @@ max-level: 3
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: LEGENDARY group: LEGENDARY
#Description # Description
description: description:
- "Grants permanent extra health." - "Grants permanent extra health."

View File

@ -7,7 +7,7 @@ max-level: 5
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: LEGENDARY group: LEGENDARY
#Description # Description
description: description:
- "Chance to steal EXP from your opponent." - "Chance to steal EXP from your opponent."

View File

@ -7,7 +7,7 @@ max-level: 1
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: SIMPLE group: SIMPLE
#Description # Description
description: description:
- "Gives permanent water breathing." - "Gives permanent water breathing."

View File

@ -7,7 +7,7 @@ max-level: 3
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: SIMPLE group: SIMPLE
#Description # Description
description: description:
- "A chance to deal" - "A chance to deal"
- "nauseau to your victim." - "nauseau to your victim."

View File

@ -7,7 +7,7 @@ max-level: 5
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: SIMPLE group: SIMPLE
#Description # Description
description: description:
- "A chance to receive" - "A chance to receive"
- "more EXP when mining blocks." - "more EXP when mining blocks."

View File

@ -7,7 +7,7 @@ max-level: 1
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: SIMPLE group: SIMPLE
#Description # Description
description: description:
- "Gives you permanent night vision" - "Gives you permanent night vision"

View File

@ -7,7 +7,7 @@ max-level: 3
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: SIMPLE group: SIMPLE
#Description # Description
description: description:
- "Permanent haste effect when" - "Permanent haste effect when"
- "holding a tool with this enchant." - "holding a tool with this enchant."

View File

@ -7,7 +7,7 @@ max-level: 7
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: SIMPLE group: SIMPLE
#Description # Description
description: description:
- "A chance to give your opponent" - "A chance to give your opponent"
- "slowness, slow swinging and confusion." - "slowness, slow swinging and confusion."

View File

@ -7,7 +7,7 @@ max-level: 3
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: SIMPLE group: SIMPLE
#Description # Description
description: description:
- "A chance to deal extreme knockback" - "A chance to deal extreme knockback"

View File

@ -7,7 +7,7 @@ max-level: 5
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: ULTIMATE group: ULTIMATE
#Description # Description
description: description:
- "Chance to give the blindness on" - "Chance to give the blindness on"
- "effect to your opponent on attack." - "effect to your opponent on attack."

View File

@ -7,7 +7,7 @@ max-level: 5
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: ULTIMATE group: ULTIMATE
#Description # Description
description: description:
- "Chance to dodge melee attacks," - "Chance to dodge melee attacks,"
- "increased chance when sneaking." - "increased chance when sneaking."
@ -22,5 +22,5 @@ effects:
# The trigger that will fire this effect # The trigger that will fire this effect
trigger: "DEFENSE_PLAYER_MELEE,DEFENSE_MOB_MELEE" trigger: "DEFENSE_PLAYER_MELEE,DEFENSE_MOB_MELEE"
# Chance that this effect wil fire. # Chance that this effect wil fire.
chance: "user_is_sneaking ? (8 * {level}) : (4 * {level})" chance: "{user_is_sneaking} ? (8 * {level}) : (4 * {level})"

View File

@ -16,12 +16,12 @@ item-whitelist:
- "SWORDS" - "SWORDS"
- "AXES" - "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: effects:
POTION: POTION:
trigger: 'ATTACK_PLAYER_MELEE,ATTACK_PLAYER_RANGE,ATTACK_MOB_MELEE,ATTACK_MOB_RANGE' trigger: 'ATTACK_PLAYER_MELEE,ATTACK_PLAYER_RANGE,ATTACK_MOB_MELEE,ATTACK_MOB_RANGE'
potion-type: SLOWNESS potion-type: SLOW
duration: '10*{level}' duration: '10*{level}'
amplifier: '{level}' amplifier: '{level}'
who: OPPONENT who: OPPONENT
chance: '15*{level}' chance: '15*{level}'

View File

@ -7,7 +7,7 @@ max-level: 3
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: ULTIMATE group: ULTIMATE
#Description # Description
description: description:
- "Summon Lightnings at your Opponnent." - "Summon Lightnings at your Opponnent."

View File

@ -7,7 +7,7 @@ max-level: 5
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: UNIQUE group: UNIQUE
#Description # Description
description: description:
- "A chance to receive strength." - "A chance to receive strength."
- "and mining fatique." - "and mining fatique."

View File

@ -7,7 +7,7 @@ max-level: 5
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: UNIQUE group: UNIQUE
#Description # Description
description: description:
- "A chance for your arrows to" - "A chance for your arrows to"
- "blow up on impact." - "blow up on impact."

View File

@ -7,7 +7,7 @@ max-level: 3
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: UNIQUE group: UNIQUE
#Description # Description
description: description:
- "A chance to give a burst of haste." - "A chance to give a burst of haste."

View File

@ -7,7 +7,7 @@ max-level: 5
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: SIMPLE group: SIMPLE
#Description # Description
description: description:
- "A chance to instantly break obsidian." - "A chance to instantly break obsidian."

View File

@ -7,7 +7,7 @@ max-level: 8
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: UNIQUE group: UNIQUE
#Description # Description
description: description:
- "When near death summon creepers" - "When near death summon creepers"
- "to avenge you." - "to avenge you."

View File

@ -7,7 +7,7 @@ max-level: 4
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: UNIQUE group: UNIQUE
#Description # Description
description: description:
- "A chance to be pushed back when." - "A chance to be pushed back when."
- "you take damage." - "you take damage."

View File

@ -7,7 +7,7 @@ max-level: 3
# The group of this enchant. Configure the groups in the groups.yml file. # The group of this enchant. Configure the groups in the groups.yml file.
group: UNIQUE group: UNIQUE
#Description # Description
description: description:
- "When near death spawns tnt around you." - "When near death spawns tnt around you."