Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused setting #1144

Merged
merged 2 commits into from
Jan 25, 2025
Merged

Remove unused setting #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e31f7b
remove the setting
olim88 Jan 22, 2025
69f9342
deprecate the setting
olim88 Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/main/java/de/hysky/skyblocker/config/categories/ChatCategory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,6 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
newValue -> config.chat.chatRuleConfig.announcementLength = newValue)
.controller(opt -> IntegerSliderControllerBuilder.create(opt).range(5, 200).step(1))
.build())
.option(Option.<Integer>createBuilder()
.name(Text.translatable("skyblocker.config.chat.chatRules.announcementScale"))
.description(OptionDescription.of(Text.translatable("skyblocker.config.chat.chatRules.announcementScale.@Tooltip")))
.binding(defaults.chat.chatRuleConfig.announcementScale,
() -> config.chat.chatRuleConfig.announcementScale,
newValue -> config.chat.chatRuleConfig.announcementScale = newValue)
.controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 8).step(1))
.build())
.build())
.build();
}
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/de/hysky/skyblocker/config/configs/ChatConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ public class ChatConfig {
public static class ChatRuleConfig {
@SerialEntry
public int announcementLength = 60;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just deprecate the config options to prevent future conflicts.

Suggested change
public int announcementLength = 60;
public int announcementLength = 60;
@Deprecated
@SerialEntry
public int announcementScale = 3;

@SerialEntry
public int announcementScale = 3;

@Deprecated
@SerialEntry
public int announcementScale = 3;
}
}
2 changes: 0 additions & 2 deletions src/main/resources/assets/skyblocker/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,6 @@
"skyblocker.config.chat.chatRules": "Custom Chat Rules",
"skyblocker.config.chat.chatRules.announcementLength": "Announcement Display Time",
"skyblocker.config.chat.chatRules.announcementLength.@Tooltip": "The amount of time the announcement will show for in ticks.",
"skyblocker.config.chat.chatRules.announcementScale": "Announcement Size",
"skyblocker.config.chat.chatRules.announcementScale.@Tooltip": "The amount to scale the size of the announcement.",
"skyblocker.config.chat.chatRules.screen": "Chat Rules Config...",
"skyblocker.config.chat.chatRules.screen.deleteQuestion": "Are you sure you want to remove this rule?",
"skyblocker.config.chat.chatRules.screen.deleteWarning": "Rule '%s' will be lost forever! (A long time!)",
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/skyblocker/lang/it_it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@
"skyblocker.config.mining.crystalsHud.showLocations.locationSize": "Dimensioni Luogo",
"skyblocker.config.mining.crystalsWaypoints.enabled": "Waypoint Attivi",
"skyblocker.config.otherLocations.rift.mcGrubberStacks": "Stack per McGrubber",
"skyblocker.config.chat.chatRules.announcementScale": "Dimensione Annunci",
"skyblocker.config.chat.chatRules.screen.ruleScreen.regex": "È Regex:",
"skyblocker.config.chat.chatRules.screen.ruleScreen.locations": "Posizioni Valide:",
"skyblocker.config.chat.chatRules.screen.ruleScreen.announcement": "Mostra Annunci:",
Expand Down
2 changes: 0 additions & 2 deletions src/main/resources/assets/skyblocker/lang/ru_ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,6 @@
"skyblocker.config.chat.chatRules": "Кастомные настройки чата",
"skyblocker.config.chat.chatRules.announcementLength": "Время отображения оповещений",
"skyblocker.config.chat.chatRules.announcementLength.@Tooltip": "Время, которое будет отображаться оповещение (в тиках).",
"skyblocker.config.chat.chatRules.announcementScale": "Размер оповещения",
"skyblocker.config.chat.chatRules.announcementScale.@Tooltip": "Размер оповещения.",
"skyblocker.config.chat.chatRules.screen": "Настройки правил чата...",
"skyblocker.config.chat.chatRules.screen.new": "Новое правило",
"skyblocker.config.chat.chatRules.screen.ruleScreen.announcement": "Показывать оповещение:",
Expand Down
2 changes: 0 additions & 2 deletions src/main/resources/assets/skyblocker/lang/zh_cn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,8 +497,6 @@
"skyblocker.garden.hud.mouseLocked": "鼠标已锁定。",
"skyblocker.config.chat.chatRules.announcementLength": "告示显示时长",
"skyblocker.config.chat.chatRules.announcementLength.@Tooltip": "显示公告的时间长度，以游戏刻为单位。",
"skyblocker.config.chat.chatRules.announcementScale": "告示尺寸",
"skyblocker.config.chat.chatRules.announcementScale.@Tooltip": "告示的缩放级别。",
"skyblocker.config.helpers.enableNewYearCakesHelper": "启用新年蛋糕助手",
"skyblocker.config.helpers.enableNewYearCakesHelper.@Tooltip": "以绿色高亮显示缺少的新年蛋糕、红色高亮显示已有的蛋糕。\n\n需要至少打开一次蛋糕背包才能生效。",
"skyblocker.config.slayer.vampireSlayer.maniaUpdateFrequency.@Tooltip": "值越低，更新越频繁，可能会导致卡顿。",
Expand Down
2 changes: 0 additions & 2 deletions src/main/resources/assets/skyblocker/lang/zh_tw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,10 +490,8 @@
"skyblocker.config.farming.garden.lockMouseTool": "手持農具時鎖定鏡頭",
"skyblocker.config.farming.garden.lockMouseGround": "僅當在地面上時鎖定鏡頭",
"skyblocker.config.chat.chatRules.announcementLength": "告示顯示時長",
"skyblocker.config.chat.chatRules.announcementScale.@Tooltip": "告示的縮放等級。",
"skyblocker.garden.hud.mouseLocked": "滑鼠已鎖定。",
"skyblocker.config.chat.chatRules.announcementLength.@Tooltip": "顯示公告的時間長度，以遊戲刻為單位。",
"skyblocker.config.chat.chatRules.announcementScale": "告示尺寸",
"skyblocker.config.helpers.enableNewYearCakesHelper.@Tooltip": "以綠色高亮顯示缺少的新年蛋糕、紅色高亮顯示已有的蛋糕。\n\n需要至少打開一次蛋糕背包才能生效。",
"skyblocker.config.helpers.enableNewYearCakesHelper": "啟用新年蛋糕助手",
"skyblocker.config.uiAndVisuals.titleContainer.@Tooltip": "用於同時顯示多個標題，例如：吸血鬼殺手",
Expand Down
Loading