-
-
Notifications
You must be signed in to change notification settings - Fork 20
GH-886 Sign editor (/sign setline <index> <text> command) #895
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
12 commits
Select commit
Hold shift + click to select a range
bb017c8
primary implementation (to be fixed)
igoyek aa76ccb
Update command name
igoyek 2c16d2b
Merge branch 'master' into feature/sign-command-editor
vLuckyyy e3fe988
Refactor messages, add compatibility for non-side-based sing's
vLuckyyy 45a19e7
Use Block#getTargetBlockExact
vLuckyyy c6fcdfd
Fix index placeholder.
vLuckyyy 91ea5e3
followed all instructions
igoyek 9017146
Update eternalcore-core/src/main/java/com/eternalcode/core/feature/si…
Rollczi 5536321
Fix for 1.19.4 compatibility
igoyek 36da3a6
Merge branch 'master' of https://github.com/EternalCodeTeam/EternalCo…
igoyek a65bb24
Fix jar build
igoyek fe2466e
Code review
Rollczi 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
70 changes: 70 additions & 0 deletions
70
...nalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/SignEditorCommand.java
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,70 @@ | ||
| package com.eternalcode.core.feature.signeditor; | ||
|
|
||
| import com.eternalcode.commons.adventure.AdventureUtil; | ||
| import com.eternalcode.core.compatibility.Compatibility; | ||
| import com.eternalcode.core.compatibility.Version; | ||
| import com.eternalcode.core.injector.annotations.Inject; | ||
| import com.eternalcode.core.notice.NoticeService; | ||
| import dev.rollczi.litecommands.annotations.argument.Arg; | ||
| import dev.rollczi.litecommands.annotations.command.Command; | ||
| import dev.rollczi.litecommands.annotations.context.Context; | ||
| import dev.rollczi.litecommands.annotations.execute.Execute; | ||
| import dev.rollczi.litecommands.annotations.join.Join; | ||
| import dev.rollczi.litecommands.annotations.permission.Permission; | ||
| import net.kyori.adventure.text.minimessage.MiniMessage; | ||
| import org.bukkit.block.Block; | ||
| import org.bukkit.block.Sign; | ||
| import org.bukkit.entity.Player; | ||
|
|
||
| @Command(name = "signedit") | ||
| @Permission("eternalcode.signedit") | ||
| @Compatibility(to = @Version(minor = 19, patch = 4)) | ||
| public class SignEditorCommand { | ||
|
|
||
| private final NoticeService noticeService; | ||
| private final MiniMessage miniMessage; | ||
|
|
||
| @Inject | ||
| public SignEditorCommand(NoticeService noticeService, MiniMessage miniMessage) { | ||
| this.noticeService = noticeService; | ||
| this.miniMessage = miniMessage; | ||
| } | ||
|
|
||
| @Execute(name = "set") | ||
| @Deprecated(since = "1.20") | ||
| void execute(@Context Player player, @Arg int line, @Join String text) { | ||
| Block targetBlock = player.getTargetBlockExact(5); | ||
|
|
||
| if (targetBlock == null) { | ||
| return; | ||
| } | ||
|
|
||
| if (!(targetBlock.getState() instanceof Sign sign)) { | ||
| this.noticeService.create() | ||
| .player(player.getUniqueId()) | ||
| .notice(translation -> translation.signEditor().noSignFound()) | ||
| .send(); | ||
| return; | ||
| } | ||
|
|
||
| if (line < 1 || line >= sign.getTargetSide(player).getLines().length) { | ||
| this.noticeService.create() | ||
| .player(player.getUniqueId()) | ||
| .placeholder("{LINE}", String.valueOf(line)) | ||
| .notice(translation -> translation.signEditor().invalidIndex()) | ||
| .send(); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| sign.setLine(line - 1, AdventureUtil.SECTION_SERIALIZER.serialize(this.miniMessage.deserialize(text))); | ||
| sign.update(); | ||
|
|
||
| this.noticeService.create() | ||
| .player(player.getUniqueId()) | ||
| .placeholder("{LINE}", String.valueOf(line)) | ||
| .placeholder("{TEXT}", text) | ||
| .notice(translation -> translation.signEditor().lineSet()) | ||
| .send(); | ||
| } | ||
| } | ||
72 changes: 72 additions & 0 deletions
72
...ore-core/src/main/java/com/eternalcode/core/feature/signeditor/SignSideEditorCommand.java
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,72 @@ | ||
| package com.eternalcode.core.feature.signeditor; | ||
|
|
||
| import com.eternalcode.commons.adventure.AdventureUtil; | ||
| import com.eternalcode.core.compatibility.Compatibility; | ||
| import com.eternalcode.core.compatibility.Version; | ||
| import com.eternalcode.core.injector.annotations.Inject; | ||
| import com.eternalcode.core.notice.NoticeService; | ||
| import dev.rollczi.litecommands.annotations.argument.Arg; | ||
| import dev.rollczi.litecommands.annotations.command.Command; | ||
| import dev.rollczi.litecommands.annotations.context.Context; | ||
| import dev.rollczi.litecommands.annotations.execute.Execute; | ||
| import dev.rollczi.litecommands.annotations.join.Join; | ||
| import dev.rollczi.litecommands.annotations.permission.Permission; | ||
| import net.kyori.adventure.text.minimessage.MiniMessage; | ||
| import org.bukkit.block.Block; | ||
| import org.bukkit.block.Sign; | ||
| import org.bukkit.block.sign.Side; | ||
| import org.bukkit.block.sign.SignSide; | ||
| import org.bukkit.entity.Player; | ||
|
|
||
| @Command(name = "signedit") | ||
| @Permission("eternalcode.signedit") | ||
| @Compatibility(from = @Version(minor = 20, patch = 0)) | ||
| public class SignSideEditorCommand { | ||
|
|
||
| private final NoticeService noticeService; | ||
| private final MiniMessage miniMessage; | ||
|
|
||
| @Inject | ||
| public SignSideEditorCommand(NoticeService noticeService, MiniMessage miniMessage) { | ||
| this.noticeService = noticeService; | ||
| this.miniMessage = miniMessage; | ||
| } | ||
|
|
||
| @Execute(name = "set") | ||
| void execute(@Context Player player, @Arg Side side, @Arg int line, @Join String text) { | ||
| Block targetBlock = player.getTargetBlockExact(5); | ||
|
|
||
| if (targetBlock == null) { | ||
| return; | ||
| } | ||
|
|
||
| if (!(targetBlock.getState() instanceof Sign sign)) { | ||
| this.noticeService.create() | ||
| .player(player.getUniqueId()) | ||
| .notice(translation -> translation.signEditor().noSignFound()) | ||
| .send(); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| SignSide signSide = sign.getSide(side); | ||
| if (line < 1 || line > signSide.getLines().length) { | ||
| this.noticeService.create() | ||
| .player(player.getUniqueId()) | ||
| .placeholder("{LINE}", String.valueOf(line)) | ||
| .notice(translation -> translation.signEditor().invalidIndex()) | ||
| .send(); | ||
| return; | ||
| } | ||
|
|
||
| signSide.setLine(line - 1, AdventureUtil.SECTION_SERIALIZER.serialize(this.miniMessage.deserialize(text))); | ||
| sign.update(); | ||
|
|
||
| this.noticeService.create() | ||
| .player(player.getUniqueId()) | ||
| .placeholder("{LINE}", String.valueOf(line)) | ||
| .placeholder("{TEXT}", text) | ||
| .notice(translation -> translation.signEditor().lineSet()) | ||
| .send(); | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
.../src/main/java/com/eternalcode/core/feature/signeditor/messages/ENSignEditorMessages.java
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,15 @@ | ||
| package com.eternalcode.core.feature.signeditor.messages; | ||
|
|
||
| import com.eternalcode.multification.notice.Notice; | ||
| import lombok.Getter; | ||
| import lombok.experimental.Accessors; | ||
| import net.dzikoysk.cdn.entity.Contextual; | ||
|
|
||
| @Getter | ||
| @Accessors(fluent = true) | ||
| @Contextual | ||
| public class ENSignEditorMessages implements SignEditorMessages { | ||
igoyek marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| public Notice noSignFound = Notice.chat("<red>✘ <dark_red>Look at the sign to edit it!"); | ||
| public Notice invalidIndex = Notice.chat("<red>✘ <dark_red>The value {LINE} is invalid! <red>Please select a number between 1 and 4!"); | ||
| public Notice lineSet = Notice.chat("<green>► <white>Line <green>{LINE} <white>set to <green>{TEXT}"); | ||
vLuckyyy marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
15 changes: 15 additions & 0 deletions
15
.../src/main/java/com/eternalcode/core/feature/signeditor/messages/PLSignEditorMessages.java
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,15 @@ | ||
| package com.eternalcode.core.feature.signeditor.messages; | ||
|
|
||
| import com.eternalcode.multification.notice.Notice; | ||
| import lombok.Getter; | ||
| import lombok.experimental.Accessors; | ||
| import net.dzikoysk.cdn.entity.Contextual; | ||
|
|
||
| @Getter | ||
| @Accessors(fluent = true) | ||
| @Contextual | ||
| public class PLSignEditorMessages implements SignEditorMessages { | ||
| public Notice noSignFound = Notice.chat("<red>✘ <dark_red>Spójrz na tabliczkę, aby ją edytować!"); | ||
| public Notice invalidIndex = Notice.chat("<red>✘ <dark_red>Wartość {LINE} jest nieprawidłowa! <red>Wybierz numer od 1 do 4!"); | ||
| public Notice lineSet = Notice.chat("<green>► <white>Zmieniono linię <green>{LINE}</green> na <green>{TEXT}"); | ||
| } |
9 changes: 9 additions & 0 deletions
9
...re/src/main/java/com/eternalcode/core/feature/signeditor/messages/SignEditorMessages.java
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,9 @@ | ||
| package com.eternalcode.core.feature.signeditor.messages; | ||
|
|
||
| import com.eternalcode.multification.notice.Notice; | ||
|
|
||
| public interface SignEditorMessages { | ||
| Notice noSignFound(); | ||
| Notice invalidIndex(); | ||
| Notice lineSet(); | ||
| } |
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
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.