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

run IWYU on entire codebase

Browse source
This commit is contained in:
Tropical 2026-04-01 18:02:06 -05:00
parent 729aad5f06
commit 6eb277c9aa
1125 changed files with 5104 additions and 2009 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
targets/4J.Input/4J_Input.cpp
View file

@ -4,10 +4,19 @@
#include <math.h>
#include <stdio.h>
#include <string.h>
#include <SDL2/SDL_events.h>
#include <SDL2/SDL_gamecontroller.h>
#include <SDL2/SDL_joystick.h>
#include <SDL2/SDL_keyboard.h>
#include <SDL2/SDL_mouse.h>
#include <SDL2/SDL_scancode.h>
#include <SDL2/SDL_stdinc.h>
#include <SDL2/SDL_video.h>
#include <SDL2/begin_code.h>
#include <string>
#include "../4J.Common/4J_InputActions.h"
#include "../platform/PlatformTypes.h"
C_4JInput InputManager;

2
targets/4J.Profile/4J_Profile.h
View file

@ -5,6 +5,8 @@
#include "../4J.Common/4J_Compat.h"
#include "../platform/IPlatformProfile.h"
#include "../4J.Common/4J_Compat.h"
#include "../platform/PlatformTypes.h"
#define TITLEID_MINECRAFT 0x584111F7

18
targets/4J.Render/4J_Render.cpp
View file

@ -1,6 +1,12 @@
#include "4J_Render.h"
#include "gl3_loader.h"
#include "../platform/PlatformTypes.h"
#include "SDL.h"
#include "SDL_error.h"
#include "SDL_events.h"
#include "SDL_stdinc.h"
#include "SDL_video.h"
// undefine macros from header to avoid argument mismatch
#undef glGenTextures
@ -24,16 +30,15 @@
#define GLM_FORCE_RADIANS
#include <dlfcn.h>
#include <pthread.h>
#include <cassert>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <cstdio>
#include <cstring>
#include <unordered_map>
#include <vector>
#include <cmath>
#include <utility>
C4JRender RenderManager;
@ -44,13 +49,16 @@ C4JRender RenderManager;
#ifdef GLES
static const char* VERT_SRC =
#include "shaders/vertex_es.vert"
;
static const char* FRAG_SRC =
#include "shaders/fragment_es.frag"
;
#else
static const char* VERT_SRC =
#include "shaders/vertex.vert"
;
static const char* FRAG_SRC =
#include "shaders/fragment.frag"

5
targets/4J.Render/4J_Render.h
View file

@ -1,12 +1,11 @@
#pragma once
#include <cstdint>
#include <cstdlib>
#include "gl3_loader.h"
// NOTE: gl3_loader.h must be included before these two
#include <GL/gl.h>
#include <GL/glu.h>
#include <cstdint>
#include <cstdlib>
#include "../platform/IPlatformRender.h"

1
targets/4J.Storage/4J_Storage.cpp
View file

@ -1,5 +1,6 @@
#include "4J_Storage.h"
#include <stdlib.h>
#include <cstring>
#include <string>
#include <vector>

1
targets/4J.Storage/4J_Storage.h
View file

@ -8,6 +8,7 @@
#include "../4J.Common/4J_Compat.h"
#include "../platform/IPlatformStorage.h"
#include "../4J.Common/4J_Compat.h"
class C4JStringTable;

105
targets/Minecraft.Client/Common/Consoles_App.cpp
View file

