Isolated Velocity

api/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("geyser.publish-conventions")
+    id("geyser.shadow-conventions")
 }
 
 dependencies {

api/src/main/java/org/geysermc/geyser/api/event/bedrock/ClientEmoteEvent.java

@@ -55,12 +55,24 @@ public final class ClientEmoteEvent extends ConnectionEvent implements Cancellab
      * event is cancelled, but other Bedrock players will not see.
      */
     @Override
-    public boolean isCancelled() {
+    public boolean cancelled() {
         return cancelled;
     }
 
     @Override
-    public void setCancelled(boolean cancelled) {
+    public void cancelled(boolean cancelled) {
         this.cancelled = cancelled;
     }
+
+    @Override
+    @Deprecated
+    public boolean isCancelled() {
+        return cancelled();
+    }
+
+    @Override
+    @Deprecated
+    public void setCancelled(boolean cancelled) {
+        cancelled(cancelled);
+    }
 }

api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionLoginEvent.java

@@ -52,7 +52,7 @@ public final class SessionLoginEvent extends ConnectionEvent implements Cancella
      * @return The cancel status of the event.
      */
     @Override
-    public boolean isCancelled() {
+    public boolean cancelled() {
         return this.cancelled;
     }
 
@@ -64,10 +64,11 @@ public final class SessionLoginEvent extends ConnectionEvent implements Cancella
      * @param cancelled If the login event should be cancelled.
      */
     @Override
-    public void setCancelled(boolean cancelled) {
+    public void cancelled(boolean cancelled) {
         this.cancelled = cancelled;
     }
 
+
     /**
      * Cancels the login event, and disconnects the player with the specified reason.
      * If cancelled, the player disconnects without connecting to the remote server.
@@ -75,11 +76,28 @@ public final class SessionLoginEvent extends ConnectionEvent implements Cancella
      * @param cancelled If the login event should be cancelled.
      * @param disconnectReason The reason for the cancellation.
      */
-    public void setCancelled(boolean cancelled, @NonNull String disconnectReason) {
+    public void cancelled(boolean cancelled, @NonNull String disconnectReason) {
         this.cancelled = cancelled;
         this.disconnectReason = disconnectReason;
     }
 
+    @Override
+    @Deprecated
+    public boolean isCancelled() {
+        return cancelled();
+    }
+
+    @Override
+    @Deprecated
+    public void setCancelled(boolean cancelled) {
+        cancelled(cancelled);
+    }
+
+    @Deprecated
+    public void setCancelled(boolean cancelled, @NonNull String disconnectReason) {
+        cancelled(cancelled, disconnectReason);
+    }
+
     /**
      * Returns the reason for the cancellation, or null if there is no reason given.
      *

api/src/main/java/org/geysermc/geyser/api/event/downstream/ServerDefineCommandsEvent.java

@@ -58,15 +58,27 @@ public class ServerDefineCommandsEvent extends ConnectionEvent implements Cancel
     }
 
     @Override
-    public boolean isCancelled() {
+    public boolean cancelled() {
         return this.cancelled;
     }
 
     @Override
-    public void setCancelled(boolean cancelled) {
+    public void cancelled(boolean cancelled) {
         this.cancelled = cancelled;
     }
 
+    @Override
+    @Deprecated
+    public boolean isCancelled() {
+        return cancelled();
+    }
+
+    @Override
+    @Deprecated
+    public void setCancelled(boolean cancelled) {
+        cancelled(cancelled);
+    }
+
     @Deprecated(forRemoval = true)
     public interface CommandInfo {
         /**

api/src/main/java/org/geysermc/geyser/api/event/java/ServerDefineCommandsEvent.java

@@ -58,15 +58,27 @@ public class ServerDefineCommandsEvent extends ConnectionEvent implements Cancel
     }
 
     @Override
-    public boolean isCancelled() {
+    public boolean cancelled() {
         return this.cancelled;
     }
 
     @Override
-    public void setCancelled(boolean cancelled) {
+    public void cancelled(boolean cancelled) {
         this.cancelled = cancelled;
     }
 
+    @Override
+    @Deprecated
+    public boolean isCancelled() {
+        return cancelled();
+    }
+
+    @Override
+    @Deprecated
+    public void setCancelled(boolean cancelled) {
+        cancelled(cancelled);
+    }
+
     public interface CommandInfo {
         /**
          * Gets the name of the command.