more aggressive and explicit joinpoint limits and improve messaging (add limit type)

Author: John-Paul-R

src/main/java/com/fibermc/essentialcommands/commands/joinpoints/JoinpointException.java

@@ -2,6 +2,7 @@
 
 import com.fibermc.essentialcommands.text.ECText;
 import com.fibermc.essentialcommands.text.TextFormatType;
+import com.fibermc.essentialcommands.types.JoinpointLimit;
 
 import net.minecraft.text.Text;
 
@@ -210,11 +211,13 @@ public Text message(ECText ecText) {
         static final class MaxPointsExceeded extends Set {
             private final int max;
             private final int current;
+            private final JoinpointLimit.JoinpointType limitType;
 
-            public MaxPointsExceeded(String joinpointName, int max, int current) {
+            public MaxPointsExceeded(String joinpointName, int max, int current, JoinpointLimit.JoinpointType limitType) {
                 super(joinpointName);
                 this.max = max;
                 this.current = current;
+                this.limitType = limitType;
             }
 
             public int getMax() {
@@ -230,7 +233,9 @@ public Text message(ECText ecText) {
                 return ecText.getText(
                     "cmd.joinpoint.set.error.limit",
                     TextFormatType.Error,
-                    ecText.accent(this.getJoinpointName())
+                    ecText.accent(this.getJoinpointName()),
+                    ecText.accent(String.valueOf(this.getMax())),
+                    ecText.accent(limitType.name().toLowerCase())
                 );
             }
         }

src/main/java/com/fibermc/essentialcommands/commands/joinpoints/JoinpointSetCommand.java

@@ -27,8 +27,6 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 
-import dev.jpcode.eccore.util.CollectionUtils;
-
 public class JoinpointSetCommand implements Command<ServerCommandSource> {
 
     private final Action action;
@@ -124,24 +122,34 @@ private Void handleSetAsync(
         var targetTypePerms = ECPerms.Registry.Group.joinpoint_limit_groups.get(joinpointType);
         var anyTypePerms = ECPerms.Registry.Group.joinpoint_limit_groups.get(JoinpointLimit.JoinpointType.ANY);
 
-        int playerMaxJoinpoints = ECPerms.getHighestNumericPermission(
-            senderPlayer.getCommandSource(),
-            CollectionUtils.concat(targetTypePerms, anyTypePerms));
+        int playerAllowedOfAnyType = anyTypePerms.length == 0 ? -1 : ECPerms.getHighestNumericPermission(senderPlayer.getCommandSource(), anyTypePerms);
+        int playerAllowedCountOfTargetType = targetTypePerms.length == 0 ? -1 : ECPerms.getHighestNumericPermission(senderPlayer.getCommandSource(), targetTypePerms);
+
+        // any(5) -> up to 5 shared or global, any combindation
+        // any(5),shared(3) -> no more then 3 shared. Could have 5 global:0 shared to 2 global:3 shared
 
-        if (joinpoints.size() >= playerMaxJoinpoints) {
-            throw new JoinpointException.Set.MaxPointsExceeded(joinpointName, playerMaxJoinpoints, joinpoints.size());
+        boolean targetTypeIsGlobal = joinpointType == JoinpointLimit.JoinpointType.GLOBAL;
+        int joinpointsOfTargetType = (int)joinpoints.stream().filter(p -> p.isGlobal() == targetTypeIsGlobal).count();
+
+        if (playerAllowedCountOfTargetType != -1) {
+            // if we have an explicit permission for the target type, that overrides all others
+            if (joinpointsOfTargetType >= playerAllowedCountOfTargetType) {
+                throw new JoinpointException.Set.MaxPointsExceeded(joinpointName, playerAllowedCountOfTargetType, joinpointsOfTargetType, joinpointType);
+            }
+        } else if (playerAllowedOfAnyType != -1 && joinpoints.size() >= playerAllowedOfAnyType) {
+            throw new JoinpointException.Set.MaxPointsExceeded(joinpointName, playerAllowedOfAnyType, joinpoints.size(), JoinpointLimit.JoinpointType.ANY);
         }
 
         // Create new joinpoint
         MinecraftLocation location = new MinecraftLocation(senderPlayer);
         JoinpointLocation joinpoint = new JoinpointLocation(
-            location, joinpointName, senderPlayer.getUuid(), isGlobal, Set.of()
+            location, joinpointName, senderPlayer.getUuid(), targetTypeIsGlobal, Set.of()
         );
 
         database.createJoinpointAsync(joinpointName, senderPlayer.getUuid(), joinpoint).join();
 
         Text joinpointNameText = ECText.access(senderPlayer).accent(joinpointName);
-        String messageKey = isGlobal ? "cmd.joinpoint.set.feedback.global"
+        String messageKey = targetTypeIsGlobal ? "cmd.joinpoint.set.feedback.global"
             : "cmd.joinpoint.set.feedback";
 
         playerData.sendCommandFeedback(messageKey, joinpointNameText);

src/main/resources/assets/essential_commands/lang/en_us.json

@@ -30,7 +30,7 @@
   "cmd.joinpoint.set.feedback": "Joinpoint '${0}' set.",
   "cmd.joinpoint.set.feedback.global": "Global joinpoint '${0}' set.",
   "cmd.joinpoint.set.feedback.shared": "Shared joinpoint '${0}' set.",
-  "cmd.joinpoint.set.error.limit": "Joinpoint '${0}' could not be set. Joinpoint limit (${1}) reached.",
+  "cmd.joinpoint.set.error.limit": "Joinpoint '${0}' could not be set. Joinpoint limit (${1}) for joinpoint type '${2}' reached.",
   "cmd.joinpoint.set.error.exists": "Joinpoint '${0}' could not be set. A joinpoint with the specified name already exists.",
   "cmd.joinpoint.set.overwrite": "Joinpoint '${0}' already exists.\nWould you like to overwrite the existing joinpoint?",
   "cmd.joinpoint.overwrite.feedback": "Joinpoint '${0}' moved to current location.",