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

painful update

Browse source
This commit is contained in:
JuiceyDev 2026-03-06 18:31:46 +01:00
parent 587e9a676e
commit 417ea73050
408 changed files with 1605 additions and 1594 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
4J.Input/4J_Input.cpp
View file

@ -4,7 +4,7 @@
// avoiding a coupling dependency on 4J_Render.h.
#include "4J_Input.h"
#include "../Minecraft.Client/Build/Common/App_enums.h"
#include "../Common/App_enums.h"
#include <GLFW/glfw3.h>
#include <math.h>
#include <string.h>

37
4J.Render/4J_Render.cpp
View file

@ -1,3 +1,5 @@
// TODO: ADD BETTER COMMENTS.
#include "4J_Render.h"
#include <cstring>
#include <cstdlib> // getenv
@ -42,13 +44,22 @@ static pthread_mutex_t s_sharedCtxMutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_t s_mainThread;
static bool s_mainThreadSet = false;
// viewport go brr
static void onFramebufferResize(GLFWwindow * /*win*/, int w, int h)
{
if (w < 1) w = 1;
if (h < 1) h = 1;
s_windowWidth = w;
s_windowHeight = h;
::glViewport(0, 0, w, h);
}
void C4JRender::Initialise()
{
if (!glfwInit()) {
fprintf(stderr, "[4J_Render] Failed to initialise GLFW\n");
return;
}
// todo: make resolution work
GLFWmonitor *primaryMonitor = glfwGetPrimaryMonitor();
const GLFWvidmode *mode = primaryMonitor ? glfwGetVideoMode(primaryMonitor) : nullptr;
@ -79,6 +90,9 @@ void C4JRender::Initialise()
glfwMakeContextCurrent(s_window);
glfwSwapInterval(1); // vsync
// Keep viewport in sync with OS-driven window resizes.
glfwSetFramebufferSizeCallback(s_window, onFramebufferResize);
// init opengl
::glEnable(GL_TEXTURE_2D);
::glEnable(GL_DEPTH_TEST);
@ -318,14 +332,6 @@ void C4JRender::DrawVertices(ePrimitiveType PrimitiveType, int count,
}
::glEnd();
} else {
// Standard (non-compact) vertex: 8 × int32 = 32 bytes per vertex
// Layout: [x(f), y(f), z(f), u(f), v(f), color(RGBA packed), normal, tex2]
// Color byte-order fix for little-endian (x86/x64):
// Console code stores color as int col = (r<<24)|(g<<16)|(b<<8)|a
// In little-endian memory the bytes are: [a, b, g, r] at increasing addresses.
// Read as: col[3]=r, col[2]=g, col[1]=b, col[0]=a.
// Always use glBegin/glEnd — safe for both display-list compilation and immediate mode.
// (glVertexPointer/glDrawArrays inside glNewList record a stale pointer, not the data.)
unsigned int *idata = (unsigned int *)dataIn;
::glBegin(mode);
for (int i = 0; i < count; i++) {
@ -423,12 +429,6 @@ void C4JRender::TextureBind(int idx)
void C4JRender::TextureBindVertex(int idx)
{
// No-op on desktop OpenGL. On consoles this binds a lightmap to the vertex shader
// sampler. On desktop GL 2.1 fixed-function there is no vertex texture concept;
// lighting is handled via vertex colors. Binding anything here OVERRIDES GL_TEXTURE0
// after the call (because the game calls glTexParameteri on whatever is active),
// causing the terrain atlas filter params to be corrupted or the lightmap to appear
// on terrain instead of the atlas. Leave it as a no-op.
(void)idx;
}
@ -451,13 +451,6 @@ void C4JRender::TextureData(int width, int height, void *data, int level,
width, height, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
// For the base level (0), force the texture to be non-mipmapped and pixel-crisp.
// glGenerateMipmap() was previously called here as a "safety net", but on Mesa/Nvidia
// drivers it silently resets GL_TEXTURE_MIN_FILTER to the OpenGL spec default
// (GL_NEAREST_MIPMAP_LINEAR), overriding the GL_NEAREST set before this call.
// Fix: set GL_TEXTURE_MAX_LEVEL=0 (only sample level 0) and re-enforce GL_NEAREST.
// The game manually uploads explicit mip levels 1..N-1 after this call anyway,
// so we don't need glGenerateMipmap() as a completeness safety net.
if (level == 0) {
::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

2
Common/Audio/Consoles_SoundEngine.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "Consoles_SoundEngine.h"

10
Common/Audio/Consoles_SoundEngine.h
View file

@ -1,28 +1,28 @@
#pragma once
#include "../../../../Minecraft.World/Util/SoundTypes.h"
#include "../../Minecraft.World/Util/SoundTypes.h"
#ifdef _XBOX
#elif defined (__PS3__)
#undef __in
#undef __out
#include "../../../Platform/PS3/Miles/include/mss.h"
#include "../../Minecraft.Client/Platform/PS3/Miles/include/mss.h"
#elif defined (__PSVITA__)
#include "../../PSVITA/Miles/include/mss.h"
#elif defined _DURANGO
// 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
#define _SEKRIT
#include "../../../Platform/Durango/Miles/include/mss.h"
#include "../../Minecraft.Client/Platform/Durango/Miles/include/mss.h"
#elif defined _WINDOWS64
#include "../../windows64/Miles/include/mss.h"
#elif defined(__linux__)
// (DecalOverdose)HACK + TODO: Find native Linux headers and libs for this, but for now I'm using Win64 ones
#include "../../../Platform/Windows64/Miles/include/mss.h"
#include "../../Minecraft.Client/Platform/Windows64/Miles/include/mss.h"
#else // PS4
// 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
#define _SEKRIT2
#include "../../../Platform/Orbis/Miles/include/mss.h"
#include "../../Minecraft.Client/Platform/Orbis/Miles/include/mss.h"
#endif
typedef struct

16
Common/Audio/SoundEngine.cpp
View file

@ -1,13 +1,13 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "SoundEngine.h"
#include "../Consoles_App.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../../../Minecraft.World/Level/LevelData.h"
#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../Minecraft.World/Level/LevelData.h"
#include "../../Minecraft.World/Util/Mth.h"
#include "../../../Textures/Packs/TexturePackRepository.h"
#include "../../../Textures/Packs/DLCTexturePack.h"
#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
#include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h"
#include "../DLC/DLCAudioFile.h"
#ifdef __PSVITA__
@ -15,8 +15,8 @@
#endif
#ifdef _WINDOWS64
#include "../../../Platform/Windows64/Windows64_App.h"
#include "../../../Platform/Windows64/Miles/include/imssapi.h"
#include "../../Minecraft.Client/Platform/Windows64/Windows64_App.h"
#include "../../Minecraft.Client/Platform/Windows64/Miles/include/imssapi.h"
#endif
#ifdef __ORBIS__

2
Common/Audio/SoundEngine.h
View file

@ -2,7 +2,7 @@
class Mob;
class Options;
using namespace std;
#include "../../../../Minecraft.World/Util/SoundTypes.h"
#include "../../Minecraft.World/Util/SoundTypes.h"
enum eMUSICFILES
{

2
Common/Audio/SoundNames.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "Consoles_SoundEngine.h"

4
Common/Colours/ColourTable.cpp
View file

@ -1,6 +1,6 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "ColourTable.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
unordered_map<wstring,eMinecraftColour> ColourTable::s_colourNamesMap;

2
Common/ConsoleGameMode.cpp
View file

@ -1,4 +1,4 @@
#include "../../../Minecraft.World/Build/stdafx.h"
#include "../Minecraft.World/Build/stdafx.h"
#include "ConsoleGameMode.h"
#include "Tutorial/Tutorial.h"

2
Common/Console_Utils.cpp
View file

@ -1,4 +1,4 @@
#include "../../../Minecraft.World/Build/stdafx.h"
#include "../Minecraft.World/Build/stdafx.h"
#define CDECL

86
Common/Consoles_App.cpp
View file

@ -1,58 +1,58 @@

#include "../../../Minecraft.World/Build/stdafx.h"
#include "../Minecraft.World/Build/stdafx.h"
#include "../../../Minecraft.World/Recipes/Recipy.h"
#include "../../GameState/Options.h"
#include "../../../Minecraft.World/Util/AABB.h"
#include "../../../Minecraft.World/Util/Vec3.h"
#include "../../MinecraftServer.h"
#include "../../Level/MultiPlayerLevel.h"
#include "../../Rendering/GameRenderer.h"
#include "../../Rendering/EntityRenderers/ProgressRenderer.h"
#include "../../Rendering/LevelRenderer.h"
#include "../../Textures/MobSkinMemTextureProcessor.h"
#include "../../Minecraft.h"
#include "../../Network/ClientConnection.h"
#include "../../Player/MultiPlayerLocalPlayer.h"
#include "../../Player/LocalPlayer.h"
#include "../../../Minecraft.World/Player/Player.h"
#include "../../../Minecraft.World/Containers/Inventory.h"
#include "../../../Minecraft.World/Level/Level.h"
#include "../../../Minecraft.World/Blocks/TileEntities/FurnaceTileEntity.h"
#include "../../../Minecraft.World/Containers/Container.h"
#include "../../../Minecraft.World/Blocks/TileEntities/DispenserTileEntity.h"
#include "../../../Minecraft.World/Blocks/TileEntities/SignTileEntity.h"
#include "../../GameState/StatsCounter.h"
#include "../../GameState/GameMode.h"
#include "../../Platform/Xbox/Social/SocialManager.h"
#include "../Minecraft.World/Recipes/Recipy.h"
#include "../Minecraft.Client/GameState/Options.h"
#include "../Minecraft.World/Util/AABB.h"
#include "../Minecraft.World/Util/Vec3.h"
#include "../Minecraft.Client/MinecraftServer.h"
#include "../Minecraft.Client/Level/MultiPlayerLevel.h"
#include "../Minecraft.Client/Rendering/GameRenderer.h"
#include "../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h"
#include "../Minecraft.Client/Rendering/LevelRenderer.h"
#include "../Minecraft.Client/Textures/MobSkinMemTextureProcessor.h"
#include "../Minecraft.Client/Minecraft.h"
#include "../Minecraft.Client/Network/ClientConnection.h"
#include "../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
#include "../Minecraft.Client/Player/LocalPlayer.h"
#include "../Minecraft.World/Player/Player.h"
#include "../Minecraft.World/Containers/Inventory.h"
#include "../Minecraft.World/Level/Level.h"
#include "../Minecraft.World/Blocks/TileEntities/FurnaceTileEntity.h"
#include "../Minecraft.World/Containers/Container.h"
#include "../Minecraft.World/Blocks/TileEntities/DispenserTileEntity.h"
#include "../Minecraft.World/Blocks/TileEntities/SignTileEntity.h"
#include "../Minecraft.Client/GameState/StatsCounter.h"
#include "../Minecraft.Client/GameState/GameMode.h"
#include "../Minecraft.Client/Platform/Xbox/Social/SocialManager.h"
#include "Tutorial/TutorialMode.h"
#if defined _XBOX || defined _WINDOWS64
#include "../../Platform/Xbox/XML/ATGXmlParser.h"
#include "../../Platform/Xbox/XML/xmlFilesCallback.h"
#include "../Minecraft.Client/Platform/Xbox/XML/ATGXmlParser.h"
#include "../Minecraft.Client/Platform/Xbox/XML/xmlFilesCallback.h"
#endif
#include "Minecraft_Macros.h"
#include "../../Network/PlayerList.h"
#include "../../Player/ServerPlayer.h"
#include "../Minecraft.Client/Network/PlayerList.h"
#include "../Minecraft.Client/Player/ServerPlayer.h"
#include "GameRules/ConsoleGameRules.h"
#include "GameRules/ConsoleSchematicFile.h"
#include "../../../Minecraft.World/IO/Streams/InputOutputStream.h"
#include "../../../Minecraft.World/Level/Storage/LevelSettings.h"
#include "../../Player/User.h"
#include "../../../Minecraft.World/Level/LevelData.h"
#include "../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
#include "../../Rendering/EntityRenderers/EntityRenderDispatcher.h"
#include "../../../Minecraft.World/IO/Streams/Compression.h"
#include "../../Textures/Packs/TexturePackRepository.h"
#include "../../Textures/Packs/DLCTexturePack.h"
#include "../Minecraft.World/IO/Streams/InputOutputStream.h"
#include "../Minecraft.World/Level/Storage/LevelSettings.h"
#include "../Minecraft.Client/Player/User.h"
#include "../Minecraft.World/Level/LevelData.h"
#include "../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
#include "../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h"
#include "../Minecraft.World/IO/Streams/Compression.h"
#include "../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
#include "../Minecraft.Client/Textures/Packs/DLCTexturePack.h"
#include "DLC/DLCPack.h"
#include "../../Utils/StringTable.h"
#include "../Minecraft.Client/Utils/StringTable.h"
#ifndef _XBOX
#include "../../Utils/ArchiveFile.h"
#include "../Minecraft.Client/Utils/ArchiveFile.h"
#endif
#include "../../Minecraft.h"
#include "../Minecraft.Client/Minecraft.h"
#ifdef _XBOX
#include "../../Platform/Xbox/GameConfig/Minecraft.spa.h"
#include "../../Platform/Xbox/Network/NetworkPlayerXbox.h"
#include "../Minecraft.Client/Platform/Xbox/GameConfig/Minecraft.spa.h"
#include "../Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h"
#include "XUI/XUI_TextEntry.h"
#include "XUI/XUI_XZP_Icons.h"
#include "XUI/XUI_PauseMenu.h"

8
Common/Consoles_App.h
View file

@ -14,17 +14,17 @@ using namespace std;
#endif
#include "UI/UIStructs.h"
#include "../../../Minecraft.World/Network/Packets/DisconnectPacket.h"
#include "../Minecraft.World/Network/Packets/DisconnectPacket.h"
#ifndef __linux__
#include <xsocialpost.h>
#endif // __linux__
#include "../../Utils/StringTable.h"
#include "../Minecraft.Client/Utils/StringTable.h"
#include "DLC/DLCManager.h"
#include "GameRules/ConsoleGameRulesConstants.h"
#include "GameRules/GameRuleManager.h"
#include "../../Rendering/Models/SkinBox.h"
#include "../../Utils/ArchiveFile.h"
#include "../Minecraft.Client/Rendering/Models/SkinBox.h"
#include "../Minecraft.Client/Utils/ArchiveFile.h"
typedef struct _JoinFromInviteData
{

6
Common/DLC/DLCAudioFile.cpp
View file

@ -1,9 +1,9 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "DLCManager.h"
#include "DLCAudioFile.h"
#if defined _XBOX || defined _WINDOWS64
#include "../../../Platform/Xbox/XML/ATGXmlParser.h"
#include "../../../Platform/Xbox/XML/xmlFilesCallback.h"
#include "../../Minecraft.Client/Platform/Xbox/XML/ATGXmlParser.h"
#include "../../Minecraft.Client/Platform/Xbox/XML/xmlFilesCallback.h"
#endif
DLCAudioFile::DLCAudioFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path)

2
Common/DLC/DLCCapeFile.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "DLCManager.h"
#include "DLCCapeFile.h"

8
Common/DLC/DLCColourTableFile.cpp
View file

@ -1,9 +1,9 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "DLCManager.h"
#include "DLCColourTableFile.h"
#include "../../../Minecraft.h"
#include "../../../Textures/Packs/TexturePackRepository.h"
#include "../../../Textures/Packs/TexturePack.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
#include "../../Minecraft.Client/Textures/Packs/TexturePack.h"
DLCColourTableFile::DLCColourTableFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path)
{

2
Common/DLC/DLCFile.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "DLCFile.h"
DLCFile::DLCFile(DLCManager::EDLCType type, const wstring &path)

2
Common/DLC/DLCGameRulesFile.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "DLCManager.h"
#include "DLCGameRulesFile.h"

8
Common/DLC/DLCGameRulesHeader.cpp
View file

@ -1,10 +1,10 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include <string>
#include "../../../../Minecraft.World/IO/Files/File.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/IO/Streams/InputOutputStream.h"
#include "../../Minecraft.World/IO/Files/File.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/IO/Streams/InputOutputStream.h"
#include "DLCManager.h"
#include "DLCGameRulesHeader.h"

4
Common/DLC/DLCLocalisationFile.cpp
View file

@ -1,7 +1,7 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "DLCManager.h"
#include "DLCLocalisationFile.h"
#include "../../../Utils/StringTable.h"
#include "../../Minecraft.Client/Utils/StringTable.h"
DLCLocalisationFile::DLCLocalisationFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path)
{

8
Common/DLC/DLCManager.cpp
View file

@ -1,11 +1,11 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include <algorithm>
#include "DLCManager.h"
#include "DLCPack.h"
#include "DLCFile.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../Minecraft.h"
#include "../../../Textures/Packs/TexturePackRepository.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
#ifdef __linux__
#include <stdint.h>

4
Common/DLC/DLCPack.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "DLCPack.h"
#include "DLCSkinFile.h"
#include "DLCCapeFile.h"
@ -9,7 +9,7 @@
#include "DLCGameRulesHeader.h"
#include "DLCAudioFile.h"
#include "DLCColourTableFile.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
DLCPack::DLCPack(const wstring &name,DWORD dwLicenseMask)
{

12
Common/DLC/DLCSkinFile.cpp
View file

@ -1,11 +1,11 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "DLCManager.h"
#include "DLCSkinFile.h"
#include "../../../Rendering/Models/ModelPart.h"
#include "../../../Rendering/EntityRenderers/EntityRenderer.h"
#include "../../../Rendering/EntityRenderers/EntityRenderDispatcher.h"
#include "../../../../Minecraft.World/Player/Player.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.Client/Rendering/Models/ModelPart.h"
#include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderer.h"
#include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h"
#include "../../Minecraft.World/Player/Player.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
DLCSkinFile::DLCSkinFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path)
{

2
Common/DLC/DLCSkinFile.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "DLCFile.h"
#include "../../../Rendering/Models/HumanoidModel.h"
#include "../../Minecraft.Client/Rendering/Models/HumanoidModel.h"
class DLCSkinFile : public DLCFile
{

2
Common/DLC/DLCTextureFile.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "DLCManager.h"
#include "DLCTextureFile.h"

2
Common/DLC/DLCUIDataFile.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "DLCManager.h"
#include "DLCUIDataFile.h"

8
Common/GameRules/AddEnchantmentRuleDefinition.cpp
View file

@ -1,7 +1,7 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.enchantment.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.enchantment.h"
#include "AddEnchantmentRuleDefinition.h"
AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition()

10
Common/GameRules/AddItemRuleDefinition.cpp
View file

@ -1,8 +1,8 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
#include "AddItemRuleDefinition.h"
#include "AddEnchantmentRuleDefinition.h"

14
Common/GameRules/ApplySchematicRuleDefinition.cpp
View file

@ -1,10 +1,10 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
#include "ApplySchematicRuleDefinition.h"
#include "LevelGenerationOptions.h"
#include "ConsoleSchematicFile.h"

4
Common/GameRules/BiomeOverride.cpp
View file

@ -1,5 +1,5 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "BiomeOverride.h"
BiomeOverride::BiomeOverride()

12
Common/GameRules/CollectItemRuleDefinition.cpp
View file

@ -1,10 +1,10 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../Utils/WstringLookup.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.Client/Utils/WstringLookup.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "CollectItemRuleDefinition.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../../../Minecraft.World/Network/Connection.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Network/Connection.h"
#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h"
CollectItemRuleDefinition::CollectItemRuleDefinition()
{

8
Common/GameRules/CompleteAllRuleDefinition.cpp
View file

@ -1,9 +1,9 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "CompleteAllRuleDefinition.h"
#include "ConsoleGameRules.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/Network/Connection.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Network/Connection.h"
#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h"
void CompleteAllRuleDefinition::getChildren(vector<GameRuleDefinition *> *children)
{

6
Common/GameRules/CompoundGameRuleDefinition.cpp
View file

@ -1,6 +1,6 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "CompoundGameRuleDefinition.h"
#include "ConsoleGameRules.h"

12
Common/GameRules/ConsoleGenerateStructure.cpp
View file

@ -1,11 +1,11 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "ConsoleGenerateStructure.h"
#include "ConsoleGameRules.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.dimension.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Headers/net.minecraft.h"
ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0)
{

2
Common/GameRules/ConsoleGenerateStructure.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "GameRuleDefinition.h"
#include "../../../../Minecraft.World/WorldGen/Structures/StructurePiece.h"
#include "../../Minecraft.World/WorldGen/Structures/StructurePiece.h"
class Level;
class Random;

22
Common/GameRules/ConsoleSchematicFile.cpp
View file

@ -1,16 +1,16 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include <vector>
#include "../../../../Minecraft.World/Headers/com.mojang.nbt.h"
#include "../../../../Minecraft.World/Build/System.h"
#include "../../Minecraft.World/Headers/com.mojang.nbt.h"
#include "../../Minecraft.World/Build/System.h"
#include "ConsoleSchematicFile.h"
#include "../../../../Minecraft.World/IO/Streams/InputOutputStream.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.item.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h"
#include "../../../../Minecraft.World/IO/Streams/Compression.h"
#include "../../Minecraft.World/IO/Streams/InputOutputStream.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.entity.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.entity.item.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
#include "../../Minecraft.World/IO/Streams/Compression.h"
ConsoleSchematicFile::ConsoleSchematicFile()
{

2
Common/GameRules/ConsoleSchematicFile.h
View file

@ -4,7 +4,7 @@ using namespace std;
#define XBOX_SCHEMATIC_ORIGINAL_VERSION 1
#define XBOX_SCHEMATIC_CURRENT_VERSION 2
#include "../../../../Minecraft.World/Util/ArrayWithLength.h"
#include "../../Minecraft.World/Util/ArrayWithLength.h"
class Level;
class DataOutputStream;

2
Common/GameRules/GameRule.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "ConsoleGameRules.h"
GameRule::GameRule(GameRuleDefinition *definition, Connection *connection)

6
Common/GameRules/GameRuleDefinition.cpp
View file

@ -1,6 +1,6 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../Utils/WstringLookup.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.Client/Utils/WstringLookup.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "ConsoleGameRules.h"
GameRuleDefinition::GameRuleDefinition()

2
Common/GameRules/GameRuleDefinition.h
View file

@ -3,7 +3,7 @@ using namespace std;
#include <unordered_map>
#include <string>
#include "../../../../Minecraft.World/Items/ItemInstance.h"
#include "../../Minecraft.World/Items/ItemInstance.h"
#include "ConsoleGameRulesConstants.h"
#include "GameRulesInstance.h"

12
Common/GameRules/GameRuleManager.cpp
View file

@ -1,14 +1,14 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/IO/Streams/Compression.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/IO/Files/File.h"
#include "../../../../Minecraft.World/IO/Streams/Compression.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/IO/Streams/Compression.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/IO/Files/File.h"
#include "../../Minecraft.World/IO/Streams/Compression.h"
#include "../DLC/DLCPack.h"
#include "../DLC/DLCLocalisationFile.h"
#include "../DLC/DLCGameRulesFile.h"
#include "../DLC/DLCGameRules.h"
#include "../DLC/DLCGameRulesHeader.h"
#include "../../../Utils/StringTable.h"
#include "../../Minecraft.Client/Utils/StringTable.h"
#include "ConsoleGameRules.h"
#include "GameRuleManager.h"

14
Common/GameRules/LevelGenerationOptions.cpp
View file

@ -1,13 +1,13 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include <unordered_set>
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/Util/Pos.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
#include "../../../Utils/StringTable.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Util/Pos.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"
#include "../../Minecraft.Client/Utils/StringTable.h"
#include "LevelGenerationOptions.h"
#include "ConsoleGameRules.h"

2
Common/GameRules/LevelGenerationOptions.h
View file

@ -4,7 +4,7 @@ using namespace std;
// #pragma message("LevelGenerationOptions.h ")
#include "GameRuleDefinition.h"
#include "../../../../Minecraft.World/WorldGen/Features/StructureFeature.h"
#include "../../Minecraft.World/WorldGen/Features/StructureFeature.h"
class ApplySchematicRuleDefinition;
class LevelChunk;

2
Common/GameRules/LevelGenerators.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "LevelGenerationOptions.h"
#include "LevelGenerators.h"

2
Common/GameRules/LevelRules.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "LevelRules.h"

6
Common/GameRules/LevelRuleset.cpp
View file

@ -1,6 +1,6 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../Utils/StringTable.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.Client/Utils/StringTable.h"
#include "ConsoleGameRules.h"
#include "LevelRuleset.h"

6
Common/GameRules/NamedAreaRuleDefinition.cpp
View file

@ -1,7 +1,7 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "NamedAreaRuleDefinition.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
NamedAreaRuleDefinition::NamedAreaRuleDefinition()
{

4
Common/GameRules/StartFeature.cpp
View file

@ -1,5 +1,5 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "StartFeature.h"
StartFeature::StartFeature()

2
Common/GameRules/StartFeature.h
View file

@ -2,7 +2,7 @@
using namespace std;
#include "GameRuleDefinition.h"
#include "../../../../Minecraft.World/WorldGen/Features/StructureFeature.h"
#include "../../Minecraft.World/WorldGen/Features/StructureFeature.h"
class StartFeature : public GameRuleDefinition
{

12
Common/GameRules/UpdatePlayerRuleDefinition.cpp
View file

@ -1,11 +1,11 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "UpdatePlayerRuleDefinition.h"
#include "ConsoleGameRules.h"
#include "../../../../Minecraft.World/Util/Pos.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.food.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Util/Pos.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.food.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition()
{

4
Common/GameRules/UseTileRuleDefinition.cpp
View file

@ -1,5 +1,5 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "UseTileRuleDefinition.h"
UseTileRuleDefinition::UseTileRuleDefinition()

2
Common/GameRules/UseTileRuleDefinition.h
View file

@ -2,7 +2,7 @@
using namespace std;
#include "GameRuleDefinition.h"
#include "../../../../Minecraft.World/Util/Pos.h"
#include "../../Minecraft.World/Util/Pos.h"
class UseTileRuleDefinition : public GameRuleDefinition
{

6
Common/GameRules/XboxStructureActionGenerateBox.cpp
View file

@ -1,7 +1,7 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "XboxStructureActionGenerateBox.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
XboxStructureActionGenerateBox::XboxStructureActionGenerateBox()
{

6
Common/GameRules/XboxStructureActionPlaceBlock.cpp
View file

@ -1,7 +1,7 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "XboxStructureActionPlaceBlock.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock()
{

12
Common/GameRules/XboxStructureActionPlaceContainer.cpp
View file

@ -1,11 +1,11 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "XboxStructureActionPlaceContainer.h"
#include "AddItemRuleDefinition.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer()
{

10
Common/GameRules/XboxStructureActionPlaceSpawner.cpp
View file

@ -1,9 +1,9 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "XboxStructureActionPlaceSpawner.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.levelgen.structure.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner()
{

4
Common/Leaderboards/LeaderboardManager.cpp
View file

@ -1,6 +1,6 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "LeaderboardManager.h"

56
Common/Network/GameNetworkManager.cpp
View file

@ -1,30 +1,30 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Minecraft.World/Util/AABB.h"
#include "../../../../Minecraft.World/Util/Vec3.h"
#include "../../../../Minecraft.World/Network/Socket.h"
#include "../../../../Minecraft.World/Util/ThreadName.h"
#include "../../../../Minecraft.World/Entities/Entity.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../../Network/ClientConnection.h"
#include "../../../Minecraft.h"
#include "../../../Player/User.h"
#include "../../../MinecraftServer.h"
#include "../../../Network/PlayerList.h"
#include "../../../Player/ServerPlayer.h"
#include "../../../Network/PlayerConnection.h"
#include "../../../Level/MultiPlayerLevel.h"
#include "../../../Rendering/EntityRenderers/ProgressRenderer.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../../../Minecraft.World/Network/Packets/DisconnectPacket.h"
#include "../../../../Minecraft.World/IO/Streams/Compression.h"
#include "../../../../Minecraft.World/Level/Storage/OldChunkStorage.h"
#include "../../../Textures/Packs/TexturePackRepository.h"
#include "../../../Textures/Packs/TexturePack.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Util/AABB.h"
#include "../../Minecraft.World/Util/Vec3.h"
#include "../../Minecraft.World/Network/Socket.h"
#include "../../Minecraft.World/Util/ThreadName.h"
#include "../../Minecraft.World/Entities/Entity.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../Minecraft.Client/Network/ClientConnection.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/Player/User.h"
#include "../../Minecraft.Client/MinecraftServer.h"
#include "../../Minecraft.Client/Network/PlayerList.h"
#include "../../Minecraft.Client/Player/ServerPlayer.h"
#include "../../Minecraft.Client/Network/PlayerConnection.h"
#include "../../Minecraft.Client/Level/MultiPlayerLevel.h"
#include "../../Minecraft.Client/Rendering/EntityRenderers/ProgressRenderer.h"
#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
#include "../../Minecraft.World/Network/Packets/DisconnectPacket.h"
#include "../../Minecraft.World/IO/Streams/Compression.h"
#include "../../Minecraft.World/Level/Storage/OldChunkStorage.h"
#include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h"
#include "../../Minecraft.Client/Textures/Packs/TexturePack.h"
#include "../../../UI/Gui.h"
#include "../../../Rendering/LevelRenderer.h"
#include "../../../../Minecraft.World/Util/IntCache.h"
#include "../../Minecraft.Client/UI/Gui.h"
#include "../../Minecraft.Client/Rendering/LevelRenderer.h"
#include "../../Minecraft.World/Util/IntCache.h"
#include "../GameRules/ConsoleGameRules.h"
#include "GameNetworkManager.h"
@ -33,11 +33,11 @@
#elif !(defined __PSVITA__)
#include "../UI/UI.h"
#include "../UI/UIScene_PauseMenu.h"
#include "../../../Platform/Xbox/Network/NetworkPlayerXbox.h"
#include "../../Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h"
#endif
#ifdef _DURANGO
#include "../../../../Minecraft.World/Stats/DurangoStats.h"
#include "../../Minecraft.World/Stats/DurangoStats.h"
#endif
#define WAIT_TIMEOUT 258

8
Common/Network/GameNetworkManager.h
View file

@ -4,21 +4,21 @@ using namespace std;
#ifndef __linux__
#include <qnet.h>
#endif
#include "../../../../Minecraft.World/Util/C4JThread.h"
#include "../../Minecraft.World/Util/C4JThread.h"
#include "NetworkPlayerInterface.h"
#ifdef _XBOX
#include "../../../Platform/Xbox/Network/PlatformNetworkManagerXbox.h"
#include "../../Minecraft.Client/Platform/Xbox/Network/PlatformNetworkManagerXbox.h"
#elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
#include "Sony/PlatformNetworkManagerSony.h"
#elif defined _DURANGO
#include "../../../Platform/Durango/Network/PlatformNetworkManagerDurango.h"
#include "../../Minecraft.Client/Platform/Durango/Network/PlatformNetworkManagerDurango.h"
#else
#include "PlatformNetworkManagerStub.h"
#endif
#include "SessionInfo.h"
#ifdef __ORBIS__
#include "../../../Platform/Orbis/Network/PsPlusUpsellWrapper_Orbis.h"
#include "../../Minecraft.Client/Platform/Orbis/Network/PsPlusUpsellWrapper_Orbis.h"
#endif
class ClientConnection;

2
Common/Network/PlatformNetworkManagerInterface.h
View file

@ -4,7 +4,7 @@ using namespace std;
#ifndef __linux__
#include <qnet.h>
#endif // __linux__
#include "../../../../Minecraft.World/Util/C4JThread.h"
#include "../../Minecraft.World/Util/C4JThread.h"
#include "NetworkPlayerInterface.h"
#include "SessionInfo.h"

8
Common/Network/PlatformNetworkManagerStub.cpp
View file

@ -1,8 +1,8 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Network/Socket.h"
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Network/Socket.h"
#include "../../Minecraft.World/Util/StringHelpers.h"
#include "PlatformNetworkManagerStub.h"
#include "../../../Platform/Xbox/Network/NetworkPlayerXbox.h" // TODO - stub version of this?
#include "../../Minecraft.Client/Platform/Xbox/Network/NetworkPlayerXbox.h" // TODO - stub version of this?
CPlatformNetworkManagerStub *g_pPlatformNetworkManager;

2
Common/Network/PlatformNetworkManagerStub.h
View file

@ -1,7 +1,7 @@
#pragma once
using namespace std;
#include <vector>
#include "../../../../Minecraft.World/Util/C4JThread.h"
#include "../../Minecraft.World/Util/C4JThread.h"
#include "NetworkPlayerInterface.h"
#include "PlatformNetworkManagerInterface.h"
#include "SessionInfo.h"

2
Common/Network/Sony/NetworkPlayerSony.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../../Minecraft.World/Build/stdafx.h"
#include "../../../Minecraft.World/Build/stdafx.h"
#include "NetworkPlayerSony.h"
NetworkPlayerSony::NetworkPlayerSony(SQRNetworkPlayer *qnetPlayer)

6
Common/Network/Sony/PlatformNetworkManagerSony.cpp
View file

@ -1,6 +1,6 @@
#include "../../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../../Minecraft.World/Network/Socket.h"
#include "../../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../Minecraft.World/Build/stdafx.h"
#include "../../../Minecraft.World/Network/Socket.h"
#include "../../../Minecraft.World/Util/StringHelpers.h"
#include "PlatformNetworkManagerSony.h"
#include "NetworkPlayerSony.h"
#include "../GameNetworkManager.h"

2
Common/Network/Sony/PlatformNetworkManagerSony.h
View file

@ -1,7 +1,7 @@
#pragma once
using namespace std;
#include <vector>
#include "../../../../../Minecraft.World/Util/C4JThread.h"
#include "../../../Minecraft.World/Util/C4JThread.h"
#include "../NetworkPlayerInterface.h"
#include "../PlatformNetworkManagerInterface.h"
#include "../SessionInfo.h"

2
Common/Network/Sony/SQRNetworkManager.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../../Minecraft.World/Build/stdafx.h"
#include "../../../Minecraft.World/Build/stdafx.h"
#include "SQRNetworkManager.h"

2
Common/Network/Sony/SQRNetworkPlayer.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../../Minecraft.World/Build/stdafx.h"
#include "../../../Minecraft.World/Build/stdafx.h"
#include "SQRNetworkPlayer.h"
#ifdef __PS3__

2
Common/Network/Sony/SonyCommerce.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../../Minecraft.World/Build/stdafx.h"
#include "../../../Minecraft.World/Build/stdafx.h"
#include "SonyCommerce.h"
#include "../../../../Platform/PS3/PS3Extras/ShutdownManager.h"

2
Common/Network/Sony/SonyHttp.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../../Minecraft.World/Build/stdafx.h"
#include "../../../Minecraft.World/Build/stdafx.h"
#include "SonyHttp.h"

2
Common/Network/Sony/SonyRemoteStorage.cpp
View file

@ -1,6 +1,6 @@
#include "../../../../../Minecraft.World/Build/stdafx.h"
#include "../../../Minecraft.World/Build/stdafx.h"
#include "SonyRemoteStorage.h"

10
Common/Telemetry/TelemetryManager.cpp
View file

@ -1,10 +1,10 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
#include "../../../../Minecraft.World/Level/Storage/LevelSettings.h"
#include "../../../../Minecraft.World/Level/LevelData.h"
#include "../../../../Minecraft.World/Level/Level.h"
#include "../../Minecraft.World/Level/Storage/LevelSettings.h"
#include "../../Minecraft.World/Level/LevelData.h"
#include "../../Minecraft.World/Level/Level.h"
#include "TelemetryManager.h"

4
Common/Telemetry/TelemetryManager.h
View file

@ -4,9 +4,9 @@
// SentientManager.h -> MinecraftTelemetry.h. Using the Windows64 path would
// cause duplicate enum definitions.
#if defined(__linux__)
#include "../../../Platform/Orbis/Sentient/TelemetryEnum.h"
#include "../../Minecraft.Client/Platform/Orbis/Sentient/TelemetryEnum.h"
#else
#include "../../../Platform/Windows64/Sentient/TelemetryEnum.h"
#include "../../Minecraft.Client/Platform/Windows64/Sentient/TelemetryEnum.h"
#endif
#include "../UI/UIEnums.h"

2
Common/Trial/TrialMode.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "TrialMode.h"
#include "../Tutorial/FullTutorial.h"

8
Common/Tutorial/AreaConstraint.cpp
View file

@ -1,9 +1,9 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../../Minecraft.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
#include "AreaConstraint.h"
#include "../../../../Minecraft.World/Util/AABB.h"
#include "../../Minecraft.World/Util/AABB.h"
AreaConstraint::AreaConstraint( int descriptionId, double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool restrictsMovement /*=true*/ )
: TutorialConstraint( descriptionId )

8
Common/Tutorial/AreaHint.cpp
View file

@ -1,9 +1,9 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../../Minecraft.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
#include "AreaHint.h"
#include "../../../../Minecraft.World/Util/AABB.h"
#include "../../Minecraft.World/Util/AABB.h"
#include "Tutorial.h"
AreaHint::AreaHint(eTutorial_Hint id, Tutorial *tutorial, eTutorial_State displayState, eTutorial_State completeState,

2
Common/Tutorial/AreaTask.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "Tutorial.h"
#include "AreaTask.h"

14
Common/Tutorial/ChangeStateConstraint.cpp
View file

@ -1,13 +1,13 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "Tutorial.h"
#include "../../../Minecraft.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "ChangeStateConstraint.h"
#include "../../../../Minecraft.World/Util/AABB.h"
#include "../../../Network/ClientConnection.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.network.packet.h"
#include "../../Minecraft.World/Util/AABB.h"
#include "../../Minecraft.Client/Network/ClientConnection.h"
#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h"
ChangeStateConstraint::ChangeStateConstraint( Tutorial *tutorial, eTutorial_State targetState, eTutorial_State sourceStates[], DWORD sourceStatesCount,
double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool changeGameMode /*= false*/, GameType *targetGameMode /*= 0*/ )

8
Common/Tutorial/ChoiceTask.cpp
View file

@ -1,12 +1,12 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include <string>
#include <unordered_map>
#include "../../../Minecraft.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
#include "Tutorial.h"
#include "TutorialConstraints.h"
#include "ChoiceTask.h"
#include "../../../../Minecraft.World/Blocks/Material.h"
#include "../../Minecraft.World/Blocks/Material.h"
ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/,

4
Common/Tutorial/CompleteUsingItemTask.cpp
View file

@ -1,5 +1,5 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Items/ItemInstance.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Items/ItemInstance.h"
#include "CompleteUsingItemTask.h"
CompleteUsingItemTask::CompleteUsingItemTask(Tutorial *tutorial, int descriptionId, int itemIds[], unsigned int itemIdsLength, bool enablePreCompletion)

6
Common/Tutorial/ControllerTask.cpp
View file

@ -1,8 +1,8 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include <string>
#include <unordered_map>
#include "../../../Minecraft.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
#include "Tutorial.h"
#include "TutorialConstraints.h"
#include "ControllerTask.h"

4
Common/Tutorial/CraftTask.cpp
View file

@ -1,6 +1,6 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "CraftTask.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
CraftTask::CraftTask( int itemId, int auxValue, int quantity,
Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= NULL*/,

10
Common/Tutorial/DiggerItemHint.cpp
View file

@ -1,8 +1,8 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.entity.h"
#include "Tutorial.h"
#include "DiggerItemHint.h"

4
Common/Tutorial/EffectChangedTask.cpp
View file

@ -1,5 +1,5 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.effect.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.effect.h"
#include "EffectChangedTask.h"
EffectChangedTask::EffectChangedTask(Tutorial *tutorial, int descriptionId, MobEffect *effect, bool apply,

12
Common/Tutorial/FullTutorial.cpp
View file

@ -1,9 +1,9 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.phys.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.effect.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.phys.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.effect.h"
#include "../GameRules/ConsoleGameRules.h"
#include "DiggerItemHint.h"
#include "TutorialTasks.h"

2
Common/Tutorial/FullTutorialActiveTask.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "Tutorial.h"
#include "FullTutorialActiveTask.h"

4
Common/Tutorial/FullTutorialMode.cpp
View file

@ -1,5 +1,5 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../Minecraft.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "FullTutorial.h"
#include "FullTutorialMode.h"

8
Common/Tutorial/InfoTask.cpp
View file

@ -1,12 +1,12 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include <string>
#include <unordered_map>
#include "../../../Minecraft.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
#include "Tutorial.h"
#include "TutorialConstraints.h"
#include "InfoTask.h"
#include "../../../../Minecraft.World/Blocks/Material.h"
#include "../../Minecraft.World/Blocks/Material.h"
InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
int iMapping /*= 0*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)

2
Common/Tutorial/InputConstraint.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "InputConstraint.h"
bool InputConstraint::isMappingConstrained(int iPad, int mapping)

2
Common/Tutorial/LookAtEntityHint.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "Tutorial.h"
#include "LookAtEntityHint.h"

2
Common/Tutorial/LookAtEntityHint.h
View file

@ -1,7 +1,7 @@
#pragma once
using namespace std;
#include "../../../../Minecraft.World/Util/Class.h"
#include "../../Minecraft.World/Util/Class.h"
#include "TutorialHint.h"
class ItemInstance;

6
Common/Tutorial/LookAtTileHint.cpp
View file

@ -1,6 +1,6 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "Tutorial.h"
#include "LookAtTileHint.h"

2
Common/Tutorial/PickupTask.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "PickupTask.h"
void PickupTask::onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux)

2
Common/Tutorial/ProcedureCompoundTask.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "ProcedureCompoundTask.h"
ProcedureCompoundTask::~ProcedureCompoundTask()

2
Common/Tutorial/ProgressFlagTask.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "ProgressFlagTask.h"
bool ProgressFlagTask::isCompleted()

10
Common/Tutorial/StatTask.cpp
View file

@ -1,8 +1,8 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../Minecraft.h"
#include "../../../Player/LocalPlayer.h"
#include "../../../GameState/StatsCounter.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/Player/LocalPlayer.h"
#include "../../Minecraft.Client/GameState/StatsCounter.h"
#include "../../Minecraft.World/Headers/net.minecraft.stats.h"
#include "StatTask.h"
StatTask::StatTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, Stat *stat, int variance /*= 1*/)

6
Common/Tutorial/TakeItemHint.cpp
View file

@ -1,6 +1,6 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "Tutorial.h"
#include "TakeItemHint.h"

28
Common/Tutorial/Tutorial.cpp
View file

@ -1,17 +1,17 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.stats.h"
#include "../../../Player/LocalPlayer.h"
#include "../../../../Minecraft.World/Entities/Entity.h"
#include "../../../../Minecraft.World/Level/Level.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../../MinecraftServer.h"
#include "../../../Minecraft.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../../Level/MultiPlayerLevel.h"
#include "../../../GameState/SurvivalMode.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Headers/net.minecraft.stats.h"
#include "../../Minecraft.Client/Player/LocalPlayer.h"
#include "../../Minecraft.World/Entities/Entity.h"
#include "../../Minecraft.World/Level/Level.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../Minecraft.Client/MinecraftServer.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
#include "../../Minecraft.Client/Level/MultiPlayerLevel.h"
#include "../../Minecraft.Client/GameState/SurvivalMode.h"
#include "Tutorial.h"
#include "TutorialMessage.h"
#include "TutorialTasks.h"

12
Common/Tutorial/TutorialHint.cpp
View file

@ -1,11 +1,11 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "Tutorial.h"
#include "TutorialHint.h"
#include "../../../Minecraft.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, eHintType type, bool allowFade /*= true*/)
: m_id( id ), m_tutorial(tutorial), m_descriptionId( descriptionId ), m_type( type ), m_counter( 0 ),

2
Common/Tutorial/TutorialMessage.cpp
View file

@ -1,4 +1,4 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include "TutorialMessage.h"
TutorialMessage::TutorialMessage(int messageId, bool limitRepeats /*= false*/, unsigned char numRepeats /*= TUTORIAL_MESSAGE_DEFAULT_SHOW*/)

16
Common/Tutorial/TutorialMode.cpp
View file

@ -1,12 +1,12 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "../../Minecraft.World/Build/stdafx.h"
#include <memory>
#include "../../../Minecraft.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../../../Level/MultiPlayerLevel.h"
#include "../../../../Minecraft.World/Containers/Inventory.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
#include "../../Minecraft.Client/Level/MultiPlayerLevel.h"
#include "../../Minecraft.World/Containers/Inventory.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
#include "TutorialMode.h"
TutorialMode::TutorialMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : MultiPlayerGameMode( minecraft, connection ), m_iPad( iPad )

2
Common/Tutorial/TutorialMode.h
View file

@ -1,7 +1,7 @@
#pragma once
using namespace std;
#include "../../../Player/MultiPlayerGameMode.h"
#include "../../Minecraft.Client/Player/MultiPlayerGameMode.h"
#include "Tutorial.h"
class TutorialMode : public MultiPlayerGameMode

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