Merge fixes

bundabrg · Jul 28, 2020 · 64c94f2 · 64c94f2
1 parent 46f53d0
commit 64c94f2
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 29 deletions.
diff --git a/...r/src/main/java/org/geysermc/connector/event/events/geyser/GeyserAuthenticationEvent.java b/...r/src/main/java/org/geysermc/connector/event/events/geyser/GeyserAuthenticationEvent.java
@@ -26,17 +26,26 @@
 
 package org.geysermc.connector.event.events.geyser;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.geysermc.connector.event.events.CancellableGeyserEvent;
+import lombok.NonNull;
+import org.geysermc.connector.event.Cancellable;
+import org.geysermc.connector.event.GeyserEvent;
+import org.geysermc.connector.event.Session;
 import org.geysermc.connector.network.session.GeyserSession;
 
-@EqualsAndHashCode(callSuper = true)
 @Data
-@AllArgsConstructor
-public class GeyserAuthenticationEvent extends CancellableGeyserEvent {
-    final GeyserSession session;
-    String username;
-    String password;
+@EqualsAndHashCode(callSuper = true)
+@SuppressWarnings("JavaDoc")
+public class GeyserAuthenticationEvent extends GeyserEvent implements Cancellable, Session {
+    private boolean cancelled;
+
+    @NonNull
+    private final GeyserSession session;
+
+    @NonNull
+    private String username;
+
+    @NonNull
+    private String password;
 }
diff --git a/connector/src/main/java/org/geysermc/connector/event/events/geyser/GeyserLoginEvent.java b/connector/src/main/java/org/geysermc/connector/event/events/geyser/GeyserLoginEvent.java
@@ -26,15 +26,17 @@
 
 package org.geysermc.connector.event.events.geyser;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.geysermc.connector.event.events.CancellableGeyserEvent;
+import lombok.NonNull;
+import org.geysermc.connector.event.GeyserEvent;
+import org.geysermc.connector.event.Session;
 import org.geysermc.connector.network.session.GeyserSession;
 
-@EqualsAndHashCode(callSuper = true)
 @Data
-@AllArgsConstructor
-public class GeyserLoginEvent extends CancellableGeyserEvent {
-    final GeyserSession session;
+@EqualsAndHashCode(callSuper = true)
+@SuppressWarnings("JavaDoc")
+public class GeyserLoginEvent extends GeyserEvent implements Session {
+    @NonNull
+    private final GeyserSession session;
 }
diff --git a/connector/src/main/java/org/geysermc/connector/event/events/network/SessionConnectEvent.java b/connector/src/main/java/org/geysermc/connector/event/events/network/SessionConnectEvent.java
@@ -26,16 +26,17 @@
 
 package org.geysermc.connector.event.events.network;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.geysermc.connector.event.events.CancellableGeyserEvent;
-import org.geysermc.connector.network.remote.RemoteServer;
+import lombok.NonNull;
+import org.geysermc.connector.event.GeyserEvent;
+import org.geysermc.connector.event.Session;
 import org.geysermc.connector.network.session.GeyserSession;
 
-@EqualsAndHashCode(callSuper = true)
 @Data
-@AllArgsConstructor
-public class SessionConnectEvent extends CancellableGeyserEvent {
-    final GeyserSession session;
+@EqualsAndHashCode(callSuper = true)
+@SuppressWarnings("JavaDoc")
+public class SessionConnectEvent extends GeyserEvent implements Session {
+    @NonNull
+    private final GeyserSession session;
 }
diff --git a/...tor/src/main/java/org/geysermc/connector/event/events/network/SessionDisconnectEvent.java b/...tor/src/main/java/org/geysermc/connector/event/events/network/SessionDisconnectEvent.java
@@ -26,16 +26,16 @@
 
 package org.geysermc.connector.event.events.network;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.geysermc.connector.event.events.CancellableGeyserEvent;
-import org.geysermc.connector.event.events.GeyserEvent;
+import lombok.NonNull;
+import org.geysermc.connector.event.GeyserEvent;
 import org.geysermc.connector.network.session.GeyserSession;
 
-@EqualsAndHashCode(callSuper = true)
 @Data
-@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@SuppressWarnings("JavaDoc")
 public class SessionDisconnectEvent extends GeyserEvent {
-    final GeyserSession session;
+    @NonNull
+    private final GeyserSession session;
 }
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -22,8 +22,8 @@ theme:
   palette:
     primary: 'indigo'
     accent: 'indigo'
-  features:
-    - instant
+#  features:
+#    - instant