refactor: move GameRule chain headers into minecraft

2026-04-29 22:23:36 +00:00 · 2026-04-08 21:31:07 +10:00 · 2026-04-08 21:31:07 +10:00 · 0cf527b433
parent 5679af6d6e
commit 0cf527b433
72 changed files with 88 additions and 88 deletions
--- a/targets/app/common/DLC/DLCGameRules.h
+++ b/targets/app/common/DLC/DLCGameRules.h
@ -1,7 +1,7 @@
 #pragma once

 #include "DLCFile.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"

 class DLCGameRules : public DLCFile {
 public:
--- a/targets/app/common/DLC/DLCGameRulesHeader.h
+++ b/targets/app/common/DLC/DLCGameRulesHeader.h
@ -4,7 +4,7 @@
 #include <string>

 #include "DLCGameRules.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"

 class StringTable;

--- a/targets/app/common/GameRules/ConsoleGameRules.h
+++ b/targets/app/common/GameRules/ConsoleGameRules.h
@ -5,7 +5,7 @@
 #include "app/common/GameRules/LevelGeneration/BiomeOverride.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/common/GameRules/LevelGeneration/StartFeature.h"
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
@ -16,10 +16,10 @@
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRule.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRule.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
--- a/targets/app/common/GameRules/GameRuleManager.cpp
+++ b/targets/app/common/GameRules/GameRuleManager.cpp
@ -13,10 +13,10 @@
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCPack.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/common/GameRules/LevelGeneration/LevelGenerators.h"
 #include "app/common/GameRules/LevelRules/LevelRules.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
 #include "minecraft/locale/StringTable.h"
 #include "app/linux/LinuxGame.h"
--- a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
@ -4,9 +4,9 @@
 #include <cmath>

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

 #include "ConsoleSchematicFile.h"
 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/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,7 +1,7 @@
 #include "BiomeOverride.h"

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

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

 class BiomeOverride : public GameRuleDefinition {
 private:
--- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
@ -10,7 +10,7 @@
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
 #include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
--- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h
+++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h
@ -3,7 +3,7 @@
 #include <vector>

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

--- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h
+++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h
@ -1,6 +1,6 @@
 #pragma once

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

 class ConsoleGenerateStructureAction : public GameRuleDefinition {
 public:
--- a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp
@ -1,4 +1,4 @@
-#include "LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"

 #include <limits.h>
 #include <wchar.h>
@ -16,7 +16,7 @@
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h"
 #include "app/common/GameRules/LevelGeneration/StartFeature.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "minecraft/locale/StringTable.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
--- a/targets/app/common/GameRules/LevelGeneration/LevelGenerators.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerators.cpp
@ -2,7 +2,7 @@

 #include <algorithm>

-#include "LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"

 LevelGenerators::LevelGenerators() {}

--- a/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp
@ -1,7 +1,7 @@
 #include "StartFeature.h"

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

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

 class StartFeature : public GameRuleDefinition {
--- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
@ -2,7 +2,7 @@

 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
--- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
+++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
@ -2,7 +2,7 @@

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

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

-#include "GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.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
@ -4,7 +4,7 @@

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

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

 class Container;
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
@ -1,9 +1,9 @@
 #include "CollectItemRuleDefinition.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"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRule.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h
@ -3,9 +3,9 @@
 #include <memory>
 #include <string>

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

 class Pos;
 class UseTileRuleDefinition;
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
@ -5,8 +5,8 @@
 #include <utility>

 #include "app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRule.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRule.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "minecraft/network/Connection.h"
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
@ -10,11 +10,11 @@
 #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"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRule.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRule.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 #include "util/StringHelpers.h"

 CompoundGameRuleDefinition::CompoundGameRuleDefinition() {
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h
@ -2,9 +2,9 @@

 #include <vector>

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

 class CompoundGameRuleDefinition : public GameRuleDefinition {
 protected:
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
@ -1,4 +1,4 @@
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"

 #include <assert.h>
 #include <wchar.h>
@ -11,8 +11,8 @@
 #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"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRule.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
@ -3,7 +3,7 @@
 #include <wchar.h>

 #include "minecraft/world/level/ConsoleGameRulesConstants.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/LinuxGame.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/DataOutputStream.h"
--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h
@ -2,7 +2,7 @@

 #include <string>

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

--- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
+++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
@ -6,7 +6,7 @@

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

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

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

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

 #include <string>

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

--- a/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp
+++ b/targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp
@ -1,5 +1,5 @@

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

 #include <wchar.h>

@ -8,7 +8,7 @@
 #include <unordered_map>
 #include <utility>

-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/linux/Stubs/winapi_stubs.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
--- a/targets/app/common/Network/GameNetworkManager.cpp
+++ b/targets/app/common/Network/GameNetworkManager.cpp
@ -16,7 +16,7 @@
 #include "minecraft/GameEnums.h"
 #include "app/common/Game.h"
 #include "app/common/GameRules/GameRuleManager.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "minecraft/network/platform/NetworkPlayerInterface.h"
 #include "app/common/Network/PlatformNetworkManagerStub.h"
 #include "app/common/UI/All Platforms/UIEnums.h"
--- a/targets/app/common/NetworkController.cpp
+++ b/targets/app/common/NetworkController.cpp
@ -4,6 +4,7 @@
 #include <cstring>
 #include <thread>

+#include "app/common/DLC/DLCPack.h"
 #include "app/common/Game.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/linux/LinuxGame.h"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -12,7 +12,7 @@
 #include "minecraft/GameEnums.h"
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCPack.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/UI/All Platforms/UIStructs.h"
 #include "app/common/UI/Controls/UIControl_BitmapIcon.h"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -11,7 +11,7 @@
 #include "minecraft/GameTypes.h"
 #include "minecraft/GameEnums.h"
 #include "app/common/DLC/DLCManager.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "minecraft/network/platform/SessionInfo.h"
 #include "app/common/UI/Controls/UIControl_Label.h"
--- a/targets/minecraft/client/multiplayer/ClientConnection.cpp
+++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp
@ -21,7 +21,7 @@
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCPack.h"
 #include "app/common/DLC/DLCSkinFile.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "minecraft/network/platform/NetworkPlayerInterface.h"
 #include "app/common/Network/Socket.h"
--- a/targets/minecraft/client/skins/DLCTexturePack.cpp
+++ b/targets/minecraft/client/skins/DLCTexturePack.cpp
@ -22,7 +22,7 @@
 #include "app/common/DLC/DLCTextureFile.h"
 #include "app/common/DLC/DLCUIDataFile.h"
 #include "app/common/GameRules/GameRuleManager.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "minecraft/locale/StringTable.h"
 #include "app/common/UI/All Platforms/ArchiveFile.h"
 #include "app/linux/Linux_UIController.h"
--- a/targets/minecraft/server/MinecraftServer.cpp
+++ b/targets/minecraft/server/MinecraftServer.cpp
@ -19,7 +19,7 @@
 #include "DispenserBootstrap.h"
 #include "minecraft/GameEnums.h"
 #include "app/common/GameRules/GameRuleManager.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "minecraft/network/platform/NetworkPlayerInterface.h"
 #include "PlayerList.h"
--- a/targets/minecraft/server/PlayerList.cpp
+++ b/targets/minecraft/server/PlayerList.cpp
@ -12,9 +12,9 @@

 #include "platform/profile/profile.h"
 #include "minecraft/GameEnums.h"
-#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
+#include "minecraft/world/level/GameRules/GameRuleDefinition.h"
 #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "minecraft/network/platform/NetworkPlayerInterface.h"
 #include "app/common/Network/Socket.h"
--- a/targets/minecraft/server/level/ServerPlayer.cpp
+++ b/targets/minecraft/server/level/ServerPlayer.cpp
@ -13,7 +13,7 @@
 #include "platform/input/input.h"
 #include "EntityTracker.h"
 #include "minecraft/Console_Debug_enum.h"
-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "minecraft/network/platform/NetworkPlayerInterface.h"
 #include "ServerLevel.h"
--- a/targets/minecraft/server/level/ServerPlayerGameMode.cpp
+++ b/targets/minecraft/server/level/ServerPlayerGameMode.cpp
@ -3,7 +3,7 @@

 #include <vector>

-#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
+#include "minecraft/world/level/GameRules/GameRulesInstance.h"
 #include "ServerLevel.h"
 #include "ServerPlayer.h"
 #include "minecraft/client/Minecraft.h"
--- a/targets/app/common/GameRules/LevelRules/Rules/GameRule.h
+++ b/targets/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
@ -7,7 +7,7 @@
 #include <vector>

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

 class GameRule;
--- a/targets/app/common/GameRules/LevelRules/Rules/GameRulesInstance.h
+++ b/targets/app/common/GameRules/LevelRules/Rules/GameRulesInstance.h
@ -2,7 +2,7 @@
 // using namespace std;
 #include <vector>

-#include "GameRule.h"
+#include "minecraft/world/level/GameRules/GameRule.h"

 class GameRuleDefinition;

--- a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h
+++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h
@ -8,9 +8,8 @@
 #include <unordered_map>
 #include <vector>

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

--- a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp
+++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp
@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <string.h>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "platform/fs/fs.h"
 #include "minecraft/world/level/biome/Biome.h"
 #include "minecraft/world/level/chunk/ChunkSource.h"
--- a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp
+++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp
@ -6,7 +6,7 @@

 #include <cstdint>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "util/Timer.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
--- a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp
@ -7,7 +7,7 @@
 #include <algorithm>
 #include <cmath>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
--- a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp
@ -4,7 +4,7 @@

 #include <stdlib.h>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/feature/Feature.h"
--- a/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp
@ -7,7 +7,7 @@
 #include <numbers>
 #include <vector>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
--- a/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp
@ -2,7 +2,7 @@
 #include "minecraft/util/Log.h"
 #include "FlowerFeature.h"

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/dimension/Dimension.h"
--- a/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp
@ -2,7 +2,7 @@
 #include "minecraft/util/Log.h"
 #include "LakeFeature.h"

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/LightLayer.h"
--- a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp
@ -4,7 +4,7 @@

 #include <numbers>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
--- a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp
@ -4,7 +4,7 @@

 #include <numbers>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/Level.h"
--- a/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp
@ -4,7 +4,7 @@

 #include <stdlib.h>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/LeafTile.h"
--- a/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp
@ -2,7 +2,7 @@
 #include "minecraft/util/Log.h"
 #include "ReedsFeature.h"

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
--- a/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp
@ -2,7 +2,7 @@
 #include "minecraft/util/Log.h"
 #include "SandFeature.h"

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
--- a/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp
@ -2,7 +2,7 @@
 #include "minecraft/util/Log.h"
 #include "SpringFeature.h"

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/tile/Tile.h"

--- a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp
@ -4,7 +4,7 @@

 #include <stdlib.h>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/levelgen/feature/Feature.h"
--- a/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp
@ -4,7 +4,7 @@

 #include <stdlib.h>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/world/level/Level.h"
 #include "minecraft/world/level/material/Material.h"
--- a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp
@ -4,7 +4,7 @@

 #include <stdlib.h>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/Direction.h"
 #include "minecraft/world/level/Level.h"
--- a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp
@ -10,7 +10,7 @@
 #include <utility>

 #include "minecraft/GameEnums.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
 #include "minecraft/world/level/levelgen/structure/MineShaftStart.h"
--- a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp
@ -4,7 +4,7 @@
 #include <list>
 #include <unordered_map>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "NetherBridgePieces.h"
 #include "java/Class.h"
 #include "java/Random.h"
--- a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp
@ -4,7 +4,7 @@
 #include <list>
 #include <utility>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "ScatteredFeaturePieces.h"
 #include "java/Class.h"
 #include "java/Random.h"
--- a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp
@ -6,7 +6,7 @@
 #include <string>
 #include <vector>

-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "java/Random.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
--- a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp
@ -11,7 +11,7 @@
 #include <vector>

 #include "minecraft/GameEnums.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "StrongholdPieces.h"
 #include "java/JavaMath.h"
 #include "java/Random.h"
--- a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp
+++ b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp
@ -7,7 +7,7 @@
 #include <vector>

 #include "minecraft/GameEnums.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "VillagePieces.h"
 #include "java/Random.h"
 #include "minecraft/util/Mth.h"
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
@ -17,7 +17,7 @@
 #include "platform/PlatformTypes.h"
 #include "minecraft/GameEnums.h"
 #include "minecraft/BuildVer.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/linux/Stubs/winapi_stubs.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"
 #include "java/File.h"
--- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
+++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
@ -19,7 +19,7 @@
 #include "platform/PlatformTypes.h"
 #include "minecraft/GameEnums.h"
 #include "minecraft/BuildVer.h"
-#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
+#include "minecraft/world/level/GameRules/LevelGenerationOptions.h"
 #include "app/linux/Stubs/winapi_stubs.h"
 #include "util/Timer.h"
 #include "util/StringHelpers.h"