From 58de5bb40beac5b2e197b5bc61735be992885ce6 Mon Sep 17 00:00:00 2001 From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com> Date: Wed, 8 Apr 2026 21:19:54 +1000 Subject: [PATCH] refactor: move ConsoleGameRulesConstants.h into minecraft --- targets/app/common/Game.h | 2 +- targets/app/common/GameRules/GameRuleManager.h | 2 +- .../GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp | 2 +- .../GameRules/LevelGeneration/ApplySchematicRuleDefinition.h | 2 +- targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp | 2 +- targets/app/common/GameRules/LevelGeneration/BiomeOverride.h | 2 +- .../GameRules/LevelGeneration/ConsoleGenerateStructure.cpp | 2 +- .../common/GameRules/LevelGeneration/ConsoleGenerateStructure.h | 2 +- .../common/GameRules/LevelGeneration/LevelGenerationOptions.h | 2 +- targets/app/common/GameRules/LevelGeneration/StartFeature.cpp | 2 +- targets/app/common/GameRules/LevelGeneration/StartFeature.h | 2 +- .../StructureActions/XboxStructureActionGenerateBox.cpp | 2 +- .../StructureActions/XboxStructureActionGenerateBox.h | 2 +- .../StructureActions/XboxStructureActionPlaceBlock.cpp | 2 +- .../StructureActions/XboxStructureActionPlaceBlock.h | 2 +- .../StructureActions/XboxStructureActionPlaceContainer.cpp | 2 +- .../StructureActions/XboxStructureActionPlaceContainer.h | 2 +- .../StructureActions/XboxStructureActionPlaceSpawner.cpp | 2 +- .../StructureActions/XboxStructureActionPlaceSpawner.h | 2 +- .../LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp | 2 +- .../LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h | 2 +- .../LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp | 2 +- .../LevelRules/RuleDefinitions/AddItemRuleDefinition.h | 2 +- .../LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp | 2 +- .../LevelRules/RuleDefinitions/CollectItemRuleDefinition.h | 2 +- .../LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h | 2 +- .../LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp | 2 +- .../LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h | 2 +- .../GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp | 2 +- .../GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h | 2 +- .../GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp | 2 +- .../common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h | 2 +- .../LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp | 2 +- .../LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h | 2 +- .../LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp | 2 +- .../LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h | 2 +- .../LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp | 2 +- .../LevelRules/RuleDefinitions/UseTileRuleDefinition.h | 2 +- targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h | 2 +- .../world/level}/ConsoleGameRulesConstants.h | 0 40 files changed, 39 insertions(+), 39 deletions(-) rename targets/{app/common/GameRules => minecraft/world/level}/ConsoleGameRulesConstants.h (100%) diff --git a/targets/app/common/Game.h b/targets/app/common/Game.h index 9e7be771b..0a68d6ae0 100644 --- 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" diff --git a/targets/app/common/GameRules/GameRuleManager.h b/targets/app/common/GameRules/GameRuleManager.h index 140ca4b52..dc660f6a7 100644 --- a/targets/app/common/GameRules/GameRuleManager.h +++ b/targets/app/common/GameRules/GameRuleManager.h @@ -8,7 +8,7 @@ #include #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" diff --git a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp index e4f6d4c04..65ee363ff 100644 --- 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" diff --git a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h index 1faad1f73..af8cda3eb 100644 --- a/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h +++ b/targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h @@ -5,7 +5,7 @@ #include #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" diff --git a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp index 5e45f544b..67e046563 100644 --- 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" diff --git a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h index fc3918291..f91c49ad9 100644 --- a/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h +++ b/targets/app/common/GameRules/LevelGeneration/BiomeOverride.h @@ -4,7 +4,7 @@ #include #include -#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" class BiomeOverride : public GameRuleDefinition { diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp index ceffe7f90..970df3176 100644 --- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp @@ -4,7 +4,7 @@ #include -#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" diff --git a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h index 9cb2008ab..7b92ad912 100644 --- a/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h +++ b/targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h @@ -2,7 +2,7 @@ #include #include -#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" diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h index d197644a3..10d3d501d 100644 --- a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h +++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h @@ -9,7 +9,7 @@ #include #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" diff --git a/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp b/targets/app/common/GameRules/LevelGeneration/StartFeature.cpp index fae469360..313c04fda 100644 --- 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" diff --git a/targets/app/common/GameRules/LevelGeneration/StartFeature.h b/targets/app/common/GameRules/LevelGeneration/StartFeature.h index de40a5ac2..2adff6afa 100644 --- a/targets/app/common/GameRules/LevelGeneration/StartFeature.h +++ b/targets/app/common/GameRules/LevelGeneration/StartFeature.h @@ -3,7 +3,7 @@ #include -#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" diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp index e956b4bcb..38e5e04ed 100644 --- 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" diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h index 7eee4ccf0..751d87c21 100644 --- 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 -#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" class StructurePiece; diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp index d1c19298f..2b4353df5 100644 --- 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" diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h index e217a9fa2..8ae640e6d 100644 --- 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 -#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" class StructurePiece; diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp index 1c94d8997..04e5676bc 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp @@ -4,7 +4,7 @@ #include -#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" diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h index e5735d057..5f002ed9a 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h @@ -3,7 +3,7 @@ #include #include -#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "XboxStructureActionPlaceBlock.h" class AddItemRuleDefinition; diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp index 2934b68b7..c950aad2f 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp @@ -4,7 +4,7 @@ #include -#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" diff --git a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h index 7c0b7abeb..be54cdec1 100644 --- a/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h +++ b/targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h @@ -2,7 +2,7 @@ #include -#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "XboxStructureActionPlaceBlock.h" class StructurePiece; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp index 61a1336f2..39e1261bf 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp @@ -3,7 +3,7 @@ #include #include -#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" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h index cc69dd8de..a98787675 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h @@ -4,7 +4,7 @@ #include #include "GameRuleDefinition.h" -#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" class ItemInstance; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp index 2503523bd..72985794e 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp @@ -3,7 +3,7 @@ #include #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" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h index b2391c6f5..aa3bae12c 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h @@ -5,7 +5,7 @@ #include #include "GameRuleDefinition.h" -#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" class Container; class AddEnchantmentRuleDefinition; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp index 93bf813c6..c7addda64 100644 --- 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" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h index 4f956078c..5cc4f16aa 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h @@ -4,7 +4,7 @@ #include #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; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h index ef10f3721..9905aa7d7 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h @@ -3,7 +3,7 @@ #include #include "CompoundGameRuleDefinition.h" -#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" class GameRule; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp index b3cde7a2e..d372101cf 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp @@ -7,7 +7,7 @@ #include #include -#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" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h index 26b89124e..675c85efc 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h @@ -3,7 +3,7 @@ #include #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 { diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp index 51c083dca..911e8e61c 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp @@ -8,7 +8,7 @@ #include #include -#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" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h index 71a43fa2e..19bb1271e 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h @@ -6,7 +6,7 @@ #include #include -#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" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp index c103bbaa4..9f9a2a2ec 100644 --- 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" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h index 4eaedd7b8..87ce549a5 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h @@ -4,7 +4,7 @@ #include #include "CompoundGameRuleDefinition.h" -#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" class NamedAreaRuleDefinition; class AABB; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp index 170c2c6f3..d5aa85f23 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp @@ -2,7 +2,7 @@ #include -#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" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h index b20e209c9..cad2bb6ed 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h @@ -3,7 +3,7 @@ #include #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 { diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp index f4b38a3f7..9d383bf54 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp @@ -4,7 +4,7 @@ #include -#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" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h index bb6943a31..af7dd2d33 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h @@ -5,7 +5,7 @@ #include #include "GameRuleDefinition.h" -#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" class AddItemRuleDefinition; class Pos; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp index 8f18a0e56..738f14b43 100644 --- 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" diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h index 273398dd8..6abeb1081 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h @@ -4,7 +4,7 @@ #include #include "GameRuleDefinition.h" -#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "minecraft/Pos.h" class UseTileRuleDefinition : public GameRuleDefinition { diff --git a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h index ce015a45e..754aa4877 100644 --- a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h +++ b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h @@ -6,7 +6,7 @@ #include #include -#include "app/common/GameRules/ConsoleGameRulesConstants.h" +#include "minecraft/world/level/ConsoleGameRulesConstants.h" #include "Packet.h" #include "minecraft/network/packet/Packet.h" diff --git a/targets/app/common/GameRules/ConsoleGameRulesConstants.h b/targets/minecraft/world/level/ConsoleGameRulesConstants.h similarity index 100% rename from targets/app/common/GameRules/ConsoleGameRulesConstants.h rename to targets/minecraft/world/level/ConsoleGameRulesConstants.h