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 +++ src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java | 2 +- src/main/resources/assets/skyblocker/lang/de_de.json | 2 +- src/main/resources/assets/skyblocker/lang/en_us.json | 4 ++-- src/main/resources/assets/skyblocker/lang/fr_fr.json | 2 +- src/main/resources/assets/skyblocker/lang/it_it.json | 2 +- src/main/resources/assets/skyblocker/lang/ja_jp.json | 2 +- src/main/resources/assets/skyblocker/lang/ko_kr.json | 2 +- src/main/resources/assets/skyblocker/lang/pt_br.json | 2 +- src/main/resources/assets/skyblocker/lang/ru_ru.json | 2 +- src/main/resources/assets/skyblocker/lang/tr_tr.json | 2 +- src/main/resources/assets/skyblocker/lang/zh_cn.json | 2 +- src/main/resources/assets/skyblocker/lang/zh_tw.json | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) 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; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java index d39be953..6165ac6a 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/Reparty.java @@ -43,7 +43,7 @@ public class Reparty extends ChatPatternListener { @Override public ChatFilterResult state() { - return (SkyblockerConfigManager.get().dungeons.acceptReparty || this.repartying) ? ChatFilterResult.FILTER : ChatFilterResult.PASS; + return (SkyblockerConfigManager.get().general.acceptReparty || this.repartying) ? ChatFilterResult.FILTER : ChatFilterResult.PASS; } @Override diff --git a/src/main/resources/assets/skyblocker/lang/de_de.json b/src/main/resources/assets/skyblocker/lang/de_de.json index bd13c537..7204d810 100644 --- a/src/main/resources/assets/skyblocker/lang/de_de.json +++ b/src/main/resources/assets/skyblocker/lang/de_de.json @@ -40,7 +40,7 @@ "skyblocker.config.helper.experiments.enableSuperpairsSolver": "Superpairs Solver aktivieren", "skyblocker.config.helper.experiments.enableUltrasequencerSolver": "Ultrasequencer Solver aktivieren", "skyblocker.option.general.bars.barpositions": "Balkenposition Bearbeiten", - "skyblocker.config.dungeons.acceptReparty": "Automatische Annahme von Reparty", + "skyblocker.config.general.acceptReparty": "Automatische Annahme von Reparty", "skyblocker.config.quickNav.enableQuickNav": "Schnellnavigation aktivieren", "key.itemProtection": "Artikel schützen", "text.skyblocker.confirm": "Bestätigen", diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index b3f74491..6f411778 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -38,8 +38,6 @@ "skyblocker.config.dungeons": "Dungeons", - "skyblocker.config.dungeons.acceptReparty": "Auto accept Reparty", - "skyblocker.config.dungeons.allowDroppingProtectedItems": "Enabled Dropping Protected Items & on Locked Slots", "skyblocker.config.dungeons.allowDroppingProtectedItems.@Tooltip": "Allows the use of class abilities in Dungeons on a locked slot or while holding an item which has been protected using /skyblocker protectItem.", @@ -190,6 +188,8 @@ "skyblocker.config.general.enableTips": "Enable Tips", + "skyblocker.config.general.acceptReparty": "Auto accept Reparty", + "skyblocker.config.general.hideEmptyTooltips": "Hide empty item tooltips in menus", "skyblocker.config.general.hitbox": "Hitboxes", diff --git a/src/main/resources/assets/skyblocker/lang/fr_fr.json b/src/main/resources/assets/skyblocker/lang/fr_fr.json index 3ec6db2a..d937513d 100644 --- a/src/main/resources/assets/skyblocker/lang/fr_fr.json +++ b/src/main/resources/assets/skyblocker/lang/fr_fr.json @@ -95,7 +95,7 @@ "skyblocker.config.helper.experiments.enableChronomatronSolver": "Activer l'aide au Chronomatron", "skyblocker.config.helper.experiments.enableSuperpairsSolver": "Activer l'aide aux Superpairs", "skyblocker.config.helper.experiments.enableUltrasequencerSolver": "Activer l'aide à l'Ultrasequencer", - "skyblocker.config.dungeons.acceptReparty": "Accepter automatiquement les reparty (/rp)", + "skyblocker.config.general.acceptReparty": "Accepter automatiquement les reparty (/rp)", "skyblocker.config.helper.fairySouls.enableFairySoulsHelper": "Activer l'aide au Fairy Souls", "skyblocker.config.helper.fairySouls": "Aide aux Fairy Souls", "skyblocker.config.general.shortcuts": "Raccourcis", diff --git a/src/main/resources/assets/skyblocker/lang/it_it.json b/src/main/resources/assets/skyblocker/lang/it_it.json index 6b22c0d1..d89d1ce6 100644 --- a/src/main/resources/assets/skyblocker/lang/it_it.json +++ b/src/main/resources/assets/skyblocker/lang/it_it.json @@ -17,7 +17,7 @@ "skyblocker.config.helper.experiments": "Risolutore di Esperimenti", "skyblocker.config.helper.experiments.enableSuperpairsSolver": "Attiva Risolutore per le Superpairs", "skyblocker.config.helper.experiments.enableUltrasequencerSolver": "Attiva Risolutore per Ultrasequencer", - "skyblocker.config.dungeons.acceptReparty": "Accetta automaticamente Reparty", + "skyblocker.config.general.acceptReparty": "Accetta automaticamente Reparty", "skyblocker.option.general.etherwarpOverlay": "Overlay per Etherwarp", "skyblocker.config.helper.fishing": "Aiutante per la Pesca", "skyblocker.config.helper.fairySouls": "Aiutante per le Fairy Souls", diff --git a/src/main/resources/assets/skyblocker/lang/ja_jp.json b/src/main/resources/assets/skyblocker/lang/ja_jp.json index ffce3a39..8dc93635 100644 --- a/src/main/resources/assets/skyblocker/lang/ja_jp.json +++ b/src/main/resources/assets/skyblocker/lang/ja_jp.json @@ -105,7 +105,7 @@ "skyblocker.config.general.shortcuts.enableShortcuts": "ショートカットを有効にする", "skyblocker.config.userInterfaceAndVisuals.tabHud.nameSorting": "プレイヤー名の並び替えの方式", "skyblocker.config.general.itemTooltip.avg.THREE_DAY": "この3日間での平均の値段", - "skyblocker.config.dungeons.acceptReparty": "リパーティーの自動受諾", + "skyblocker.config.general.acceptReparty": "リパーティーの自動受諾", "skyblocker.config.general.specialEffects": "特別なエフェクト", "skyblocker.config.general.specialEffects.rareDungeonDropEffects": "レアなダンジョンドロップのエフェクト", "skyblocker.config.userInterfaceAndVisuals.compactorDeletorPreview": "CompatorとDeletorのプレビューを有効にする", diff --git a/src/main/resources/assets/skyblocker/lang/ko_kr.json b/src/main/resources/assets/skyblocker/lang/ko_kr.json index bc63273c..efe70e6c 100644 --- a/src/main/resources/assets/skyblocker/lang/ko_kr.json +++ b/src/main/resources/assets/skyblocker/lang/ko_kr.json @@ -96,5 +96,5 @@ "skyblocker.config.general.quiverWarning.enableQuiverWarning": "화살통 경고 활성화", "skyblocker.config.general.quiverWarning.enableQuiverWarningInDungeons": "던전에서 화살통 경고 활성화", "skyblocker.config.general.quiverWarning.enableQuiverWarningAfterDungeon": "던전 후 화살통 경고 활성화", - "skyblocker.config.dungeons.acceptReparty": "Reparty 자동 수락" + "skyblocker.config.general.acceptReparty": "Reparty 자동 수락" } diff --git a/src/main/resources/assets/skyblocker/lang/pt_br.json b/src/main/resources/assets/skyblocker/lang/pt_br.json index c2ec7150..48b8ad7d 100644 --- a/src/main/resources/assets/skyblocker/lang/pt_br.json +++ b/src/main/resources/assets/skyblocker/lang/pt_br.json @@ -34,7 +34,7 @@ "skyblocker.config.title": "Configurações do Skyblocker", "skyblocker.option.general.bars.barpositions": "Configurar Posições das Barras", "skyblocker.config.helper.experiments.enableChronomatronSolver": "Ativar Solucionador de Chronomatron", - "skyblocker.config.dungeons.acceptReparty": "Aceitar Automaticamente Reparty", + "skyblocker.config.general.acceptReparty": "Aceitar Automaticamente Reparty", "skyblocker.config.general.shortcuts": "Atalhos", "skyblocker.config.general.shortcuts.enableShortcuts": "Ativar Atalhos", "skyblocker.config.userInterfaceAndVisuals.tabHud.plainPlayerNames": "Nomes de Player Simples", diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json index 06783df1..f61e8e18 100644 --- a/src/main/resources/assets/skyblocker/lang/ru_ru.json +++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json @@ -114,7 +114,7 @@ "skyblocker.rift.iceNow": "Лед!", "skyblocker.rift.stakeNow": "Стейк!", "skyblocker.rift.healNow": "Арбуз!", - "skyblocker.config.dungeons.acceptReparty": "Автоматически принимать Reparty", + "skyblocker.config.general.acceptReparty": "Автоматически принимать Reparty", "skyblocker.config.otherLocations.rift.mcGrubberStacks": "Стаков McGrubber", "skyblocker.config.slayer": "Slayеrs", "skyblocker.config.slayer.vampireSlayer": "Вампир-Slayer", diff --git a/src/main/resources/assets/skyblocker/lang/tr_tr.json b/src/main/resources/assets/skyblocker/lang/tr_tr.json index fc5be881..b7af138e 100644 --- a/src/main/resources/assets/skyblocker/lang/tr_tr.json +++ b/src/main/resources/assets/skyblocker/lang/tr_tr.json @@ -63,7 +63,7 @@ "skyblocker.config.helper.fairySouls.highlightOnlyNearbySouls": "Sadece yakındaki peri ruhlarını göster", "skyblocker.config.helper.fairySouls.highlightOnlyNearbySouls.@Tooltip": "Etkinleştirildiğinde sadece 50 blokluk mesafedeki peri ruhları gösterilir", "skyblocker.config.general.shortcuts.config": "Kısayol Ayarları...", - "skyblocker.config.dungeons.acceptReparty": "Tekrar parti davetini otomatik kabul et", + "skyblocker.config.general.acceptReparty": "Tekrar parti davetini otomatik kabul et", "skyblocker.config.helper.experiments.enableUltrasequencerSolver": "Ultrasekans Çözücüsünü Etkinleştir", "skyblocker.config.helper.experiments.enableSuperpairsSolver": "Süperçiftler Çözücüsünü Etkinleştir", "skyblocker.config.helper.experiments": "Deney Çözücü", diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json index c36bc29c..f0beec66 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_cn.json +++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json @@ -97,7 +97,7 @@ "skyblocker.config.helper.experiments.enableSuperpairsSolver": "启用超级配对实验助手", "skyblocker.config.helper.experiments.enableChronomatronSolver": "启用序列记忆实验助手", "skyblocker.config.helper.experiments.enableUltrasequencerSolver": "启用超级序列实验助手", - "skyblocker.config.dungeons.acceptReparty": "自动接受重新组队", + "skyblocker.config.general.acceptReparty": "自动接受重新组队", "skyblocker.config.helper.fairySouls": "仙女之魂助手", "skyblocker.config.helper.fairySouls.enableFairySoulsHelper": "启用仙女之魂助手", "skyblocker.fairySouls.markAllFound": "§r将当前岛屿上的全部仙女之魂标记为已发现", diff --git a/src/main/resources/assets/skyblocker/lang/zh_tw.json b/src/main/resources/assets/skyblocker/lang/zh_tw.json index d688967a..b49338ae 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_tw.json +++ b/src/main/resources/assets/skyblocker/lang/zh_tw.json @@ -51,7 +51,7 @@ "skyblocker.config.general.itemTooltip.enableLowestBIN": "顯示最低BIN（立即購買）價格", "skyblocker.config.general.itemTooltip.enableBazaarPrice": "顯示集市購買/賣出價格", "skyblocker.tips.clickNextTip": "§a[點擊看下一則提示]", - "skyblocker.config.dungeons.acceptReparty": "自動接受重新組隊", + "skyblocker.config.general.acceptReparty": "自動接受重新組隊", "skyblocker.config.helper.fairySouls": "仙女之魂助手", "skyblocker.config.userInterfaceAndVisuals.tabHud.tabHudScale.@Tooltip": "相對於原版GUI的百分比大小", "skyblocker.config.general.shortcuts.enableShortcuts": "啟用快捷指令", -- cgit