From a1b9329ad8bc53c62f155a603cb2c8e217cfff14 Mon Sep 17 00:00:00 2001 From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com> Date: Thu, 9 Apr 2026 22:03:05 +1000 Subject: [PATCH] refactor: move GAME_RULE_SAVENAME to ConsoleGameRulesConstants.h --- targets/app/common/GameRules/GameRuleManager.h | 2 -- targets/minecraft/client/skins/DLCTexturePack.cpp | 1 - targets/minecraft/server/MinecraftServer.cpp | 2 +- targets/minecraft/world/level/ConsoleGameRulesConstants.h | 6 ++++++ .../storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp | 2 +- .../minecraft/world/level/storage/DirectoryLevelStorage.cpp | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/targets/app/common/GameRules/GameRuleManager.h b/targets/app/common/GameRules/GameRuleManager.h index 7f3020851..002c9eb94 100644 --- a/targets/app/common/GameRules/GameRuleManager.h +++ b/targets/app/common/GameRules/GameRuleManager.h @@ -27,8 +27,6 @@ class DLCGameRulesHeader; class File; class LevelRuleset; -#define GAME_RULE_SAVENAME "requiredGameRules.grf" - // 4J-JEV: #define LEVEL_GEN_ID int #define LEVEL_GEN_ID_NULL 0 diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp index 9776bf8ec..f5562b547 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.cpp +++ b/targets/minecraft/client/skins/DLCTexturePack.cpp @@ -14,7 +14,6 @@ #include "app/common/DLC/DLCPack.h" #include "app/common/DLC/DLCTextureFile.h" #include "app/common/DLC/DLCUIDataFile.h" -#include "app/common/GameRules/GameRuleManager.h" #include "app/common/UI/All Platforms/ArchiveFile.h" #include "app/linux/Linux_UIController.h" #include "java/File.h" diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index c286eee64..a70a3c402 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -14,7 +14,6 @@ #include "DispenserBootstrap.h" #include "PlayerList.h" #include "Settings.h" -#include "app/common/GameRules/GameRuleManager.h" #include "java/Class.h" #include "java/File.h" #include "java/InputOutputStream/DataOutputStream.h" @@ -25,6 +24,7 @@ #include "minecraft/IGameServices.h" #include "minecraft/Pos.h" #include "minecraft/client/Options.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "minecraft/commands/Command.h" #include "minecraft/network/INetworkService.h" #include "minecraft/network/packet/GameEventPacket.h" diff --git a/targets/minecraft/world/level/ConsoleGameRulesConstants.h b/targets/minecraft/world/level/ConsoleGameRulesConstants.h index 522b04d66..4cd70be62 100644 --- a/targets/minecraft/world/level/ConsoleGameRulesConstants.h +++ b/targets/minecraft/world/level/ConsoleGameRulesConstants.h @@ -2,6 +2,12 @@ #include "java/InputOutputStream/DataOutputStream.h" +// Filename for the per-save game rules blob written by GameRuleManager +// and consumed by the save / converter / level storage paths. Defined +// here in minecraft/ so save-path consumers don't need to drag in the +// full app-side GameRuleManager header just for this string. +inline constexpr const char* GAME_RULE_SAVENAME = "requiredGameRules.grf"; + class ConsoleGameRules { public: enum EGameRuleType { diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp index 75290bc2d..4eb4cb992 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp @@ -8,11 +8,11 @@ #include #include -#include "app/common/GameRules/GameRuleManager.h" #include "java/InputOutputStream/BufferedOutputStream.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/util/ProgressListener.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "minecraft/world/level/chunk/ChunkSource.h" #include "minecraft/world/level/chunk/storage/RegionFile.h" #include "minecraft/world/level/chunk/storage/RegionFileCache.h" diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp index 4f4631e1f..467cd851a 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -11,7 +11,6 @@ #include #include "LevelData.h" -#include "app/common/GameRules/GameRuleManager.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" @@ -23,6 +22,7 @@ #include "minecraft/IGameServices.h" #include "minecraft/util/Log.h" #include "minecraft/world/entity/player/Player.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "minecraft/world/level/chunk/storage/OldChunkStorage.h" #include "minecraft/world/level/dimension/Dimension.h" #include "minecraft/world/level/dimension/HellDimension.h"