diff options
Diffstat (limited to 'src/main/java/net/elytrium/limboauth/event')
9 files changed, 52 insertions, 61 deletions
diff --git a/src/main/java/net/elytrium/limboauth/event/AuthPluginReloadEvent.java b/src/main/java/net/elytrium/limboauth/event/AuthPluginReloadEvent.java index c166e2d..049de11 100644 --- a/src/main/java/net/elytrium/limboauth/event/AuthPluginReloadEvent.java +++ b/src/main/java/net/elytrium/limboauth/event/AuthPluginReloadEvent.java @@ -18,4 +18,5 @@ package net.elytrium.limboauth.event; public class AuthPluginReloadEvent { + } diff --git a/src/main/java/net/elytrium/limboauth/event/AuthUnregisterEvent.java b/src/main/java/net/elytrium/limboauth/event/AuthUnregisterEvent.java index 9895d08..6a5b348 100644 --- a/src/main/java/net/elytrium/limboauth/event/AuthUnregisterEvent.java +++ b/src/main/java/net/elytrium/limboauth/event/AuthUnregisterEvent.java @@ -28,5 +28,4 @@ public class AuthUnregisterEvent { public String getNickname() { return this.nickname; } - } diff --git a/src/main/java/net/elytrium/limboauth/event/PostAuthorizationEvent.java b/src/main/java/net/elytrium/limboauth/event/PostAuthorizationEvent.java index 342c8ca..0fed613 100644 --- a/src/main/java/net/elytrium/limboauth/event/PostAuthorizationEvent.java +++ b/src/main/java/net/elytrium/limboauth/event/PostAuthorizationEvent.java @@ -22,11 +22,8 @@ import net.elytrium.limboapi.api.player.LimboPlayer; import net.elytrium.limboauth.model.RegisteredPlayer; public class PostAuthorizationEvent extends PostEvent { - public PostAuthorizationEvent(LimboPlayer player, RegisteredPlayer playerInfo, Consumer<TaskEvent> onComplete) { - super(player, playerInfo, onComplete); - } - public PostAuthorizationEvent(Result result, LimboPlayer player, RegisteredPlayer playerInfo, Consumer<TaskEvent> onComplete) { - super(result, player, playerInfo, onComplete); + public PostAuthorizationEvent(Consumer<TaskEvent> onComplete, LimboPlayer player, RegisteredPlayer playerInfo) { + super(onComplete, player, playerInfo); } } diff --git a/src/main/java/net/elytrium/limboauth/event/PostEvent.java b/src/main/java/net/elytrium/limboauth/event/PostEvent.java index 9902ab5..e3f590a 100644 --- a/src/main/java/net/elytrium/limboauth/event/PostEvent.java +++ b/src/main/java/net/elytrium/limboauth/event/PostEvent.java @@ -26,25 +26,25 @@ public abstract class PostEvent extends TaskEvent { private final LimboPlayer player; private final RegisteredPlayer playerInfo; - protected PostEvent(LimboPlayer player, RegisteredPlayer playerInfo, Consumer<TaskEvent> onComplete) { + protected PostEvent(Consumer<TaskEvent> onComplete, LimboPlayer player, RegisteredPlayer playerInfo) { super(onComplete); this.player = player; this.playerInfo = playerInfo; } - protected PostEvent(Result result, LimboPlayer player, RegisteredPlayer playerInfo, Consumer<TaskEvent> onComplete) { - super(result, onComplete); + protected PostEvent(Consumer<TaskEvent> onComplete, Result result, LimboPlayer player, RegisteredPlayer playerInfo) { + super(onComplete, result); this.player = player; this.playerInfo = playerInfo; } - public RegisteredPlayer getPlayerInfo() { - return this.playerInfo; - } - public LimboPlayer getPlayer() { return this.player; } + + public RegisteredPlayer getPlayerInfo() { + return this.playerInfo; + } } diff --git a/src/main/java/net/elytrium/limboauth/event/PostRegisterEvent.java b/src/main/java/net/elytrium/limboauth/event/PostRegisterEvent.java index c0e0504..9c3a6d5 100644 --- a/src/main/java/net/elytrium/limboauth/event/PostRegisterEvent.java +++ b/src/main/java/net/elytrium/limboauth/event/PostRegisterEvent.java @@ -22,11 +22,8 @@ import net.elytrium.limboapi.api.player.LimboPlayer; import net.elytrium.limboauth.model.RegisteredPlayer; public class PostRegisterEvent extends PostEvent { - public PostRegisterEvent(LimboPlayer player, RegisteredPlayer playerInfo, Consumer<TaskEvent> onComplete) { - super(player, playerInfo, onComplete); - } - public PostRegisterEvent(Result result, LimboPlayer player, RegisteredPlayer playerInfo, Consumer<TaskEvent> onComplete) { - super(result, player, playerInfo, onComplete); + public PostRegisterEvent(Consumer<TaskEvent> onComplete, LimboPlayer player, RegisteredPlayer playerInfo) { + super(onComplete, player, playerInfo); } } diff --git a/src/main/java/net/elytrium/limboauth/event/PreAuthorizationEvent.java b/src/main/java/net/elytrium/limboauth/event/PreAuthorizationEvent.java index 295c767..e96b0d0 100644 --- a/src/main/java/net/elytrium/limboauth/event/PreAuthorizationEvent.java +++ b/src/main/java/net/elytrium/limboauth/event/PreAuthorizationEvent.java @@ -22,15 +22,12 @@ import java.util.function.Consumer; import net.elytrium.limboauth.model.RegisteredPlayer; public class PreAuthorizationEvent extends PreEvent { + private final RegisteredPlayer playerInfo; - public PreAuthorizationEvent(Player player, RegisteredPlayer playerInfo, Consumer<TaskEvent> onComplete) { - super(player, onComplete); - this.playerInfo = playerInfo; - } + public PreAuthorizationEvent(Consumer<TaskEvent> onComplete, Result result, Player player, RegisteredPlayer playerInfo) { + super(onComplete, result, player); - public PreAuthorizationEvent(Result result, Player player, RegisteredPlayer playerInfo, Consumer<TaskEvent> onComplete) { - super(result, player, onComplete); this.playerInfo = playerInfo; } diff --git a/src/main/java/net/elytrium/limboauth/event/PreEvent.java b/src/main/java/net/elytrium/limboauth/event/PreEvent.java index a925c5d..1fab6ab 100644 --- a/src/main/java/net/elytrium/limboauth/event/PreEvent.java +++ b/src/main/java/net/elytrium/limboauth/event/PreEvent.java @@ -21,15 +21,12 @@ import com.velocitypowered.api.proxy.Player; import java.util.function.Consumer; public abstract class PreEvent extends TaskEvent { + private final Player player; - protected PreEvent(Player player, Consumer<TaskEvent> onComplete) { - super(onComplete); - this.player = player; - } + protected PreEvent(Consumer<TaskEvent> onComplete, Result result, Player player) { + super(onComplete, result); - protected PreEvent(Result result, Player player, Consumer<TaskEvent> onComplete) { - super(result, onComplete); this.player = player; } diff --git a/src/main/java/net/elytrium/limboauth/event/PreRegisterEvent.java b/src/main/java/net/elytrium/limboauth/event/PreRegisterEvent.java index 7d6aa15..e340fe0 100644 --- a/src/main/java/net/elytrium/limboauth/event/PreRegisterEvent.java +++ b/src/main/java/net/elytrium/limboauth/event/PreRegisterEvent.java @@ -21,11 +21,8 @@ import com.velocitypowered.api.proxy.Player; import java.util.function.Consumer; public class PreRegisterEvent extends PreEvent { - public PreRegisterEvent(Player player, Consumer<TaskEvent> onComplete) { - super(player, onComplete); - } - public PreRegisterEvent(Result result, Player player, Consumer<TaskEvent> onComplete) { - super(result, player, onComplete); + public PreRegisterEvent(Consumer<TaskEvent> onComplete, Result result, Player player) { + super(onComplete, result, player); } } diff --git a/src/main/java/net/elytrium/limboauth/event/TaskEvent.java b/src/main/java/net/elytrium/limboauth/event/TaskEvent.java index 1f37e0f..5562cb2 100644 --- a/src/main/java/net/elytrium/limboauth/event/TaskEvent.java +++ b/src/main/java/net/elytrium/limboauth/event/TaskEvent.java @@ -18,46 +18,30 @@ package net.elytrium.limboauth.event; import java.util.function.Consumer; +import net.elytrium.limboauth.LimboAuth; import net.elytrium.limboauth.Settings; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import org.jetbrains.annotations.NotNull; public abstract class TaskEvent { - private static final Component defaultReason - = LegacyComponentSerializer.legacyAmpersand().deserialize(Settings.IMP.MAIN.STRINGS.EVENT_CANCELLED); - private Result result = Result.NORMAL; - private Component reason = defaultReason; + + private static Component DEFAULT_REASON; private final Consumer<TaskEvent> onComplete; + private Result result = Result.NORMAL; + private Component reason = DEFAULT_REASON; + public TaskEvent(Consumer<TaskEvent> onComplete) { this.onComplete = onComplete; } - public TaskEvent(Result result, Consumer<TaskEvent> onComplete) { - this.result = result; + public TaskEvent(Consumer<TaskEvent> onComplete, Result result) { this.onComplete = onComplete; - } - - public Result getResult() { - return this.result; - } - - public void setResult(@NotNull Result result) { this.result = result; } - public void cancel(@NotNull Component reason) { - this.result = Result.CANCEL; - this.reason = reason; - } - - public Component getReason() { - return this.reason; - } - - public void complete(Result result) { + public void complete(@NotNull Result result) { if (this.result != Result.WAIT) { return; } @@ -66,16 +50,38 @@ public abstract class TaskEvent { this.onComplete.accept(this); } - public void completeAndCancel(@NotNull Component c) { + public void completeAndCancel(@NotNull Component reason) { if (this.result != Result.WAIT) { return; } - this.cancel(c); + this.cancel(reason); this.onComplete.accept(this); } + public void cancel(@NotNull Component reason) { + this.result = Result.CANCEL; + this.reason = reason; + } + + public void setResult(@NotNull Result result) { + this.result = result; + } + + public Result getResult() { + return this.result; + } + + public Component getReason() { + return this.reason; + } + + public static void reload() { + DEFAULT_REASON = LimboAuth.getSerializer().deserialize(Settings.IMP.MAIN.STRINGS.EVENT_CANCELLED); + } + public enum Result { + CANCEL, BYPASS, NORMAL, |