-
-
Notifications
You must be signed in to change notification settings - Fork 0
chore: replace SlenderBar BiConsumer with event-based state change system #75
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
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
47 changes: 47 additions & 0 deletions
47
game/src/main/java/net/onelitefeather/cygnus/event/StaminaStateChangeEvent.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,47 @@ | ||
| package net.onelitefeather.cygnus.event; | ||
|
|
||
| import net.minestom.server.entity.Player; | ||
| import net.minestom.server.event.trait.PlayerEvent; | ||
| import net.onelitefeather.cygnus.stamina.StaminaBar; | ||
|
|
||
| /** | ||
| * Called when the state of a StaminaBar changes. | ||
| * | ||
| * @author Joltra | ||
| * @version 1.0.0 | ||
| * @since 1.0.0 | ||
| **/ | ||
| @SuppressWarnings("java:S6206") | ||
| public final class StaminaStateChangeEvent implements PlayerEvent { | ||
|
|
||
| private final Player player; | ||
| private final StaminaBar.State state; | ||
|
|
||
| /** | ||
| * Creates a new instance of the {@link StaminaStateChangeEvent}. | ||
| * | ||
| * @param player the player whose stamina state changed | ||
| * @param state the new state | ||
| */ | ||
| public StaminaStateChangeEvent(Player player, StaminaBar.State state) { | ||
| this.player = player; | ||
| this.state = state; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| @Override | ||
| public Player getPlayer() { | ||
| return this.player; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the new state of the stamina bar. | ||
| * | ||
| * @return the state | ||
| */ | ||
| public StaminaBar.State getState() { | ||
| return state; | ||
| } | ||
| } |
40 changes: 40 additions & 0 deletions
40
game/src/main/java/net/onelitefeather/cygnus/listener/StaminaStateChangeListener.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,40 @@ | ||
| package net.onelitefeather.cygnus.listener; | ||
|
|
||
| import net.minestom.server.MinecraftServer; | ||
| import net.minestom.server.entity.Player; | ||
| import net.minestom.server.utils.PacketSendingUtils; | ||
| import net.onelitefeather.cygnus.event.StaminaStateChangeEvent; | ||
| import net.onelitefeather.cygnus.stamina.StaminaBar; | ||
|
|
||
| import java.util.function.Consumer; | ||
|
|
||
| /** | ||
| * Listener for stamina state changes to handle packet broadcasting. | ||
| * | ||
| * @author Joltra | ||
| * @version 1.0.0 | ||
| * @since 1.0.0 | ||
| **/ | ||
| public final class StaminaStateChangeListener implements Consumer<StaminaStateChangeEvent> { | ||
|
|
||
| @Override | ||
| public void accept(StaminaStateChangeEvent event) { | ||
| Player player = event.getPlayer(); | ||
| StaminaBar.State state = event.getState(); | ||
|
|
||
| if (state == StaminaBar.State.DRAINING) { | ||
| PacketSendingUtils.broadcastPlayPacket(player.getMetadataPacket()); | ||
| MinecraftServer.getConnectionManager().getOnlinePlayers() | ||
| .stream().filter(p -> !p.getUuid().equals(player.getUuid())).forEach(player::updateNewViewer); | ||
| PacketSendingUtils.broadcastPlayPacket(player.getMetadataPacket()); | ||
| return; | ||
| } | ||
|
|
||
| if (state == StaminaBar.State.REGENERATING) { | ||
| PacketSendingUtils.broadcastPlayPacket(player.getMetadataPacket()); | ||
| MinecraftServer.getConnectionManager().getOnlinePlayers() | ||
| .stream().filter(p -> !p.getUuid().equals(player.getUuid())).forEach(player::updateOldViewer); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nitpick: You can use |
||
| PacketSendingUtils.broadcastPlayPacket(player.getMetadataPacket()); | ||
| } | ||
| } | ||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpick: You can use
Predicate#not()