chore(git): merge refactor/convert-generics into master (#268)

Author: xeruf

server/src/sc/server/gaming/GameRoom.java

@@ -370,8 +370,8 @@ private void syncSlot(PlayerSlot slot) throws RescuableClientException {
     Player player = getGame().onPlayerJoined(); // make new player in gameState of game
     // set attributes for player XXX check whether this is needed for prepared games
     player.setDisplayName(slot.getDescriptor().getDisplayName());
-    player.setShouldBePaused(slot.getDescriptor().isShouldBePaused());
-    player.setCanTimeout(slot.getDescriptor().isCanTimeout());
+    player.setShouldBePaused(slot.getDescriptor().getShouldBePaused());
+    player.setCanTimeout(slot.getDescriptor().getCanTimeout());
 
     if (slot.isEmpty()) // needed for forced step, if client crashes before joining room
     {
@@ -652,7 +652,7 @@ public void openSlots(SlotDescriptor[] descriptors)
 
     for (int i = 0; i < descriptors.length; i++) {
       this.playerSlots.get(i).setDescriptor(descriptors[i]);
-      if (descriptors[i].isShouldBePaused()) {
+      if (descriptors[i].getShouldBePaused()) {
         pause(true);
       }
     }

server/src/sc/server/gaming/PlayerSlot.java

@@ -17,6 +17,7 @@ public PlayerSlot(GameRoom room) {
       throw new IllegalStateException("Room must not be null.");
 
     this.room = room;
+    descriptor = new SlotDescriptor();
   }
 
   public PlayerRole getRole() {
@@ -85,15 +86,12 @@ public String getDisplayName() {
   }
 
   public SlotDescriptor getDescriptor() {
-    if (this.descriptor == null) {
-      return SlotDescriptor.DEFAULT_DESCRIPTOR;
-    }
-
     return this.descriptor;
   }
 
   public void setDescriptor(SlotDescriptor descriptor) {
-    this.descriptor = descriptor;
+    if (descriptor == null) this.descriptor = new SlotDescriptor();
+    else this.descriptor = descriptor;
   }
 
   public IClient getClient() {

socha-sdk/src/framework/sc/shared/DebugHint.java

@@ -1,14 +1,10 @@
-package sc.shared;
+package sc.shared
+
+import kotlin.RuntimeException
 
 /**
  * This exception is thrown if the server tried to create an invalid game state.
  * This indicates an error in the server or plugin code. It should never be
  * thrown on invalid input to the server (i.e. invalid move made).
  */
-public class InvalidGameStateException extends RuntimeException {
-
-  public InvalidGameStateException(String reason) {
-    super(reason);
-  }
-
-}
+class InvalidGameStateException(reason: String): RuntimeException(reason)

socha-sdk/src/framework/sc/shared/InvalidGameStateException.java renamed to socha-sdk/src/framework/sc/shared/InvalidGameStateException.kt

@@ -0,0 +1,9 @@
+package sc.shared
+
+import sc.api.plugins.IMove
+import kotlin.RuntimeException
+
+/** NOTE: It is important to have information about the move in the reason
+ *  because that is the only place where the invalid move is logged */
+class InvalidMoveException @JvmOverloads constructor(reason: String, @JvmField val move: IMove? = null):
+        RuntimeException(reason + move?.let { "; move was $it"}.orEmpty())

socha-sdk/src/framework/sc/shared/InvalidMoveException.java

@@ -0,0 +1,12 @@
+package sc.shared
+
+import com.thoughtworks.xstream.annotations.XStreamAlias
+
+@XStreamAlias(value = "scoreAggregation")
+enum class ScoreAggregation {
+    /** All values from all games should be summed up.  */
+    SUM,
+    
+    /** All values from all games should be averaged.  */
+    AVERAGE
+}

socha-sdk/src/framework/sc/shared/InvalidMoveException.kt

@@ -0,0 +1,24 @@
+package sc.shared
+
+import com.thoughtworks.xstream.annotations.XStreamAlias
+
+@XStreamAlias(value = "scoreCause")
+enum class ScoreCause {
+    /** The player didn't violate against the rules or left the game early.  */
+    REGULAR,
+    
+    /** The player left the game early (connection loss).  */
+    LEFT,
+    
+    /** The player violated against the games rules.  */
+    RULE_VIOLATION,
+    
+    /** The player took to long to respond to the move request.  */
+    SOFT_TIMEOUT,
+    
+    /** The player didn't respond to the move request.  */
+    HARD_TIMEOUT,
+    
+    /** An error occurred during communication. This could indicate a bug in the server's code.  */
+    UNKNOWN
+}