From b78afab85ee15d809ea4ff0ccb14c2b263ede860 Mon Sep 17 00:00:00 2001 From: lucko Date: Sun, 21 Jul 2024 12:44:06 +0100 Subject: Include gamerule settings in metadata (#425) --- .../spark/fabric/FabricWorldInfoProvider.java | 53 +++++++++++++++++++++- 1 file changed, 51 insertions(+), 2 deletions(-) (limited to 'spark-fabric/src/main/java/me') 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 926e8a3..d7dc7a7 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 @@ -37,6 +37,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.world.ServerEntityManager; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.ChunkPos; +import net.minecraft.world.GameRules; import net.minecraft.world.entity.ClientEntityManager; import net.minecraft.world.entity.EntityIndex; import net.minecraft.world.entity.EntityTrackingSection; @@ -101,6 +102,28 @@ public abstract class FabricWorldInfoProvider implements WorldInfoProvider { return data; } + + @Override + public GameRulesResult pollGameRules() { + GameRulesResult data = new GameRulesResult(); + Iterable worlds = this.server.getWorlds(); + + GameRules.accept(new GameRules.Visitor() { + @Override + public > void visit(GameRules.Key key, GameRules.Type type) { + String defaultValue = type.createRule().serialize(); + data.putDefault(key.getName(), defaultValue); + + for (ServerWorld world : worlds) { + String worldName = world.getRegistryKey().getValue().getPath(); + + String value = world.getGameRules().get(key).serialize(); + data.put(key.getName(), worldName, value); + } + } + }); + return data; + } } public static final class Client extends FabricWorldInfoProvider { @@ -128,13 +151,13 @@ public abstract class FabricWorldInfoProvider implements WorldInfoProvider { @Override public ChunksResult pollChunks() { - ChunksResult data = new ChunksResult<>(); - ClientWorld world = this.client.world; if (world == null) { return null; } + ChunksResult data = new ChunksResult<>(); + ClientEntityManager entityManager = ((ClientWorldAccessor) world).getEntityManager(); SectionedEntityCache cache = ((ClientEntityManagerAccessor) entityManager).getCache(); @@ -143,6 +166,32 @@ public abstract class FabricWorldInfoProvider implements WorldInfoProvider { return data; } + + @Override + public GameRulesResult pollGameRules() { + ClientWorld world = this.client.world; + if (world == null) { + return null; + } + + GameRulesResult data = new GameRulesResult(); + + String worldName = world.getRegistryKey().getValue().getPath(); + GameRules worldRules = world.getGameRules(); + + GameRules.accept(new GameRules.Visitor() { + @Override + public > void visit(GameRules.Key key, GameRules.Type type) { + String defaultValue = type.createRule().serialize(); + data.putDefault(key.getName(), defaultValue); + + String value = worldRules.get(key).serialize(); + data.put(key.getName(), worldName, value); + } + }); + + return data; + } } static final class FabricChunkInfo extends AbstractChunkInfo> { -- cgit