refactor: move ConsoleGameRulesConstants.h into minecraft

2026-04-28 22:33:38 +00:00 · 2026-04-08 21:19:54 +10:00 · 2026-04-08 21:19:54 +10:00 · 58de5bb40b
parent 1ddf12beb9
commit 58de5bb40b
40 changed files with 39 additions and 39 deletions
--- a/targets/app/common/Game.h
+++ b/targets/app/common/Game.h
@ -24,7 +24,7 @@
 #include "app/common/TerrainFeatureManager.h"
 #include "app/common/Audio/Consoles_SoundEngine.h"
 #include "app/common/DLC/DLCManager.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/GameRuleManager.h"
 #include "minecraft/locale/StringTable.h"
 #include "app/common/Tutorial/TutorialEnum.h"
--- a/targets/app/common/GameRules/GameRuleManager.h
+++ b/targets/app/common/GameRules/GameRuleManager.h
@ -8,7 +8,7 @@
 #include <unordered_map>

 #include "app/common/DLC/DLCGameRulesHeader.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelGeneration/LevelGenerators.h"
 #include "app/common/GameRules/LevelRules/LevelRules.h"

--- a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
@ -5,7 +5,7 @@

 #include "ConsoleSchematicFile.h"
 #include "LevelGenerationOptions.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
--- a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h
@ -5,7 +5,7 @@
 #include <string>

 #include "ConsoleSchematicFile.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "minecraft/world/phys/AABB.h"
 #include "minecraft/world/phys/Vec3.h"
--- a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp
@ -1,6 +1,6 @@
 #include "BiomeOverride.h"

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
--- a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h
+++ b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h
@ -4,7 +4,7 @@
 #include <cstdint>
 #include <string>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"

 class BiomeOverride : public GameRuleDefinition {
--- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
@ -4,7 +4,7 @@

 #include <algorithm>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
--- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h
+++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h
@ -2,7 +2,7 @@
 #include <string>
 #include <vector>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h"
 #include "minecraft/world/level/levelgen/structure/StructurePiece.h"
--- a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h
+++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h
@ -9,7 +9,7 @@
 #include <vector>

 #include "app/common/DLC/DLCPack.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "minecraft/locale/StringTable.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeature.h"
--- a/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp
@ -1,6 +1,6 @@
 #include "StartFeature.h"

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
--- a/targets/app/common/GameRules/LevelGeneration/StartFeature.h
+++ b/targets/app/common/GameRules/LevelGeneration/StartFeature.h
@ -3,7 +3,7 @@

 #include <string>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "minecraft/world/level/levelgen/structure/StructureFeature.h"

--- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
@ -1,6 +1,6 @@
 #include "XboxStructureActionGenerateBox.h"

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
--- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h
+++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h
@ -1,7 +1,7 @@
 #pragma once
 #include <string>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"

 class StructurePiece;
--- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
@ -1,6 +1,6 @@
 #include "XboxStructureActionPlaceBlock.h"

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
--- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h
+++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h
@ -1,7 +1,7 @@
 #pragma once
 #include <string>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"

 class StructurePiece;
--- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
@ -4,7 +4,7 @@

 #include <memory>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
--- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h
+++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h
@ -3,7 +3,7 @@
 #include <string>
 #include <vector>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "XboxStructureActionPlaceBlock.h"

 class AddItemRuleDefinition;
--- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp
@ -4,7 +4,7 @@

 #include <memory>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "minecraft/world/level/Level.h"
--- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h
+++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h
@ -2,7 +2,7 @@

 #include <string>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "XboxStructureActionPlaceBlock.h"

 class StructurePiece;
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
@ -3,7 +3,7 @@
 #include <algorithm>
 #include <vector>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h
@ -4,7 +4,7 @@
 #include <string>

 #include "GameRuleDefinition.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"

 class ItemInstance;

--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
@ -3,7 +3,7 @@
 #include <algorithm>

 #include "AddEnchantmentRuleDefinition.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h
@ -5,7 +5,7 @@
 #include <vector>

 #include "GameRuleDefinition.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"

 class Container;
 class AddEnchantmentRuleDefinition;
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
@ -1,6 +1,6 @@
 #include "CollectItemRuleDefinition.h"

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/Rules/GameRule.h"
 #include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h
@ -4,7 +4,7 @@
 #include <string>

 #include "GameRuleDefinition.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"

 class Pos;
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h
@ -3,7 +3,7 @@
 #include <string>

 #include "CompoundGameRuleDefinition.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"

 class GameRule;

--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
@ -7,7 +7,7 @@
 #include <unordered_map>
 #include <utility>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h
@ -3,7 +3,7 @@
 #include <vector>

 #include "GameRuleDefinition.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"

 class CompoundGameRuleDefinition : public GameRuleDefinition {
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
@ -8,7 +8,7 @@
 #include <utility>
 #include <vector>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
 #include "app/common/GameRules/LevelRules/Rules/GameRule.h"
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h
@ -6,7 +6,7 @@
 #include <unordered_map>
 #include <vector>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
 #include "minecraft/world/item/ItemInstance.h"

--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp
@ -1,6 +1,6 @@
 #include "LevelRuleset.h"

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
 #include "minecraft/locale/StringTable.h"
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h
@ -4,7 +4,7 @@
 #include <vector>

 #include "CompoundGameRuleDefinition.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"

 class NamedAreaRuleDefinition;
 class AABB;
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
@ -2,7 +2,7 @@

 #include <wchar.h>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h
@ -3,7 +3,7 @@
 #include <string>

 #include "GameRuleDefinition.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "minecraft/world/phys/AABB.h"

 class NamedAreaRuleDefinition : public GameRuleDefinition {
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
@ -4,7 +4,7 @@

 #include <memory>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h
@ -5,7 +5,7 @@
 #include <vector>

 #include "GameRuleDefinition.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"

 class AddItemRuleDefinition;
 class Pos;
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
@ -1,6 +1,6 @@
 #include "UseTileRuleDefinition.h"

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h
@ -4,7 +4,7 @@
 #include <string>

 #include "GameRuleDefinition.h"
-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "minecraft/Pos.h"

 class UseTileRuleDefinition : public GameRuleDefinition {
--- a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h
+++ b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h
@ -6,7 +6,7 @@
 #include <string>
 #include <vector>

-#include "app/common/GameRules/ConsoleGameRulesConstants.h"
+#include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "Packet.h"
 #include "minecraft/network/packet/Packet.h"

--- a/targets/minecraft/world/level/ConsoleGameRulesConstants.h
+++ b/targets/minecraft/world/level/ConsoleGameRulesConstants.h