diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandGive.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandGive.kt index b8ee1e8..f896e84 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandGive.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandGive.kt @@ -71,7 +71,7 @@ class CommandGive(plugin: EcoPlugin) : if (args.size == 2) { StringUtil.copyPartialMatches( args[1], - Skills.values().map { it.id }, + (Skills.values() union Stats.values()).map { it.id }, completions ) return completions diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandTop.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandTop.kt index 1371d61..333dc22 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandTop.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/commands/CommandTop.kt @@ -82,6 +82,16 @@ class CommandTop(plugin: EcoPlugin) : if (args.size == 1) { StringUtil.copyPartialMatches( args[0], + listOf(1, 2, 3, 4, 5).map { it.toString() } + + Skills.values().map { it.id }, + completions + ) + return completions + } + + if (args.size == 2 && Skills.getByID(args[0]) != null) { + StringUtil.copyPartialMatches( + args[1], listOf(1, 2, 3, 4, 5).map { it.toString() }, completions ) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/menus/SkillLevelGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/menus/SkillLevelGUI.kt index 61b90e4..3303e3c 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/menus/SkillLevelGUI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/menus/SkillLevelGUI.kt @@ -44,7 +44,7 @@ class SkillLevelGUI( addComponent(1, 1, levelComponent) defaultPage { - levelComponent.getPageOf(it.getSkillLevel(skill)) + levelComponent.getPageOf(it.getSkillLevel(skill)).coerceAtLeast(1) } // Instead of the page changer, this will show up when on the first page diff --git a/eco-core/core-plugin/src/main/resources/effects/magnetic_rod.yml b/eco-core/core-plugin/src/main/resources/effects/magnetic_rod.yml index 92b8408..bfb8ff5 100644 --- a/eco-core/core-plugin/src/main/resources/effects/magnetic_rod.yml +++ b/eco-core/core-plugin/src/main/resources/effects/magnetic_rod.yml @@ -1,6 +1,6 @@ name: "Magnetic Rod" placeholder: "4 * %level%" -description: "Fishing rods pull in drops and entities &a%placeholder%%&8 faster" +description: "&8Fishing rods pull in drops and entities &a%placeholder%%&8 faster" effects: - id: reel_speed_multiplier diff --git a/eco-core/core-plugin/src/main/resources/skills/alchemy.yml b/eco-core/core-plugin/src/main/resources/skills/alchemy.yml index 2bef779..b648e24 100644 --- a/eco-core/core-plugin/src/main/resources/skills/alchemy.yml +++ b/eco-core/core-plugin/src/main/resources/skills/alchemy.yml @@ -22,17 +22,17 @@ gui: column: 4 xp-requirements: - - 1 - 5 - 10 - - 15 - - 25 - - 37 + - 20 + - 30 - 50 - 75 - 100 + - 150 - 175 - 250 + - 325 - 375 - 500 - 750 diff --git a/eco-core/core-plugin/src/main/resources/skills/enchanting.yml b/eco-core/core-plugin/src/main/resources/skills/enchanting.yml index 6e4baee..0fffcb6 100644 --- a/eco-core/core-plugin/src/main/resources/skills/enchanting.yml +++ b/eco-core/core-plugin/src/main/resources/skills/enchanting.yml @@ -22,11 +22,11 @@ gui: column: 5 xp-requirements: - - 5 - - 12 - - 20 + - 10 + - 15 - 30 - - 50 + - 45 + - 60 - 75 - 100 - 150 diff --git a/eco-core/core-plugin/src/main/resources/skills/farming.yml b/eco-core/core-plugin/src/main/resources/skills/farming.yml index 0caa535..fb025ca 100644 --- a/eco-core/core-plugin/src/main/resources/skills/farming.yml +++ b/eco-core/core-plugin/src/main/resources/skills/farming.yml @@ -118,14 +118,14 @@ xp-gain-methods: multiplier: 1 filters: fully_grown: true - items: + blocks: - bamboo - trigger: mine_block multiplier: 2 filters: fully_grown: true - items: + blocks: - cactus - sugar_cane @@ -133,7 +133,7 @@ xp-gain-methods: multiplier: 3 filters: fully_grown: true - items: + blocks: - cocoa - sweet_berries - glow_berries @@ -142,7 +142,7 @@ xp-gain-methods: multiplier: 4 filters: fully_grown: true - items: + blocks: - wheat - carrots - melon @@ -152,13 +152,13 @@ xp-gain-methods: multiplier: 4.5 filters: fully_grown: true - items: + blocks: - pumpkin - trigger: mine_block multiplier: 5 filters: fully_grown: true - items: + blocks: - potatoes - beetroot diff --git a/eco-core/core-plugin/src/main/resources/skills/fishing.yml b/eco-core/core-plugin/src/main/resources/skills/fishing.yml index 2ea0169..8eaa5c4 100644 --- a/eco-core/core-plugin/src/main/resources/skills/fishing.yml +++ b/eco-core/core-plugin/src/main/resources/skills/fishing.yml @@ -20,21 +20,21 @@ gui: column: 3 xp-requirements: - - 1 - - 2 - - 4 - - 6 + - 5 - 10 - - 14 + - 15 - 20 - - 30 - - 40 - - 70 + - 25 + - 35 + - 50 + - 75 - 100 - 150 - 200 + - 250 - 300 - 400 + - 500 - 600 - 1000 - 1500