refactor perms

Author: Mapacheee

src/main/java/me/mapacheee/extendedhorizons/integration/luckperms/LuckPermsService.java

@@ -77,7 +77,7 @@ public boolean isEnabled() {
      */
     public int resolveMaxDistance(Player player, int fallback) {
         if (!enabled || handler == null)
-            return fallback;
+            return -1;
 
         UUID id = player.getUniqueId();
         long now = Instant.now().getEpochSecond();
@@ -86,7 +86,7 @@ public int resolveMaxDistance(Player player, int fallback) {
             return ce.value;
         }
 
-        int resolved = handler.compute(player, fallback, useGroupPermissions);
+        int resolved = handler.compute(player, -1, useGroupPermissions);
 
         CacheEntry fresh = new CacheEntry();
         fresh.value = resolved;
@@ -125,31 +125,21 @@ public int compute(Player player, int fallback, boolean useGroupPermissions) {
                 if (user == null)
                     return fallback;
 
-                net.luckperms.api.cacheddata.CachedMetaData meta = user.getCachedData().getMetaData();
-                String metaValue = meta.getMetaValue("extendedhorizons.max-distance");
-                if (metaValue != null) {
-                    Integer parsed = parsePositiveInt(metaValue);
-                    if (parsed != null)
-                        return parsed;
-                }
+                int best = -1;
 
-                if (useGroupPermissions) {
-                    int best = -1;
-                    for (var node : user.getNodes()) {
-                        if (node instanceof net.luckperms.api.node.types.PermissionNode p && p.getValue()) {
-                            String perm = p.getPermission();
-                            if (perm.startsWith("extendedhorizons.max.")
-                                    || perm.startsWith("extendedhorizons.distance.")) {
-                                Optional<Integer> n = extractTrailingInt(perm);
-                                if (n.isPresent() && n.get() > best)
-                                    best = n.get();
-                            }
+                for (var node : user.getNodes()) {
+                    if (node instanceof net.luckperms.api.node.types.PermissionNode p && p.getValue()) {
+                        String perm = p.getPermission();
+                        if (perm.startsWith("extendedhorizons.view.")) {
+                            Optional<Integer> n = extractTrailingInt(perm);
+                            if (n.isPresent() && n.get() > best)
+                                best = n.get();
                         }
                     }
-                    if (best > 0)
-                        return best;
                 }
-                return fallback;
+
+                return best > 0 ? best : fallback;
+
             } catch (Exception e) {
                 return fallback;
             }
@@ -166,14 +156,5 @@ private Optional<Integer> extractTrailingInt(String key) {
                 return Optional.empty();
             }
         }
-
-        private Integer parsePositiveInt(String s) {
-            try {
-                int v = Integer.parseInt(s.trim());
-                return v > 0 ? v : null;
-            } catch (NumberFormatException e) {
-                return null;
-            }
-        }
     }
 }

src/main/java/me/mapacheee/extendedhorizons/viewdistance/service/ViewDistanceService.java

@@ -69,6 +69,10 @@ public ViewDistanceService(ConfigService configService,
     public void handlePlayerJoin(Player player) {
         fakeChunkService.onPlayerJoin(player);
 
+        if (!player.hasPermission("extendedhorizons.use")) {
+            return;
+        }
+
         if (!isPluginEnabledForWorld(player.getWorld())) {
             return;
         }
@@ -81,17 +85,15 @@ public void handlePlayerJoin(Player player) {
                 return;
             }
 
-            int fallbackDefault = configService.get().viewDistance().defaultDistance();
+            int maxAllowed = getAllowedMax(p);
+
             int dbDistance = playerData.map(PlayerData::getViewDistance).orElse(-1);
-            int clientDistance = p.getClientViewDistance();
 
             int initialDistance;
             if (dbDistance > 0) {
-                initialDistance = dbDistance;
-            } else if (clientDistance > 0) {
-                initialDistance = clientDistance;
+                initialDistance = Math.min(dbDistance, maxAllowed);
             } else {
-                initialDistance = fallbackDefault;
+                initialDistance = maxAllowed;
             }
 
             int clamped = clampDistance(p, initialDistance);
@@ -167,6 +169,10 @@ public void setPlayerDistance(Player player, int requestedDistance) {
             throw new IllegalArgumentException("Player must not be null");
         }
 
+        if (!player.hasPermission("extendedhorizons.use")) {
+            return;
+        }
+
         if (!isPluginEnabledForWorld(player.getWorld())) {
             throw new IllegalStateException("ExtendedHorizons is disabled in this world");
         }
@@ -192,24 +198,28 @@ public void setPlayerDistance(Player player, int requestedDistance) {
     }
 
     /**
-     * Returns allowed maximum distance for this player after LuckPerms check.
+     * Returns allowed maximum distance (effective default + limit)
      */
     public int getAllowedMax(Player player) {
         String worldName = player.getWorld().getName();
 
-        Map<String, WorldConfig> worldSettings = configService
-                .get().worldSettings();
+        int baseDefault = configService.get().viewDistance().defaultDistance();
+
+        int permissionMax = -1;
+        if (luckPermsService != null && luckPermsService.isEnabled()) {
+            permissionMax = luckPermsService.resolveMaxDistance(player, -1);
+        }
+        int effectiveMax = (permissionMax > 0) ? permissionMax : baseDefault;
 
-        int configMax;
+        Map<String, WorldConfig> worldSettings = configService.get().worldSettings();
+        int globalCap;
         if (worldSettings != null && worldSettings.containsKey(worldName)) {
-            configMax = worldSettings.get(worldName).maxDistance();
+            globalCap = worldSettings.get(worldName).maxDistance();
         } else {
-            configMax = configService.get().viewDistance().maxDistance();
+            globalCap = configService.get().viewDistance().maxDistance();
         }
 
-        return luckPermsService != null && luckPermsService.isEnabled()
-                ? Math.min(configMax, luckPermsService.resolveMaxDistance(player, configMax))
-                : configMax;
+        return Math.min(effectiveMax, globalCap);
     }
 
     private int clampDistance(Player player, int value) {

src/main/resources/plugin.yml

@@ -22,20 +22,8 @@ commands:
 
 permissions:
   extendedhorizons.use:
-    description: Basic permission to use ExtendedHorizons commands
+    description: Basic permission to use ExtendedHorizons features
     default: true
-  extendedhorizons.distance.16:
-    description: Allow view distance up to 16 chunks
-    default: false
-  extendedhorizons.distance.32:
-    description: Allow view distance up to 32 chunks
-    default: op
-  extendedhorizons.distance.64:
-    description: Allow view distance up to 64 chunks
-    default: false
-  extendedhorizons.distance.unlimited:
-    description: Allow unlimited view distance
-    default: false
   extendedhorizons.admin:
     description: Access to admin commands
     default: op