From 8f77ad4699e023d4fbd309e5e7b53683ebb1700e Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Sun, 8 Oct 2023 17:07:16 +0800 Subject: [PATCH] fix default config --- .../requirement/RequirementManagerImpl.java | 13 ++ plugin/src/main/resources/game-conditions.yml | 126 +++++++++--------- 2 files changed, 76 insertions(+), 63 deletions(-) diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/requirement/RequirementManagerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/requirement/RequirementManagerImpl.java index 2ef495ee..2150d519 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/requirement/RequirementManagerImpl.java +++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/requirement/RequirementManagerImpl.java @@ -197,6 +197,7 @@ public class RequirementManagerImpl implements RequirementManager { this.registerInBagRequirement(); this.registerHookRequirement(); this.registerCompetitionRequirement(); + this.registerListRequirement(); } public HashMap getLootWithWeight(Condition condition) { @@ -1051,6 +1052,18 @@ public class RequirementManagerImpl implements RequirementManager { }); } + private void registerListRequirement() { + registerRequirement("list", (args, actions, advanced) -> { + LogUtils.severe("It seems that you made a mistake where you put \"list\" into \"conditions\" section."); + ArrayList list = ConfigUtils.stringListArgs(args); + LogUtils.warn("list:"); + for (String e : list) { + LogUtils.warn(" - " + e); + } + return EmptyRequirement.instance; + }); + } + private void registerCompetitionRequirement() { registerRequirement("competition", (args, actions, advanced) -> { if (args instanceof ConfigurationSection section) { diff --git a/plugin/src/main/resources/game-conditions.yml b/plugin/src/main/resources/game-conditions.yml index 0645b1cd..6f818b6e 100644 --- a/plugin/src/main/resources/game-conditions.yml +++ b/plugin/src/main/resources/game-conditions.yml @@ -13,18 +13,18 @@ global-group: conditions: group: - silver_star - list: - - hold_game_easy:-10 - - hold_game_normal:+12 - - hold_game_hard:+3 + list: + - hold_game_easy:-10 + - hold_game_normal:+12 + - hold_game_hard:+3 golden: conditions: group: - golden_star - list: - - hold_game_easy:-15 - - hold_game_normal:-2 - - hold_game_hard:+7 + list: + - hold_game_easy:-15 + - hold_game_normal:-2 + - hold_game_hard:+7 water_fish_game: conditions: lava-fishing: false @@ -62,18 +62,18 @@ global-group: conditions: group: - silver_star - list: - - tension_game_easy:-10 - - tension_game_normal:+12 - - tension_game_hard:+3 + list: + - tension_game_easy:-10 + - tension_game_normal:+12 + - tension_game_hard:+3 golden: conditions: group: - golden_star - list: - - tension_game_easy:-15 - - tension_game_normal:-2 - - tension_game_hard:+7 + list: + - tension_game_easy:-15 + - tension_game_normal:-2 + - tension_game_hard:+7 river_fish_game: conditions: '!biome': @@ -110,54 +110,54 @@ global-group: conditions: group: - silver_star - list: - - accurate_click_bar_1_easy:-10 - - accurate_click_bar_1_normal:+5 - - accurate_click_bar_1_hard:+3 - - accurate_click_bar_2_easy:-10 - - accurate_click_bar_2_normal:+5 - - accurate_click_bar_2_hard:+3 - - accurate_click_bar_3_easy:-10 - - accurate_click_bar_3_normal:+5 - - accurate_click_bar_3_hard:+3 - - accurate_click_bar_4_easy:-10 - - accurate_click_bar_4_normal:+5 - - accurate_click_bar_4_hard:+3 - - accurate_click_bar_5_easy:-10 - - accurate_click_bar_5_normal:+5 - - accurate_click_bar_5_hard:+3 - - accurate_click_bar_6_easy:-10 - - accurate_click_bar_6_normal:+5 - - accurate_click_bar_6_hard:+3 - - accurate_click_bar_7_easy:-10 - - accurate_click_bar_7_normal:+5 - - accurate_click_bar_7_hard:+3 - - accurate_click_bar_8_easy:-10 - - accurate_click_bar_8_normal:+5 - - accurate_click_bar_8_hard:+3 - - accurate_click_bar_9_easy:-10 - - accurate_click_bar_9_normal:+5 - - accurate_click_bar_9_hard:+3 + list: + - accurate_click_bar_1_easy:-10 + - accurate_click_bar_1_normal:+5 + - accurate_click_bar_1_hard:+3 + - accurate_click_bar_2_easy:-10 + - accurate_click_bar_2_normal:+5 + - accurate_click_bar_2_hard:+3 + - accurate_click_bar_3_easy:-10 + - accurate_click_bar_3_normal:+5 + - accurate_click_bar_3_hard:+3 + - accurate_click_bar_4_easy:-10 + - accurate_click_bar_4_normal:+5 + - accurate_click_bar_4_hard:+3 + - accurate_click_bar_5_easy:-10 + - accurate_click_bar_5_normal:+5 + - accurate_click_bar_5_hard:+3 + - accurate_click_bar_6_easy:-10 + - accurate_click_bar_6_normal:+5 + - accurate_click_bar_6_hard:+3 + - accurate_click_bar_7_easy:-10 + - accurate_click_bar_7_normal:+5 + - accurate_click_bar_7_hard:+3 + - accurate_click_bar_8_easy:-10 + - accurate_click_bar_8_normal:+5 + - accurate_click_bar_8_hard:+3 + - accurate_click_bar_9_easy:-10 + - accurate_click_bar_9_normal:+5 + - accurate_click_bar_9_hard:+3 golden: conditions: group: - golden_star - list: - - accurate_click_bar_1_easy:-15 - - accurate_click_bar_1_hard:+7 - - accurate_click_bar_2_easy:-15 - - accurate_click_bar_2_hard:+7 - - accurate_click_bar_3_easy:-15 - - accurate_click_bar_3_hard:+7 - - accurate_click_bar_4_easy:-15 - - accurate_click_bar_4_hard:+7 - - accurate_click_bar_5_easy:-15 - - accurate_click_bar_5_hard:+7 - - accurate_click_bar_6_easy:-15 - - accurate_click_bar_6_hard:+7 - - accurate_click_bar_7_easy:-15 - - accurate_click_bar_7_hard:+7 - - accurate_click_bar_8_easy:-15 - - accurate_click_bar_8_hard:+7 - - accurate_click_bar_9_easy:-15 - - accurate_click_bar_9_hard:+7 \ No newline at end of file + list: + - accurate_click_bar_1_easy:-15 + - accurate_click_bar_1_hard:+7 + - accurate_click_bar_2_easy:-15 + - accurate_click_bar_2_hard:+7 + - accurate_click_bar_3_easy:-15 + - accurate_click_bar_3_hard:+7 + - accurate_click_bar_4_easy:-15 + - accurate_click_bar_4_hard:+7 + - accurate_click_bar_5_easy:-15 + - accurate_click_bar_5_hard:+7 + - accurate_click_bar_6_easy:-15 + - accurate_click_bar_6_hard:+7 + - accurate_click_bar_7_easy:-15 + - accurate_click_bar_7_hard:+7 + - accurate_click_bar_8_easy:-15 + - accurate_click_bar_8_hard:+7 + - accurate_click_bar_9_easy:-15 + - accurate_click_bar_9_hard:+7 \ No newline at end of file