backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-23 15:54:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: move Minecraft.Client into app

Browse source
This commit is contained in:
MatthewBeshay 2026-04-02 16:09:32 +11:00
parent e5a859f8a7
commit 11f9bd6046
784 changed files with 2598 additions and 2604 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -84,5 +84,5 @@ subdir('targets/platform')
subdir('targets/resources')
subdir('targets/minecraft')
subdir('targets/Minecraft.Client')
subdir('targets/app')

25
targets/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h
View file

@ -1,25 +0,0 @@
#pragma once
#include "ConsoleGameRulesConstants.h"
#include "GameRuleManager.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"

21
targets/Minecraft.Client/include/stdafx.h
View file

@ -1,21 +0,0 @@
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently, but
// are changed infrequently
//
#pragma once
#ifdef _WINDOWS64
#include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
#include "Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.h"
#include "Minecraft.Client/Windows64/Iggy/include/iggy.h"
#include "Minecraft.Client/Windows64/Windows64_App.h"
#include "Minecraft.Client/Windows64/Windows64_UIController.h"
#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
#else
#include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
#include "Minecraft.Client/Linux/Iggy/include/iggy.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Linux_UIController.h"
#include "Minecraft.Client/Linux/Stubs/LinuxStubs.h"
#endif

0
targets/Minecraft.Client/Network Implementation Notes.md → targets/app/Network Implementation Notes.md
View file

0
targets/Minecraft.Client/ReadMe.txt → targets/app/ReadMe.txt
View file

0
targets/Minecraft.Client/Common/App_Defines.h → targets/app/common/App_Defines.h
View file

0
targets/Minecraft.Client/Common/App_enums.h → targets/app/common/App_enums.h
View file

14
targets/Minecraft.Client/Common/App_structs.h → targets/app/common/App_structs.h
View file

