feat: Finished events

Author: julian-siebert

api/build.gradle.kts

@@ -1,5 +1,5 @@
 dependencies {
-    compileOnlyApi("studio.o7:octopus-plugin-api:0.0.1")
+    compileOnlyApi("studio.o7:octopus-plugin-api:0.1.1")
 }
 
 information {

api/src/main/java/studio/o7/cheetah/plugin/api/events/ProxyEvent.java

@@ -0,0 +1,9 @@
+package studio.o7.cheetah.plugin.api.events;
+
+import org.bukkit.event.Event;
+
+public abstract class ProxyEvent extends Event {
+    public ProxyEvent() {
+        super(true);
+    }
+}

api/src/main/java/studio/o7/cheetah/plugin/api/events/ProxyPlayerEvent.java

@@ -2,11 +2,10 @@
 
 import lombok.Getter;
 import lombok.NonNull;
-import org.bukkit.event.Event;
 import studio.o7.cheetah.plugin.api.player.ProxyPlayer;
 
 @Getter
-public abstract class ProxyPlayerEvent extends Event {
+public abstract class ProxyPlayerEvent extends ProxyEvent {
     private final ProxyPlayer player;
 
     public ProxyPlayerEvent(@NonNull ProxyPlayer player) {

api/src/main/java/studio/o7/cheetah/plugin/api/events/ProxyResourcePackStatusEvent.java

@@ -0,0 +1,74 @@
+package studio.o7.cheetah.plugin.api.events;
+
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import net.kyori.adventure.resource.ResourcePackInfo;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+import studio.o7.cheetah.plugin.api.player.ProxyPlayer;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * {@link ProxyResourcePackStatusEvent} is fired when the status of a resource pack sent to the player by the server is
+ * changed. Depending on the result of this event (which the proxy will wait until completely fired),
+ * the player may be kicked from the network.
+ */
+@Getter
+public final class ProxyResourcePackStatusEvent extends ProxyPlayerEvent {
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
+    @NonNull
+    private final PackStatus status;
+    @NonNull
+    private final ResourcePackInfo info;
+
+    private boolean overrideKick = false;
+
+    public ProxyResourcePackStatusEvent(@NonNull ProxyPlayer player, @NonNull PackStatus status, @NonNull ResourcePackInfo info) {
+        super(player);
+        this.status = status;
+        this.info = info;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+
+    /**
+     *  Method can set to true to prevent ResourcePackInfo.ShouldForce()
+     *  from kicking the player. Overwriting this kick is only possible on versions older than 1.17,
+     *  as the client or server will enforce this regardless. Cancelling the resulting
+     *  kick-events will not prevent the player from disconnecting from the proxy.
+     */
+    public void setOverrideKick(boolean overrideKick) {
+        this.overrideKick = overrideKick;
+    }
+
+    @RequiredArgsConstructor
+    @Getter
+    public enum PackStatus {
+        SUCCESSFUL_RESPONSE("successful"),
+        DECLINED_RESPONSE("declined"),
+        FAILED_DOWNLOAD_RESPONSE("failed_download"),
+        ACCEPTED_RESPONSE("accepted"),
+        DOWNLOADED_RESPONSE("downloaded"),
+        INVALID_URL_RESPONSE("invalid_url"),
+        FAILED_TO_RELOAD_RESPONSE("failed_reload"),
+        DISCARDED_RESPONSE("discarded");
+
+        private final String name;
+
+        public static Optional<PackStatus> getStatusByName(@NonNull String name) {
+            return Arrays.stream(values()).filter(status -> status.name.equalsIgnoreCase(name)).findAny();
+        }
+    }
+}

api/src/main/java/studio/o7/cheetah/plugin/api/events/ProxyServerResourcePackSendEvent.java

@@ -1,22 +1,37 @@
 package studio.o7.cheetah.plugin.api.events.server;
 
+import lombok.Getter;
 import lombok.NonNull;
+import net.kyori.adventure.text.Component;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import studio.o7.cheetah.plugin.api.events.ProxyPlayerEvent;
 import studio.o7.cheetah.plugin.api.player.ProxyPlayer;
+import studio.o7.cheetah.plugin.api.server.ProxyServer;
 
 /**
  * Fired when a player is kicked from a server. You may either allow the proxy to kick the player
  * (with an optional reason override) or redirect the player to a separate server. By default,
  * the proxy will notify the user (if they are already connected to a server) or disconnect them
  * (if they are not on a server and no other servers are available).
  */
+@Getter
 public final class ProxyKickedFromServerEvent extends ProxyPlayerEvent {
     private static final HandlerList HANDLER_LIST = new HandlerList();
 
-    public ProxyKickedFromServerEvent(@NonNull ProxyPlayer player) {
+    @NonNull
+    private final ProxyServer server;
+    @Nullable
+    private final Component originalReason;
+    private final boolean duringServerConnect;
+
+
+    public ProxyKickedFromServerEvent(@NonNull ProxyPlayer player, @NonNull ProxyServer server, @Nullable Component originalReason, boolean duringServerConnect) {
         super(player);
+        this.server = server;
+        this.originalReason = originalReason;
+        this.duringServerConnect = duringServerConnect;
     }
 
     @Override
@@ -27,7 +42,4 @@ public ProxyKickedFromServerEvent(@NonNull ProxyPlayer player) {
     public static HandlerList getHandlerList() {
         return HANDLER_LIST;
     }
-
-    
-
 }

api/src/main/java/studio/o7/cheetah/plugin/api/events/cookies/ProxyCookieReceiveEvent.java

@@ -1,10 +1,13 @@
 package studio.o7.cheetah.plugin.api.events.server;
 
+import lombok.Getter;
 import lombok.NonNull;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import studio.o7.cheetah.plugin.api.events.ProxyPlayerEvent;
 import studio.o7.cheetah.plugin.api.player.ProxyPlayer;
+import studio.o7.cheetah.plugin.api.server.ProxyServer;
 
 /**
  * {@link ProxyServerConnectedEvent} is fired before the player completely transitions
@@ -13,11 +16,19 @@
  * Use Server to get the target server since {@link ProxyPlayer#getCurrentServer} is yet Empty or
  * listen for {@link ProxyServerPostConnectEvent} instead.
  */
+@Getter
 public final class ProxyServerConnectedEvent extends ProxyPlayerEvent {
     private static final HandlerList HANDLER_LIST = new HandlerList();
 
-    public ProxyServerConnectedEvent(@NonNull ProxyPlayer player) {
+    @NonNull
+    private final ProxyServer server;
+    @Nullable
+    private final ProxyServer previousServer;
+
+    public ProxyServerConnectedEvent(@NonNull ProxyPlayer player, @NonNull ProxyServer server, @Nullable ProxyServer previousServer) {
         super(player);
+        this.server = server;
+        this.previousServer = previousServer;
     }
 
     @Override