From a5fd7ae8173ef527fd5270d7dc18220f70c3181a Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Sat, 4 Jan 2025 02:04:32 +0800 Subject: [PATCH] update default configs --- .../bukkit/config/BukkitConfigManager.java | 6 --- .../main/resources/contents/item/default.yml | 2 - core/src/main/resources/loot-conditions.yml | 54 +++++++++---------- 3 files changed, 27 insertions(+), 35 deletions(-) diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java index 0ac6420a..96f4197c 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java @@ -30,8 +30,6 @@ import dev.dejvokep.boostedyaml.settings.loader.LoaderSettings; import dev.dejvokep.boostedyaml.settings.updater.UpdaterSettings; import dev.dejvokep.boostedyaml.utils.format.NodeRole; import net.momirealms.customfishing.api.BukkitCustomFishingPlugin; -import net.momirealms.customfishing.api.event.FishingEffectApplyEvent; -import net.momirealms.customfishing.api.event.FishingResultEvent; import net.momirealms.customfishing.api.mechanic.MechanicType; import net.momirealms.customfishing.api.mechanic.action.Action; import net.momirealms.customfishing.api.mechanic.action.ActionManager; @@ -969,10 +967,6 @@ public class BukkitConfigManager extends ConfigManager { result.add(Pair.of(member, operation)); } } - FishingEffectApplyEvent event; - if (event.getStage() == FishingEffectApplyEvent.Stage.FISHING) { - event.getEffect().difficultyAdder(event.getEffect().difficultyAdder() + 10d); - } return result; } diff --git a/core/src/main/resources/contents/item/default.yml b/core/src/main/resources/contents/item/default.yml index de9bf2fa..ef5c8dec 100644 --- a/core/src/main/resources/contents/item/default.yml +++ b/core/src/main/resources/contents/item/default.yml @@ -8,8 +8,6 @@ vanilla: show-in-fishfinder: false disable-stat: true - group: - - river events: success: action_mending: diff --git a/core/src/main/resources/loot-conditions.yml b/core/src/main/resources/loot-conditions.yml index 15484728..2de3e754 100644 --- a/core/src/main/resources/loot-conditions.yml +++ b/core/src/main/resources/loot-conditions.yml @@ -11,9 +11,9 @@ global-group: '!rod': - magical_rod list: - - rubbish:+15 - - seagrass:+5 - - vanilla:+60 + - 'rubbish:+15' + - 'seagrass:+5' + - 'vanilla:+60' sub-groups: ocean_fish: conditions: @@ -29,13 +29,13 @@ global-group: - minecraft:warm_ocean list: # decrease the chance of getting rubbish when fishing in ocean - - rubbish:-10 - - apple_crate:+2 - - carrot_crate:+2 - - kelp:+25 - - group_for_each:ocean&no_star:+15 - - group_for_each:ocean&silver_star:+3 - - group_for_each:ocean&golden_star:+1 + - 'rubbish:-10' + - 'apple_crate:+2' + - 'carrot_crate:+2' + - 'kelp:+25' + - 'group_for_each:ocean&no_star:+15' + - 'group_for_each:ocean&silver_star:+3' + - 'group_for_each:ocean&golden_star:+1' sub-groups: warm_ocean_fish: conditions: @@ -44,9 +44,9 @@ global-group: - minecraft:deep_lukewarm_ocean - minecraft:warm_ocean list: - - group_for_each:warm_ocean&no_star:+15 - - group_for_each:warm_ocean&silver_star:+3 - - group_for_each:warm_ocean&golden_star:+1 + - 'group_for_each:warm_ocean&no_star:+15' + - 'group_for_each:warm_ocean&silver_star:+3' + - 'group_for_each:warm_ocean&golden_star:+1' river_fish: conditions: '!biome': @@ -60,17 +60,17 @@ global-group: - minecraft:deep_lukewarm_ocean - minecraft:warm_ocean list: - - rainbow_fish:+5 - - stick:+15 - - group_for_each:river&no_star:+15 - - group_for_each:river&silver_star:+3 - - group_for_each:river&golden_star:+1 + - 'rainbow_fish:+5' + - 'stick:+15' + - 'group_for_each:river&no_star:+15' + - 'group_for_each:river&silver_star:+3' + - 'group_for_each:river&golden_star:+1' sub-groups: swamp_fish: list: - - group_for_each:swamp&no_star:+15 - - group_for_each:swamp&silver_star:+3 - - group_for_each:swamp&golden_star:+1 + - 'group_for_each:swamp&no_star:+15' + - 'group_for_each:swamp&silver_star:+3' + - 'group_for_each:swamp&golden_star:+1' conditions: biome: - minecraft:swamp @@ -80,9 +80,9 @@ global-group: ypos: - -64~0 list: - - group_for_each:cave&no_star:+9 - - group_for_each:cave&silver_star:+3 - - group_for_each:cave&golden_star:+1 + - 'group_for_each:cave&no_star:+9' + - 'group_for_each:cave&silver_star:+3' + - 'group_for_each:cave&golden_star:+1' # Skeletons might appear if player holds the bone_rod and fish at night skeleton_group: conditions: @@ -118,9 +118,9 @@ global-group: - 'gold_ingot:+3' - 'gold_nugget:+8' - 'magma_cube:+3' - - group_for_each:lava&no_star:+15 - - group_for_each:lava&silver_star:+3 - - group_for_each:lava&golden_star:+1 + - 'group_for_each:lava&no_star:+15' + - 'group_for_each:lava&silver_star:+3' + - 'group_for_each:lava&golden_star:+1' sub-groups: skeleton_group: conditions: