From 0730b5f54e673131b4ae935fbaf7c5f8e38c2da3 Mon Sep 17 00:00:00 2001 From: Yasin Date: Thu, 9 May 2024 16:29:04 +0200 Subject: hideStatusEffectOverlay -> ui tab --- .../java/de/hysky/skyblocker/config/categories/MiscCategory.java | 7 ------- .../hysky/skyblocker/config/categories/UIAndVisualsCategory.java | 7 +++++++ src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java | 2 -- .../de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java | 3 +++ .../de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java | 2 +- src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java | 2 +- src/main/resources/assets/skyblocker/lang/en_us.json | 4 ++-- 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/zh_cn.json | 2 +- src/main/resources/assets/skyblocker/lang/zh_tw.json | 2 +- 11 files changed, 18 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java index e5dba84e..b2127e6b 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java @@ -17,13 +17,6 @@ public class MiscCategory { .name(Text.translatable("skyblocker.config.misc")) //Uncategorized Options - .option(Option.createBuilder() - .name(Text.translatable("skyblocker.config.misc.hideStatusEffectOverlay")) - .binding(defaults.misc.hideStatusEffectOverlay, - () -> config.misc.hideStatusEffectOverlay, - newValue -> config.misc.hideStatusEffectOverlay = newValue) - .controller(ConfigUtils::createBooleanController) - .build()) //Discord RPC .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 12edd0d1..c6936335 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java @@ -57,6 +57,13 @@ public class UIAndVisualsCategory { newValue -> config.uiAndVisuals.fancyCraftingTable = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("skyblocker.config.uiAndVisuals.hideStatusEffectOverlay")) + .binding(defaults.uiAndVisuals.hideStatusEffectOverlay, + () -> config.uiAndVisuals.hideStatusEffectOverlay, + newValue -> config.uiAndVisuals.hideStatusEffectOverlay = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) //Chest Value FIXME change dropdown to color controller .group(OptionGroup.createBuilder() diff --git a/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java index ed0857e0..919a26d8 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java @@ -4,8 +4,6 @@ import dev.isxander.yacl3.config.v2.api.SerialEntry; import net.minecraft.client.resource.language.I18n; public class MiscConfig { - @SerialEntry - public boolean hideStatusEffectOverlay = false; @SerialEntry public RichPresence richPresence = new RichPresence(); 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 8c96ec57..267dde14 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java @@ -23,6 +23,9 @@ public class UIAndVisualsConfig { @SerialEntry public boolean fancyCraftingTable = true; + @SerialEntry + public boolean hideStatusEffectOverlay = false; + @SerialEntry public ChestValue chestValue = new ChestValue(); diff --git a/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java index b0e26575..69f33aa0 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java @@ -14,6 +14,6 @@ public class AbstractInventoryScreenMixin { @Inject(method = "drawStatusEffects", at = @At("HEAD"), cancellable = true) private void skyblocker$dontDrawStatusEffects(CallbackInfo ci) { - if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().misc.hideStatusEffectOverlay) ci.cancel(); + if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.hideStatusEffectOverlay) ci.cancel(); } } diff --git a/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java b/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java index 30f1626f..b939b401 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java @@ -99,7 +99,7 @@ public abstract class InGameHudMixin { @Inject(method = "renderStatusEffectOverlay", at = @At("HEAD"), cancellable = true) private void skyblocker$dontRenderStatusEffects(CallbackInfo ci) { - if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().misc.hideStatusEffectOverlay) ci.cancel(); + if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.hideStatusEffectOverlay) ci.cancel(); } @ModifyExpressionValue(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getAttackCooldownProgress(F)F")) diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 35cd92fd..0ff25125 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -414,8 +414,6 @@ "skyblocker.config.misc": "Misc", - "skyblocker.config.misc.hideStatusEffectOverlay": "Hide Status Effect Overlay", - "skyblocker.config.misc.richPresence": "Discord RPC", "skyblocker.config.misc.richPresence.customMessage": "Custom Message", "skyblocker.config.misc.richPresence.cycleMode": "Cycle Skyblock Info", @@ -494,6 +492,8 @@ "skyblocker.config.uiAndVisuals.backpackPreviewWithoutShift": "View backpack preview without holding Shift", + "skyblocker.config.uiAndVisuals.hideStatusEffectOverlay": "Hide Status Effect Overlay", + "skyblocker.config.uiAndVisuals.bars": "Health, Mana, Defence & XP Bars", "skyblocker.config.uiAndVisuals.bars.enableBars": "Enable Bars", diff --git a/src/main/resources/assets/skyblocker/lang/pt_br.json b/src/main/resources/assets/skyblocker/lang/pt_br.json index 5636494d..3683e87e 100644 --- a/src/main/resources/assets/skyblocker/lang/pt_br.json +++ b/src/main/resources/assets/skyblocker/lang/pt_br.json @@ -141,7 +141,7 @@ "skyblocker.config.general.itemInfoDisplay.attributeShardInfo.@Tooltip": "Mostra o nível do atributo como uma contagem de stack e os iniciais do nome do atributo.", "skyblocker.config.slayer": "Slayers", "skyblocker.updateRepository.error": "§cAtualização do repositório local falhou. Remova os arquivos manualmente e reinicie o jogo.", - "skyblocker.config.misc.hideStatusEffectOverlay": "Esconder Overlay de Status de Efeitos", + "skyblocker.config.uiAndVisuals.hideStatusEffectOverlay": "Esconder Overlay de Status de Efeitos", "skyblocker.config.general.itemList.enableItemList": "Ativar Lista de Itens", "skyblocker.config.general.itemList": "Lista de Itens", "text.skyblocker.open": "Abrir", diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json index cbfa5cde..441e175a 100644 --- a/src/main/resources/assets/skyblocker/lang/ru_ru.json +++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json @@ -274,7 +274,7 @@ "skyblocker.config.general.itemInfoDisplay.attributeShardInfo": "Информация об Attribute Shard", "skyblocker.config.general.itemInfoDisplay": "Отображение информации о предмете", "skyblocker.dungeons.secrets.markSecretMissing": "§b[§6Skyblocker§b] §rПометил секрет #%d как пропущенный.", - "skyblocker.config.misc.hideStatusEffectOverlay": "Скрыть отображение статуса эффектов", + "skyblocker.config.uiAndVisuals.hideStatusEffectOverlay": "Скрыть отображение статуса эффектов", "skyblocker.dungeons.secrets.markSecretFound": "§b[§6Skyblocker§b] §гПометил секрет #%d как найденный.", "skyblocker.dungeons.secrets.markSecretMissingUnable": "§b[§6Skyblocker§b] §cНевозможно отметить секрет #%d как пропущенный.", "skyblocker.dungeons.secrets.markSecretFoundUnable": "§b[§6Skyblocker§b] §cНевозможно отметить секрет #%d как найденный.", diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json index 1ae39a89..211e618a 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_cn.json +++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json @@ -450,7 +450,7 @@ "skyblocker.config.dungeons.professor.fireFreezeStaffTimer": "开火冻结计时器（F3/M3）", "skyblocker.config.dungeons.dungeonChestProfit.neutralThreshold": "中性的临界点", "skyblocker.config.dungeons.dungeonChestProfit.neutralThreshold.@Tooltip": "低于这个数值的利润将被视为中性。", - "skyblocker.config.misc.hideStatusEffectOverlay": "隐藏状态效果动画", + "skyblocker.config.uiAndVisuals.hideStatusEffectOverlay": "隐藏状态效果动画", "skyblocker.tips.fancyTabExtraInfo": "你知道吗？在拿着N或M时可以在精致菜单中看到额外的信息。", "skyblocker.config.dungeons.map.mapScreen": "地牢地图和分数的位置设置...", "skyblocker.config.quickNav.button": "按钮 %d", diff --git a/src/main/resources/assets/skyblocker/lang/zh_tw.json b/src/main/resources/assets/skyblocker/lang/zh_tw.json index b5584c68..6f125699 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_tw.json +++ b/src/main/resources/assets/skyblocker/lang/zh_tw.json @@ -415,7 +415,7 @@ "skyblocker.rift.enigmaSouls.markAllMissing": "§r將所有Enigma之魂標記為已忽略！", "skyblocker.shortcuts.deleteQuestion": "你確定要移除這個快捷指令嗎？", "skyblocker.config.slayer.vampireSlayer.maniaUpdateFrequency.@Tooltip": "值越低，更新越頻繁，可能會導致卡頓。", - "skyblocker.config.misc.hideStatusEffectOverlay": "隱藏狀態效果動畫", + "skyblocker.config.uiAndVisuals.hideStatusEffectOverlay": "隱藏狀態效果動畫", "key.itemProtection": "保護物品", "skyblocker.config.uiAndVisuals.teleportOverlay.enableWeirdTransmission": "啟用Weird Transmission目標位置顯示", "skyblocker.config.uiAndVisuals.teleportOverlay.enableInstantTransmission": "啟用Instant Transmission技能目標位置顯示", -- cgit