feat(tsl): add random N players selector to REFLECT action

Closes #18
iGoodie · Jan 1, 2020 · 5b81a88 · 5b81a88
1 parent 55df8d6
commit 5b81a88
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=false
 
 mod_id=twitchspawn
 mod_group=net.programmer.igoodie
-mod_version=0.4.16
+mod_version=0.4.17
 
 minecraft_version=1.12.2
 forge_version=14.23.3.2655

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/action/ReflectAction.java b/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/action/ReflectAction.java
@@ -10,11 +10,13 @@
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 
 public class ReflectAction extends TSLAction {
 
     private boolean reflectEveryone;
+    private int reflectRandomN;
     private List<String> reflectedUsers;
     private TSLAction action;
 
@@ -25,17 +27,25 @@ public ReflectAction(List<String> words) throws TSLSyntaxError {
             throw new TSLSyntaxError("Invalid length of words: " + words);
 
         // "REFLECT %% REFLECT %% ..." is not allowed
-        if (words.get(1).equalsIgnoreCase(TSLActionKeyword.ofClass(getClass())))
+        String reflectActionName = TSLActionKeyword.ofClass(getClass());
+        if (words.stream().anyMatch(word -> word.equalsIgnoreCase(reflectActionName)))
             throw new TSLSyntaxError("Cannot have a cyclic REFLECT rule.");
 
         String usersRaw = words.get(0);
 
         if (usersRaw.equals("*")) {
             this.reflectEveryone = true;
+            this.reflectRandomN = 0;
+            this.reflectedUsers = null;
+
+        } else if (usersRaw.matches("\\d+")) {
+            this.reflectEveryone = false;
+            this.reflectRandomN = parseInt(usersRaw);
             this.reflectedUsers = null;
 
         } else {
             this.reflectEveryone = false;
+            this.reflectRandomN = 0;
             this.reflectedUsers = Arrays.asList(usersRaw.split(",\\s*"));
         }
 
@@ -50,9 +60,7 @@ protected void performAction(EntityPlayerMP player, EventArguments args) {
         action.process(args);
 
         // Select where to reflect
-        List<String> reflectedUsers = this.reflectEveryone
-                ? Arrays.asList(player.getServer().getOnlinePlayerNames())
-                : this.reflectedUsers;
+        List<String> reflectedUsers = getReflectedPlayers(player);
 
         // Reflect to selected users
         reflectedUsers.forEach(username -> {
@@ -79,6 +87,29 @@ protected void performAction(EntityPlayerMP player, EventArguments args) {
         });
     }
 
+    private List<String> getReflectedPlayers(EntityPlayerMP player) {
+        if (this.reflectEveryone) {
+            return Arrays.asList(player.getServer().getOnlinePlayerNames());
+        }
+
+        if (this.reflectRandomN != 0) {
+            List<String> reflectedPlayers = new LinkedList<>();
+            List<String> onlinePlayers = new LinkedList<>(Arrays.asList(player.getServer().getOnlinePlayerNames()));
+
+            for (int i = 0; i < reflectRandomN; i++) {
+                if (onlinePlayers.size() == 0) break;
+
+                int index = (int) (Math.random() * onlinePlayers.size());
+                String selectedPlayer = onlinePlayers.remove(index);
+                reflectedPlayers.add(selectedPlayer);
+            }
+
+            return reflectedPlayers;
+        }
+
+        return this.reflectedUsers;
+    }
+
     private void reflectAction(EntityPlayerMP player, EventArguments args) {
         action.reflectedUser = player;