From 3dba363515579b171a94db699a64157406b1734c Mon Sep 17 00:00:00 2001 From: Yasin Date: Wed, 8 May 2024 19:55:03 +0200 Subject: reparty -> general tab --- .../de/hysky/skyblocker/config/categories/DungeonsCategory.java | 7 ------- .../de/hysky/skyblocker/config/categories/GeneralCategory.java | 7 +++++++ .../java/de/hysky/skyblocker/config/configs/DungeonsConfig.java | 3 --- .../java/de/hysky/skyblocker/config/configs/GeneralConfig.java | 3 +++ 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java index dddb19a0..b1754bbd 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java @@ -67,13 +67,6 @@ public class DungeonsCategory { newValue -> config.dungeons.allowDroppingProtectedItems = newValue) .controller(ConfigUtils::createBooleanController) .build()) - .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.dungeons.acceptReparty")) - .binding(defaults.dungeons.acceptReparty, - () -> config.dungeons.acceptReparty, - newValue -> config.dungeons.acceptReparty = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) // Map .group(OptionGroup.createBuilder() diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java index d75f1623..69182506 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -24,6 +24,13 @@ public class GeneralCategory { newValue -> config.general.enableTips = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("skyblocker.config.general.acceptReparty")) + .binding(defaults.general.acceptReparty, + () -> config.general.acceptReparty, + newValue -> config.general.acceptReparty = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .option(Option.createBuilder() .name(Text.translatable("skyblocker.config.general.hideEmptyTooltips")) .binding(defaults.general.hideEmptyTooltips, diff --git a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java index 4bf90435..d458cd63 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java @@ -23,9 +23,6 @@ public class DungeonsConfig { @SerialEntry public boolean allowDroppingProtectedItems = false; - @SerialEntry - public boolean acceptReparty = true; - @SerialEntry public DungeonMap dungeonMap = new DungeonMap(); diff --git a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java index a899d6ed..2a8e31df 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java @@ -18,6 +18,9 @@ public class GeneralConfig { @SerialEntry public boolean enableTips = true; + @SerialEntry + public boolean acceptReparty = true; + @SerialEntry public boolean hideEmptyTooltips = true; -- cgit