@ -1,5 +1,3 @@
#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
#include "Minecraft.Client/include/MobSkinMemTextureProcessor.h"
#include "console_helpers/PathHelper.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/Options.h"
@ -7,44 +5,82 @@
#include "minecraft/client/multiplayer/ClientConnection.h"
#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "minecraft/client/player/LocalPlayer.h"
#include "minecraft/client/renderer/GameRenderer.h"
#include "minecraft/client/renderer/LevelRenderer.h"
#include "minecraft/server/MinecraftServer.h"
#include "minecraft/server/level/GameMode.h"
#include "minecraft/stats/StatsCounter.h"
#include "minecraft/world/Container.h"
#include "minecraft/world/entity/player/Inventory.h"
#include "minecraft/world/entity/player/Player.h"
#include "minecraft/world/item/crafting/Recipy.h"
#include "minecraft/world/level/Level.h"
#include "minecraft/world/level/tile/entity/DispenserTileEntity.h"
#include "minecraft/world/level/tile/entity/FurnaceTileEntity.h"
#include "minecraft/world/level/tile/entity/HopperTileEntity.h"
#include "minecraft/world/level/tile/entity/SignTileEntity.h"
#include "minecraft/world/phys/AABB.h"
#include "minecraft/world/phys/Vec3.h"
#include "4J.Common/4J_Compat.h"
#include "4J.Common/4J_InputActions.h"
#include "4J_Profile.h"
#include "4J_Render.h"
#include "4J_Storage.h"
#include "Common/App_Defines.h"
#include "Common/App_enums.h"
#include "Common/App_structs.h"
#include "Common/Consoles_App.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 "SkinBox.h"
#include "XboxStubs.h"
#include "java/Class.h"
#include "java/File.h"
#include "java/Random.h"
#include "minecraft/client/model/geom/Model.h"
#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
#include "minecraft/client/renderer/Textures.h"
#include "minecraft/client/renderer/entity/EntityRenderer.h"
#include "minecraft/client/skins/TexturePack.h"
#include "minecraft/network/packet/DisconnectPacket.h"
#include "minecraft/world/entity/item/MinecartHopper.h"
#include "minecraft/world/level/tile/Tile.h"
#include "strings.h"
#if defined(_WINDOWS64)
#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
#include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"
#endif
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <wchar.h>
#include <cstring>
#include <chrono>
#include <thread>
#include <compare>
#include <cstdint>
#include <memory>
#include <mutex>
#include <sstream>
#include <string>
#include <unordered_map>
#include <utility>
#include <vector>
#include "4J_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/GameRules/ConsoleGameRules.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h"
#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
#include "Minecraft_Macros.h"
#include "console_helpers/PlatformTime.h"
#include "console_helpers/StringHelpers.h"
#include "console_helpers/compression.h"
#include "java/InputOutputStream/InputOutputStream.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/User.h"
#include "minecraft/client/gui/Gui.h"
#include "minecraft/client/renderer/entity/EntityRenderDispatcher.h"
@ -52,20 +88,22 @@
#include "minecraft/client/skins/TexturePackRepository.h"
#include "minecraft/server/PlayerList.h"
#include "minecraft/server/level/ServerPlayer.h"
#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
#include "minecraft/world/level/LevelSettings.h"
#include "minecraft/world/level/storage/LevelData.h"
#if defined(__linux__)
#include <unistd.h>
#include <climits>
#endif
#include <chrono>
#include <thread>
#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
#include "Minecraft.Client/Common/src/UI/UI.h"
class BeaconTileEntity;
class BrewingStandTileEntity;
class DispenserTileEntity;
class EntityHorse;
class FurnaceTileEntity;
class INVITE_INFO;
class Inventory;
class Level;
class LevelChunk;
class LevelGenerationOptions;
class LocalPlayer;
class Merchant;
class ModelPart;
class SignTileEntity;
// CMinecraftApp app;
unsigned int CMinecraftApp::m_uiLastSignInData = 0;
@ -874,9 +912,6 @@ int CMinecraftApp::OldProfileVersionCallback(void* pParam,
// updates
app.DebugPrintf(
"Don't know what to do with this profile version!\n");
#if !defined(_CONTENT_PACKAGE)
// __debugbreak();
#endif
GAME_SETTINGS* pGameSettings = (GAME_SETTINGS*)pucData;
pGameSettings->ucMenuSensitivity =
@ -4420,10 +4455,6 @@ void CMinecraftApp::AddMemoryTextureFile(const std::wstring& wName,
++pData->ucRefCount;
return;
}
#if !defined(_CONTENT_PACKAGE)
// wprintf(L"Adding the memory texture file data for %ls\n", wName.c_str());
#endif
// this is a texture (png) file
// add this texture to the list of memory texture files - it will then be

2
targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp
View file

@ -1,7 +1,5 @@
#include "Consoles_SoundEngine.h"
#include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h"
bool ConsoleSoundEngine::GetIsPlayingStreamingCDMusic() {
return m_bIsPlayingStreamingCDMusic;
}

14
targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp
View file

@ -3,8 +3,6 @@
#include <ctype.h>
#include <stdio.h>
#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <cmath>
#include <cstdlib>
@ -14,7 +12,9 @@
#include <vector>
#include "4J.Common/4J_Compat.h"
#include "Minecraft.Client/Common/src/Audio/SoundEngine.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 "console_helpers/C4JThread.h"
#include "console_helpers/PathHelper.h"
@ -49,6 +49,7 @@ int strcasecmp(const char* a, const char* b) {
#undef STB_VORBIS_HEADER_ONLY
#include "stb_vorbis.c"
// stb_vorbis leaks single-letter macros (C, L, R, etc.) that collide with
// identifiers in other translation units during unity builds.
#undef C
@ -355,8 +356,9 @@ int SoundEngine::getMusicID(const std::wstring& name) {
return iCD + m_iStream_CD_1;
}
void SoundEngine::playStreaming(const wstring& name, float x, float y, float z,
float volume, float pitch, bool bMusicDelay) {
void SoundEngine::playStreaming(const std::wstring& name, float x, float y,
float z, float volume, float pitch,
bool bMusicDelay) {
m_StreamingAudioInfo.x = x;
m_StreamingAudioInfo.y = y;
m_StreamingAudioInfo.z = z;
@ -745,7 +747,7 @@ void SoundEngine::updateMiniAudio() {
}
}
void SoundEngine::tick(shared_ptr<Mob>* players, float a) {
void SoundEngine::tick(std::shared_ptr<Mob>* players, float a) {
// update the listener positions
int listenerCount = 0;
if (players) {

1
targets/Minecraft.Client/Common/src/Audio/SoundEngine.h
View file

@ -4,7 +4,6 @@ class Options;
class C4JThread;
class Random;
using namespace std;
#include <string>
#include "Minecraft.Client/Common/App_Defines.h"

5
targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp
View file

@ -4,13 +4,10 @@
#include <utility>
#include <vector>
#include "Minecraft.Client/Common/src/Colours/ColourTable.h"
#include "Minecraft.Client/include/NetTypes.h"
#include "Minecraft.Client/include/SkinBox.h"
#include "Minecraft.Client/include/XboxStubs.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"
#include "java/InputOutputStream/DataInputStream.h"
#include "Common/App_enums.h"
std::unordered_map<std::wstring, eMinecraftColour>
ColourTable::s_colourNamesMap;

1
targets/Minecraft.Client/Common/src/ConsoleGameMode.cpp
View file

@ -1,6 +1,5 @@
#include "ConsoleGameMode.h"
#include "Minecraft.Client/Common/src/ConsoleGameMode.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"

4
targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp
View file

@ -8,11 +8,9 @@
#include "4J.Render/4J_Render.h"
#include "4J_Storage.h"
#include "DLCManager.h"
#include "Minecraft.Client/Common/src/DLC/DLCFile.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/include/NetTypes.h"
#include "Minecraft.Client/include/SkinBox.h"
#include "Minecraft.Client/include/XboxStubs.h"
#include "Minecraft.Client/Common/src/DLC/DLCFile.h"
#if defined(_WINDOWS64)
#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
#include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"

2
targets/Minecraft.Client/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 "Minecraft.Client/Common/src/DLC/DLCFile.h"
DLCCapeFile::DLCCapeFile(const std::wstring& path)
: DLCFile(DLCManager::e_DLCType_Cape, path) {}

2
targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp
View file

@ -2,11 +2,11 @@
#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 "minecraft/client/Minecraft.h"
#include "minecraft/client/skins/TexturePack.h"
#include "minecraft/client/skins/TexturePackRepository.h"
#include "Minecraft.Client/Common/src/DLC/DLCFile.h"
DLCColourTableFile::DLCColourTableFile(const std::wstring& path)
: DLCFile(DLCManager::e_DLCType_ColourTable, path) {

3
targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp
View file

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

2
targets/Minecraft.Client/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 "Minecraft.Client/Common/src/DLC/DLCFile.h"
DLCLocalisationFile::DLCLocalisationFile(const std::wstring& path)
: DLCFile(DLCManager::e_DLCType_LocalisationData, path) {

13
targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp
View file

@ -1,20 +1,29 @@
#include "DLCManager.h"
#include <wchar.h>
#include <algorithm>
#include <cassert>
#include <cstddef>
#include <cstdint>
#include <cstring>
#include <limits>
#include <cstdio>
#include <sstream>
#include <unordered_map>
#include <utility>
#include "DLCFile.h"
#include "DLCPack.h"
#include "Minecraft.Client/Common/src/UI/UIController.h"
#include "Minecraft.Client/include/stdafx.h"
#include "console_helpers/PortableFileIO.h"
#include "console_helpers/StringHelpers.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/skins/TexturePackRepository.h"
#include "4J_Profile.h"
#include "4J_Storage.h"
#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Linux_UIController.h"
#include "strings.h"
// 4jcraft, this is the size of wchar_t on disk
// the DLC was created on windows, with wchar_t beeing 2 bytes and UTF-16

6
targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp
View file

@ -1,7 +1,6 @@
#include "DLCPack.h"
#include <wchar.h>
#include <algorithm>
#include <sstream>
#include <utility>
@ -13,17 +12,16 @@
#include "DLCGameRulesFile.h"
#include "DLCGameRulesHeader.h"
#include "DLCLocalisationFile.h"
#include "DLCSkinFile.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/DLCPack.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 "console_helpers/StringHelpers.h"
#include "Minecraft.Client/Common/src/DLC/DLCManager.h"
#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) {
m_dataPath = L"";

6
targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp
View file

@ -1,16 +1,14 @@
#include "DLCSkinFile.h"
#include <wchar.h>
#include <string.h>
#include "4J.Render/4J_Render.h"
#include "DLCManager.h"
#include "Minecraft.Client/Common/src/DLC/DLCFile.h"
#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "Minecraft.Client/include/NetTypes.h"
#include "Minecraft.Client/include/SkinBox.h"
#include "Minecraft.Client/include/XboxStubs.h"
#include "Minecraft.Client/Common/src/DLC/DLCFile.h"
DLCSkinFile::DLCSkinFile(const std::wstring& path)
: DLCFile(DLCManager::e_DLCType_Skin, path) {

1
targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h
View file

@ -8,6 +8,7 @@
#include "Minecraft.Client/Common/src/DLC/DLCManager.h"
#include "Minecraft.Client/include/SkinBox.h"
#include "minecraft/client/model/HumanoidModel.h"
#include "Minecraft.Client/Common/src/DLC/DLCManager.h"
class DLCSkinFile : public DLCFile {
private:

1
targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.h
View file

@ -4,6 +4,7 @@
#include "DLCFile.h"
#include "Minecraft.Client/Common/src/DLC/DLCManager.h"
#include "Minecraft.Client/Common/src/DLC/DLCManager.h"
class DLCTextureFile : public DLCFile {
private:

2
targets/Minecraft.Client/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 "Minecraft.Client/Common/src/DLC/DLCFile.h"
DLCUIDataFile::DLCUIDataFile(const std::wstring& path)
: DLCFile(DLCManager::e_DLCType_UIData, path) {

24
targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp
View file

@ -1,16 +1,32 @@
#include "GameRuleManager.h"
#include "ConsoleGameRules.h"
#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h"
#include <assert.h>
#include <string.h>
#include <cstdint>
#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/DLCPack.h"
#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
#include "Minecraft.Client/include/stdafx.h"
#include "console_helpers/StringHelpers.h"
#include "console_helpers/compression.h"
#include "java/File.h"
#include "Minecraft.Client/Common/src/DLC/DLCManager.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/Linux/Linux_App.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"
#include "java/InputOutputStream/ByteArrayOutputStream.h"
#include "java/InputOutputStream/DataInputStream.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
#include "strings.h"
const wchar_t* GameRuleManager::wchTagNameA[] = {
L"", // eGameRuleType_Root

9
targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h
View file

@ -1,9 +1,15 @@
#pragma once
////using namespace std;
#include <stdint.h>
#include <format>
#include <string>
#include <unordered_map>
#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.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/ConsoleGameRulesConstants.h"
class LevelGenerationOptions;
class RootGameRulesDefinition;
@ -16,6 +22,9 @@ class GameRuleDefinition;
class DataInputStream;
class DataOutputStream;
class WstringLookup;
class DLCGameRulesHeader;
class File;
class LevelRuleset;
#define GAME_RULE_SAVENAME L"requiredGameRules.grf"

5
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
View file

@ -5,18 +5,15 @@
#include "ConsoleSchematicFile.h"
#include "LevelGenerationOptions.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/include/NetTypes.h"
#include "Minecraft.Client/include/SkinBox.h"
#include "Minecraft.Client/include/XboxStubs.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/level/Level.h"
#include "minecraft/world/level/chunk/LevelChunk.h"
#include "minecraft/world/level/dimension/Dimension.h"
#include "minecraft/world/phys/AABB.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
ApplySchematicRuleDefinition::ApplySchematicRuleDefinition(
LevelGenerationOptions* levelGenOptions) {

1
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h
View file

@ -1,6 +1,5 @@
#pragma once
#include <stdint.h>
#include <optional>
#include <string>

2
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp
View file

@ -1,10 +1,10 @@
#include "BiomeOverride.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
BiomeOverride::BiomeOverride() {
m_tile = 0;

3
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
View file

@ -1,10 +1,8 @@
#include "ConsoleGenerateStructure.h"
#include <wchar.h>
#include <algorithm>
#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/StructureActions/XboxStructureActionGenerateBox.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
@ -18,6 +16,7 @@
#include "minecraft/world/level/Level.h"
#include "minecraft/world/level/dimension/Dimension.h"
#include "minecraft/world/level/levelgen/structure/BoundingBox.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0) {
m_x = m_y = m_z = 0;

5
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
View file

@ -2,16 +2,12 @@
#include <assert.h>
#include <string.h>
#include <algorithm>
#include <string>
#include <unordered_map>
#include <vector>
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/include/NetTypes.h"
#include "Minecraft.Client/include/SkinBox.h"
#include "Minecraft.Client/include/XboxStubs.h"
#include "console_helpers/compression.h"
#include "java/Class.h"
#include "java/InputOutputStream/DataInputStream.h"
@ -33,6 +29,7 @@
#include "nbt/ListTag.h"
#include "nbt/NbtIo.h"
#include "nbt/Tag.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
ConsoleSchematicFile::ConsoleSchematicFile() {
m_xSize = m_ySize = m_zSize = 0;

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

@ -5,7 +5,7 @@
#define XBOX_SCHEMATIC_CURRENT_VERSION 2
#include <stdint.h>
#include <string.h>
#include <format>
#include <memory>
#include <ranges>

33
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp
View file

@ -1,22 +1,39 @@
#include "LevelGenerationOptions.h"
#include <limits.h>
#include <wchar.h>
#include <filesystem>
#include <fstream>
#include <unordered_set>
#include <utility>
#include "4J_Storage.h"
#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
#include "Minecraft.Client/include/NetTypes.h"
#include "Minecraft.Client/include/SkinBox.h"
#include "Minecraft.Client/include/XboxStubs.h"
#include "Minecraft.Client/include/stdafx.h"
#include "console_helpers/StringHelpers.h"
#include "minecraft/Pos.h"
#include "minecraft/world/level/chunk/net.minecraft.world.level.chunk.h"
#include "minecraft/world/level/net.minecraft.world.level.h"
#include "minecraft/world/phys/net.minecraft.world.phys.h"
#include "4J_Profile.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/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/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "java/File.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"
#include "java/InputOutputStream/DataInputStream.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/level/Level.h"
#include "minecraft/world/level/chunk/LevelChunk.h"
#include "minecraft/world/level/levelgen/structure/BoundingBox.h"
#include "minecraft/world/phys/AABB.h"
#include "strings.h"
JustGrSource::JustGrSource() {
m_displayName = L"Default_DisplayName";

7
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h
View file

@ -4,11 +4,15 @@
// #pragma message("LevelGenerationOptions.h ")
#include <cstdint>
#include <string>
#include <unordered_map>
#include <vector>
#include "Minecraft.Client/Common/src/DLC/DLCPack.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
#include "minecraft/world/level/levelgen/structure/StructureFeature.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
class ApplySchematicRuleDefinition;
class LevelChunk;
@ -17,6 +21,9 @@ class ConsoleSchematicFile;
class LevelRuleset;
class BiomeOverride;
class StartFeature;
class DLCPack;
class Pos;
class StringTable;
class GrSource {
public:

1
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp
View file

@ -3,7 +3,6 @@
#include <algorithm>
#include "LevelGenerationOptions.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h"
LevelGenerators::LevelGenerators() {}

2
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp
View file

@ -1,10 +1,10 @@
#include "StartFeature.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
StartFeature::StartFeature() {
m_chunkX = 0;

2
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
View file

@ -1,12 +1,12 @@
#include "XboxStructureActionGenerateBox.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/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
XboxStructureActionGenerateBox::XboxStructureActionGenerateBox() {
m_x0 = m_y0 = m_z0 = m_x1 = m_y1 = m_z1 = m_edgeTile = m_fillTile = 0;

2
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
View file

@ -1,12 +1,12 @@
#include "XboxStructureActionPlaceBlock.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock() {
m_x = m_y = m_z = m_tile = m_data = 0;

5
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
View file

@ -1,11 +1,8 @@
#include "XboxStructureActionPlaceContainer.h"
#include <wchar.h>
#include <memory>
#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/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
@ -15,6 +12,8 @@
#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
#include "minecraft/world/level/tile/Tile.h"
#include "minecraft/world/level/tile/entity/TileEntity.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer() {
m_tile = Tile::chest_Id;

5
targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp
View file

@ -1,17 +1,16 @@
#include "XboxStructureActionPlaceSpawner.h"
#include <wchar.h>
#include <memory>
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/level/Level.h"
#include "minecraft/world/level/levelgen/structure/BoundingBox.h"
#include "minecraft/world/level/levelgen/structure/StructurePiece.h"
#include "minecraft/world/level/tile/Tile.h"
#include "minecraft/world/level/tile/entity/MobSpawnerTileEntity.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() {
m_tile = Tile::mobSpawner_Id;

2
targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp
View file

@ -1,7 +1,5 @@
#include "LevelRules.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h"
LevelRules::LevelRules() {}
void LevelRules::addLevelRule(const std::wstring& displayName,

4
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
View file

@ -3,8 +3,6 @@
#include <algorithm>
#include <vector>
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
@ -14,6 +12,8 @@
#include "minecraft/world/item/enchantment/Enchantment.h"
#include "minecraft/world/item/enchantment/EnchantmentCategory.h"
#include "minecraft/world/item/enchantment/EnchantmentInstance.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition() {
m_enchantmentId = m_enchantmentLevel = 0;

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

@ -3,14 +3,14 @@
#include <algorithm>
#include "AddEnchantmentRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/world/Container.h"
#include "minecraft/world/entity/player/Inventory.h"
#include "minecraft/world/item/Item.h"
#include "minecraft/world/item/ItemInstance.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
AddItemRuleDefinition::AddItemRuleDefinition() {
m_itemId = m_quantity = m_auxValue = m_dataTag = 0;

5
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
View file

@ -1,7 +1,5 @@
#include "CollectItemRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.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 "console_helpers/StringHelpers.h"
@ -9,6 +7,9 @@
#include "minecraft/network/Connection.h"
#include "minecraft/network/packet/UpdateGameRuleProgressPacket.h"
#include "minecraft/world/item/ItemInstance.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/GameRulesInstance.h"
CollectItemRuleDefinition::CollectItemRuleDefinition() {
m_itemId = 0;

5
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
View file

@ -4,14 +4,13 @@
#include <unordered_map>
#include <utility>
#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/Rules/GameRule.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "minecraft/network/Connection.h"
#include "minecraft/network/packet/UpdateGameRuleProgressPacket.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
void CompleteAllRuleDefinition::getChildren(
std::vector<GameRuleDefinition*>* children) {

5
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
View file

@ -1,7 +1,6 @@
#include "CompoundGameRuleDefinition.h"
#include <wchar.h>
#include <memory>
#include <string>
#include <unordered_map>
@ -9,11 +8,13 @@
#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 "console_helpers/StringHelpers.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/GameRulesInstance.h"
CompoundGameRuleDefinition::CompoundGameRuleDefinition() {
m_lastRuleStatusChanged = nullptr;

2
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
View file

@ -2,8 +2,6 @@
#include <assert.h>
#include <wchar.h>
#include <format>
#include <string>
#include <unordered_map>
#include <utility>

1
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h
View file

@ -4,6 +4,7 @@
#include <memory>
#include <string>
#include <unordered_map>
#include <vector>
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h"

4
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp
View file

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

4
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
View file

@ -2,11 +2,11 @@
#include <wchar.h>
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
NamedAreaRuleDefinition::NamedAreaRuleDefinition() {
m_name = L"";

5
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
View file

@ -1,12 +1,9 @@
#include "UpdatePlayerRuleDefinition.h"
#include <wchar.h>
#include <memory>
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
@ -14,6 +11,8 @@
#include "minecraft/world/entity/player/Inventory.h"
#include "minecraft/world/entity/player/Player.h"
#include "minecraft/world/food/FoodData.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition() {
m_bUpdateHealth = m_bUpdateFood = m_bUpdateYRot = false;

4
targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
View file

@ -1,10 +1,10 @@
#include "UseTileRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "console_helpers/StringHelpers.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
UseTileRuleDefinition::UseTileRuleDefinition() {
m_tileId = -1;

1
targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h
View file

@ -2,7 +2,6 @@
// using namespace std;
#include <stdint.h>
#include <memory>
#include <string>
#include <unordered_map>

3
targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp
View file

@ -1,9 +1,6 @@
#include "LeaderboardManager.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/include/NetTypes.h"
#include "Minecraft.Client/include/SkinBox.h"
#include "Minecraft.Client/include/XboxStubs.h"
#include "console_helpers/StringHelpers.h"
const std::wstring LeaderboardManager::filterNames[eNumFilterModes] = {

1
targets/Minecraft.Client/Common/src/Localisation/StringTable.cpp
View file

@ -3,7 +3,6 @@
#include <ranges>
#include <utility>
#include "Minecraft.Client/Common/src/Localisation/StringTable.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "java/InputOutputStream/ByteArrayInputStream.h"

36
targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp
View file

@ -1,15 +1,17 @@
#include "GameNetworkManager.h"
#include <assert.h>
#include <chrono>
#include <filesystem>
#include <fstream>
#include <thread>
#include <algorithm>
#include <compare>
#include <memory>
#include <vector>
#include "4J_Input.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
#include "Minecraft.Client/Common/src/UI/UI.h"
#include "Minecraft.Client/include/stdafx.h"
#include "Socket.h"
#include "console_helpers/StringHelpers.h"
#include "console_helpers/ThreadName.h"
@ -19,7 +21,6 @@
#include "minecraft/client/User.h"
#include "minecraft/client/gui/Gui.h"
#include "minecraft/client/multiplayer/ClientConnection.h"
#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "minecraft/client/renderer/LevelRenderer.h"
#include "minecraft/client/skins/TexturePack.h"
@ -32,9 +33,30 @@
#include "minecraft/world/entity/Entity.h"
#include "minecraft/world/item/crafting/FireworksRecipe.h"
#include "minecraft/world/level/chunk/storage/OldChunkStorage.h"
#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
#include "minecraft/world/phys/AABB.h"
#include "minecraft/world/phys/Vec3.h"
#include "4J_Profile.h"
#include "4J_Render.h"
#include "4J_Storage.h"
#include "Common/App_enums.h"
#include "Common/Consoles_App.h"
#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
#include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h"
#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h"
#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Linux_UIController.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "XboxStubs.h"
#include "java/File.h"
#include "minecraft/network/Connection.h"
#include "minecraft/network/packet/PreLoginPacket.h"
#include "minecraft/world/level/Level.h"
#include "minecraft/world/level/tile/Tile.h"
#include "strings.h"
class FriendSessionInfo;
class INVITE_INFO;
// Global instance
CGameNetworkManager g_NetworkManager;

9
targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h
View file

@ -1,6 +1,9 @@
#pragma once
#include <stdint.h>
// using namespace std;
#include <vector>
#include <format>
#include <string>
#if !defined(__linux__)
#include <qnet.h>
#endif
@ -8,9 +11,15 @@
#include "PlatformNetworkManagerStub.h"
#include "SessionInfo.h"
#include "console_helpers/C4JThread.h"
#include "4J.Common/4J_Compat.h"
#include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h"
#include "Minecraft.Client/include/NetTypes.h"
class ClientConnection;
class Minecraft;
class FriendSessionInfo;
class INVITE_INFO;
class INetworkPlayer;
const int NON_QNET_SENDDATA_ACK_REQUIRED = 1;

2
targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp
View file

@ -3,8 +3,6 @@
#include <limits.h>
#include "Minecraft.Client/include/NetTypes.h"
#include "Minecraft.Client/include/SkinBox.h"
#include "Minecraft.Client/include/XboxStubs.h"
#include "java/System.h"
NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) {

4
targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp
View file

@ -2,16 +2,16 @@
#include <string.h>
#include <wchar.h>
#include <compare>
#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "NetworkPlayerQNet.h"
#include "Socket.h"
#include "console_helpers/C4JThread.h"
#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
#include "Minecraft.Client/include/NetTypes.h"
CPlatformNetworkManagerStub* g_pPlatformNetworkManager;

4
targets/Minecraft.Client/Common/src/Network/Socket.cpp
View file

@ -1,17 +1,15 @@
#include "Socket.h"
#include <stdio.h>
#include <chrono>
#include <thread>
#include <vector>
// 4jcraft TODO
#include "Minecraft.Client/Common/ShutdownManager.h"
#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
#include "Minecraft.Client/include/NetTypes.h"
#include "Minecraft.Client/include/SkinBox.h"
#include "Minecraft.Client/include/XboxStubs.h"
#include "minecraft/server/network/ServerConnection.h"
class SocketAddress {};

1
targets/Minecraft.Client/Common/src/Network/Socket.h
View file

@ -2,6 +2,7 @@
#include <cstddef>
#include <cstdint>
#include <format>
#include <vector>
#ifndef __linux__
#include <qnet.h>
#include <xrnm.h>

1
targets/Minecraft.Client/Common/src/Trial/TrialMode.cpp
View file

@ -1,6 +1,5 @@
#include "TrialMode.h"
#include "Minecraft.Client/Common/src/Trial/TrialMode.h"
#include "Minecraft.Client/Common/src/Tutorial/FullTutorial.h"
#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"

2
targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp
View file

@ -2,11 +2,11 @@
#include <memory>
#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "minecraft/world/phys/AABB.h"
#include "minecraft/world/phys/Vec3.h"
#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
AreaConstraint::AreaConstraint(int descriptionId, double x0, double y0,
double z0, double x1, double y1, double z1,

2
targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp
View file

@ -3,7 +3,6 @@
#include <memory>
#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
#include "minecraft/client/Minecraft.h"
@ -15,6 +14,7 @@
#include "minecraft/world/level/LevelSettings.h"
#include "minecraft/world/phys/AABB.h"
#include "minecraft/world/phys/Vec3.h"
#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
ChangeStateConstraint::ChangeStateConstraint(
Tutorial* tutorial, eTutorial_State targetState,

1
targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp
View file

@ -2,7 +2,6 @@
#include "4J.Common/4J_InputActions.h"
#include "4J_Input.h"
#include "Minecraft.Client/Common/App_enums.h"
bool InputConstraint::isMappingConstrained(int iPad, int mapping) {
// If it's a menu button, then we ignore all inputs

42
targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp
View file

@ -1,18 +1,40 @@
#include "FullTutorial.h"
#include <string>
#include <vector>
#include "4J.Common/4J_InputActions.h"
#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h"
#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h"
#include "Minecraft.Client/include/stdafx.h"
#include "minecraft/world/effect/net.minecraft.world.effect.h"
#include "minecraft/world/item/alchemy/PotionMacros.h"
#include "minecraft/world/item/net.minecraft.world.item.h"
#include "minecraft/world/level/net.minecraft.world.level.h"
#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
#include "minecraft/world/phys/net.minecraft.world.phys.h"
#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h"
#include "Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.h"
#include "Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/StateChangeTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "minecraft/world/effect/MobEffect.h"
#include "minecraft/world/item/Item.h"
#include "minecraft/world/item/crafting/Recipy.h"
#include "minecraft/world/level/LevelSettings.h"
#include "minecraft/world/level/tile/Tile.h"
#include "minecraft/world/phys/AABB.h"
#include "strings.h"
class TutorialConstraint;
FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
: Tutorial(iPad, true) {

1
targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.h
View file

@ -1,5 +1,6 @@
#pragma once
#include "Tutorial.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
#define FULL_TUTORIAL_PROGRESS_2_X_2_Crafting 1
#define FULL_TUTORIAL_PROGRESS_3_X_3_Crafting 2

3
targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp
View file

@ -1,10 +1,9 @@
#include "FullTutorialMode.h"
#include "FullTutorial.h"
#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"
#include "minecraft/client/Minecraft.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
#include "minecraft/client/Minecraft.h"
class ClientConnection;

3
targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp
View file

@ -2,12 +2,13 @@
#include <memory>
#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "minecraft/world/phys/AABB.h"
#include "minecraft/world/phys/Vec3.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
AreaHint::AreaHint(eTutorial_Hint id, Tutorial* tutorial,
eTutorial_State displayState, eTutorial_State completeState,

11
targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp
View file

@ -1,11 +1,14 @@
#include "DiggerItemHint.h"
#include <memory>
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "minecraft/world/entity/net.minecraft.world.entity.h"
#include "minecraft/world/item/net.minecraft.world.item.h"
#include "minecraft/world/level/net.minecraft.world.level.h"
#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
#include "java/Class.h"
#include "minecraft/world/entity/Entity.h"
#include "minecraft/world/item/ItemInstance.h"
#include "strings.h"
DiggerItemHint::DiggerItemHint(eTutorial_Hint id, Tutorial* tutorial,
int descriptionId, int items[],

2
targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h
View file

@ -1,9 +1,11 @@
#pragma once
#include "TutorialHint.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
class DiggerItem;
class Level;
class Tutorial;
class DiggerItemHint : public TutorialHint {
private:

3
targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp
View file

@ -1,7 +1,8 @@
#include "LookAtEntityHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
LookAtEntityHint::LookAtEntityHint(eTutorial_Hint id, Tutorial* tutorial,
int descriptionId, int titleId,

3
targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp
View file

@ -2,9 +2,10 @@
#include <vector>
#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "minecraft/world/item/Item.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
LookAtTileHint::LookAtTileHint(eTutorial_Hint id, Tutorial* tutorial,
int tiles[], unsigned int tilesLength,

3
targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp
View file

@ -2,9 +2,10 @@
#include <memory>
#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "minecraft/world/item/ItemInstance.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
TakeItemHint::TakeItemHint(eTutorial_Hint id, Tutorial* tutorial, int items[],
unsigned int itemsLength)

1
targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp
View file

@ -1,6 +1,5 @@
#include "TutorialHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
#include "minecraft/client/Minecraft.h"

3
targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp
View file

@ -3,8 +3,9 @@
#include <vector>
#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
AreaTask::AreaTask(eTutorial_State state, Tutorial* tutorial,
std::vector<TutorialConstraint*>* inConstraints,

1
targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h
View file

@ -2,6 +2,7 @@
// using namespace std;
#include <format>
#include <vector>
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
#include "TutorialTask.h"

3
targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp
View file

@ -5,12 +5,13 @@
#include "4J_Input.h"
#include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "Minecraft.Client/Linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "minecraft/world/level/material/Material.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
ChoiceTask::ChoiceTask(
Tutorial* tutorial, int descriptionId, int promptId /*= -1*/,

2
targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp
View file

@ -2,8 +2,8 @@
#include <memory>
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "minecraft/world/item/ItemInstance.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
class Tutorial;

2
targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp
View file

@ -9,10 +9,10 @@
#include "4J_Input.h"
#include "Minecraft.Client/Common/App_enums.h"
#include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
class Tutorial;

3
targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp
View file

@ -1,12 +1,11 @@
#include "CraftTask.h"
#include <wchar.h>
#include <memory>
#include <string>
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "minecraft/world/item/ItemInstance.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
class Tutorial;
class TutorialConstraint;

1
targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.h
View file

@ -1,5 +1,6 @@
#pragma once
#include <format>
#include <vector>
#include "TutorialTask.h"

3
targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp
View file

@ -1,7 +1,8 @@
#include "FullTutorialActiveTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
FullTutorialActiveTask::FullTutorialActiveTask(
Tutorial* tutorial,

3
targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp
View file

@ -2,10 +2,11 @@
#include <memory>
#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h"
#include "java/Class.h"
#include "minecraft/world/entity/Entity.h"
#include "minecraft/world/entity/animal/EntityHorse.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
class Tutorial;

2
targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp
View file

@ -7,12 +7,12 @@
#include "4J_Input.h"
#include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "Minecraft.Client/Linux/Linux_UIController.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "minecraft/world/level/material/Material.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
InfoTask::InfoTask(Tutorial* tutorial, int descriptionId, int promptId /*= -1*/,
bool requiresUserInput /*= false*/, int iMapping /*= 0*/)

1
targets/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.h
View file

@ -1,5 +1,6 @@
#pragma once
#include <format>
#include <vector>
// using namespace std;
#include "TutorialTask.h"

1
targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp
View file

@ -4,6 +4,7 @@
#include <memory>
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
ProcedureCompoundTask::~ProcedureCompoundTask() {
for (auto it = m_taskSequence.begin(); it < m_taskSequence.end(); ++it) {

1
targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h
View file

@ -2,6 +2,7 @@
// using namespace std;
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "TutorialTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
class Tutorial;

2
targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp
View file

@ -2,9 +2,9 @@
#include <memory>
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "java/Class.h"
#include "minecraft/world/entity/Entity.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
class Tutorial;
class TutorialConstraint;

1
targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.h
View file

@ -1,6 +1,7 @@
#pragma once
#include <format>
#include <vector>
#include "TutorialTask.h"

2
targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp
View file

@ -1,9 +1,9 @@
#include "StatTask.h"
#include "4J_Profile.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/stats/StatsCounter.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
class Tutorial;

1
targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp
View file

@ -3,7 +3,6 @@
#include <compare>
#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
TutorialTask::TutorialTask(Tutorial* tutorial, int descriptionId,

2
targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp
View file

@ -2,8 +2,8 @@
#include <memory>
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "minecraft/world/item/ItemInstance.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
class Tutorial;
class TutorialConstraint;

1
targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.h
View file

@ -2,6 +2,7 @@
// using namespace std;
#include <format>
#include <vector>
#include "TutorialTask.h"

2
targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp
View file

@ -2,8 +2,8 @@
#include <memory>
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "minecraft/world/level/Level.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
class Tutorial;
class TutorialConstraint;

1
targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.h
View file

@ -2,6 +2,7 @@
// using namespace std;
#include <format>
#include <vector>
#include "TutorialTask.h"

1
targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h
View file

@ -1,5 +1,6 @@
#pragma once
#include <format>
#include <vector>
#include "TutorialTask.h"
#include "minecraft/world/item/crafting/Recipy.h"

51
targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp
View file

@ -1,26 +1,53 @@
#include "Tutorial.h"
#include <assert.h>
#include <string.h>
#include <algorithm>
#include <compare>
#include "4J.Common/4J_InputActions.h"
#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h"
#include "Minecraft.Client/include/stdafx.h"
#include "TutorialMessage.h"
#include "console_helpers/PlatformTime.h"
#include "console_helpers/StringHelpers.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "minecraft/client/player/LocalPlayer.h"
#include "minecraft/server/MinecraftServer.h"
#include "minecraft/server/level/SurvivalMode.h"
#include "minecraft/stats/net.minecraft.stats.h"
#include "minecraft/world/entity/Entity.h"
#include "minecraft/world/entity/player/net.minecraft.world.entity.player.h"
#include "minecraft/world/item/net.minecraft.world.item.h"
#include "minecraft/world/level/Level.h"
#include "minecraft/world/level/net.minecraft.world.level.h"
#include "minecraft/world/level/tile/net.minecraft.world.level.tile.h"
#include "4J_Profile.h"
#include "Common/App_enums.h"
#include "Common/App_structs.h"
#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Linux_UIController.h"
#include "java/Class.h"
#include "minecraft/world/entity/player/Inventory.h"
#include "minecraft/world/entity/player/Player.h"
#include "minecraft/world/item/DyePowderItem.h"
#include "minecraft/world/item/Item.h"
#include "minecraft/world/item/ItemInstance.h"
#include "minecraft/world/level/material/Material.h"
#include "minecraft/world/level/tile/QuartzBlockTile.h"
#include "minecraft/world/level/tile/SandStoneTile.h"
#include "minecraft/world/level/tile/StoneSlabTile.h"
#include "minecraft/world/level/tile/TallGrassPlantTile.h"
#include "minecraft/world/level/tile/Tile.h"
#include "minecraft/world/level/tile/TreeTile.h"
#include "minecraft/world/level/tile/WallTile.h"
#include "strings.h"
class MobEffect;
std::vector<int> Tutorial::s_completableTasks;

14
targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h
View file

@ -2,12 +2,26 @@
// using namespace std;
#include <cstdint>
#include <unordered_map>
#include <memory>
#include <ranges>
#include <string>
#include <utility>
#include <vector>
#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h"
#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h"
#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h"
#include "TutorialEnum.h"
#include "TutorialMessage.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
class Entity;
class ItemInstance;
class MobEffect;
class Tile;
class TutorialConstraint;
class TutorialHint;
class TutorialTask;
// #define TUTORIAL_HINT_DELAY_TIME 14000 // How long we should wait from
// displaying one hint to the next #define TUTORIAL_DISPLAY_MESSAGE_TIME 7000

5
targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp
View file

@ -2,17 +2,14 @@
#include <memory>
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
#include "console_helpers/PlatformTime.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "minecraft/stdafx.h"
#include "minecraft/world/entity/player/Inventory.h"
#include "minecraft/world/item/ItemInstance.h"
#include "minecraft/world/level/tile/Tile.h"
#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
class ClientConnection;

2
targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp
View file

@ -1,11 +1,9 @@
#include "ArchiveFile.h"
#include <assert.h>
#include <cstdlib>
#include <utility>
#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
#include "Minecraft.Client/Linux/Linux_App.h"
#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
#include "console_helpers/PortableFileIO.h"

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