backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-24 00:52:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: flatten app/ and util/ directory structure

Browse source
This commit is contained in:
MatthewBeshay 2026-04-04 13:58:04 +11:00 committed by Tropical
parent 9c0dfd60d5
commit d814a78453
616 changed files with 1731 additions and 1747 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
targets/app/common/App_structs.h
View file

@ -5,11 +5,11 @@
#include "platform/sdl2/Storage.h"
#include "app/common/App_Defines.h"
#include "app/common/App_enums.h"
#include "app/common/src/Tutorial/TutorialEnum.h"
#include "app/common/src/UI/All Platforms/UIEnums.h"
#include "app/include/NetTypes.h"
#include "app/include/SkinBox.h"
#include "app/include/XboxStubs.h"
#include "app/common/Tutorial/TutorialEnum.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/NetTypes.h"
#include "app/common/SkinBox.h"
#include "app/common/XboxStubs.h"
typedef struct {
wchar_t* wchFilename;

0
targets/app/common/src/Audio/Consoles_SoundEngine.cpp → targets/app/common/Audio/Consoles_SoundEngine.cpp
View file

0
targets/app/common/src/Audio/Consoles_SoundEngine.h → targets/app/common/Audio/Consoles_SoundEngine.h
View file

2
targets/app/common/src/Audio/SoundEngine.cpp → targets/app/common/Audio/SoundEngine.cpp
View file

@ -12,7 +12,7 @@
#include "platform/PlatformTypes.h"
#include "app/common/App_Defines.h"
#include "app/common/src/Audio/Consoles_SoundEngine.h"
#include "app/common/Audio/Consoles_SoundEngine.h"
#include "app/linux/Iggy/include/rrCore.h"
#include "app/linux/LinuxGame.h"
#include "platform/C4JThread.h"

2
targets/app/common/src/Audio/SoundEngine.h → targets/app/common/Audio/SoundEngine.h
View file

@ -7,7 +7,7 @@ class Random;
#include <string>
#include "app/common/App_Defines.h"
#include "app/common/src/Audio/Consoles_SoundEngine.h"
#include "app/common/Audio/Consoles_SoundEngine.h"
#include "app/linux/Iggy/include/rrCore.h"
#include "minecraft/sounds/SoundTypes.h"
#include "miniaudio.h"

0
targets/app/common/src/Audio/SoundNames.cpp → targets/app/common/Audio/SoundNames.cpp
View file

8
targets/app/src/BufferedImage.cpp → targets/app/common/BufferedImage.cpp
View file

@ -1,4 +1,4 @@
#include "app/include/BufferedImage.h"
#include "app/common/BufferedImage.h"
#include <string.h>
@ -7,9 +7,9 @@
#include <vector>
#include "platform/sdl2/Render.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/common/src/DLC/DLCManager.h"
#include "app/common/src/DLC/DLCPack.h"
#include "app/common/DLC/DLCFile.h"
#include "app/common/DLC/DLCManager.h"
#include "app/common/DLC/DLCPack.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "PlatformTypes.h"

0
targets/app/include/BufferedImage.h → targets/app/common/BufferedImage.h
View file

0
targets/app/common/src/BuildVer/BuildVer.h → targets/app/common/BuildVer/BuildVer.h
View file

0
targets/app/common/src/Colours/ColourTable.cpp → targets/app/common/Colours/ColourTable.cpp
View file

0
targets/app/common/src/Colours/ColourTable.h → targets/app/common/Colours/ColourTable.h
View file

4
targets/app/common/src/ConsoleGameMode.cpp → targets/app/common/ConsoleGameMode.cpp
View file

@ -1,7 +1,7 @@
#include "ConsoleGameMode.h"
#include "app/common/src/Tutorial/Tutorial.h"
#include "app/common/src/Tutorial/TutorialMode.h"
#include "app/common/Tutorial/Tutorial.h"
#include "app/common/Tutorial/TutorialMode.h"
class ClientConnection;
class Minecraft;

2
targets/app/common/src/ConsoleGameMode.h → targets/app/common/ConsoleGameMode.h
View file

@ -1,5 +1,5 @@
#pragma once
#include "app/common/src/Tutorial/TutorialMode.h"
#include "app/common/Tutorial/TutorialMode.h"
class ClientConnection;
class Minecraft;

0
targets/app/common/src/Console_Awards_enum.h → targets/app/common/Console_Awards_enum.h
View file

0
targets/app/common/src/Console_Debug_enum.h → targets/app/common/Console_Debug_enum.h
View file

4
targets/app/common/src/DLC/DLCAudioFile.cpp → targets/app/common/DLC/DLCAudioFile.cpp
View file

@ -8,9 +8,9 @@
#include "platform/sdl2/Render.h"
#include "platform/sdl2/Storage.h"
#include "DLCManager.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/common/DLC/DLCFile.h"
#include "app/linux/LinuxGame.h"
#include "app/include/XboxStubs.h"
#include "app/common/XboxStubs.h"
#if defined(_WINDOWS64)
#include "app/windows/XML/ATGXmlParser.h"
#include "app/windows/XML/xmlFilesCallback.h"

0
targets/app/common/src/DLC/DLCAudioFile.h → targets/app/common/DLC/DLCAudioFile.h
View file

2
targets/app/common/src/DLC/DLCCapeFile.cpp → targets/app/common/DLC/DLCCapeFile.cpp
View file

@ -1,7 +1,7 @@
#include "DLCCapeFile.h"
#include "DLCManager.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/common/DLC/DLCFile.h"
#include "app/linux/LinuxGame.h"
DLCCapeFile::DLCCapeFile(const std::wstring& path)

0
targets/app/common/src/DLC/DLCCapeFile.h → targets/app/common/DLC/DLCCapeFile.h
View file

4
targets/app/common/src/DLC/DLCColourTableFile.cpp → targets/app/common/DLC/DLCColourTableFile.cpp
View file

@ -1,8 +1,8 @@
#include "DLCColourTableFile.h"
#include "DLCManager.h"
#include "app/common/src/Colours/ColourTable.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/common/Colours/ColourTable.h"
#include "app/common/DLC/DLCFile.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/skins/TexturePack.h"

0
targets/app/common/src/DLC/DLCColourTableFile.h → targets/app/common/DLC/DLCColourTableFile.h
View file

2
targets/app/common/src/DLC/DLCFile.cpp → targets/app/common/DLC/DLCFile.cpp
View file

@ -3,7 +3,7 @@
#include <sstream>
#include "app/common/Minecraft_Macros.h"
#include "app/common/src/DLC/DLCManager.h"
#include "app/common/DLC/DLCManager.h"
DLCFile::DLCFile(DLCManager::EDLCType type, const std::wstring& path) {
m_type = type;

0
targets/app/common/src/DLC/DLCFile.h → targets/app/common/DLC/DLCFile.h
View file

2
targets/app/common/src/DLC/DLCGameRules.h → targets/app/common/DLC/DLCGameRules.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "DLCFile.h"
#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
class DLCGameRules : public DLCFile {
public:

2
targets/app/common/src/DLC/DLCGameRulesFile.cpp → targets/app/common/DLC/DLCGameRulesFile.cpp
View file

@ -1,7 +1,7 @@
#include "DLCGameRulesFile.h"
#include "DLCManager.h"
#include "app/common/src/DLC/DLCGameRules.h"
#include "app/common/DLC/DLCGameRules.h"
DLCGameRulesFile::DLCGameRulesFile(const std::wstring& path)
: DLCGameRules(DLCManager::e_DLCType_GameRules, path) {

0
targets/app/common/src/DLC/DLCGameRulesFile.h → targets/app/common/DLC/DLCGameRulesFile.h
View file

4
targets/app/common/src/DLC/DLCGameRulesHeader.cpp → targets/app/common/DLC/DLCGameRulesHeader.cpp
View file

@ -3,8 +3,8 @@
#include <string>
#include "DLCManager.h"
#include "app/common/src/DLC/DLCGameRules.h"
#include "app/common/src/GameRules/GameRuleManager.h"
#include "app/common/DLC/DLCGameRules.h"
#include "app/common/GameRules/GameRuleManager.h"
#include "app/linux/LinuxGame.h"
class StringTable;

2
targets/app/common/src/DLC/DLCGameRulesHeader.h → targets/app/common/DLC/DLCGameRulesHeader.h
View file

@ -4,7 +4,7 @@
#include <string>
#include "DLCGameRules.h"
#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
#include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
class StringTable;

4
targets/app/common/src/DLC/DLCLocalisationFile.cpp → targets/app/common/DLC/DLCLocalisationFile.cpp
View file

@ -1,8 +1,8 @@
#include "DLCLocalisationFile.h"
#include "DLCManager.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/common/src/Localisation/StringTable.h"
#include "app/common/DLC/DLCFile.h"
#include "app/common/Localisation/StringTable.h"
DLCLocalisationFile::DLCLocalisationFile(const std::wstring& path)
: DLCFile(DLCManager::e_DLCType_LocalisationData, path) {

0
targets/app/common/src/DLC/DLCLocalisationFile.h → targets/app/common/DLC/DLCLocalisationFile.h
View file

2
targets/app/common/src/DLC/DLCManager.cpp → targets/app/common/DLC/DLCManager.cpp
View file

@ -17,7 +17,7 @@
#include "platform/sdl2/Storage.h"
#include "DLCFile.h"
#include "DLCPack.h"
#include "app/common/src/GameRules/GameRuleManager.h"
#include "app/common/GameRules/GameRuleManager.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "platform/PlatformServices.h"

0
targets/app/common/src/DLC/DLCManager.h → targets/app/common/DLC/DLCManager.h
View file

10
targets/app/common/src/DLC/DLCPack.cpp → targets/app/common/DLC/DLCPack.cpp
View file

@ -15,11 +15,11 @@
#include "DLCLocalisationFile.h"
#include "DLCTextureFile.h"
#include "DLCUIDataFile.h"
#include "app/common/src/Console_Debug_enum.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/common/src/DLC/DLCManager.h"
#include "app/common/src/DLC/DLCSkinFile.h"
#include "app/common/src/Localisation/StringTable.h"
#include "app/common/Console_Debug_enum.h"
#include "app/common/DLC/DLCFile.h"
#include "app/common/DLC/DLCManager.h"
#include "app/common/DLC/DLCSkinFile.h"
#include "app/common/Localisation/StringTable.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "util/StringHelpers.h"

2
targets/app/common/src/DLC/DLCPack.h → targets/app/common/DLC/DLCPack.h
View file

@ -7,7 +7,7 @@
#include "platform/PlatformTypes.h"
#include "DLCManager.h"
#include "app/common/src/DLC/DLCSkinFile.h"
#include "app/common/DLC/DLCSkinFile.h"
class DLCFile;
class DLCSkinFile;

6
targets/app/common/src/DLC/DLCSkinFile.cpp → targets/app/common/DLC/DLCSkinFile.cpp
View file

@ -5,10 +5,10 @@
#include "platform/sdl2/Render.h"
#include "DLCManager.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/common/DLC/DLCFile.h"
#include "app/linux/LinuxGame.h"
#include "app/include/SkinBox.h"
#include "app/include/XboxStubs.h"
#include "app/common/SkinBox.h"
#include "app/common/XboxStubs.h"
DLCSkinFile::DLCSkinFile(const std::wstring& path)
: DLCFile(DLCManager::e_DLCType_Skin, path) {

4
targets/app/common/src/DLC/DLCSkinFile.h → targets/app/common/DLC/DLCSkinFile.h
View file

@ -5,8 +5,8 @@
#include <vector>
#include "DLCFile.h"
#include "app/common/src/DLC/DLCManager.h"
#include "app/include/SkinBox.h"
#include "app/common/DLC/DLCManager.h"
#include "app/common/SkinBox.h"
#include "minecraft/client/model/HumanoidModel.h"
class DLCSkinFile : public DLCFile {

2
targets/app/common/src/DLC/DLCTextureFile.cpp → targets/app/common/DLC/DLCTextureFile.cpp
View file

@ -1,7 +1,7 @@
#include "DLCTextureFile.h"
#include "DLCManager.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/common/DLC/DLCFile.h"
DLCTextureFile::DLCTextureFile(const std::wstring& path)
: DLCFile(DLCManager::e_DLCType_Texture, path) {

2
targets/app/common/src/DLC/DLCTextureFile.h → targets/app/common/DLC/DLCTextureFile.h
View file

@ -3,7 +3,7 @@
#include <string>
#include "DLCFile.h"
#include "app/common/src/DLC/DLCManager.h"
#include "app/common/DLC/DLCManager.h"
class DLCTextureFile : public DLCFile {
private:

2
targets/app/common/src/DLC/DLCUIDataFile.cpp → targets/app/common/DLC/DLCUIDataFile.cpp
View file

@ -1,7 +1,7 @@
#include "DLCUIDataFile.h"
#include "DLCManager.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/common/DLC/DLCFile.h"
#include "app/linux/LinuxGame.h"
DLCUIDataFile::DLCUIDataFile(const std::wstring& path)

0
targets/app/common/src/DLC/DLCUIDataFile.h → targets/app/common/DLC/DLCUIDataFile.h
View file

0
targets/app/src/FrameProfiler.cpp → targets/app/common/FrameProfiler.cpp
View file

0
targets/app/include/FrameProfiler.h → targets/app/common/FrameProfiler.h
View file

38
targets/app/common/Game.cpp
View file

@ -8,22 +8,22 @@
#include "app/common/App_Defines.h"
#include "app/common/App_enums.h"
#include "app/common/App_structs.h"
#include "app/common/src/Console_Debug_enum.h"
#include "app/common/src/DLC/DLCManager.h"
#include "app/common/src/DLC/DLCSkinFile.h"
#include "app/common/src/GameRules/GameRuleManager.h"
#include "app/common/src/Network/GameNetworkManager.h"
#include "app/common/src/Network/NetworkPlayerInterface.h"
#include "app/common/src/Tutorial/Tutorial.h"
#include "app/common/src/UI/All Platforms/UIEnums.h"
#include "app/common/src/UI/All Platforms/UIStructs.h"
#include "app/common/src/UI/Scenes/UIScene_FullscreenProgress.h"
#include "app/common/Console_Debug_enum.h"
#include "app/common/DLC/DLCManager.h"
#include "app/common/DLC/DLCSkinFile.h"
#include "app/common/GameRules/GameRuleManager.h"
#include "app/common/Network/GameNetworkManager.h"
#include "app/common/Network/NetworkPlayerInterface.h"
#include "app/common/Tutorial/Tutorial.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/UI/Scenes/UIScene_FullscreenProgress.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "app/include/NetTypes.h"
#include "SkinBox.h"
#include "XboxStubs.h"
#include "app/common/NetTypes.h"
#include "app/common/SkinBox.h"
#include "app/common/XboxStubs.h"
#include "platform/PlatformServices.h"
#include "java/Class.h"
#include "java/File.h"
@ -74,12 +74,12 @@
#include <vector>
#include "platform/sdl2/Input.h"
#include "app/common/src/Audio/SoundEngine.h"
#include "app/common/src/Colours/ColourTable.h"
#include "app/common/src/DLC/DLCPack.h"
#include "app/common/src/Localisation/StringTable.h"
#include "app/common/src/UI/All Platforms/ArchiveFile.h"
#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
#include "app/common/Audio/SoundEngine.h"
#include "app/common/Colours/ColourTable.h"
#include "app/common/DLC/DLCPack.h"
#include "app/common/Localisation/StringTable.h"
#include "app/common/UI/All Platforms/ArchiveFile.h"
#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
#include "Minecraft_Macros.h"
#include "util/Timer.h"
#include "util/StringHelpers.h"

22
targets/app/common/Game.h
View file

@ -11,17 +11,17 @@
#include "app/common/IPlatformGame.h"
#include "app/common/App_structs.h"
#include "app/common/src/Audio/Consoles_SoundEngine.h"
#include "app/common/src/DLC/DLCManager.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/GameRuleManager.h"
#include "app/common/src/Localisation/StringTable.h"
#include "app/common/src/Tutorial/TutorialEnum.h"
#include "app/common/src/UI/All Platforms/ArchiveFile.h"
#include "app/common/src/UI/All Platforms/UIStructs.h"
#include "app/include/NetTypes.h"
#include "app/include/SkinBox.h"
#include "app/include/XboxStubs.h"
#include "app/common/Audio/Consoles_SoundEngine.h"
#include "app/common/DLC/DLCManager.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/GameRuleManager.h"
#include "app/common/Localisation/StringTable.h"
#include "app/common/Tutorial/TutorialEnum.h"
#include "app/common/UI/All Platforms/ArchiveFile.h"
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/NetTypes.h"
#include "app/common/SkinBox.h"
#include "app/common/XboxStubs.h"
#include "minecraft/network/packet/DisconnectPacket.h"
#include "minecraft/world/entity/item/MinecartHopper.h"

25
targets/app/common/GameRules/ConsoleGameRules.h Normal file
View file

@ -0,0 +1,25 @@
#pragma once
#include "ConsoleGameRulesConstants.h"
#include "GameRuleManager.h"
#include "app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
#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 "app/common/GameRules/LevelGeneration/StartFeature.h"
#include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
#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/AddEnchantmentRuleDefinition.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
#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 "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"

0
targets/app/common/src/GameRules/ConsoleGameRulesConstants.h → targets/app/common/GameRules/ConsoleGameRulesConstants.h
View file

24
targets/app/common/src/GameRules/GameRuleManager.cpp → targets/app/common/GameRules/GameRuleManager.cpp
View file

@ -7,18 +7,18 @@
#include <utility>
#include <vector>
#include "app/common/src/DLC/DLCGameRulesFile.h"
#include "app/common/src/DLC/DLCGameRulesHeader.h"
#include "app/common/src/DLC/DLCLocalisationFile.h"
#include "app/common/src/DLC/DLCManager.h"
#include "app/common/src/DLC/DLCPack.h"
#include "app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
#include "app/common/src/GameRules/LevelGeneration/LevelGenerators.h"
#include "app/common/src/GameRules/LevelRules/LevelRules.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
#include "app/common/src/Localisation/StringTable.h"
#include "app/common/DLC/DLCGameRulesFile.h"
#include "app/common/DLC/DLCGameRulesHeader.h"
#include "app/common/DLC/DLCLocalisationFile.h"
#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 "app/common/GameRules/LevelGeneration/LevelGenerators.h"
#include "app/common/GameRules/LevelRules/LevelRules.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
#include "app/common/Localisation/StringTable.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"
#include "java/File.h"

8
targets/app/common/src/GameRules/GameRuleManager.h → targets/app/common/GameRules/GameRuleManager.h
View file

@ -7,10 +7,10 @@
#include <string>
#include <unordered_map>
#include "app/common/src/DLC/DLCGameRulesHeader.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelGeneration/LevelGenerators.h"
#include "app/common/src/GameRules/LevelRules/LevelRules.h"
#include "app/common/DLC/DLCGameRulesHeader.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelGeneration/LevelGenerators.h"
#include "app/common/GameRules/LevelRules/LevelRules.h"
class LevelGenerationOptions;
class RootGameRulesDefinition;

4
targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp → targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
View file

@ -5,8 +5,8 @@
#include "ConsoleSchematicFile.h"
#include "LevelGenerationOptions.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

4
targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h → targets/app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h
View file

@ -5,8 +5,8 @@
#include <string>
#include "ConsoleSchematicFile.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "minecraft/world/phys/AABB.h"
#include "minecraft/world/phys/Vec3.h"

4
targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp → targets/app/common/GameRules/LevelGeneration/BiomeOverride.cpp
View file

@ -1,7 +1,7 @@
#include "BiomeOverride.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

4
targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.h → targets/app/common/GameRules/LevelGeneration/BiomeOverride.h
View file

@ -4,8 +4,8 @@
#include <cstdint>
#include <string>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
class BiomeOverride : public GameRuleDefinition {
private:

14
targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp → targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
View file

@ -4,13 +4,13 @@
#include <algorithm>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/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"
#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 "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

4
targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h → targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructure.h
View file

@ -2,8 +2,8 @@
#include <string>
#include <vector>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/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"

2
targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h → targets/app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
class ConsoleGenerateStructureAction : public GameRuleDefinition {
public:

0
targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp → targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
View file

0
targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h → targets/app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h
View file

22
targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp → targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp
View file

@ -7,17 +7,17 @@
#include <utility>
#include "app/common/App_enums.h"
#include "app/common/src/DLC/DLCGameRulesHeader.h"
#include "app/common/src/DLC/DLCManager.h"
#include "app/common/src/DLC/DLCPack.h"
#include "app/common/src/GameRules/GameRuleManager.h"
#include "app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
#include "app/common/src/GameRules/LevelGeneration/BiomeOverride.h"
#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
#include "app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
#include "app/common/src/GameRules/LevelGeneration/StartFeature.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/src/Localisation/StringTable.h"
#include "app/common/DLC/DLCGameRulesHeader.h"
#include "app/common/DLC/DLCManager.h"
#include "app/common/DLC/DLCPack.h"
#include "app/common/GameRules/GameRuleManager.h"
#include "app/common/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
#include "app/common/GameRules/LevelGeneration/BiomeOverride.h"
#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 "app/common/Localisation/StringTable.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "java/File.h"

8
targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h → targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h
View file

@ -8,10 +8,10 @@
#include <unordered_map>
#include <vector>
#include "app/common/src/DLC/DLCPack.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/src/Localisation/StringTable.h"
#include "app/common/DLC/DLCPack.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/Localisation/StringTable.h"
#include "minecraft/world/level/levelgen/structure/StructureFeature.h"
class ApplySchematicRuleDefinition;

0
targets/app/common/src/GameRules/LevelGeneration/LevelGenerators.cpp → targets/app/common/GameRules/LevelGeneration/LevelGenerators.cpp
View file

0
targets/app/common/src/GameRules/LevelGeneration/LevelGenerators.h → targets/app/common/GameRules/LevelGeneration/LevelGenerators.h
View file

4
targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp → targets/app/common/GameRules/LevelGeneration/StartFeature.cpp
View file

@ -1,7 +1,7 @@
#include "StartFeature.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

4
targets/app/common/src/GameRules/LevelGeneration/StartFeature.h → targets/app/common/GameRules/LevelGeneration/StartFeature.h
View file

@ -3,8 +3,8 @@
#include <string>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "minecraft/world/level/levelgen/structure/StructureFeature.h"
class StartFeature : public GameRuleDefinition {

6
targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp → targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
View file

@ -1,8 +1,8 @@
#include "XboxStructureActionGenerateBox.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

4
targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h → targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h
View file

@ -1,8 +1,8 @@
#pragma once
#include <string>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
class StructurePiece;
class Level;

6
targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp → targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
View file

@ -1,8 +1,8 @@
#include "XboxStructureActionPlaceBlock.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

4
targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h → targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h
View file

@ -1,8 +1,8 @@
#pragma once
#include <string>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
class StructurePiece;
class Level;

6
targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp → targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
View file

@ -4,9 +4,9 @@
#include <memory>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "minecraft/world/Container.h"

2
targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h → targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h
View file

@ -3,7 +3,7 @@
#include <string>
#include <vector>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "XboxStructureActionPlaceBlock.h"
class AddItemRuleDefinition;

4
targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp → targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp
View file

@ -4,8 +4,8 @@
#include <memory>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/level/Level.h"
#include "minecraft/world/level/levelgen/structure/BoundingBox.h"

2
targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h → targets/app/common/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h
View file

@ -2,7 +2,7 @@
#include <string>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "XboxStructureActionPlaceBlock.h"
class StructurePiece;

0
targets/app/common/src/GameRules/LevelRules/LevelRules.cpp → targets/app/common/GameRules/LevelRules/LevelRules.cpp
View file

0
targets/app/common/src/GameRules/LevelRules/LevelRules.h → targets/app/common/GameRules/LevelRules/LevelRules.h
View file

4
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp → targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
View file

@ -3,8 +3,8 @@
#include <algorithm>
#include <vector>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

2
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h → targets/app/common/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h
View file

@ -4,7 +4,7 @@
#include <string>
#include "GameRuleDefinition.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
class ItemInstance;

4
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp → targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
View file

@ -3,8 +3,8 @@
#include <algorithm>
#include "AddEnchantmentRuleDefinition.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/Container.h"

2
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h → targets/app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h
View file

@ -5,7 +5,7 @@
#include <vector>
#include "GameRuleDefinition.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
class Container;
class AddEnchantmentRuleDefinition;

8
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp → targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
View file

@ -1,9 +1,9 @@
#include "CollectItemRuleDefinition.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
#include "app/common/GameRules/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 "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

4
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h → targets/app/common/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h
View file

@ -4,8 +4,8 @@
#include <string>
#include "GameRuleDefinition.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
class Pos;
class UseTileRuleDefinition;

6
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp → targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
View file

@ -4,9 +4,9 @@
#include <unordered_map>
#include <utility>
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h"
#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 "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "minecraft/network/Connection.h"

2
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h → targets/app/common/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h
View file

@ -3,7 +3,7 @@
#include <string>
#include "CompoundGameRuleDefinition.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
class GameRule;

16
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp → targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
View file

@ -7,14 +7,14 @@
#include <unordered_map>
#include <utility>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
#include "app/common/GameRules/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 "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 "util/StringHelpers.h"
CompoundGameRuleDefinition::CompoundGameRuleDefinition() {

4
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h → targets/app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h
View file

@ -3,8 +3,8 @@
#include <vector>
#include "GameRuleDefinition.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
class CompoundGameRuleDefinition : public GameRuleDefinition {
protected:

12
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp → targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
View file

@ -1,4 +1,4 @@
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include <assert.h>
#include <wchar.h>
@ -8,11 +8,11 @@
#include <utility>
#include <vector>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
#include "app/common/GameRules/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 "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

4
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h → targets/app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h
View file

@ -6,8 +6,8 @@
#include <unordered_map>
#include <vector>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h"
#include "minecraft/world/item/ItemInstance.h"
class GameRule;

8
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp → targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp
View file

@ -1,9 +1,9 @@
#include "LevelRuleset.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
#include "app/common/src/Localisation/StringTable.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
#include "app/common/Localisation/StringTable.h"
class AABB;

2
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h → targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h
View file

@ -4,7 +4,7 @@
#include <vector>
#include "CompoundGameRuleDefinition.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
class NamedAreaRuleDefinition;
class AABB;

4
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp → targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
View file

@ -2,8 +2,8 @@
#include <wchar.h>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

2
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h → targets/app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h
View file

@ -3,7 +3,7 @@
#include <string>
#include "GameRuleDefinition.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "minecraft/world/phys/AABB.h"
class NamedAreaRuleDefinition : public GameRuleDefinition {

6
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp → targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
View file

@ -4,9 +4,9 @@
#include <memory>
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

2
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h → targets/app/common/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h
View file

@ -5,7 +5,7 @@
#include <vector>
#include "GameRuleDefinition.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
class AddItemRuleDefinition;
class Pos;

4
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp → targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
View file

@ -1,7 +1,7 @@
#include "UseTileRuleDefinition.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/LinuxGame.h"
#include "util/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

2
targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h → targets/app/common/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h
View file

@ -4,7 +4,7 @@
#include <string>
#include "GameRuleDefinition.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/GameRules/ConsoleGameRulesConstants.h"
#include "minecraft/Pos.h"
class UseTileRuleDefinition : public GameRuleDefinition {

4
targets/app/common/src/GameRules/LevelRules/Rules/GameRule.cpp → targets/app/common/GameRules/LevelRules/Rules/GameRule.cpp
View file

@ -1,5 +1,5 @@
#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h"
#include "app/common/GameRules/LevelRules/Rules/GameRule.h"
#include <wchar.h>
@ -8,7 +8,7 @@
#include <unordered_map>
#include <utility>
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "java/InputOutputStream/DataInputStream.h"
#include "java/InputOutputStream/DataOutputStream.h"

0
targets/app/common/src/GameRules/LevelRules/Rules/GameRule.h → targets/app/common/GameRules/LevelRules/Rules/GameRule.h
View file

0
targets/app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h → targets/app/common/GameRules/LevelRules/Rules/GameRulesInstance.h
View file

0
targets/app/common/src/GameRules/WstringLookup.cpp → targets/app/common/GameRules/WstringLookup.cpp
View file

0
targets/app/common/src/GameRules/WstringLookup.h → targets/app/common/GameRules/WstringLookup.h
View file

2
targets/app/common/src/Leaderboards/LeaderboardInterface.cpp → targets/app/common/Leaderboards/LeaderboardInterface.cpp
View file

@ -2,7 +2,7 @@
#include <assert.h>
#include "app/common/src/Leaderboards/LeaderboardManager.h"
#include "app/common/Leaderboards/LeaderboardManager.h"
LeaderboardInterface::LeaderboardInterface(IPlatformLeaderboard* man) {
m_manager = man;

0
targets/app/common/src/Leaderboards/LeaderboardInterface.h → targets/app/common/Leaderboards/LeaderboardInterface.h
View file

Some files were not shown because too many files have changed in this diff Show more