SkyBlock Mayors #731
Merged
Swofty-Developments merged 21 commits intoSwofty-Developments:masterfrom Apr 8, 2026
Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
Keep i18n translation system from master while preserving mayors-specific election room scoreboard and dark auction toggle check in calendar lore.
Add I18n.lore/dialogueLines locale overloads, HypixelPlayer.sendTranslated(), TranslatableItemStackCreator, ViewConfiguration.translatable(), and locale-aware HypixelNPC.DialogueSet.ofTranslation overloads.
Update ~110 files across GUIs, commands, scoreboards, tab modules, and NPCs to resolve translations using the player's client locale instead of the hardcoded default (Locale.US).
…lti-server safety Replace single-document read-modify-write with per-voter documents and atomic $inc tally counters for O(1) vote reads. Add StartElection and ResolveElection endpoints for idempotent multi-server election lifecycle. Remove SaveElectionData endpoint.
…s to service Remove mutable color field from SkyBlockMayor, use ElectionData.colorForIndex() instead. Remove local resolveElection/saveToService from ElectionManager, delegate to service endpoints. Fix loadFromService to not require minister for special mayors.
…onDisplay thread safety Extract AbstractCandidateNPC and AbstractCurrentMayorNPC to eliminate duplicated NPC logic. Fix ElectionDisplay HashMap to ConcurrentHashMap with player cleanup.
… system Add gui_election.properties for GUI strings and election NPC keys to npcs_hub. Migrate ElectionView, ElectionViewStatsView, MayorMenuView, MinisterMenuView, ElectionDisplay holograms, and all election NPCs to use I18n.string() with per-player locale.
# Conflicts: # commons/src/main/java/net/swofty/commons/ServiceType.java # type.galatea/src/main/java/net/swofty/type/galatea/npcs/NPCVaeri.java # type.generic/src/main/java/net/swofty/type/generic/user/HypixelPlayer.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/GUIConsumeSoulflow.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUICrafting.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockMenu.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/GUISkyBlockProfile.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/bags/GUIYourBags.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/calendar/GUICalendar.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/profiles/GUIProfileSelectMode.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/questlog/GUIFairySoulsGuide.java # type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/gui/inventories/sbmenu/questlog/GUIMissionLog.java # type.skywarslobby/src/main/java/net/swofty/type/skywarslobby/SkywarsLobbyScoreboard.java
Swofty-Developments
merged commit 0fcc325
into
Swofty-Developments:master
3 checks passed
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #703