From 8932c4336f5093442ba8fd196bb238fdc0902c49 Mon Sep 17 00:00:00 2001 From: Joltras Date: Sun, 9 Aug 2026 14:24:05 +0200 Subject: [PATCH] chore(game): overhaul not null annotation usage --- .../java/net/theevilreaper/bounce/Bounce.java | 9 ++++---- .../bounce/attribute/AttributeHelper.java | 9 ++++---- .../bounce/attribute/package-info.java | 5 +++++ .../bounce/commands/StartCommand.java | 22 ++++++++++++++----- .../bounce/commands/StatsCommand.java | 10 ++++----- .../bounce/commands/package-info.java | 5 +++++ .../bounce/event/BounceGameFinishEvent.java | 5 ++--- .../bounce/event/PlayerLavaEvent.java | 18 +++++++++++---- .../bounce/event/ScoreUpdateEvent.java | 7 +++--- .../bounce/event/package-info.java | 5 +++++ .../bounce/jump/PlayerJumpTask.java | 12 +++++----- .../bounce/jump/package-info.java | 5 +++++ .../bounce/listener/PlayerChatListener.java | 3 +-- .../listener/PlayerConfigurationListener.java | 9 ++++---- .../bounce/listener/PlayerJoinListener.java | 8 ++----- .../bounce/listener/PlayerQuitListener.java | 11 +++++----- .../listener/damage/AttackListener.java | 5 ++--- .../listener/damage/DamageListener.java | 3 +-- .../listener/damage/KnockbackListener.java | 5 ++--- .../bounce/listener/damage/package-info.java | 5 +++++ .../listener/game/GameFinishListener.java | 6 ++--- .../listener/game/GamePrepareListener.java | 5 ++--- .../listener/game/PlayerLavaListener.java | 5 ++--- .../listener/game/ScoreUpdateListener.java | 5 ++--- .../bounce/listener/game/package-info.java | 5 +++++ .../bounce/listener/package-info.java | 4 ++++ .../bounce/map/BounceMapProvider.java | 9 ++++---- .../bounce/map/package-info.java | 5 +++++ .../theevilreaper/bounce/package-info.java | 4 ++++ .../bounce/profile/BounceProfile.java | 13 +++++------ .../bounce/profile/ProfileService.java | 16 +++++++------- .../bounce/profile/package-info.java | 4 ++++ .../bounce/timer/LobbyPhase.java | 3 +-- .../bounce/timer/PlayingPhase.java | 7 +++--- .../bounce/timer/RestartPhase.java | 3 +-- .../bounce/timer/TeleportPhase.java | 5 ++--- .../bounce/timer/package-info.java | 4 ++++ .../bounce/util/BounceScoreboard.java | 11 +++++----- .../bounce/util/GameMessages.java | 11 +++++----- .../theevilreaper/bounce/util/ItemUtil.java | 5 ++--- .../theevilreaper/bounce/util/PlayerUtil.java | 3 +-- .../bounce/util/package-info.java | 4 ++++ 42 files changed, 173 insertions(+), 125 deletions(-) create mode 100644 src/main/java/net/theevilreaper/bounce/attribute/package-info.java create mode 100644 src/main/java/net/theevilreaper/bounce/commands/package-info.java create mode 100644 src/main/java/net/theevilreaper/bounce/event/package-info.java create mode 100644 src/main/java/net/theevilreaper/bounce/jump/package-info.java create mode 100644 src/main/java/net/theevilreaper/bounce/listener/damage/package-info.java create mode 100644 src/main/java/net/theevilreaper/bounce/listener/game/package-info.java create mode 100644 src/main/java/net/theevilreaper/bounce/listener/package-info.java create mode 100644 src/main/java/net/theevilreaper/bounce/map/package-info.java create mode 100644 src/main/java/net/theevilreaper/bounce/package-info.java create mode 100644 src/main/java/net/theevilreaper/bounce/profile/package-info.java create mode 100644 src/main/java/net/theevilreaper/bounce/timer/package-info.java create mode 100644 src/main/java/net/theevilreaper/bounce/util/package-info.java diff --git a/src/main/java/net/theevilreaper/bounce/Bounce.java b/src/main/java/net/theevilreaper/bounce/Bounce.java index 12305c0..28e5dcd 100644 --- a/src/main/java/net/theevilreaper/bounce/Bounce.java +++ b/src/main/java/net/theevilreaper/bounce/Bounce.java @@ -48,7 +48,6 @@ import net.theevilreaper.bounce.util.BounceScoreboard; import net.theevilreaper.xerus.api.phase.LinearPhaseSeries; import net.theevilreaper.xerus.api.phase.Phase; -import org.jetbrains.annotations.NotNull; import java.nio.file.Path; import java.nio.file.Paths; @@ -111,7 +110,7 @@ private void registerPhases() { this.phaseSeries.add(new RestartPhase()); } - private void registerListener(@NotNull EventNode node) { + private void registerListener(EventNode node) { node.addListener(AsyncPlayerConfigurationEvent.class, new PlayerConfigurationListener( this.phaseSeries::getCurrentPhase, this.mapProvider.getActiveInstance(), @@ -130,7 +129,7 @@ private void registerListener(@NotNull EventNode node) { node.addListener(PlayerChatEvent.class, new PlayerChatListener()); } - private void registerGameListener(@NotNull EventNode node) { + private void registerGameListener(EventNode node) { node.addListener(BounceGameFinishEvent.class, new GameFinishListener(profileService)); node.addListener(ScoreUpdateEvent.class, new ScoreUpdateListener(scoreboard::updatePlayerLine)); node.addListener(FinalAttackEvent.class, new AttackListener(this.phaseSeries::getCurrentPhase)); @@ -143,7 +142,7 @@ private void registerCommands() { MinecraftServer.getCommandManager().register(new StartCommand(this.phaseSeries::getCurrentPhase)); } - private void handleGameLeave(@NotNull Player player) { + private void handleGameLeave(Player player) { BounceProfile profile = this.profileService.remove(player); if (profile == null) return; @@ -152,7 +151,7 @@ private void handleGameLeave(@NotNull Player player) { this.scoreboard.removeViewer(player); } - private void handleGeneralJoin(@NotNull Player player) { + private void handleGeneralJoin(Player player) { this.mapProvider.teleportToSpawn(player, false); this.scoreboard.addViewer(player); } diff --git a/src/main/java/net/theevilreaper/bounce/attribute/AttributeHelper.java b/src/main/java/net/theevilreaper/bounce/attribute/AttributeHelper.java index 61fd7bc..6f82222 100644 --- a/src/main/java/net/theevilreaper/bounce/attribute/AttributeHelper.java +++ b/src/main/java/net/theevilreaper/bounce/attribute/AttributeHelper.java @@ -2,13 +2,12 @@ import net.minestom.server.entity.Player; import net.minestom.server.entity.attribute.Attribute; -import org.jetbrains.annotations.NotNull; /** * The {@link AttributeHelper} is a utility class to manage player attributes related to jumping. * * @author theEvilReaper - * @version 1.0.0 + * @version 1.0.1 * @since 0.1.0 */ public final class AttributeHelper { @@ -21,7 +20,7 @@ public final class AttributeHelper { * * @param player the player whose jump strength is to be disabled */ - public static void disableJumpStrength(@NotNull Player player) { + public static void disableJumpStrength(Player player) { player.getAttribute(Attribute.JUMP_STRENGTH).setBaseValue(ZERO_JUMP); } @@ -30,11 +29,11 @@ public static void disableJumpStrength(@NotNull Player player) { * * @param player the player whose jump strength is to be reset */ - public static void resetJumpStrength(@NotNull Player player) { + public static void resetJumpStrength(Player player) { player.getAttribute(Attribute.JUMP_STRENGTH).setBaseValue(DEFAULT_JUMP_HEIGHT); } private AttributeHelper() { - + // Nothing to do here } } diff --git a/src/main/java/net/theevilreaper/bounce/attribute/package-info.java b/src/main/java/net/theevilreaper/bounce/attribute/package-info.java new file mode 100644 index 0000000..983415e --- /dev/null +++ b/src/main/java/net/theevilreaper/bounce/attribute/package-info.java @@ -0,0 +1,5 @@ + +@NotNullByDefault +package net.theevilreaper.bounce.attribute; + +import org.jetbrains.annotations.NotNullByDefault; \ No newline at end of file diff --git a/src/main/java/net/theevilreaper/bounce/commands/StartCommand.java b/src/main/java/net/theevilreaper/bounce/commands/StartCommand.java index bf9c54e..eded714 100644 --- a/src/main/java/net/theevilreaper/bounce/commands/StartCommand.java +++ b/src/main/java/net/theevilreaper/bounce/commands/StartCommand.java @@ -1,5 +1,7 @@ package net.theevilreaper.bounce.commands; +import net.minestom.server.command.CommandSender; +import net.minestom.server.command.builder.Command; import net.theevilreaper.bounce.common.config.GameConfig; import net.theevilreaper.bounce.common.util.Messages; import net.theevilreaper.bounce.timer.LobbyPhase; @@ -9,7 +11,6 @@ import net.kyori.adventure.text.format.NamedTextColor; import net.minestom.server.command.builder.CommandContext; import net.minestom.server.command.builder.condition.Conditions; -import org.jetbrains.annotations.NotNull; import java.util.function.Supplier; @@ -19,24 +20,35 @@ * It checks if the game is paused if the timer is long enough, and if the game has already been force started. * * @author theEvilReaper - * @version 1.0.0 + * @version 1.0.1 * @since 1.0.0 **/ -public class StartCommand extends net.minestom.server.command.builder.Command { +public class StartCommand extends Command { private final Supplier phaseSupplier; private final Component unableToStart = Messages.withPrefix( Component.text("Unable to start the game because the timer is to low!", NamedTextColor.RED) ); - public StartCommand(@NotNull Supplier phaseSupplier) { + /** + * Creates a new instance of the command with the given {@link Supplier}. + * + * @param phaseSupplier which returns the current phase + */ + public StartCommand(Supplier phaseSupplier) { super("start"); this.phaseSupplier = phaseSupplier; this.setCondition(Conditions::playerOnly); addSyntax(this::forceStart); } - private void forceStart(@NotNull net.minestom.server.command.CommandSender sender, @NotNull CommandContext commandContext) { + /** + * Handles the command logic to force start the game. + * + * @param sender which is involved + * @param commandContext of the command + */ + private void forceStart(CommandSender sender, CommandContext commandContext) { Phase phase = phaseSupplier.get(); if (!(phase instanceof LobbyPhase lobbyPhase)) return; diff --git a/src/main/java/net/theevilreaper/bounce/commands/StatsCommand.java b/src/main/java/net/theevilreaper/bounce/commands/StatsCommand.java index 01f15c7..54c1f31 100644 --- a/src/main/java/net/theevilreaper/bounce/commands/StatsCommand.java +++ b/src/main/java/net/theevilreaper/bounce/commands/StatsCommand.java @@ -9,7 +9,6 @@ import net.minestom.server.entity.Player; import net.theevilreaper.bounce.profile.BounceProfile; import net.theevilreaper.bounce.util.GameMessages; -import org.jetbrains.annotations.NotNull; import java.util.function.Function; @@ -17,18 +16,19 @@ public class StatsCommand extends Command { private final Function profileFunction; private final ArgumentString playerArgument; - public StatsCommand(@NotNull Function profileFunction) { + + public StatsCommand(Function profileFunction) { super("stats"); this.profileFunction = profileFunction; this.playerArgument = ArgumentType.String("player"); addSyntax(this::handleOwnStats); } - private void handleOtherStats(@NotNull CommandSender sender, @NotNull CommandContext context) { + private void handleOtherStats(CommandSender sender, CommandContext context) { Player player = (Player) sender; String playerName = context.get(playerArgument); - if (playerName == null || playerName.isEmpty()) { + if (playerName.isEmpty()) { sender.sendMessage(GameMessages.INVALID_PLAYER_NAME); return; } @@ -54,7 +54,7 @@ private void handleOtherStats(@NotNull CommandSender sender, @NotNull CommandCon } - private void handleOwnStats(@NotNull CommandSender sender, @NotNull CommandContext context) { + private void handleOwnStats(CommandSender sender, CommandContext context) { Player player = (Player) sender; BounceProfile profile = profileFunction.apply(player); diff --git a/src/main/java/net/theevilreaper/bounce/commands/package-info.java b/src/main/java/net/theevilreaper/bounce/commands/package-info.java new file mode 100644 index 0000000..7c32e6c --- /dev/null +++ b/src/main/java/net/theevilreaper/bounce/commands/package-info.java @@ -0,0 +1,5 @@ + +@NotNullByDefault +package net.theevilreaper.bounce.commands; + +import org.jetbrains.annotations.NotNullByDefault; \ No newline at end of file diff --git a/src/main/java/net/theevilreaper/bounce/event/BounceGameFinishEvent.java b/src/main/java/net/theevilreaper/bounce/event/BounceGameFinishEvent.java index 3c1f6a3..3132a84 100644 --- a/src/main/java/net/theevilreaper/bounce/event/BounceGameFinishEvent.java +++ b/src/main/java/net/theevilreaper/bounce/event/BounceGameFinishEvent.java @@ -1,14 +1,13 @@ package net.theevilreaper.bounce.event; import net.theevilreaper.xerus.api.event.GameFinishEvent; -import org.jetbrains.annotations.NotNull; /** * The {@link BounceGameFinishEvent} extends the {@link GameFinishEvent} to provide specific reasons for finishing a Bounce game. * It includes reasons such as time over, one player left, or a player left the game. * * @author theEvilReaper - * @version 1.0.0 + * @version 1.0.1 * @since 0.1.0 */ public class BounceGameFinishEvent extends GameFinishEvent { @@ -18,7 +17,7 @@ public class BounceGameFinishEvent extends GameFinishEvent getCheckPositions() { + private List getCheckPositions() { Pos playerPos = player.getPosition(); double halfWidth = 0.3; double minX = playerPos.x() - halfWidth; diff --git a/src/main/java/net/theevilreaper/bounce/jump/package-info.java b/src/main/java/net/theevilreaper/bounce/jump/package-info.java new file mode 100644 index 0000000..2fd3b9b --- /dev/null +++ b/src/main/java/net/theevilreaper/bounce/jump/package-info.java @@ -0,0 +1,5 @@ + +@NotNullByDefault +package net.theevilreaper.bounce.jump; + +import org.jetbrains.annotations.NotNullByDefault; \ No newline at end of file diff --git a/src/main/java/net/theevilreaper/bounce/listener/PlayerChatListener.java b/src/main/java/net/theevilreaper/bounce/listener/PlayerChatListener.java index 72782ab..3e663ec 100644 --- a/src/main/java/net/theevilreaper/bounce/listener/PlayerChatListener.java +++ b/src/main/java/net/theevilreaper/bounce/listener/PlayerChatListener.java @@ -5,14 +5,13 @@ import net.minestom.server.entity.Player; import net.minestom.server.event.player.PlayerChatEvent; import net.theevilreaper.bounce.common.util.Messages; -import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; public final class PlayerChatListener implements Consumer { @Override - public void accept(@NotNull PlayerChatEvent event) { + public void accept(PlayerChatEvent event) { Player player = event.getPlayer(); Component message = player.getDisplayName().append(Messages.SEPARATOR).append(Component.text(event.getRawMessage(), NamedTextColor.WHITE)); event.setFormattedMessage(message); diff --git a/src/main/java/net/theevilreaper/bounce/listener/PlayerConfigurationListener.java b/src/main/java/net/theevilreaper/bounce/listener/PlayerConfigurationListener.java index 7c0e87a..2443817 100644 --- a/src/main/java/net/theevilreaper/bounce/listener/PlayerConfigurationListener.java +++ b/src/main/java/net/theevilreaper/bounce/listener/PlayerConfigurationListener.java @@ -8,7 +8,6 @@ import net.minestom.server.instance.Instance; import net.theevilreaper.bounce.timer.LobbyPhase; import net.theevilreaper.xerus.api.phase.Phase; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.function.Consumer; @@ -20,11 +19,11 @@ public class PlayerConfigurationListener implements Consumer phaseSupplier; - private final Supplier<@NotNull Instance> instanceSupplier; + private final Supplier instanceSupplier; public PlayerConfigurationListener( - @NotNull Supplier phaseSupplier, - @NotNull Supplier instanceSupplier, + Supplier phaseSupplier, + Supplier instanceSupplier, int maxPlayers ) { this.phaseSupplier = phaseSupplier; @@ -33,7 +32,7 @@ public PlayerConfigurationListener( } @Override - public void accept(@NotNull AsyncPlayerConfigurationEvent event) { + public void accept(AsyncPlayerConfigurationEvent event) { Player player = event.getPlayer(); if (MinecraftServer.getConnectionManager().getOnlinePlayers().size() >= maxPlayers) { player.kick(FULL_SERVER); diff --git a/src/main/java/net/theevilreaper/bounce/listener/PlayerJoinListener.java b/src/main/java/net/theevilreaper/bounce/listener/PlayerJoinListener.java index 3dbbbef..a527282 100644 --- a/src/main/java/net/theevilreaper/bounce/listener/PlayerJoinListener.java +++ b/src/main/java/net/theevilreaper/bounce/listener/PlayerJoinListener.java @@ -7,7 +7,6 @@ import net.theevilreaper.bounce.timer.LobbyPhase; import net.theevilreaper.bounce.util.GameMessages; import net.theevilreaper.xerus.api.phase.Phase; -import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; import java.util.function.Supplier; @@ -19,16 +18,13 @@ public class PlayerJoinListener implements Consumer { private final Supplier phaseSupplier; private final PlayerConsumer spawnConsumer; - public PlayerJoinListener( - @NotNull Supplier phaseSupplier, - @NotNull PlayerConsumer spawnConsumer - ) { + public PlayerJoinListener(Supplier phaseSupplier, PlayerConsumer spawnConsumer) { this.phaseSupplier = phaseSupplier; this.spawnConsumer = spawnConsumer; } @Override - public void accept(@NotNull PlayerSpawnEvent event) { + public void accept(PlayerSpawnEvent event) { var player = event.getPlayer(); player.setDisplayName(Component.text(player.getUsername())); diff --git a/src/main/java/net/theevilreaper/bounce/listener/PlayerQuitListener.java b/src/main/java/net/theevilreaper/bounce/listener/PlayerQuitListener.java index 828c211..de01cce 100644 --- a/src/main/java/net/theevilreaper/bounce/listener/PlayerQuitListener.java +++ b/src/main/java/net/theevilreaper/bounce/listener/PlayerQuitListener.java @@ -8,7 +8,6 @@ import net.theevilreaper.bounce.timer.PlayingPhase; import net.theevilreaper.bounce.util.GameMessages; import net.theevilreaper.xerus.api.phase.Phase; -import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; import java.util.function.Supplier; @@ -20,13 +19,13 @@ public class PlayerQuitListener implements Consumer { private final Supplier phaseSupplier; private final PlayerConsumer playerLeave; - public PlayerQuitListener(@NotNull Supplier phaseSupplier, @NotNull PlayerConsumer playerLeave) { + public PlayerQuitListener(Supplier phaseSupplier, PlayerConsumer playerLeave) { this.phaseSupplier = phaseSupplier; this.playerLeave = playerLeave; } @Override - public void accept(@NotNull PlayerDisconnectEvent event) { + public void accept(PlayerDisconnectEvent event) { Phase phase = phaseSupplier.get(); Player player = event.getPlayer(); @@ -43,7 +42,7 @@ public void accept(@NotNull PlayerDisconnectEvent event) { * @param lobbyPhase the reference from the phase * @param player the player which is involved */ - private void handleLobbyQuit(@NotNull LobbyPhase lobbyPhase, @NotNull Player player) { + private void handleLobbyQuit(LobbyPhase lobbyPhase, Player player) { lobbyPhase.checkStopCondition(); Audience.audience(getConnectionManager().getOnlinePlayers()).sendMessage(GameMessages.getLeaveMessage(player)); } @@ -54,7 +53,7 @@ private void handleLobbyQuit(@NotNull LobbyPhase lobbyPhase, @NotNull Player pla * @param playingPhase the reference from the phase * @param player the player which is involved */ - private void handleGameQuit(@NotNull PlayingPhase playingPhase, @NotNull Player player) { + private void handleGameQuit(PlayingPhase playingPhase, Player player) { Audience.audience(getConnectionManager().getOnlinePlayers()).sendMessage(GameMessages.getLeaveMessage(player)); this.playerLeave.accept(player); playingPhase.handlePlayerCheck(); @@ -65,7 +64,7 @@ private void handleGameQuit(@NotNull PlayingPhase playingPhase, @NotNull Player * * @param player the player which is involved */ - private void handleDefaultLeave(@NotNull Player player) { + private void handleDefaultLeave(Player player) { Audience.audience(getConnectionManager().getOnlinePlayers()).sendMessage(GameMessages.getLeaveMessage(player)); } } \ No newline at end of file diff --git a/src/main/java/net/theevilreaper/bounce/listener/damage/AttackListener.java b/src/main/java/net/theevilreaper/bounce/listener/damage/AttackListener.java index 136bdd5..9bbc603 100644 --- a/src/main/java/net/theevilreaper/bounce/listener/damage/AttackListener.java +++ b/src/main/java/net/theevilreaper/bounce/listener/damage/AttackListener.java @@ -3,7 +3,6 @@ import io.github.togar2.pvp.events.FinalAttackEvent; import net.theevilreaper.bounce.timer.PlayingPhase; import net.theevilreaper.xerus.api.phase.Phase; -import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; import java.util.function.Supplier; @@ -12,12 +11,12 @@ public final class AttackListener implements Consumer { private final Supplier phaseSupplier; - public AttackListener(@NotNull Supplier phaseSupplier) { + public AttackListener(Supplier phaseSupplier) { this.phaseSupplier = phaseSupplier; } @Override - public void accept(@NotNull FinalAttackEvent event) { + public void accept(FinalAttackEvent event) { Phase phase = phaseSupplier.get(); if (phase instanceof PlayingPhase) { diff --git a/src/main/java/net/theevilreaper/bounce/listener/damage/DamageListener.java b/src/main/java/net/theevilreaper/bounce/listener/damage/DamageListener.java index 75e0cc1..62c47c7 100644 --- a/src/main/java/net/theevilreaper/bounce/listener/damage/DamageListener.java +++ b/src/main/java/net/theevilreaper/bounce/listener/damage/DamageListener.java @@ -5,7 +5,6 @@ import net.minestom.server.entity.Player; import net.minestom.server.entity.damage.DamageType; import net.minestom.server.registry.RegistryKey; -import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; @@ -15,7 +14,7 @@ public DamageListener() { } @Override - public void accept(@NotNull FinalDamageEvent event) { + public void accept(FinalDamageEvent event) { if (event.getEntity().getEntityType() != EntityType.PLAYER) return; RegistryKey type = event.getDamage().getType(); diff --git a/src/main/java/net/theevilreaper/bounce/listener/damage/KnockbackListener.java b/src/main/java/net/theevilreaper/bounce/listener/damage/KnockbackListener.java index 5c2f82a..df7acc3 100644 --- a/src/main/java/net/theevilreaper/bounce/listener/damage/KnockbackListener.java +++ b/src/main/java/net/theevilreaper/bounce/listener/damage/KnockbackListener.java @@ -3,7 +3,6 @@ import io.github.togar2.pvp.events.EntityKnockbackEvent; import net.minestom.server.entity.Player; import net.theevilreaper.bounce.profile.BounceProfile; -import org.jetbrains.annotations.NotNull; import java.util.UUID; import java.util.function.Consumer; @@ -13,12 +12,12 @@ public class KnockbackListener implements Consumer { private final Function profileFunction; - public KnockbackListener(@NotNull Function profileFunction) { + public KnockbackListener(Function profileFunction) { this.profileFunction = profileFunction; } @Override - public void accept(@NotNull EntityKnockbackEvent event) { + public void accept(EntityKnockbackEvent event) { if (!(event.getEntity() instanceof Player)) return; if (!(event.getAttacker() instanceof Player)) return; BounceProfile profile = profileFunction.apply(event.getEntity().getUuid()); diff --git a/src/main/java/net/theevilreaper/bounce/listener/damage/package-info.java b/src/main/java/net/theevilreaper/bounce/listener/damage/package-info.java new file mode 100644 index 0000000..7b2f177 --- /dev/null +++ b/src/main/java/net/theevilreaper/bounce/listener/damage/package-info.java @@ -0,0 +1,5 @@ + +@NotNullByDefault +package net.theevilreaper.bounce.listener.damage; + +import org.jetbrains.annotations.NotNullByDefault; \ No newline at end of file diff --git a/src/main/java/net/theevilreaper/bounce/listener/game/GameFinishListener.java b/src/main/java/net/theevilreaper/bounce/listener/game/GameFinishListener.java index 22eb223..c302ad9 100644 --- a/src/main/java/net/theevilreaper/bounce/listener/game/GameFinishListener.java +++ b/src/main/java/net/theevilreaper/bounce/listener/game/GameFinishListener.java @@ -9,21 +9,19 @@ import net.theevilreaper.bounce.event.BounceGameFinishEvent; import net.theevilreaper.bounce.profile.BounceProfile; import net.theevilreaper.bounce.profile.ProfileService; -import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; - public class GameFinishListener implements Consumer { private final ProfileService profileService; - public GameFinishListener(@NotNull ProfileService profileService) { + public GameFinishListener(ProfileService profileService) { this.profileService = profileService; } @Override - public void accept(@NotNull BounceGameFinishEvent event) { + public void accept(BounceGameFinishEvent event) { if (event.getReason() == BounceGameFinishEvent.Reason.PLAYER_LEFT) return; BounceProfile winnerProfile = profileService.getWinner(); diff --git a/src/main/java/net/theevilreaper/bounce/listener/game/GamePrepareListener.java b/src/main/java/net/theevilreaper/bounce/listener/game/GamePrepareListener.java index ab5d551..e1f815b 100644 --- a/src/main/java/net/theevilreaper/bounce/listener/game/GamePrepareListener.java +++ b/src/main/java/net/theevilreaper/bounce/listener/game/GamePrepareListener.java @@ -2,7 +2,6 @@ import net.theevilreaper.bounce.event.GamePrepareEvent; import net.theevilreaper.bounce.util.PlayerUtil; -import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; @@ -10,12 +9,12 @@ public class GamePrepareListener implements Consumer { private final PlayerUtil playerUtil; - public GamePrepareListener(@NotNull PlayerUtil playerUtil) { + public GamePrepareListener(PlayerUtil playerUtil) { this.playerUtil = playerUtil; } @Override - public void accept(@NotNull GamePrepareEvent event) { + public void accept(GamePrepareEvent event) { playerUtil.preparePlayers(); } } diff --git a/src/main/java/net/theevilreaper/bounce/listener/game/PlayerLavaListener.java b/src/main/java/net/theevilreaper/bounce/listener/game/PlayerLavaListener.java index 250e623..40f27a8 100644 --- a/src/main/java/net/theevilreaper/bounce/listener/game/PlayerLavaListener.java +++ b/src/main/java/net/theevilreaper/bounce/listener/game/PlayerLavaListener.java @@ -4,7 +4,6 @@ import net.minestom.server.entity.Player; import net.theevilreaper.bounce.event.PlayerLavaEvent; import net.theevilreaper.bounce.profile.BounceProfile; -import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; import java.util.function.Function; @@ -15,13 +14,13 @@ public class PlayerLavaListener implements Consumer { private final Function profileFunction; private final Supplier spawnCoordinates; - public PlayerLavaListener(@NotNull Function profileFunction, @NotNull Supplier spawnCoordinates) { + public PlayerLavaListener(Function profileFunction, Supplier spawnCoordinates) { this.profileFunction = profileFunction; this.spawnCoordinates = spawnCoordinates; } @Override - public void accept(@NotNull PlayerLavaEvent event) { + public void accept(PlayerLavaEvent event) { Player player = event.getPlayer(); BounceProfile profile = profileFunction.apply(player); diff --git a/src/main/java/net/theevilreaper/bounce/listener/game/ScoreUpdateListener.java b/src/main/java/net/theevilreaper/bounce/listener/game/ScoreUpdateListener.java index 48006e6..170826e 100644 --- a/src/main/java/net/theevilreaper/bounce/listener/game/ScoreUpdateListener.java +++ b/src/main/java/net/theevilreaper/bounce/listener/game/ScoreUpdateListener.java @@ -1,7 +1,6 @@ package net.theevilreaper.bounce.listener.game; import net.theevilreaper.bounce.event.ScoreUpdateEvent; -import org.jetbrains.annotations.NotNull; import java.util.UUID; import java.util.function.BiConsumer; @@ -11,12 +10,12 @@ public final class ScoreUpdateListener implements Consumer { private final BiConsumer scoreUpdater; - public ScoreUpdateListener(@NotNull BiConsumer scoreUpdater) { + public ScoreUpdateListener(BiConsumer scoreUpdater) { this.scoreUpdater = scoreUpdater; } @Override - public void accept(@NotNull ScoreUpdateEvent event) { + public void accept(ScoreUpdateEvent event) { this.scoreUpdater.accept(event.getPlayer().getUuid(), event.getPoints()); } } diff --git a/src/main/java/net/theevilreaper/bounce/listener/game/package-info.java b/src/main/java/net/theevilreaper/bounce/listener/game/package-info.java new file mode 100644 index 0000000..d5d8bce --- /dev/null +++ b/src/main/java/net/theevilreaper/bounce/listener/game/package-info.java @@ -0,0 +1,5 @@ + +@NotNullByDefault +package net.theevilreaper.bounce.listener.game; + +import org.jetbrains.annotations.NotNullByDefault; \ No newline at end of file diff --git a/src/main/java/net/theevilreaper/bounce/listener/package-info.java b/src/main/java/net/theevilreaper/bounce/listener/package-info.java new file mode 100644 index 0000000..de7db16 --- /dev/null +++ b/src/main/java/net/theevilreaper/bounce/listener/package-info.java @@ -0,0 +1,4 @@ +@NotNullByDefault +package net.theevilreaper.bounce.listener; + +import org.jetbrains.annotations.NotNullByDefault; \ No newline at end of file diff --git a/src/main/java/net/theevilreaper/bounce/map/BounceMapProvider.java b/src/main/java/net/theevilreaper/bounce/map/BounceMapProvider.java index d0a846b..4f51762 100644 --- a/src/main/java/net/theevilreaper/bounce/map/BounceMapProvider.java +++ b/src/main/java/net/theevilreaper/bounce/map/BounceMapProvider.java @@ -8,14 +8,13 @@ import net.theevilreaper.bounce.common.map.GameMap; import net.theevilreaper.bounce.common.map.MapFilters; import net.theevilreaper.bounce.common.util.GsonUtil; -import org.jetbrains.annotations.NotNull; import java.nio.file.Path; import java.util.Optional; public class BounceMapProvider extends AbstractMapProvider { - public BounceMapProvider(@NotNull Path path) { + public BounceMapProvider(Path path) { super(GsonUtil.GSON_FILE_HANDLER, MapFilters::filterMapsForGame); this.loadMapEntries(path.resolve("maps")); this.activeInstance = MinecraftServer.getInstanceManager().createInstanceContainer(); @@ -38,11 +37,11 @@ public BounceMapProvider(@NotNull Path path) { } @Override - public void saveMap(@NotNull Path path, @NotNull BaseMap baseMap) { + public void saveMap(Path path, BaseMap baseMap) { throw new UnsupportedOperationException("Not supported yet."); } - public void teleportToGameSpawn(@NotNull Player player) { + public void teleportToGameSpawn(Player player) { player.teleport(((GameMap) this.activeMap).getGameSpawn()); } @@ -50,7 +49,7 @@ public String getMapName() { return this.activeMap.name(); } - public @NotNull GameMap getActiveMap() { + public GameMap getActiveMap() { if (!(this.activeMap instanceof GameMap gameMap)) { throw new IllegalStateException("Active map is not a GameMap"); } diff --git a/src/main/java/net/theevilreaper/bounce/map/package-info.java b/src/main/java/net/theevilreaper/bounce/map/package-info.java new file mode 100644 index 0000000..138211c --- /dev/null +++ b/src/main/java/net/theevilreaper/bounce/map/package-info.java @@ -0,0 +1,5 @@ + +@NotNullByDefault +package net.theevilreaper.bounce.map; + +import org.jetbrains.annotations.NotNullByDefault; \ No newline at end of file diff --git a/src/main/java/net/theevilreaper/bounce/package-info.java b/src/main/java/net/theevilreaper/bounce/package-info.java new file mode 100644 index 0000000..d8c6b27 --- /dev/null +++ b/src/main/java/net/theevilreaper/bounce/package-info.java @@ -0,0 +1,4 @@ +@NotNullByDefault +package net.theevilreaper.bounce; + +import org.jetbrains.annotations.NotNullByDefault; \ No newline at end of file diff --git a/src/main/java/net/theevilreaper/bounce/profile/BounceProfile.java b/src/main/java/net/theevilreaper/bounce/profile/BounceProfile.java index f2348ac..e021590 100644 --- a/src/main/java/net/theevilreaper/bounce/profile/BounceProfile.java +++ b/src/main/java/net/theevilreaper/bounce/profile/BounceProfile.java @@ -8,7 +8,6 @@ import net.theevilreaper.bounce.event.ScoreUpdateEvent; import net.theevilreaper.bounce.jump.PlayerJumpTask; import net.theevilreaper.bounce.util.GameMessages; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Objects; @@ -24,11 +23,11 @@ public final class BounceProfile implements Comparable { private final Player player; - private Player lastDamager; + private @Nullable Player lastDamager; private int points; private int kills; private int deaths; - private PlayerJumpTask jumpRunnable; + private @Nullable PlayerJumpTask jumpRunnable; private long firstReachTimestamp; /** @@ -36,7 +35,7 @@ public final class BounceProfile implements Comparable { * * @param player the player associated with this profile */ - public BounceProfile(@NotNull Player player) { + public BounceProfile(Player player) { this.player = player; this.points = 0; } @@ -47,7 +46,7 @@ public BounceProfile(@NotNull Player player) { * * @param pushData the push data containing information about the jump */ - public void registerJumpRunnable(@NotNull PushData pushData) { + public void registerJumpRunnable(PushData pushData) { this.jumpRunnable = new PlayerJumpTask(player, pushData); } @@ -56,7 +55,7 @@ public void registerJumpRunnable(@NotNull PushData pushData) { * * @param paramPlayer the player who last damaged this profile's player */ - public void setLastDamager(@NotNull Player paramPlayer) { + public void setLastDamager(Player paramPlayer) { this.lastDamager = paramPlayer; } @@ -140,7 +139,7 @@ public void sendStats(boolean winner) { } @Override - public int compareTo(@NotNull BounceProfile other) { + public int compareTo(BounceProfile other) { int pointComparison = Integer.compare(this.points, other.points); // Descending by points if (pointComparison != 0) return pointComparison; diff --git a/src/main/java/net/theevilreaper/bounce/profile/ProfileService.java b/src/main/java/net/theevilreaper/bounce/profile/ProfileService.java index 338c52b..2355e50 100644 --- a/src/main/java/net/theevilreaper/bounce/profile/ProfileService.java +++ b/src/main/java/net/theevilreaper/bounce/profile/ProfileService.java @@ -3,7 +3,7 @@ import net.minestom.server.entity.Player; import net.theevilreaper.aves.util.functional.PlayerConsumer; import net.theevilreaper.bounce.common.map.GameMap; -import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -17,30 +17,30 @@ public ProfileService() { profileMap = new ConcurrentHashMap<>(); } - public @NotNull BounceProfile add(@NotNull Player player) { + public BounceProfile add(Player player) { return this.profileMap.computeIfAbsent(player.getUuid(), uuid -> new BounceProfile(player)); } - public BounceProfile remove(@NotNull Player player) { + public @Nullable BounceProfile remove(Player player) { return this.profileMap.remove(player.getUuid()); } - public BounceProfile get(@NotNull Player player) { + public @Nullable BounceProfile get(Player player) { return this.profileMap.get(player.getUuid()); } - public BounceProfile get(@NotNull UUID uuid) { + public @Nullable BounceProfile get(UUID uuid) { return this.profileMap.get(uuid); } - public void start(@NotNull GameMap gameMap, @NotNull PlayerConsumer consumer) { + public void start(GameMap gameMap, PlayerConsumer consumer) { for (BounceProfile value : this.profileMap.values()) { value.getJumpRunnable().start(gameMap); consumer.accept(value.getPlayer()); } } - public BounceProfile getWinner() { + public @Nullable BounceProfile getWinner() { if (this.profileMap.isEmpty()) return null; return profileMap.values().stream() @@ -53,7 +53,7 @@ public void clear() { this.profileMap.clear(); } - public void clear(@NotNull Consumer callback) { + public void clear(Consumer callback) { if (this.profileMap.isEmpty()) return; for (BounceProfile value : this.profileMap.values()) { callback.accept(value); diff --git a/src/main/java/net/theevilreaper/bounce/profile/package-info.java b/src/main/java/net/theevilreaper/bounce/profile/package-info.java new file mode 100644 index 0000000..3524f44 --- /dev/null +++ b/src/main/java/net/theevilreaper/bounce/profile/package-info.java @@ -0,0 +1,4 @@ +@NotNullByDefault +package net.theevilreaper.bounce.profile; + +import org.jetbrains.annotations.NotNullByDefault; \ No newline at end of file diff --git a/src/main/java/net/theevilreaper/bounce/timer/LobbyPhase.java b/src/main/java/net/theevilreaper/bounce/timer/LobbyPhase.java index 0f39f74..a8dd1c9 100644 --- a/src/main/java/net/theevilreaper/bounce/timer/LobbyPhase.java +++ b/src/main/java/net/theevilreaper/bounce/timer/LobbyPhase.java @@ -8,7 +8,6 @@ import net.theevilreaper.bounce.util.GameMessages; import net.theevilreaper.xerus.api.phase.TickDirection; import net.theevilreaper.xerus.api.phase.TimedPhase; -import org.jetbrains.annotations.NotNull; import java.time.temporal.ChronoUnit; @@ -80,7 +79,7 @@ private void setLevel(int amount) { * * @param player the player who should receive the update */ - public void updatePlayerValues(@NotNull Player player) { + public void updatePlayerValues(Player player) { player.setLevel(getCurrentTicks()); float currentExpCount = (float) this.getCurrentTicks() / getLobbyOrForceTime(); player.setExp(currentExpCount); diff --git a/src/main/java/net/theevilreaper/bounce/timer/PlayingPhase.java b/src/main/java/net/theevilreaper/bounce/timer/PlayingPhase.java index c401a59..fc9701a 100644 --- a/src/main/java/net/theevilreaper/bounce/timer/PlayingPhase.java +++ b/src/main/java/net/theevilreaper/bounce/timer/PlayingPhase.java @@ -8,7 +8,6 @@ import net.theevilreaper.bounce.event.BounceGameFinishEvent; import net.theevilreaper.xerus.api.phase.TickDirection; import net.theevilreaper.xerus.api.phase.TimedPhase; -import org.jetbrains.annotations.NotNull; import java.time.temporal.ChronoUnit; import java.util.Collection; @@ -22,7 +21,7 @@ public class PlayingPhase extends TimedPhase { private final VoidConsumer startTrigger; private BounceGameFinishEvent.Reason reason; - public PlayingPhase(@NotNull IntConsumer timeUpdater, @NotNull VoidConsumer startTrigger) { + public PlayingPhase(IntConsumer timeUpdater, VoidConsumer startTrigger) { super("GamePhase", ChronoUnit.SECONDS, 1); this.setTickDirection(TickDirection.DOWN); this.setCurrentTicks(300); @@ -64,13 +63,13 @@ public void onSkip() { } - private void broadcast(@NotNull Component component) { + private void broadcast(Component component) { Audience.audience(getConnectionManager().getOnlinePlayers()) .sendMessage(component); } public void handlePlayerCheck() { - Collection<@NotNull Player> onlinePlayers = getConnectionManager().getOnlinePlayers(); + Collection onlinePlayers = getConnectionManager().getOnlinePlayers(); if (onlinePlayers.size() - 1 == 0) { this.reason = BounceGameFinishEvent.Reason.PLAYER_LEFT; diff --git a/src/main/java/net/theevilreaper/bounce/timer/RestartPhase.java b/src/main/java/net/theevilreaper/bounce/timer/RestartPhase.java index 0b0554a..5218fcb 100644 --- a/src/main/java/net/theevilreaper/bounce/timer/RestartPhase.java +++ b/src/main/java/net/theevilreaper/bounce/timer/RestartPhase.java @@ -7,7 +7,6 @@ import net.minestom.server.entity.Player; import net.theevilreaper.bounce.util.GameMessages; import net.theevilreaper.xerus.api.phase.TimedPhase; -import org.jetbrains.annotations.NotNull; import java.time.temporal.ChronoUnit; @@ -43,7 +42,7 @@ public void onUpdate() { } } - private void broadcast(@NotNull Component component) { + private void broadcast(Component component) { Audience.audience(getConnectionManager().getOnlinePlayers()) .sendMessage(component); } diff --git a/src/main/java/net/theevilreaper/bounce/timer/TeleportPhase.java b/src/main/java/net/theevilreaper/bounce/timer/TeleportPhase.java index d33ea70..b1a9e75 100644 --- a/src/main/java/net/theevilreaper/bounce/timer/TeleportPhase.java +++ b/src/main/java/net/theevilreaper/bounce/timer/TeleportPhase.java @@ -7,7 +7,6 @@ import net.theevilreaper.bounce.attribute.AttributeHelper; import net.theevilreaper.bounce.util.ItemUtil; import net.theevilreaper.xerus.api.phase.TimedPhase; -import org.jetbrains.annotations.NotNull; import java.time.temporal.ChronoUnit; import java.util.Collection; @@ -17,7 +16,7 @@ public class TeleportPhase extends TimedPhase { private final PlayerConsumer teleport; private final VoidConsumer startTrigger; - public TeleportPhase(@NotNull PlayerConsumer teleport, @NotNull VoidConsumer startTrigger) { + public TeleportPhase(PlayerConsumer teleport, VoidConsumer startTrigger) { super("Teleport", ChronoUnit.SECONDS, 1); this.setCurrentTicks(3); this.teleport = teleport; @@ -36,7 +35,7 @@ public void onUpdate() { @Override protected void onFinish() { - Collection<@NotNull Player> onlinePlayers = MinecraftServer.getConnectionManager().getOnlinePlayers(); + Collection onlinePlayers = MinecraftServer.getConnectionManager().getOnlinePlayers(); for (Player onlinePlayer : onlinePlayers) { ItemUtil.setItem(onlinePlayer); teleport.accept(onlinePlayer); diff --git a/src/main/java/net/theevilreaper/bounce/timer/package-info.java b/src/main/java/net/theevilreaper/bounce/timer/package-info.java new file mode 100644 index 0000000..2fcc951 --- /dev/null +++ b/src/main/java/net/theevilreaper/bounce/timer/package-info.java @@ -0,0 +1,4 @@ +@NotNullByDefault +package net.theevilreaper.bounce.timer; + +import org.jetbrains.annotations.NotNullByDefault; \ No newline at end of file diff --git a/src/main/java/net/theevilreaper/bounce/util/BounceScoreboard.java b/src/main/java/net/theevilreaper/bounce/util/BounceScoreboard.java index 4ae4db8..179e9da 100644 --- a/src/main/java/net/theevilreaper/bounce/util/BounceScoreboard.java +++ b/src/main/java/net/theevilreaper/bounce/util/BounceScoreboard.java @@ -7,7 +7,6 @@ import net.theevilreaper.aves.util.Strings; import net.theevilreaper.aves.util.TimeFormat; import net.theevilreaper.bounce.common.util.Messages; -import org.jetbrains.annotations.NotNull; import java.util.UUID; @@ -37,7 +36,7 @@ public BounceScoreboard() { * * @param mapName the name of the map to display in the scoreboard */ - public void initLobbyLayout(@NotNull String mapName) { + public void initLobbyLayout(String mapName) { sideBar.setTitle(Component.text("Bounce", NamedTextColor.DARK_AQUA)); sideBar.createLine(new Sidebar.ScoreboardLine("header", Component.space(), 3)); @@ -73,7 +72,7 @@ public void initGameScoreboard() { * * @param player the player to add as a viewer */ - public void addViewer(@NotNull Player player) { + public void addViewer(Player player) { this.sideBar.addViewer(player); } @@ -82,7 +81,7 @@ public void addViewer(@NotNull Player player) { * * @param player the player to remove from the viewers */ - public void removeViewer(@NotNull Player player) { + public void removeViewer(Player player) { this.sideBar.removeViewer(player); } @@ -92,7 +91,7 @@ public void removeViewer(@NotNull Player player) { * * @param player the player for whom to create a line */ - public void createPlayerLine(@NotNull Player player) { + public void createPlayerLine(Player player) { this.sideBar.createLine(new Sidebar.ScoreboardLine(player.getUuid().toString(), player.getDisplayName(), 0)); } @@ -102,7 +101,7 @@ public void createPlayerLine(@NotNull Player player) { * @param uuid the UUID of the player whose score is to be updated * @param points the points to set for the player */ - public void updatePlayerLine(@NotNull UUID uuid, int points) { + public void updatePlayerLine(UUID uuid, int points) { this.sideBar.updateLineScore(uuid.toString(), points); } diff --git a/src/main/java/net/theevilreaper/bounce/util/GameMessages.java b/src/main/java/net/theevilreaper/bounce/util/GameMessages.java index 55ce697..9fd5dd2 100644 --- a/src/main/java/net/theevilreaper/bounce/util/GameMessages.java +++ b/src/main/java/net/theevilreaper/bounce/util/GameMessages.java @@ -8,7 +8,6 @@ import net.theevilreaper.bounce.common.config.GameConfig; import net.theevilreaper.bounce.common.util.Messages; import org.jetbrains.annotations.Contract; -import org.jetbrains.annotations.NotNull; public class GameMessages extends Messages { @@ -50,29 +49,29 @@ public class GameMessages extends Messages { } @Contract - public static @NotNull Component getLobbyTime(int time) { + public static Component getLobbyTime(int time) { return withMiniPrefix("Starting in... " + time); } @Contract - public static @NotNull Component getStopTime(int time) { + public static Component getStopTime(int time) { return withMiniPrefix("Stopping in... " + time); } @Contract(value = "_ -> new", pure = true) - public static @NotNull Component getJoinMessage(@NotNull Player player) { + public static Component getJoinMessage(Player player) { return withPrefix(player.getDisplayName()) .append(Component.space()).append(JOIN_PART); } @Contract(value = "_ -> new", pure = true) - public static @NotNull Component getLeaveMessage(@NotNull Player player) { + public static Component getLeaveMessage(Player player) { return withPrefix(player.getDisplayName()) .append(Component.space()).append(LEAVE_PART); } @Contract(value = "_, _ -> new", pure = true) - public static @NotNull Component getCoinComponent(int coins, boolean add) { + public static Component getCoinComponent(int coins, boolean add) { Component base = add ? PLUS_POINTS : MINUS_POINTS; return base.append(Component.text(coins, NamedTextColor.GOLD)).append(POINT_PART); } diff --git a/src/main/java/net/theevilreaper/bounce/util/ItemUtil.java b/src/main/java/net/theevilreaper/bounce/util/ItemUtil.java index 61c57bb..520493a 100644 --- a/src/main/java/net/theevilreaper/bounce/util/ItemUtil.java +++ b/src/main/java/net/theevilreaper/bounce/util/ItemUtil.java @@ -9,13 +9,12 @@ import net.minestom.server.item.Material; import net.minestom.server.item.component.EnchantmentList; import net.minestom.server.item.enchant.Enchantment; -import org.jetbrains.annotations.NotNull; /** * The {@link ItemUtil} is a small utility class which handles the creation and management of the used {@link ItemStack} in the game. * * @author theEvilReaper - * @version 1.0.0 + * @version 1.0.1 * @since 1.0.0 */ public final class ItemUtil { @@ -34,7 +33,7 @@ public final class ItemUtil { * * @param paramPlayer the player who should get the {@link ItemStack} */ - public static void setItem(@NotNull Player paramPlayer) { + public static void setItem(Player paramPlayer) { paramPlayer.getInventory().addItemStack(FEATHER); } diff --git a/src/main/java/net/theevilreaper/bounce/util/PlayerUtil.java b/src/main/java/net/theevilreaper/bounce/util/PlayerUtil.java index f0996af..b0459a0 100644 --- a/src/main/java/net/theevilreaper/bounce/util/PlayerUtil.java +++ b/src/main/java/net/theevilreaper/bounce/util/PlayerUtil.java @@ -5,14 +5,13 @@ import net.theevilreaper.bounce.common.push.PushData; import net.theevilreaper.bounce.profile.BounceProfile; import net.theevilreaper.bounce.profile.ProfileService; -import org.jetbrains.annotations.NotNull; public final class PlayerUtil { private final ProfileService profileService; private final PushData pushData; - public PlayerUtil(@NotNull ProfileService profileService, @NotNull PushData pushData) { + public PlayerUtil(ProfileService profileService, PushData pushData) { this.profileService = profileService; this.pushData = pushData; } diff --git a/src/main/java/net/theevilreaper/bounce/util/package-info.java b/src/main/java/net/theevilreaper/bounce/util/package-info.java new file mode 100644 index 0000000..b7bdae9 --- /dev/null +++ b/src/main/java/net/theevilreaper/bounce/util/package-info.java @@ -0,0 +1,4 @@ +@NotNullByDefault +package net.theevilreaper.bounce.util; + +import org.jetbrains.annotations.NotNullByDefault; \ No newline at end of file