diff options
13 files changed, 20 insertions, 20 deletions
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 69182506..1477d669 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -31,13 +31,6 @@ public class GeneralCategory { newValue -> config.general.acceptReparty = newValue) .controller(ConfigUtils::createBooleanController) .build()) - .option(Option.<Boolean>createBuilder() - .name(Text.translatable("skyblocker.config.general.hideEmptyTooltips")) - .binding(defaults.general.hideEmptyTooltips, - () -> config.general.hideEmptyTooltips, - newValue -> config.general.hideEmptyTooltips = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) //Shortcuts .group(OptionGroup.createBuilder() diff --git a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java index fd638198..460a250d 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java @@ -44,6 +44,13 @@ public class UIAndVisualsCategory { .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() + .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips")) + .binding(defaults.uiAndVisuals.hideEmptyTooltips, + () -> config.uiAndVisuals.hideEmptyTooltips, + newValue -> config.uiAndVisuals.hideEmptyTooltips = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.fancyCraftingTable")) .binding(defaults.uiAndVisuals.fancyCraftingTable, () -> config.uiAndVisuals.fancyCraftingTable, 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 2a8e31df..56e110b6 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java @@ -22,9 +22,6 @@ public class GeneralConfig { public boolean acceptReparty = true; @SerialEntry - public boolean hideEmptyTooltips = true; - - @SerialEntry public Shortcuts shortcuts = new Shortcuts(); @SerialEntry diff --git a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java index 9facd21d..8c96ec57 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java @@ -18,6 +18,9 @@ public class UIAndVisualsConfig { public boolean backpackPreviewWithoutShift = false; @SerialEntry + public boolean hideEmptyTooltips = true; + + @SerialEntry public boolean fancyCraftingTable = true; @SerialEntry diff --git a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java index 46207669..631a1ed8 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java @@ -120,7 +120,7 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen if (!Utils.isOnSkyblock()) return; // Hide Empty Tooltips - if (SkyblockerConfigManager.get().general.hideEmptyTooltips && stack.getName().getString().equals(" ")) { + if (SkyblockerConfigManager.get().uiAndVisuals.hideEmptyTooltips && stack.getName().getString().equals(" ")) { ci.cancel(); } @@ -185,7 +185,7 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen ContainerSolver currentSolver = SkyblockerMod.getInstance().containerSolverManager.getCurrentSolver(); // Prevent clicks on filler items - if (SkyblockerConfigManager.get().general.hideEmptyTooltips && FILLER_ITEMS.contains(stack.getName().getString()) && + if (SkyblockerConfigManager.get().uiAndVisuals.hideEmptyTooltips && FILLER_ITEMS.contains(stack.getName().getString()) && // Allow clicks in Ultrasequencer and Superpairs (!UltrasequencerSolver.INSTANCE.getName().matcher(title).matches() || SkyblockerConfigManager.get().helper.experiments.enableUltrasequencerSolver)) { ci.cancel(); diff --git a/src/main/resources/assets/skyblocker/lang/de_de.json b/src/main/resources/assets/skyblocker/lang/de_de.json index 7204d810..9177c9e0 100644 --- a/src/main/resources/assets/skyblocker/lang/de_de.json +++ b/src/main/resources/assets/skyblocker/lang/de_de.json @@ -9,7 +9,7 @@ "skyblocker.config.userInterfaceAndVisuals.tabHud.tabHudScale": "Skalierungsfaktor für schöners Tab-HUD", "skyblocker.config.userInterfaceAndVisuals.tabHud.tabHudScale.@Tooltip": "Wert in %, relativ zur Skalierung des Vanilla-GUIs", "skyblocker.config.userInterfaceAndVisuals.bars.enableBars": "Balken aktivieren", - "skyblocker.config.general.hideEmptyTooltips": "Leere Item-Tooltips in Menüs verstecken", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "Leere Item-Tooltips in Menüs verstecken", "skyblocker.config.otherLocations": "Standorte", "skyblocker.config.dungeons": "Dungeons", "skyblocker.config.dungeons.map.enableMap": "Karte aktivieren", diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 6f411778..48af15a5 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -190,7 +190,7 @@ "skyblocker.config.general.acceptReparty": "Auto accept Reparty", - "skyblocker.config.general.hideEmptyTooltips": "Hide empty item tooltips in menus", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "Hide empty item tooltips in menus", "skyblocker.config.general.hitbox": "Hitboxes", "skyblocker.config.general.hitbox.oldFarmlandHitbox": "Enable 1.8 farmland hitbox", diff --git a/src/main/resources/assets/skyblocker/lang/fr_fr.json b/src/main/resources/assets/skyblocker/lang/fr_fr.json index d937513d..e1b967b8 100644 --- a/src/main/resources/assets/skyblocker/lang/fr_fr.json +++ b/src/main/resources/assets/skyblocker/lang/fr_fr.json @@ -74,7 +74,7 @@ "skyblocker.config.otherLocations.barn.solveTreasureHunter": "Résoudre Chasseur de trésor", "skyblocker.config.otherLocations.barn.solveHungryHiker": "Résoudre Randonneur affamé", "skyblocker.config.chat.filter.chatFilterResult.PASS": "Désactivé", - "skyblocker.config.general.hideEmptyTooltips": "Cacher les tooltips des items vides dans les menus", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "Cacher les tooltips des items vides dans les menus", "skyblocker.config.userInterfaceAndVisuals.tabHud.tabHudScale.@Tooltip": "Valeur en %, relative à la taille de l'interface vanilla", "key.skyblocker.defaultTgl": "Passer le HUD Tab à la vue par défaut", "skyblocker.config.userInterfaceAndVisuals.tabHud": "HUD Tab joli (temporairement désactivé en dehors des donjons)", diff --git a/src/main/resources/assets/skyblocker/lang/pt_br.json b/src/main/resources/assets/skyblocker/lang/pt_br.json index 48b8ad7d..c1c1f4cc 100644 --- a/src/main/resources/assets/skyblocker/lang/pt_br.json +++ b/src/main/resources/assets/skyblocker/lang/pt_br.json @@ -104,7 +104,7 @@ "skyblocker.config.slayer.vampireSlayer.holyIceUpdateFrequency.@Tooltip": "Quanto menor o valor, maior será a frequência de atualizações, o que irá talvez causa lag.", "skyblocker.config.slayer.vampireSlayer.steakStakeUpdateFrequency.@Tooltip": "Quanto menor o valor, maior será a frequência de atualizações, o que irá talvez causa lag.", "skyblocker.config.slayer.vampireSlayer.maniaUpdateFrequency.@Tooltip": "Quanto menor o valor, maior será a frequência de atualizações, o que irá talvez causa lag.", - "skyblocker.config.general.hideEmptyTooltips": "Esconder tooltips vazio de itens nos menus", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "Esconder tooltips vazio de itens nos menus", "skyblocker.config.general.shortcuts.enableCommandArgShortcuts": "Ativar Atalhos de Argumentos de Comando", "skyblocker.config.general.quiverWarning.enableQuiverWarningInDungeons": "Ativar Aviso de Aljava em Dungeons", "skyblocker.config.general.quiverWarning.enableQuiverWarningAfterDungeon": "Ativar Aviso de Aljava Após uma Dungeon", diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json index f61e8e18..af1843e8 100644 --- a/src/main/resources/assets/skyblocker/lang/ru_ru.json +++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json @@ -52,7 +52,7 @@ "skyblocker.fishing.reelNow": "Тяни!", "skyblocker.config.chat.filter.hideAutopet": "Скрывать сообщения Autopet", "skyblocker.config.chat.filter.hideMana": "Скрывать сообщения о расходе маны из Action Bar", - "skyblocker.config.general.hideEmptyTooltips": "Скрывать описания предметов в меню", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "Скрывать описания предметов в меню", "skyblocker.config.helper.fishing": "Помощь в рыбалке", "skyblocker.config.helper.fishing.enableFishingHelper": "Включить помощь в рыбалке", "skyblocker.config.general.itemTooltip.avg.BOTH": "Обе", diff --git a/src/main/resources/assets/skyblocker/lang/tr_tr.json b/src/main/resources/assets/skyblocker/lang/tr_tr.json index b7af138e..76afc019 100644 --- a/src/main/resources/assets/skyblocker/lang/tr_tr.json +++ b/src/main/resources/assets/skyblocker/lang/tr_tr.json @@ -37,7 +37,7 @@ "skyblocker.config.chat.filter.hideAutopet": "Autopet mesajlarını filtrele", "skyblocker.config.chat.filter.hideMana": "Aksiyon barındaki mana tüketimlerini gizle", "skyblocker.config.chat.filter.hideMana.@Tooltip": "FancyBar ile daha iyi bir deneyim sunar", - "skyblocker.config.general.hideEmptyTooltips": "Menülerdeki boş eşya açıklamalarını gizle", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "Menülerdeki boş eşya açıklamalarını gizle", "skyblocker.config.general.itemTooltip.avg.@Tooltip": "Kaç günlük ortalamanın gösterileceğini seçebilirsiniz", "skyblocker.config.general.itemTooltip.enableLowestBIN": "En düşük BIN fiyatını göster", "skyblocker.config.misc.richPresence.enableRichPresence": "Aktif", diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json index f0beec66..0abaacf3 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_cn.json +++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json @@ -71,7 +71,7 @@ "skyblocker.config.chat.filter.hideAutopet": "隐藏自动宠物消息", "skyblocker.config.chat.filter.hideMana": "在动作栏中隐藏法力消耗信息", "skyblocker.config.chat.filter.hideMana.@Tooltip": "已被更好的属性条代替", - "skyblocker.config.general.hideEmptyTooltips": "隐藏菜单中分隔符的物品信息", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "隐藏菜单中分隔符的物品信息", "skyblocker.config.dungeons.map.mapScaling": "地图界面大小", "skyblocker.updateRepository.error": "§c更新本地数据存储库失败，请手动删除文件并重启游戏。", "skyblocker.config.helper.fishing": "钓鱼助手", diff --git a/src/main/resources/assets/skyblocker/lang/zh_tw.json b/src/main/resources/assets/skyblocker/lang/zh_tw.json index b49338ae..0e4285ce 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_tw.json +++ b/src/main/resources/assets/skyblocker/lang/zh_tw.json @@ -9,7 +9,7 @@ "skyblocker.config.chat.filter.hideTeleportPad": "隱藏傳送點訊息", "skyblocker.config.chat.filter.hideCombo": "隱藏連殺訊息", "skyblocker.config.chat.filter.hideAutopet": "隱藏自動寵物訊息", - "skyblocker.config.general.hideEmptyTooltips": "隱藏選單玻璃物品資訊", + "skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips": "隱藏選單玻璃物品資訊", "skyblocker.config.chat.filter.hideAbility": "隱藏技能冷卻", "skyblocker.config.chat.filter.hideHeal": "隱藏治療訊息", "skyblocker.config.chat.filter.hideMana": "在動作欄中隱藏魔力消耗的提示訊息", |