-
Notifications
You must be signed in to change notification settings - Fork 2
Feat/two pages for flags #28
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
a354566
feat: implement dual flag editing views for enhanced protection manag…
TheBjoRedCraft 19194ec
feat: adjust pagination and layout for flag editing views
TheBjoRedCraft 82a85f9
feat: adjust pagination chunk size for flag editing views
TheBjoRedCraft a69b381
feat: update close item display name formatting in view-util
TheBjoRedCraft 8226514
feat: update display name formatting for back item in view-util
TheBjoRedCraft File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| kotlin.code.style=official | ||
| kotlin.stdlib.default.dependency=false | ||
| org.gradle.parallel=true | ||
| version=3.2.1-SNAPSHOT | ||
| version=3.2.2-SNAPSHOT |
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
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
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
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
183 changes: 183 additions & 0 deletions
183
src/main/kotlin/dev/slne/surf/protect/paper/menu/view/flags/ProtectionEditFlagsViewB.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| package dev.slne.surf.protect.paper.menu.view.flags | ||
|
|
||
| import com.sk89q.worldguard.protection.flags.RegionGroup | ||
| import com.sk89q.worldguard.protection.flags.StateFlag | ||
| import com.sk89q.worldguard.protection.regions.ProtectedRegion | ||
| import dev.slne.surf.api.core.font.toSmallCaps | ||
| import dev.slne.surf.api.core.messages.adventure.sendText | ||
| import dev.slne.surf.api.paper.builder.buildItem | ||
| import dev.slne.surf.api.paper.builder.buildLore | ||
| import dev.slne.surf.api.paper.builder.displayName | ||
| import dev.slne.surf.api.paper.inventory.framework.titleBuilder | ||
| import dev.slne.surf.protect.paper.menu.util.* | ||
| import dev.slne.surf.protect.paper.menu.view.ProtectionInfoView | ||
| import dev.slne.surf.protect.paper.region.flags.EditableProtectionFlags | ||
| import dev.slne.surf.protect.paper.region.info.RegionInfo | ||
| import me.devnatan.inventoryframework.View | ||
| import me.devnatan.inventoryframework.ViewConfigBuilder | ||
| import me.devnatan.inventoryframework.component.Pagination | ||
| import me.devnatan.inventoryframework.context.RenderContext | ||
| import me.devnatan.inventoryframework.state.State | ||
| import net.kyori.adventure.text.format.TextDecoration | ||
|
|
||
| object ProtectionEditFlagsViewB : View() { | ||
| private val protectionState: State<RegionInfo> = initialState("protection") | ||
|
|
||
| private val paginationState: State<Pagination> = | ||
| buildLazyPaginationState { _ -> EditableProtectionFlags.entries.chunked(21)[1].toMutableList() } | ||
|
TheBjoRedCraft marked this conversation as resolved.
|
||
| .elementFactory { context, builder, _, flag -> | ||
|
|
||
| builder.renderWith { | ||
| val region = protectionState.get(context).region | ||
| val state = getCurrentState(region, flag) | ||
| createFlagItem(flag, state) | ||
| } | ||
|
|
||
| builder.onClick { context -> | ||
| val protection = protectionState.get(context) | ||
| val region = protection.region | ||
|
|
||
| val newState = toggleState(region, flag) | ||
| applyState(region, flag, newState) | ||
|
|
||
| context.playGeneralClickSound() | ||
|
|
||
| context.openForPlayer( | ||
| ProtectionEditFlagsViewB::class.java, | ||
| mapOf("protection" to protection) | ||
| ) | ||
|
|
||
| context.player.sendText { | ||
| appendSuccessPrefix() | ||
| success("Du hast die Flag ") | ||
| protectColored(flag.displayName.toSmallCaps(), TextDecoration.BOLD) | ||
| success(" auf ") | ||
| variableValue(formatState(flag, newState)) | ||
| success(" gesetzt.") | ||
| } | ||
| } | ||
| } | ||
| .layoutTarget('R') | ||
| .build() | ||
|
|
||
| override fun onInit(config: ViewConfigBuilder) { | ||
| config | ||
| .titleBuilder { | ||
| protectColored("Grundstück - Flags".toSmallCaps(), TextDecoration.BOLD) | ||
| } | ||
| .size(5) | ||
| .layout( | ||
| "OOOOOOOOO", | ||
| "ORRRRRRRO", | ||
| "ORRRRRRRO", | ||
| "ORRRRRRRO", | ||
| "OOLOBOOOO", | ||
| ) | ||
| .cancelInteractions() | ||
| } | ||
|
|
||
| override fun onFirstRender(render: RenderContext) { | ||
| render.layoutSlot('B', backItem).onClick { click -> | ||
| click.openForPlayer( | ||
| ProtectionInfoView::class.java, | ||
| mapOf("protection" to protectionState.get(render)) | ||
| ) | ||
| } | ||
|
|
||
| render.layoutSlot('O', outlineItem) | ||
| render.layoutSlot('L', previousItem).onClick { click -> | ||
| click.playGeneralClickSound() | ||
| click.openForPlayer( | ||
| ProtectionEditFlagsViewA::class.java, | ||
| mapOf("protection" to protectionState.get(render)) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private fun getCurrentState( | ||
| region: ProtectedRegion, | ||
| flag: EditableProtectionFlags | ||
| ): StateFlag.State { | ||
| return if (flag.isPlayerRelated) { | ||
| val group = region.getFlag(flag.flag.regionGroupFlag) | ||
| if (group == RegionGroup.MEMBERS) StateFlag.State.DENY else StateFlag.State.ALLOW | ||
| } else { | ||
| region.getFlag(flag.flag) ?: flag.initialState ?: StateFlag.State.ALLOW | ||
| } | ||
| } | ||
|
|
||
| private fun toggleState( | ||
| region: ProtectedRegion, | ||
| flag: EditableProtectionFlags | ||
| ): StateFlag.State { | ||
| val current = getCurrentState(region, flag) | ||
| return if (current == StateFlag.State.ALLOW) StateFlag.State.DENY else StateFlag.State.ALLOW | ||
| } | ||
|
|
||
| private fun applyState( | ||
| region: ProtectedRegion, | ||
| flag: EditableProtectionFlags, | ||
| state: StateFlag.State | ||
| ) { | ||
| if (flag.isPlayerRelated) { | ||
| region.setFlag(flag.flag, StateFlag.State.ALLOW) | ||
| if (state == StateFlag.State.ALLOW) { | ||
| region.setFlag(flag.flag.regionGroupFlag, null) | ||
| } else { | ||
| region.setFlag(flag.flag.regionGroupFlag, RegionGroup.MEMBERS) | ||
| } | ||
| } else { | ||
| region.setFlag(flag.flag, state) | ||
| } | ||
| } | ||
|
|
||
| private fun formatState(flag: EditableProtectionFlags, state: StateFlag.State): String { | ||
| return if (flag.isPlayerRelated) { | ||
| if (state == StateFlag.State.ALLOW) "Für alle erlaubt" else "Nur für Mitglieder" | ||
| } else { | ||
| if (state == StateFlag.State.ALLOW) "Erlaubt" else "Verboten" | ||
| } | ||
| } | ||
|
|
||
| private fun createFlagItem(flag: EditableProtectionFlags, state: StateFlag.State) = | ||
| buildItem(flag.icon) { | ||
| displayName { | ||
| protectColored(flag.displayName.toSmallCaps(), TextDecoration.BOLD) | ||
| } | ||
|
|
||
| buildLore { | ||
| line { darkSpacer("Flag: ${flag.flag.name}".toSmallCaps()) } | ||
| emptyLine() | ||
| line { | ||
| appendBlob() | ||
| appendSpace() | ||
| spacer(flag.description) | ||
| } | ||
| emptyLine() | ||
| line { | ||
| appendBlob() | ||
| appendSpace() | ||
| white("Status: ".toSmallCaps()) | ||
|
|
||
| if (flag.isPlayerRelated) { | ||
| if (state == StateFlag.State.ALLOW) { | ||
| success("Alle".toSmallCaps()) | ||
| } else { | ||
| variableValue("Mitglieder".toSmallCaps()) | ||
| } | ||
| } else { | ||
| if (state == StateFlag.State.ALLOW) { | ||
| success("Erlaubt".toSmallCaps()) | ||
| } else { | ||
| error("Verboten".toSmallCaps()) | ||
| } | ||
| } | ||
| } | ||
| emptyLine() | ||
| line { | ||
| appendSpace() | ||
| variableValue("Klicke zum Umschalten".toSmallCaps()) | ||
| } | ||
| } | ||
| } | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.