Merge pull request #2 from Andre601/feature/improved-condition-parsing

Better condition parsing

Author: Andre601

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/events/PingEvent.java

@@ -85,6 +85,16 @@ public void onProxyPing(ProxyPingEvent event){
             ping.setDescriptionComponent(component);
         }
 
+        if(profile.shouldHidePlayers()){
+            ping.setPlayers(null);
+            
+            ping.setFavicon(ping.getFaviconObject());
+            ping.setVersion(protocol);
+            
+            event.setResponse(ping);
+            return;
+        }
+        
         if(!profile.getPlayerCount().isEmpty()){
             protocol.setName(ComponentParser.text(profile.getPlayerCount())
                 .replacements(replacements)

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/logging/BungeeLogger.java

@@ -44,8 +44,8 @@ public void info(String msg, Object... args){
     }
 
     @Override
-    public void warn(String msg){
-        logger.warning(msg);
+    public void warn(String msg, Object... args){
+        logger.warning(String.format(msg, args));
     }
 
     @Override

core/src/main/java/ch/andre601/advancedserverlist/core/file/FileHandler.java

@@ -130,7 +130,7 @@ public boolean reloadProfiles(){
             if(tmp == null)
                 continue;
 
-            profiles.add(new ServerListProfile(tmp));
+            profiles.add(new ServerListProfile(tmp, logger));
             logger.info("Loaded " + file.getName());
         }
 

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/PluginLogger.java

@@ -29,7 +29,7 @@ public interface PluginLogger{
 
     void info(String msg, Object... args);
 
-    void warn(String msg);
+    void warn(String msg, Object... args);
 
     void warn(String msg, Throwable throwable);
 }

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/ConditionsHolder.java

@@ -53,10 +53,8 @@ public ServerListProfile getProfile(){
         for(ServerListProfile profile : core.getFileHandler().getProfiles()){
             if(profile.getMotd().isEmpty() && profile.getPlayers().isEmpty() && profile.getPlayerCount().isEmpty())
                 continue;
-    
-            ConditionsHolder conditions = profile.getConditions();
-            conditions.replacements(replacements);
-            if(conditions.eval(core.getPluginLogger()))
+            
+            if(profile.evalConditions(replacements))
                 return profile;
         }
 

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/ProfileManager.java

@@ -25,32 +25,34 @@
 
 package ch.andre601.advancedserverlist.core.profiles;
 
+import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.profiles.conditions.Expression;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 public class ServerListProfile{
 
-    private final ConditionsHolder conditions;
     private final int priority;
+    private final List<Expression> expressions;
 
     private final List<String> motd;
     private final List<String> players;
     private final String playerCount;
+    private final boolean hidePlayers;
 
-    public ServerListProfile(ConfigurationNode node){
-        this.conditions = new ConditionsHolder(getList(node, "conditions", false));
+    public ServerListProfile(ConfigurationNode node, PluginLogger logger){
         this.priority = node.node("priority").getInt();
+        this.expressions = createExpressions(getList(node, "conditions", false), logger);
 
         this.motd = getList(node, "motd", true);
         this.players = getList(node, "players", false);
         this.playerCount = node.node("playerCount").getString("");
-    }
-    
-    public ConditionsHolder getConditions(){
-        return conditions;
+        this.hidePlayers = node.node("hidePlayers").getBoolean();
     }
 
     public int getPriority(){
@@ -69,6 +71,44 @@ public String getPlayerCount(){
         return playerCount;
     }
 
+    public boolean shouldHidePlayers(){
+        return hidePlayers;
+    }
+    
+    public boolean evalConditions(Map<String, Object> replacements){
+        if(expressions.isEmpty())
+            return true;
+        
+        for(Expression expression : expressions){
+            if(!expression.evaluate(replacements)){
+                return false;
+            }
+        }
+        
+        return true;
+    }
+    
+    private List<Expression> createExpressions(List<String> list, PluginLogger logger) {
+        if(list.isEmpty())
+            return Collections.emptyList();
+        
+        List<Expression> expressions = new ArrayList<>();
+        for(String str : list){
+            Expression expression = new Expression(str);
+            
+            switch(expression.getResult()){
+                case VALID -> expressions.add(expression);
+                case INVALID_EMPTY_PARTS -> logInvalid(logger, str, "Either left or right part of condition was empty.");
+                case INVALID_NO_EXPRESSION -> logInvalid(logger, str, "Empty conditions are not allowed.");
+                case INVALID_DOUBLE_OPERATOR -> logInvalid(logger, str, "Condition had two operands!");
+                case INVALID_BROKEN_NOT_EQUAL -> logInvalid(logger, str, "Found '!' without '=' following it.");
+                default -> logInvalid(logger, str, "Encountered unknown issue.");
+            }
+        }
+        
+        return expressions;
+    }
+    
     private List<String> getList(ConfigurationNode node, String key, boolean trim){
         List<String> list;
         try{
@@ -85,4 +125,8 @@ private List<String> getList(ConfigurationNode node, String key, boolean trim){
 
         return list;
     }
+    
+    private void logInvalid(PluginLogger logger, String expression, String reason){
+        logger.warn("Invalid Condition '%s'! %s", expression, reason);
+    }
 }