From f2c2a75bfa73080c9837471c92f96f57c9620c45 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Wed, 29 Jun 2022 22:36:27 +0100
Subject: Fix entity stats on Fabric/Forge

---
 .../src/main/java/me/lucko/spark/fabric/FabricWorldInfoProvider.java | 5 ++---
 .../src/main/java/me/lucko/spark/forge/ForgeWorldInfoProvider.java   | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricWorldInfoProvider.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricWorldInfoProvider.java
index fddcf58..f2f7b96 100644
--- a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricWorldInfoProvider.java
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricWorldInfoProvider.java
@@ -42,7 +42,6 @@ import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.entity.EntityTrackingSection;
 import net.minecraft.world.entity.SectionedEntityCache;
-import net.minecraft.world.level.ServerWorldProperties;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -81,7 +80,7 @@ public abstract class FabricWorldInfoProvider implements WorldInfoProvider {
                 SectionedEntityCache<Entity> cache = ((ServerEntityManagerAccessor) entityManager).getCache();
 
                 List<FabricChunkInfo> list = getChunksFromCache(cache);
-                data.put(((ServerWorldProperties) world.getLevelProperties()).getLevelName(), list);
+                data.put(world.getRegistryKey().getValue().getPath(), list);
             }
 
             return data;
@@ -108,7 +107,7 @@ public abstract class FabricWorldInfoProvider implements WorldInfoProvider {
             SectionedEntityCache<Entity> cache = ((ClientEntityManagerAccessor) entityManager).getCache();
 
             List<FabricChunkInfo> list = getChunksFromCache(cache);
-            data.put(world.getDimensionKey().getValue().getPath(), list);
+            data.put(world.getRegistryKey().getValue().getPath(), list);
 
             return data;
         }
diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeWorldInfoProvider.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeWorldInfoProvider.java
index b17dab5..1d65d6a 100644
--- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeWorldInfoProvider.java
+++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeWorldInfoProvider.java
@@ -38,7 +38,6 @@ import net.minecraft.world.level.entity.EntitySection;
 import net.minecraft.world.level.entity.EntitySectionStorage;
 import net.minecraft.world.level.entity.PersistentEntitySectionManager;
 import net.minecraft.world.level.entity.TransientEntitySectionManager;
-import net.minecraft.world.level.storage.ServerLevelData;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -77,7 +76,7 @@ public abstract class ForgeWorldInfoProvider implements WorldInfoProvider {
                 EntitySectionStorage<Entity> cache = entityManager.sectionStorage;
 
                 List<ForgeChunkInfo> list = getChunksFromCache(cache);
-                data.put(((ServerLevelData) level.getLevelData()).getLevelName(), list);
+                data.put(level.dimension().location().getPath(), list);
             }
 
             return data;
@@ -104,7 +103,7 @@ public abstract class ForgeWorldInfoProvider implements WorldInfoProvider {
             EntitySectionStorage<Entity> cache = entityManager.sectionStorage;
 
             List<ForgeChunkInfo> list = getChunksFromCache(cache);
-            data.put(level.dimensionTypeId().location().getPath(), list);
+            data.put(level.dimension().location().getPath(), list);
 
             return data;
         }
-- 
cgit