diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/cast/listener/KeyCombos.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/cast/listener/KeyCombos.java index 1aad35ae..ecb16a98 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/cast/listener/KeyCombos.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/cast/listener/KeyCombos.java @@ -236,7 +236,7 @@ public class KeyCombos implements Listener { this.suffix = config.contains("suffix") ? config.getString("suffix") : ""; this.separator = Objects.requireNonNull(config.getString("separator"), "Could not find action bar option 'separator'"); this.noKey = Objects.requireNonNull(config.getString("no-key"), "Could not find action bar option 'no-key'"); - this.isSubtitle = config.getBoolean("is-subtitle", false); + this.isSubtitle = config.getBoolean("" + "", false); for (PlayerKey key : PlayerKey.values()) keyNames.put(key, Objects.requireNonNull(config.getString("key-name." + key.name()), "Could not find translation for key " + key.name())); } diff --git a/MMOCore-Dist/src/main/resources/default/conditions.yml b/MMOCore-Dist/src/main/resources/default/conditions.yml index e69de29b..64deeadf 100644 --- a/MMOCore-Dist/src/main/resources/default/conditions.yml +++ b/MMOCore-Dist/src/main/resources/default/conditions.yml @@ -0,0 +1,9 @@ +#Example +test-condition: + - 'level{amount=10}' + #Will load the 2 conditions from test-condition-2. + - 'from{source=test-condition-2}' + +test-condition-2: + - 'world{name=world}' + - 'level{profession=MINING;amount=3}' \ No newline at end of file diff --git a/MMOCore-Dist/src/main/resources/default/skilltree/autocombat.yml b/MMOCore-Dist/src/main/resources/default/skilltree/autocombat.yml deleted file mode 100644 index 9fb30c62..00000000 --- a/MMOCore-Dist/src/main/resources/default/skilltree/autocombat.yml +++ /dev/null @@ -1,143 +0,0 @@ -id: autocombat -name: AutoCombat -type: automatic -item: GOLDEN_AXE -lore: -- '&6This autoskill tree is used for combat abilities!' - -nodes: - strength: - name: 'Combat strength' - children: - strong: - force: 2 - - max-level: 2 - size: 1 - lores: - unlocked: - 1 : - - "&eYou are level 1" - 2: - - "&eYou are level 2" - locked: - - "&4This skill is locked" - unlockable: - - "&aThis skill is unlockable" - fully-locked: - - '&aThis is skill is fully locked' - #modifers - - force: - name: 'Force' - size: 1 - max-children: 1 - children: - strong: - weaponry: 1 - archery: 1 - lores: - unlocked: - 1 : - - "&eYou are level 1" - 2: - - "&eYou are level 2" - locked: - - "&4This skill is locked" - unlockable: - - "&aThis skill is unlockable" - fully-locked: - - '&aThis is skill is fully locked' - - weaponry: - name: 'Weaponry' - max-level: 2 - size: 1 - lores: - unlocked: - 1 : - - "&eYou are level 1" - 2: - - "&eYou are level 2" - locked: - - "&4This skill is locked" - unlockable: - - "&aThis skill is unlockable" - fully-locked: - - '&aThis is skill is fully locked' - - archery: - name: 'Archery' - - max-level: 2 - size: 1 - children: - strong: - archery2: 2 - lores: - unlocked: - 1 : - - "&eYou are level 1" - 2: - - "&eYou are level 2" - locked: - - "&4This skill is locked" - unlockable: - - "&aThis skill is unlockable" - fully-locked: - - '&aThis is skill is fully locked' - archery2: - name: 'Archery2' - - max-level: 2 - size: 1 - children: - strong: - archery3: 1 - lores: - unlocked: - 1 : - - "&eYou are level 1" - 2: - - "&eYou are level 2" - locked: - - "&4This skill is locked" - unlockable: - - "&aThis skill is unlockable" - fully-locked: - - '&aThis is skill is fully locked' - archery3: - name: 'Archery3' - - max-level: 2 - size: 1 - lores: - unlocked: - 1 : - - "&eYou are level 1" - 2: - - "&eYou are level 2" - locked: - - "&4This skill is locked" - unlockable: - - "&aThis skill is unlockable" - fully-locked: - - '&aThis is skill is fully locked' - - - -icons: - unlocked: - 1: - item: 'GREEN_DYE' - locked: - 1: - item: "BROWN_DYE" - unlockable: - 1: - item: "BLUE_DYE" - fully-locked: - 1: - item: "BLACK_DYE" - path: - item: "WHITE_DYE" diff --git a/MMOCore-Dist/src/main/resources/default/skilltree/combat.yml b/MMOCore-Dist/src/main/resources/default/skilltree/combat.yml deleted file mode 100644 index d04474ff..00000000 --- a/MMOCore-Dist/src/main/resources/default/skilltree/combat.yml +++ /dev/null @@ -1,152 +0,0 @@ -id: 'combat' -name: '&4Combat' -lore: -- '&6This skill tree is used for combat abilities!' -type: 'linked' -item: 'DIAMOND_AXE' -nodes: - strength: - name: 'Combat strength' - coordinates: - x: 0 - y: 0 - - max-level: 2 - is-root: true - size: 1 - lores: - unlocked: - 1 : - - "&eYou are level 1" - 2: - - "&eYou are level 2" - locked: - - "&4This skill is locked" - unlockable: - - "&aThis skill is unlockable" - fully-locked: - - '&aThis is skill is fully locked' - #modifers - - force: - name: 'Force' - size: 1 - max-children: 1 - coordinates: - x: 1 - y: 0 - lores: - unlocked: - 1 : - - "&eYou are level 1" - 2: - - "&eYou are level 2" - locked: - - "&4This skill is locked" - unlockable: - - "&aThis skill is unlockable" - fully-locked: - - '&aThis is skill is fully locked' - - weaponry: - name: 'Weaponry' - coordinates: - x: 2 - y: 0 - - max-level: 2 - size: 1 - lores: - unlocked: - 1 : - - "&eYou are level 1" - 2: - - "&eYou are level 2" - locked: - - "&4This skill is locked" - unlockable: - - "&aThis skill is unlockable" - fully-locked: - - '&aThis is skill is fully locked' - - archery: - name: 'Archery' - coordinates: - x: 1 - y: 1 - - max-level: 2 - size: 1 - lores: - unlocked: - 1 : - - "&eYou are level 1" - 2: - - "&eYou are level 2" - locked: - - "&4This skill is locked" - unlockable: - - "&aThis skill is unlockable" - fully-locked: - - '&aThis is skill is fully locked' - archery2: - name: 'Archery2' - coordinates: - x: 1 - y: 2 - - max-level: 2 - size: 1 - lores: - unlocked: - 1 : - - "&eYou are level 1" - 2: - - "&eYou are level 2" - locked: - - "&4This skill is locked" - unlockable: - - "&aThis skill is unlockable" - fully-locked: - - '&aThis is skill is fully locked' - archery3: - name: 'Archery3' - coordinates: - x: 1 - y: 3 - - max-level: 2 - size: 1 - lores: - unlocked: - 1 : - - "&eYou are level 1" - 2: - - "&eYou are level 2" - locked: - - "&4This skill is locked" - unlockable: - - "&aThis skill is unlockable" - fully-locked: - - '&aThis is skill is fully locked' - -paths: - coordinates: - x: 2 - y: 2 - -icons: - unlocked: - 1: - item: 'GREEN_DYE' - locked: - 1: - item: "BROWN_DYE" - unlockable: - 1: - item: "BLUE_DYE" - fully-locked: - 1: - item: "BLACK_DYE" - path: - item: "WHITE_DYE"