Implement {worldPlayer} variable

DistrictOfJoban · Jan 31, 2025 · cff258f · cff258f
1 parent 5d3f703
commit cff258f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 **New:**
 - Disneyland Resorts Line APG now reacts to redstone signal just like built-in APGs in MTR 4
+- **JSON PIDS Preset**
+- - The PIDS Variable `{worldPlayer}` is now implemented and displayed correctly again
 
 **Changes:**
 - Most blocks can now be crafted with a crafting recipe and drop items again, making it possible to use survival mode with JCM (Albeit still need improvements)

diff --git a/fabric/src/main/java/com/lx862/jcm/mod/data/pids/preset/components/CustomTextComponent.java b/fabric/src/main/java/com/lx862/jcm/mod/data/pids/preset/components/CustomTextComponent.java
@@ -49,11 +49,18 @@ private static String parsePIDSVariable(String str, PIDSContext context) {
             timeGreetings = "Night";
         }
 
+        int playerInWorld;
+        #if LOADER == "forge"
+            playerInWorld = context.world.data.players().size();
+        #else
+            playerInWorld = context.world.data.getPlayers().size();
+        #endif
+
         return str.replace("{time}", timeString)
                 .replace("{day}", String.valueOf(worldDay))
                 .replace("{weather}", weatherString)
                 .replace("{time_period}", timeGreetings)
                 .replace("{weatherChin}", weatherChinString)
-                .replace("{worldPlayer}", "?");
+                .replace("{worldPlayer}", String.valueOf(playerInWorld));
     }
 }