Merged
Conversation
[ADD] Abstract for panel [ADD] Base for admin panel
[ADD] UpgradesDataManager to manage database
Removed need for a local variable by using a map to boolean.
I think the log line should be shown unconditionally, but it was indented in a way that made it look like it shouldn't be. I added curly braces.
Initially this was to avoid the local variable 'vault' being used because it was shadowing the vault field.
Merged a number of collapsible if statements to increase the code's readability. Made fields final.
Duplicated string literals make the process of refactoring error-prone, since you must be sure to update all occurrences. On the other hand, constants can be referenced from many places, but only need to be updated in a single place.
It may throw NullPointerException if the value is null.
[ADD] Code Doc in upgradesDataManeger [ADD] Default values to upgrade data/tier
[WIP] Edit Tier Panel
[WIP] Edit price
[ADD] prices interface
Resolves merge conflicts between develop and the AdminInterface branch (PR #65, issue #37). Key changes: - Add admin GUI panels: AdminPanel, EditUpgradePanel, EditTierPanel, ListUpgradeDataPanel, ListUpgradeTierPanel, YesNoPanel - Add AdminCommand hooked into each GameMode's admin command - Add UpgradesDataManager for database-backed upgrade/tier storage - Add Price/Reward plugin architecture (IslandLevelPrice, RangeReward) - Rename Upgrade base class to UpgradeAPI - Add ChatInput utility for in-game text input prompts - Add JoinPermCheckListener (replaces commented-out listener) - Update en-US.yml with admin UI locale keys Conflict resolution notes: - Kept current pom.xml dependency versions (Java 21, Paper 1.21, BB 3.0.0) - Kept HEAD's CommandUpgrade bug fix #64 (use getName() not cmdId in isShowed) - Kept HEAD's Limits API calls in BlockLimitsUpgrade (compatible with 1.19.1) - Kept HEAD's Level API in UpgradesManager.getIslandLevel - Fixed com.mongodb.lang.NonNull imports → org.eclipse.jdt.annotation - Initialized upgrade/upgradesCache fields eagerly to fix existing tests Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
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
1 participant
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.
Summary
/[gamemode] admin upgradesWhat's new
AdminPanel,EditUpgradePanel,EditTierPanel,ListUpgradeDataPanel,ListUpgradeTierPanel,YesNoPanelAdminCommand: hooked into each GameMode's admin commandUpgradesDataManager: stores upgrade definitions (UpgradeData,UpgradeTier) in the BentoBox databaseChatInput: utility for in-game text input prompts used by admin panelsJoinPermCheckListener: cleaner replacement for the previously commented-out limits permission listenerUpgradeAPI: renamed fromUpgradeas the base class for all upgrade typesen-US.ymlwith all admin UI locale keysConflict resolution notes
CommandUpgrade.isShowed(getName()notcmdId)BlockLimitsUpgrade.doUpgradeUpgradesManager.getIslandLevelcom.mongodb.langannotations →org.eclipse.jdt.annotationupgrade/upgradesCachefields to keep existing tests passingTest plan
mvn clean package) — all 70+ tests green/[gamemode] upgrades(player panel still works)/[gamemode] admin upgradesopens the admin GUI🤖 Generated with Claude Code