From fac196ed0d8b2187934d87f0ccb9e07129979634 Mon Sep 17 00:00:00 2001
From: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com>
Date: Sun, 13 Nov 2022 15:11:57 +0200
Subject: [PATCH] Refactor PlayerPlaceHolders to reduce method length

---
 .../plan/placeholder/PlayerPlaceHolders.java  | 197 ++++++++++--------
 1 file changed, 105 insertions(+), 92 deletions(-)

diff --git a/Plan/common/src/main/java/com/djrapitops/plan/placeholder/PlayerPlaceHolders.java b/Plan/common/src/main/java/com/djrapitops/plan/placeholder/PlayerPlaceHolders.java
index eed07ffa8..74fbf2f4f 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/placeholder/PlayerPlaceHolders.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/placeholder/PlayerPlaceHolders.java
@@ -247,99 +247,13 @@ public class PlayerPlaceHolders implements Placeholders {
     }
 
     private void registerPlaytimePlaceholders(PlanPlaceholders placeholders, Formatter<Long> time) {
-        placeholders.register("player_time_active",
-                player -> time.apply(SessionsMutator.forContainer(player)
-                        .toActivePlaytime())
-        );
-        placeholders.register("player_time_active_raw",
-                player -> SessionsMutator.forContainer(player)
-                        .toActivePlaytime()
-        );
-
-        placeholders.register("player_time_active_day",
-                player -> time.apply(SessionsMutator.forContainer(player)
-                        .filterSessionsBetween(dayAgo(), now())
-                        .toActivePlaytime())
-        );
-        placeholders.register("player_time_active_day_raw",
-                player -> SessionsMutator.forContainer(player)
-                        .filterSessionsBetween(dayAgo(), now())
-                        .toActivePlaytime()
-        );
-
-        placeholders.register("player_time_active_week",
-                player -> time.apply(SessionsMutator.forContainer(player)
-                        .filterSessionsBetween(weekAgo(), now())
-                        .toActivePlaytime())
-        );
-        placeholders.register("player_time_active_week_raw",
-                player -> SessionsMutator.forContainer(player)
-                        .filterSessionsBetween(weekAgo(), now())
-                        .toActivePlaytime()
-        );
-
-        placeholders.register("player_time_active_month",
-                player -> time.apply(SessionsMutator.forContainer(player)
-                        .filterSessionsBetween(monthAgo(), now())
-                        .toActivePlaytime())
-        );
-        placeholders.register("player_time_active_month_raw",
-                player -> SessionsMutator.forContainer(player)
-                        .filterSessionsBetween(monthAgo(), now())
-                        .toActivePlaytime()
-        );
-
-        placeholders.register("player_time_afk",
-                player -> time.apply(SessionsMutator.forContainer(player)
-                        .toAfkTime())
-        );
-        placeholders.register("player_time_afk_raw",
-                player -> SessionsMutator.forContainer(player)
-                        .toAfkTime()
-        );
-
-        placeholders.register("player_time_total",
-                player -> time.apply(SessionsMutator.forContainer(player)
-                        .toPlaytime())
-        );
-        placeholders.register("player_time_total_raw",
-                player -> SessionsMutator.forContainer(player)
-                        .toPlaytime()
-        );
-
-        placeholders.register("player_time_day",
-                player -> time.apply(SessionsMutator.forContainer(player)
-                        .filterSessionsBetween(dayAgo(), now())
-                        .toPlaytime())
-        );
-        placeholders.register("player_time_day_raw",
-                player -> SessionsMutator.forContainer(player)
-                        .filterSessionsBetween(dayAgo(), now())
-                        .toPlaytime()
-        );
-
-        placeholders.register("player_time_week",
-                player -> time.apply(SessionsMutator.forContainer(player)
-                        .filterSessionsBetween(weekAgo(), now())
-                        .toPlaytime())
-        );
-        placeholders.register("player_time_week_raw",
-                player -> SessionsMutator.forContainer(player)
-                        .filterSessionsBetween(weekAgo(), now())
-                        .toPlaytime()
-        );
-
-        placeholders.register("player_time_month",
-                player -> time.apply(SessionsMutator.forContainer(player)
-                        .filterSessionsBetween(monthAgo(), now())
-                        .toPlaytime())
-        );
-        placeholders.register("player_time_month_raw",
-                player -> SessionsMutator.forContainer(player)
-                        .filterSessionsBetween(monthAgo(), now())
-                        .toPlaytime()
-        );
+        registerActivePlaytimePlaceholders(placeholders, time);
+        registerAfkTimePlaceholders(placeholders, time);
+        registerPlayerPlaytimePlaceholders(placeholders, time);
+        registerServerSpecificPlaytimePlaceholders(placeholders, time);
+    }
 
