Some basic improvements to match stuff/rename

Aelysium-Group · Jun 8, 2024 · eea0c7c · eea0c7c
1 parent aeba394
commit eea0c7c
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 27 deletions.
diff --git a/...rc/main/java/group/aelysium/rustyconnector/toolkit/velocity/matchmaking/IMatchPlayer.java b/...rc/main/java/group/aelysium/rustyconnector/toolkit/velocity/matchmaking/IMatchPlayer.java
@@ -1,6 +1,5 @@
 package group.aelysium.rustyconnector.toolkit.velocity.matchmaking;
 
-import group.aelysium.rustyconnector.toolkit.core.matchmaking.IPlayerRank;
 import group.aelysium.rustyconnector.toolkit.velocity.load_balancing.ISortable;
 import group.aelysium.rustyconnector.toolkit.velocity.player.IPlayer;
 

diff --git a/.../java/group/aelysium/rustyconnector/toolkit/velocity/matchmaking/IVelocityPlayerRank.java b/.../java/group/aelysium/rustyconnector/toolkit/velocity/matchmaking/IVelocityPlayerRank.java
@@ -1,14 +1,16 @@
 package group.aelysium.rustyconnector.toolkit.velocity.matchmaking;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.List;
 
 public interface IVelocityPlayerRank extends group.aelysium.rustyconnector.toolkit.core.matchmaking.IPlayerRank {
     /**
      * Returns the computer used to compute new ranks.
      */
-    IComputor computor();
+    @NotNull IComputer computer();
 
-    interface IComputor {
+    interface IComputer {
         /**
          * Compute the new rank of all the winners and losers.
          * @param winners The winners.

diff --git a/.../main/java/group/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/MatchPlayer.java b/.../main/java/group/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/MatchPlayer.java
@@ -4,6 +4,7 @@
 import group.aelysium.rustyconnector.toolkit.core.matchmaking.IPlayerRank;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IVelocityPlayerRank;
 import group.aelysium.rustyconnector.toolkit.velocity.player.IPlayer;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Objects;
 
@@ -12,21 +13,21 @@ public class MatchPlayer implements IMatchPlayer {
     private final IVelocityPlayerRank rank;
     private final String gameId;
 
-    public MatchPlayer(IPlayer player, IVelocityPlayerRank rank, String gameId) {
+    public MatchPlayer(@NotNull IPlayer player, @NotNull IVelocityPlayerRank rank, @NotNull String gameId) {
         this.player = player;
         this.rank = rank;
         this.gameId = gameId;
     }
 
-    public IPlayer player() {
+    public @NotNull IPlayer player() {
         return this.player;
     }
 
-    public IVelocityPlayerRank gameRank() {
+    public @NotNull IVelocityPlayerRank gameRank() {
         return this.rank;
     }
 
-    public String gameId() {
+    public @NotNull String gameId() {
         return this.gameId;
     }
 

diff --git a/.../src/main/java/group/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/Session.java b/.../src/main/java/group/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/Session.java
@@ -155,7 +155,7 @@ public void leave(IPlayer player) {
 
         if(settings.quittersLose()) {
             Optional<IMatchPlayer> matchPlayer = this.matchmaker.matchPlayer(player);
-            matchPlayer.ifPresent(mp -> mp.gameRank().computor().compute(List.of(), List.of(mp), matchmaker, this));
+            matchPlayer.ifPresent(mp -> mp.gameRank().computer().compute(List.of(), List.of(mp), matchmaker, this));
         }
 
         if(this.players.size() > this.settings.min()) return;
@@ -192,12 +192,12 @@ public void end(List<UUID> winners, List<UUID> losers, boolean unlock) {
 
         ((Matchmaker) this.matchmaker).remove(this);
 
-        IVelocityPlayerRank.IComputor computer = null;
+        IVelocityPlayerRank.IComputer computer = null;
         List<IMatchPlayer> playerWinners = new ArrayList<>();
         List<IMatchPlayer> playerLosers = new ArrayList<>();
 
         for (IMatchPlayer matchPlayer : this.players.values()) {
-            if(computer == null) computer = matchPlayer.gameRank().computor();
+            computer = matchPlayer.gameRank().computer();
 
             try {
                 if(winners.contains(matchPlayer.player().uuid())) playerWinners.add(matchPlayer);
@@ -237,9 +237,9 @@ public void endTied(boolean unlock) {
 
         ((Matchmaker) this.matchmaker).remove(this);
 
-        IVelocityPlayerRank.IComputor computer = null;
+        IVelocityPlayerRank.IComputer computer = null;
         for (IMatchPlayer matchPlayer : this.players.values()) {
-            if(computer == null) computer = matchPlayer.gameRank().computor();
+            if(computer == null) computer = matchPlayer.gameRank().computer();
 
             if(this.active())
                 try {

diff --git a/...ava/group/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/rank/ELOPlayerRank.java b/...ava/group/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/rank/ELOPlayerRank.java
@@ -4,9 +4,9 @@
 import com.google.gson.JsonPrimitive;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IMatchPlayer;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IMatchmaker;
-import group.aelysium.rustyconnector.toolkit.core.matchmaking.IPlayerRank;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.ISession;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IVelocityPlayerRank;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
@@ -34,7 +34,7 @@ public String schemaName() {
         return schema();
     }
 
-    public IComputor computor() {
+    public @NotNull IComputer computer() {
         return Computer.New();
     }
 
@@ -46,7 +46,7 @@ public JsonObject toJSON() {
         return object;
     }
 
-    public static class Computer implements IComputor {
+    public static class Computer implements IComputer {
         private static final Computer singleton = new Computer();
         public static Computer New() {
             return singleton;

diff --git a/...oup/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/rank/OpenSkillPlayerRank.java b/...oup/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/rank/OpenSkillPlayerRank.java
@@ -4,9 +4,9 @@
 import com.google.gson.JsonPrimitive;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IMatchPlayer;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IMatchmaker;
-import group.aelysium.rustyconnector.toolkit.core.matchmaking.IPlayerRank;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.ISession;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IVelocityPlayerRank;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
@@ -40,7 +40,7 @@ public String schemaName() {
         return schema();
     }
 
-    public IComputor computor() {
+    public @NotNull IComputer computer() {
         return Computer.New();
     }
 
@@ -53,7 +53,7 @@ public JsonObject toJSON() {
         return object;
     }
 
-    public static class Computer implements IComputor {
+    public static class Computer implements IComputer {
         private static final Computer singleton = new Computer();
         public static Computer New() {
             return singleton;

diff --git a/...up/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/rank/RandomizedPlayerRank.java b/...up/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/rank/RandomizedPlayerRank.java
@@ -4,9 +4,9 @@
 import com.google.gson.JsonPrimitive;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IMatchPlayer;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IMatchmaker;
-import group.aelysium.rustyconnector.toolkit.core.matchmaking.IPlayerRank;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.ISession;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IVelocityPlayerRank;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
@@ -25,7 +25,7 @@ public String schemaName() {
         return schema();
     }
 
-    public IComputor computor() {
+    public @NotNull IComputer computer() {
         return Computer.New();
     }
 
@@ -36,7 +36,7 @@ public JsonObject toJSON() {
         return object;
     }
 
-    public static class Computer implements IComputor {
+    public static class Computer implements IComputer {
         private static final Computer singleton = new Computer();
         public static Computer New() {
             return singleton;

diff --git a/...group/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/rank/WinLossPlayerRank.java b/...group/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/rank/WinLossPlayerRank.java
@@ -4,10 +4,10 @@
 import com.google.gson.JsonPrimitive;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IMatchPlayer;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IMatchmaker;
-import group.aelysium.rustyconnector.toolkit.core.matchmaking.IPlayerRank;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.ISession;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IVelocityPlayerRank;
 import group.aelysium.rustyconnector.toolkit.velocity.storage.IDatabase;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
@@ -48,7 +48,7 @@ public String schemaName() {
         return schema();
     }
 
-    public IComputor computor() {
+    public @NotNull IComputer computer() {
         return Computer.New();
     }
 
@@ -61,7 +61,7 @@ public JsonObject toJSON() {
         return object;
     }
 
-    public static class Computer implements IComputor {
+    public static class Computer implements IComputer {
         private static final Computer singleton = new Computer();
         public static Computer New() {
             return singleton;

diff --git a/...group/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/rank/WinRatePlayerRank.java b/...group/aelysium/rustyconnector/plugin/velocity/lib/matchmaking/rank/WinRatePlayerRank.java
@@ -5,10 +5,10 @@
 
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IMatchPlayer;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IMatchmaker;
-import group.aelysium.rustyconnector.toolkit.core.matchmaking.IPlayerRank;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.ISession;
 import group.aelysium.rustyconnector.toolkit.velocity.matchmaking.IVelocityPlayerRank;
 import group.aelysium.rustyconnector.toolkit.velocity.storage.IDatabase;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
@@ -52,7 +52,7 @@ public String schemaName() {
         return schema();
     }
 
-    public IComputor computor() {
+    public @NotNull IComputer computer() {
         return Computer.New();
     }
 
@@ -66,7 +66,7 @@ public JsonObject toJSON() {
         return object;
     }
 
-    public static class Computer implements IComputor {
+    public static class Computer implements IComputer {
         private static final Computer singleton = new Computer();
         public static Computer New() {
             return singleton;