@ -3,13 +3,13 @@
#include <cstdint>
#include "platform/sdl2/Storage.h"
#include "Minecraft.Client/Common/App_Defines.h"
#include "Minecraft.Client/Common/App_enums.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
#include "Minecraft.Client/include/NetTypes.h"
#include "Minecraft.Client/include/SkinBox.h"
#include "Minecraft.Client/include/XboxStubs.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"
typedef struct {
wchar_t* wchFilename;

54
targets/Minecraft.Client/Common/Consoles_App.cpp → targets/app/common/Consoles_App.cpp
View file

@ -1,27 +1,27 @@
#include "Common/Consoles_App.h"
#include "app/common/Consoles_App.h"
#include "4J.Common/4J_Compat.h"
#include "4J.Common/4J_InputActions.h"
#include "platform/sdl2/Profile.h"
#include "platform/sdl2/Render.h"
#include "platform/sdl2/Storage.h"
#include "Common/App_Defines.h"
#include "Common/App_enums.h"
#include "Common/App_structs.h"
#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
#include "Minecraft.Client/Common/src/DLC/DLCManager.h"
#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Linux_UIController.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "Minecraft.Client/include/NetTypes.h"
#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/linux/Linux_App.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 "console_helpers/PathHelper.h"
@ -51,8 +51,8 @@
#include "minecraft/world/level/tile/entity/HopperTileEntity.h"
#include "strings.h"
#if defined(_WINDOWS64)
#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
#include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"
#include "app/windows/XML/ATGXmlParser.h"
#include "app/windows/XML/xmlFilesCallback.h"
#endif
#include <assert.h>
#include <stdarg.h>
@ -74,12 +74,12 @@
#include <vector>
#include "platform/sdl2/Input.h"
#include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.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 "Minecraft_Macros.h"
#include "console_helpers/PlatformTime.h"
#include "console_helpers/StringHelpers.h"
@ -3647,7 +3647,7 @@ void CMinecraftApp::loadMediaArchive() {
#if _WINDOWS64
mediapath = L"Common\\Media\\MediaWindows64.arc";
#elif __linux__
mediapath = L"Minecraft.Client/Common/Media/MediaLinux.arc";
mediapath = L"app/common/Media/MediaLinux.arc";
#endif
if (!mediapath.empty()) {

24
targets/Minecraft.Client/Common/Consoles_App.h → targets/app/common/Consoles_App.h
View file

@ -8,18 +8,18 @@
// using namespace std;
#include "Minecraft.Client/Common/App_structs.h"
#include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h"
#include "Minecraft.Client/Common/src/DLC/DLCManager.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
#include "Minecraft.Client/include/NetTypes.h"
#include "Minecraft.Client/include/SkinBox.h"
#include "Minecraft.Client/include/XboxStubs.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 "minecraft/network/packet/DisconnectPacket.h"
#include "minecraft/world/entity/item/MinecartHopper.h"

0
targets/Minecraft.Client/Common/Minecraft_Macros.h → targets/app/common/Minecraft_Macros.h
View file

0
targets/Minecraft.Client/Common/ShutdownManager.h → targets/app/common/ShutdownManager.h
View file

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

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

25
targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp → targets/app/common/src/Audio/SoundEngine.cpp
View file

@ -12,10 +12,10 @@
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "Common/App_Defines.h"
#include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h"
#include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "app/common/App_Defines.h"
#include "app/common/src/Audio/Consoles_SoundEngine.h"
#include "app/linux/Iggy/include/rrCore.h"
#include "app/linux/Linux_App.h"
#include "console_helpers/C4JThread.h"
#include "console_helpers/PathHelper.h"
#include "java/Random.h"
@ -59,8 +59,7 @@ int strcasecmp(const char* a, const char* b) {
#undef FALSE
#endif
#if defined(_WINDOWS64)
#include "Minecraft.Client/Platform/Windows64/Miles/include/imssapi.h"
#include "Minecraft.Client/Windows64/Windows64_App.h"
#include "app/windows/Windows64_App.h"
#endif
// ASSETS
@ -105,8 +104,8 @@ const char* SoundEngine::m_szStreamFileA[eStream_Max] = {"calm1",
"ward",
"where_are_we_now"};
#if defined(__linux__)
char SoundEngine::m_szSoundPath[] = {"Minecraft.Client/Common/Sound/"};
char SoundEngine::m_szMusicPath[] = {"Minecraft.Client/Common/"};
char SoundEngine::m_szSoundPath[] = {"app/common/Sound/"};
char SoundEngine::m_szMusicPath[] = {"app/common/"};
char SoundEngine::m_szRedistName[] = {"redist64"};
#endif
@ -187,8 +186,8 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume,
std::string base = PathHelper::GetExecutableDirA() + "/";
const char* roots[] = {
"Sound/Minecraft/", "Minecraft.Client/Common/Sound/Minecraft/",
"Minecraft.Client/Common/res/TitleUpdate/res/Sound/Minecraft/"};
"Sound/Minecraft/", "app/common/Sound/Minecraft/",
"app/common/res/TitleUpdate/res/Sound/Minecraft/"};
char finalPath[512] = {0};
bool found = false;
@ -256,8 +255,8 @@ void SoundEngine::playUI(int iSound, float volume, float pitch) {
const char* roots[] = {
"Sound/Minecraft/UI/",
"Sound/Minecraft/",
"Minecraft.Client/Common/Sound/Minecraft/UI/",
"Minecraft.Client/Common/Sound/Minecraft/",
"app/common/Sound/Minecraft/UI/",
"app/common/Sound/Minecraft/",
};
char finalPath[512] = {0};
bool found = false;
@ -461,7 +460,7 @@ void SoundEngine::playMusicTick() {
bool found = false;
m_szStreamName[0] = '\0';
const char* roots[] = {"Minecraft.Client/Common/music/",
const char* roots[] = {"app/common/music/",
"music/", "./"};
for (const char* r : roots) {

6
targets/Minecraft.Client/Common/src/Audio/SoundEngine.h → targets/app/common/src/Audio/SoundEngine.h
View file

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

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

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

2
targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp → targets/app/common/src/Colours/ColourTable.cpp
View file

@ -4,7 +4,7 @@
#include <utility>
#include <vector>
#include "Common/App_enums.h"
#include "app/common/App_enums.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"
#include "java/InputOutputStream/DataInputStream.h"

2
targets/Minecraft.Client/Common/src/Colours/ColourTable.h → targets/app/common/src/Colours/ColourTable.h
View file

@ -3,7 +3,7 @@
#include <string>
#include <unordered_map>
#include "Minecraft.Client/Common/App_enums.h"
#include "app/common/App_enums.h"
class ColourTable {
private:

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

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

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

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

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

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

10
targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp → targets/app/common/src/DLC/DLCAudioFile.cpp
View file

@ -8,12 +8,12 @@
#include "platform/sdl2/Render.h"
#include "platform/sdl2/Storage.h"
#include "DLCManager.h"
#include "Minecraft.Client/Common/src/DLC/DLCFile.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/include/XboxStubs.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/linux/Linux_App.h"
#include "app/include/XboxStubs.h"
#if defined(_WINDOWS64)
#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
#include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"
#include "app/windows/XML/ATGXmlParser.h"
#include "app/windows/XML/xmlFilesCallback.h"
#endif
namespace {

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

4
targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp → targets/app/common/src/DLC/DLCCapeFile.cpp
View file

@ -1,8 +1,8 @@
#include "DLCCapeFile.h"
#include "DLCManager.h"
#include "Minecraft.Client/Common/src/DLC/DLCFile.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/linux/Linux_App.h"
DLCCapeFile::DLCCapeFile(const std::wstring& path)
: DLCFile(DLCManager::e_DLCType_Cape, path) {}

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

6
targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp → targets/app/common/src/DLC/DLCColourTableFile.cpp
View file

@ -1,9 +1,9 @@
#include "DLCColourTableFile.h"
#include "DLCManager.h"
#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
#include "Minecraft.Client/Common/src/DLC/DLCFile.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "app/common/src/Colours/ColourTable.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/linux/Linux_App.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/skins/TexturePack.h"
#include "minecraft/client/skins/TexturePackRepository.h"

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

4
targets/Minecraft.Client/Common/src/DLC/DLCFile.cpp → targets/app/common/src/DLC/DLCFile.cpp
View file

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

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

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

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

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

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

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

6
targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp → targets/app/common/src/DLC/DLCGameRulesHeader.cpp
View file

@ -3,9 +3,9 @@
#include <string>
#include "DLCManager.h"
#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h"
#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "app/common/src/DLC/DLCGameRules.h"
#include "app/common/src/GameRules/GameRuleManager.h"
#include "app/linux/Linux_App.h"
class StringTable;

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

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

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

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

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

6
targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp → targets/app/common/src/DLC/DLCManager.cpp
View file

@ -17,9 +17,9 @@
#include "platform/sdl2/Storage.h"
#include "DLCFile.h"
#include "DLCPack.h"
#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Linux_UIController.h"
#include "app/common/src/GameRules/GameRuleManager.h"
#include "app/linux/Linux_App.h"
#include "app/linux/Linux_UIController.h"
#include "console_helpers/PortableFileIO.h"
#include "console_helpers/StringHelpers.h"
#include "minecraft/client/Minecraft.h"

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

14
targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp → targets/app/common/src/DLC/DLCPack.cpp
View file

@ -15,13 +15,13 @@
#include "DLCLocalisationFile.h"
#include "DLCTextureFile.h"
#include "DLCUIDataFile.h"
#include "Minecraft.Client/Common/src/Console_Debug_enum.h"
#include "Minecraft.Client/Common/src/DLC/DLCFile.h"
#include "Minecraft.Client/Common/src/DLC/DLCManager.h"
#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.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/linux/Linux_App.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "console_helpers/StringHelpers.h"
DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) {

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

@ -7,7 +7,7 @@
#include "4J.Common/4J_Compat.h"
#include "DLCManager.h"
#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
#include "app/common/src/DLC/DLCSkinFile.h"
class DLCFile;
class DLCSkinFile;

8
targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp → targets/app/common/src/DLC/DLCSkinFile.cpp
View file

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

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

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

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

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

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

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

4
targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp → targets/app/common/src/DLC/DLCUIDataFile.cpp
View file

@ -1,8 +1,8 @@
#include "DLCUIDataFile.h"
#include "DLCManager.h"
#include "Minecraft.Client/Common/src/DLC/DLCFile.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "app/common/src/DLC/DLCFile.h"
#include "app/linux/Linux_App.h"
DLCUIDataFile::DLCUIDataFile(const std::wstring& path)
: DLCFile(DLCManager::e_DLCType_UIData, path) {

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

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

@ -0,0 +1,25 @@
#pragma once
#include "ConsoleGameRulesConstants.h"
#include "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/ConsoleGenerateStructureAction.h"
#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
#include "app/common/src/GameRules/LevelGeneration/StartFeature.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/AddEnchantmentRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.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/CompoundGameRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.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"

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

26
targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp → targets/app/common/src/GameRules/GameRuleManager.cpp
View file

@ -7,19 +7,19 @@
#include <utility>
#include <vector>
#include "Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h"
#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
#include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h"
#include "Minecraft.Client/Common/src/DLC/DLCManager.h"
#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#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/linux/Linux_App.h"
#include "console_helpers/compression.h"
#include "java/File.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"

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

@ -7,10 +7,10 @@
#include <string>
#include <unordered_map>
#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h"
#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"
class LevelGenerationOptions;
class RootGameRulesDefinition;

6
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp → targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
View file

@ -5,9 +5,9 @@
#include "ConsoleSchematicFile.h"
#include "LevelGenerationOptions.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/level/Level.h"

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

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

6
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp → targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp
View file

@ -1,8 +1,8 @@
#include "BiomeOverride.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

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

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

16
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp → targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
View file

@ -4,14 +4,14 @@
#include <algorithm>
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#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/linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/Direction.h"

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

@ -2,8 +2,8 @@
#include <string>
#include <vector>
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h"
#include "minecraft/world/level/levelgen/structure/StructurePiece.h"

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

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

4
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp → targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
View file

@ -8,8 +8,8 @@
#include <unordered_map>
#include <vector>
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "app/linux/Linux_App.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "console_helpers/compression.h"
#include "java/Class.h"
#include "java/InputOutputStream/DataInputStream.h"

2
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h → targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h
View file

@ -13,7 +13,7 @@
#include <utility>
#include <vector>
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "console_helpers/compression.h"
#include "minecraft/world/phys/Vec3.h"

28
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp → targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp
View file

@ -10,20 +10,20 @@
#include "platform/sdl2/Profile.h"
#include "platform/sdl2/Storage.h"
#include "Common/App_enums.h"
#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h"
#include "Minecraft.Client/Common/src/DLC/DLCManager.h"
#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#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/linux/Linux_App.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "console_helpers/StringHelpers.h"
#include "java/File.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"

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

@ -8,10 +8,10 @@
#include <unordered_map>
#include <vector>
#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
#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 "minecraft/world/level/levelgen/structure/StructureFeature.h"
class ApplySchematicRuleDefinition;

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

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

6
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp → targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp
View file

@ -1,8 +1,8 @@
#include "StartFeature.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

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

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

8
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp → targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
View file

@ -1,9 +1,9 @@
#include "XboxStructureActionGenerateBox.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.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/linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/level/levelgen/structure/StructurePiece.h"

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

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

8
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp → targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
View file

@ -1,9 +1,9 @@
#include "XboxStructureActionPlaceBlock.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.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/linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/level/levelgen/structure/StructurePiece.h"

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

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

8
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp → targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
View file

@ -4,10 +4,10 @@
#include <memory>
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#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/linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "minecraft/world/Container.h"
#include "minecraft/world/level/Level.h"

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

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

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

@ -4,8 +4,8 @@
#include <memory>
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/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/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h → targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h
View file

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

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

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

6
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp → targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
View file

@ -3,9 +3,9 @@
#include <algorithm>
#include <vector>
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/item/EnchantedBookItem.h"

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

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

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

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

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

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

10
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp → targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
View file

@ -1,10 +1,10 @@
#include "CollectItemRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"
#include "Minecraft.Client/Linux/Linux_App.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/linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/network/Connection.h"

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

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

8
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp → targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
View file

@ -4,10 +4,10 @@
#include <unordered_map>
#include <utility>
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#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/linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "minecraft/network/Connection.h"
#include "minecraft/network/packet/UpdateGameRuleProgressPacket.h"

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

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

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

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

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

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

14
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp → targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
View file

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

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

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

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

@ -1,9 +1,9 @@
#include "LevelRuleset.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
#include "Minecraft.Client/Common/src/Localisation/StringTable.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"
class AABB;

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

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

6
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp → targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
View file

@ -2,9 +2,9 @@
#include <wchar.h>
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

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

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

8
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp → targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
View file

@ -4,10 +4,10 @@
#include <memory>
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#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/linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/Pos.h"

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

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

6
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp → targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
View file

@ -1,8 +1,8 @@
#include "UseTileRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "app/common/src/GameRules/ConsoleGameRulesConstants.h"
#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "app/linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"

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

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

6
targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.cpp → targets/app/common/src/GameRules/LevelRules/Rules/GameRule.cpp
View file

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

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

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