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) --- .../lucko/spark/forge/ForgeWorldInfoProvider.java | 54 +++++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) (limited to 'spark-forge/src/main/java') 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 e10a0c8..286605a 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 @@ -32,6 +32,7 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.ChunkPos; +import net.minecraft.world.level.GameRules; import net.minecraft.world.level.entity.EntityLookup; import net.minecraft.world.level.entity.EntitySection; import net.minecraft.world.level.entity.EntitySectionStorage; @@ -97,6 +98,29 @@ public abstract class ForgeWorldInfoProvider implements WorldInfoProvider { return data; } + + @Override + public GameRulesResult pollGameRules() { + GameRulesResult data = new GameRulesResult(); + Iterable levels = this.server.getAllLevels(); + + GameRules.visitGameRuleTypes(new GameRules.GameRuleTypeVisitor() { + @Override + public > void visit(GameRules.Key key, GameRules.Type type) { + String defaultValue = type.createRule().serialize(); + data.putDefault(key.getId(), defaultValue); + + for (ServerLevel level : levels) { + String levelName = level.dimension().location().getPath(); + + String value = level.getGameRules().getRule(key).serialize(); + data.put(key.getId(), levelName, value); + } + } + }); + + return data; + } } public static final class Client extends ForgeWorldInfoProvider { @@ -124,13 +148,13 @@ public abstract class ForgeWorldInfoProvider implements WorldInfoProvider { @Override public ChunksResult pollChunks() { - ChunksResult data = new ChunksResult<>(); - ClientLevel level = this.client.level; if (level == null) { return null; } + ChunksResult data = new ChunksResult<>(); + TransientEntitySectionManager entityManager = level.entityStorage; EntitySectionStorage cache = entityManager.sectionStorage; @@ -139,6 +163,32 @@ public abstract class ForgeWorldInfoProvider implements WorldInfoProvider { return data; } + + @Override + public GameRulesResult pollGameRules() { + ClientLevel level = this.client.level; + if (level == null) { + return null; + } + + GameRulesResult data = new GameRulesResult(); + + String levelName = level.dimension().location().getPath(); + GameRules levelRules = level.getGameRules(); + + GameRules.visitGameRuleTypes(new GameRules.GameRuleTypeVisitor() { + @Override + public > void visit(GameRules.Key key, GameRules.Type type) { + String defaultValue = type.createRule().serialize(); + data.putDefault(key.getId(), defaultValue); + + String value = levelRules.getRule(key).serialize(); + data.put(key.getId(), levelName, value); + } + }); + + return data; + } } static final class ForgeChunkInfo extends AbstractChunkInfo> { -- cgit