+    private void registerServerSpecificPlaytimePlaceholders(PlanPlaceholders placeholders, Formatter<Long> time) {
         placeholders.register("player_server_time_active",
                 player -> time.apply(SessionsMutator.forContainer(player)
                         .filterPlayedOnServer(serverInfo.getServerUUID())
@@ -413,6 +327,105 @@ public class PlayerPlaceHolders implements Placeholders {
         );
     }
 
+    private void registerPlayerPlaytimePlaceholders(PlanPlaceholders placeholders, Formatter<Long> time) {
+        placeholders.register("player_time_total",
+                player -> time.apply(SessionsMutator.forContainer(player)
+                        .toPlaytime())
+        );
+        placeholders.register("player_time_total_raw",
+                player -> SessionsMutator.forContainer(player)
+                        .toPlaytime()
+        );
+
+        placeholders.register("player_time_day",
+                player -> time.apply(SessionsMutator.forContainer(player)
+                        .filterSessionsBetween(dayAgo(), now())
+                        .toPlaytime())
+        );
+        placeholders.register("player_time_day_raw",
+                player -> SessionsMutator.forContainer(player)
+                        .filterSessionsBetween(dayAgo(), now())
+                        .toPlaytime()
+        );
+
+        placeholders.register("player_time_week",
+                player -> time.apply(SessionsMutator.forContainer(player)
+                        .filterSessionsBetween(weekAgo(), now())
+                        .toPlaytime())
+        );
+        placeholders.register("player_time_week_raw",
+                player -> SessionsMutator.forContainer(player)
+                        .filterSessionsBetween(weekAgo(), now())
+                        .toPlaytime()
+        );
+
+        placeholders.register("player_time_month",
+                player -> time.apply(SessionsMutator.forContainer(player)
+                        .filterSessionsBetween(monthAgo(), now())
+                        .toPlaytime())
+        );
+        placeholders.register("player_time_month_raw",
+                player -> SessionsMutator.forContainer(player)
+                        .filterSessionsBetween(monthAgo(), now())
+                        .toPlaytime()
+        );
+    }
+
+    private void registerAfkTimePlaceholders(PlanPlaceholders placeholders, Formatter<Long> time) {
+        placeholders.register("player_time_afk",
+                player -> time.apply(SessionsMutator.forContainer(player)
+                        .toAfkTime())
+        );
+        placeholders.register("player_time_afk_raw",
+                player -> SessionsMutator.forContainer(player)
+                        .toAfkTime()
+        );
+    }
+
+    private void registerActivePlaytimePlaceholders(PlanPlaceholders placeholders, Formatter<Long> time) {
+        placeholders.register("player_time_active",
+                player -> time.apply(SessionsMutator.forContainer(player)
+                        .toActivePlaytime())
+        );
+        placeholders.register("player_time_active_raw",
+                player -> SessionsMutator.forContainer(player)
+                        .toActivePlaytime()
+        );
+
+        placeholders.register("player_time_active_day",
+                player -> time.apply(SessionsMutator.forContainer(player)
+                        .filterSessionsBetween(dayAgo(), now())
+                        .toActivePlaytime())
+        );
+        placeholders.register("player_time_active_day_raw",
+                player -> SessionsMutator.forContainer(player)
+                        .filterSessionsBetween(dayAgo(), now())
+                        .toActivePlaytime()
+        );
+
+        placeholders.register("player_time_active_week",
+                player -> time.apply(SessionsMutator.forContainer(player)
+                        .filterSessionsBetween(weekAgo(), now())
+                        .toActivePlaytime())
+        );
+        placeholders.register("player_time_active_week_raw",
+                player -> SessionsMutator.forContainer(player)
+                        .filterSessionsBetween(weekAgo(), now())
+                        .toActivePlaytime()
+        );
+
+        placeholders.register("player_time_active_month",
+                player -> time.apply(SessionsMutator.forContainer(player)
+                        .filterSessionsBetween(monthAgo(), now())
+                        .toActivePlaytime())
+        );
+        placeholders.register("player_time_active_month_raw",
+                player -> SessionsMutator.forContainer(player)
+                        .filterSessionsBetween(monthAgo(), now())
+                        .toActivePlaytime()
+        );
+    }
+
     @NotNull
     private Optional<Long> getActiveSessionLength(PlayerContainer player) {
         SessionCache.refreshActiveSessionsState();