backups/LCEMP
2
0
Fork 0
mirror of https://github.com/LCEMP/LCEMP.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

world/server linux support

Browse source
This commit is contained in:
NOTPIES 2026-03-15 22:21:24 -03:00
parent 6d6016a403
commit 9b34142250
823 changed files with 5141 additions and 3263 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitignore vendored
View file

@ -1,6 +1,9 @@
# =========================================== # ===========================================
# Build outputs # Build outputs
# =========================================== # ===========================================
build/
build_dedicated/
build_linux/
x64/ x64/
x64_Server_Release/ x64_Server_Release/
x64_Server_Debug/ x64_Server_Debug/
@ -8,6 +11,12 @@ Minecraft.Client/x64/
Minecraft.World/x64_Debug/ Minecraft.World/x64_Debug/
Minecraft.World/x64_Release/ Minecraft.World/x64_Release/
ipch/ ipch/
MinecraftConsoles.opensdf
MinecraftConsoles.sdf
server.properties
fix_include_case.ps1
# =========================================== # ===========================================
# Visual Studio files # Visual Studio files
@ -208,5 +217,4 @@ Minecraft.Client/PS3/PS3Extras/HeapInspector/
# Sony remote storage libs # Sony remote storage libs
Minecraft.Client/Common/Network/Sony/ Minecraft.Client/Common/Network/Sony/
Minecraft.Server/
build_dedicated/ build_dedicated/

187
CMakeLists.txt
View file

@ -5,67 +5,154 @@ set(LCEMP_WORKING_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Assets" CACHE STRING "The wor
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
if(NOT WIN32) if(NOT WIN32 AND NOT UNIX)
message(FATAL_ERROR "Windows is currently the only supported OS") message(FATAL_ERROR "Only Windows and Linux are supported")
endif() endif()
# Fix linking errors with other libs compiled with an older CRT
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/Sources.cmake") include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/Sources.cmake")
list(TRANSFORM MINECRAFT_WORLD_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/") list(TRANSFORM MINECRAFT_WORLD_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/")
list(TRANSFORM MINECRAFT_CLIENT_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/")
add_library(MinecraftWorld STATIC ${MINECRAFT_WORLD_SOURCES}) if(UNIX)
add_executable(MinecraftClient WIN32 ${MINECRAFT_CLIENT_SOURCES}) set(BUNDLED_ZLIB_SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Common/zlib/adler32.c"
set_property(TARGET MinecraftClient PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${LCEMP_WORKING_DIR}") "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Common/zlib/compress.c"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Common/zlib/crc32.c"
if(MSVC) "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Common/zlib/deflate.c"
# /MT and /MTd options set the CRT version to multi-threaded static mode "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Common/zlib/inffast.c"
# which is what the 4J libs were compiled with "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Common/zlib/inflate.c"
target_compile_options(MinecraftWorld PRIVATE /W3 /MP $<$<CONFIG:Debug>:/MTd> $<$<NOT:$<CONFIG:Debug>>:/MT> /EHsc) "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Common/zlib/inftrees.c"
target_compile_options(MinecraftClient PRIVATE /W3 /MP $<$<CONFIG:Debug>:/MTd> $<$<NOT:$<CONFIG:Debug>>:/MT> /EHsc) "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Common/zlib/trees.c"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Common/zlib/uncompr.c"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Common/zlib/zutil.c"
)
add_library(MinecraftWorld STATIC ${MINECRAFT_WORLD_SOURCES} ${BUNDLED_ZLIB_SOURCES})
else()
add_library(MinecraftWorld STATIC ${MINECRAFT_WORLD_SOURCES})
endif() endif()
target_compile_definitions(MinecraftWorld PRIVATE
$<$<CONFIG:Debug>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
$<$<NOT:$<CONFIG:Debug>>:_LARGE_WORLDS;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
)
target_compile_definitions(MinecraftClient PRIVATE
$<$<CONFIG:Debug>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
$<$<NOT:$<CONFIG:Debug>>:_LARGE_WORLDS;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
)
target_include_directories(MinecraftWorld PUBLIC target_include_directories(MinecraftWorld PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World" "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/x64headers" "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/x64headers"
) )
target_include_directories(MinecraftClient PRIVATE if(WIN32)
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client" target_compile_definitions(MinecraftWorld PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/include" $<$<CONFIG:Debug>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Xbox/Sentient/Include" $<$<NOT:$<CONFIG:Debug>>:_LARGE_WORLDS;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
) )
endif()
target_link_libraries(MinecraftClient PRIVATE if(MSVC)
MinecraftWorld target_compile_options(MinecraftWorld PRIVATE /W3 /MP $<$<CONFIG:Debug>:/MTd> $<$<NOT:$<CONFIG:Debug>>:/MT> /EHsc)
d3d11 endif()
XInput9_1_0
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/lib/iggy_w64.lib" if(UNIX)
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Miles/lib/mss64.lib" target_include_directories(MinecraftWorld BEFORE PRIVATE
$<$<CONFIG:Debug>: "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Linux/stubs"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_d.lib" )
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_d.lib" target_include_directories(MinecraftWorld PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_d.lib" "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC_d.lib" "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/include"
> "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Xbox/Sentient/Include"
$<$<NOT:$<CONFIG:Debug>>: )
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_r.lib" target_compile_options(MinecraftWorld PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_r.lib" -include "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Linux/LinuxCompat.h"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_r.lib" -Wno-write-strings -Wno-narrowing -Wno-deprecated
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib" )
> target_compile_definitions(MinecraftWorld PRIVATE
) _LARGE_WORLDS _LIB _WINDOWS64
_CRT_NON_CONFORMING_SWPRINTFS _CRT_SECURE_NO_WARNINGS
)
endif()
if(WIN32)
list(TRANSFORM MINECRAFT_CLIENT_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/")
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
add_executable(MinecraftClient WIN32 ${MINECRAFT_CLIENT_SOURCES})
set_property(TARGET MinecraftClient PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${LCEMP_WORKING_DIR}")
if(MSVC)
target_compile_options(MinecraftClient PRIVATE /W3 /MP $<$<CONFIG:Debug>:/MTd> $<$<NOT:$<CONFIG:Debug>>:/MT> /EHsc)
endif()
target_compile_definitions(MinecraftClient PRIVATE
$<$<CONFIG:Debug>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
$<$<NOT:$<CONFIG:Debug>>:_LARGE_WORLDS;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
)
target_include_directories(MinecraftClient PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/include"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Xbox/Sentient/Include"
)
target_link_libraries(MinecraftClient PRIVATE
MinecraftWorld
d3d11
XInput9_1_0
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/lib/iggy_w64.lib"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Miles/lib/mss64.lib"
$<$<CONFIG:Debug>:
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_d.lib"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_d.lib"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_d.lib"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC_d.lib"
>
$<$<NOT:$<CONFIG:Debug>>:
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_r.lib"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_r.lib"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Profile_r.lib"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib"
>
)
endif()
if(UNIX)
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/ServerSources.cmake")
list(TRANSFORM MINECRAFT_SERVER_OWN_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/")
list(TRANSFORM MINECRAFT_SERVER_SHARED_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/")
add_executable(MinecraftDedicatedServer
${MINECRAFT_SERVER_OWN_SOURCES}
${MINECRAFT_SERVER_SHARED_SOURCES}
)
target_compile_definitions(MinecraftDedicatedServer PRIVATE
_DEDICATED_SERVER
_CONTENT_PACKAGE
_LARGE_WORLDS
_WINDOWS64
WITH_SERVER_CODE
_CRT_NON_CONFORMING_SWPRINTFS
_CRT_SECURE_NO_WARNINGS
)
target_include_directories(MinecraftDedicatedServer BEFORE PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Linux/stubs"
)
target_include_directories(MinecraftDedicatedServer PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Linux"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/inc"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/include"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Xbox/Sentient/Include"
"${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/x64headers"
)
target_compile_options(MinecraftDedicatedServer PRIVATE
-include "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Linux/LinuxCompat.h"
-Wno-write-strings -Wno-narrowing -Wno-deprecated
)
find_package(Threads REQUIRED)
target_link_libraries(MinecraftDedicatedServer PRIVATE
MinecraftWorld
Threads::Threads
)
endif()

8
Minecraft.Client/AbstractContainerScreen.cpp
View file

@ -1,14 +1,14 @@
#include "stdafx.h" #include "stdafx.h"
#include "AbstractContainerScreen.h" #include "AbstractContainerScreen.h"
#include "ItemRenderer.h" #include "ItemRenderer.h"
#include "MultiplayerLocalPlayer.h" #include "MultiPlayerLocalPlayer.h"
#include "Lighting.h" #include "Lighting.h"
#include "GameMode.h" #include "GameMode.h"
#include "KeyMapping.h" #include "KeyMapping.h"
#include "Options.h" #include "Options.h"
#include "..\Minecraft.World\net.minecraft.world.inventory.h" #include "../Minecraft.World/net.minecraft.world.inventory.h"
#include "..\Minecraft.World\net.minecraft.locale.h" #include "../Minecraft.World/net.minecraft.locale.h"
#include "..\Minecraft.World\net.minecraft.world.item.h" #include "../Minecraft.World/net.minecraft.world.item.h"
ItemRenderer *AbstractContainerScreen::itemRenderer = new ItemRenderer(); ItemRenderer *AbstractContainerScreen::itemRenderer = new ItemRenderer();

4
Minecraft.Client/AbstractTexturePack.cpp
View file

@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include "Textures.h" #include "Textures.h"
#include "AbstractTexturePack.h" #include "AbstractTexturePack.h"
#include "..\Minecraft.World\InputOutputStream.h" #include "../Minecraft.World/InputOutputStream.h"
#include "..\Minecraft.World\StringHelpers.h" #include "../Minecraft.World/StringHelpers.h"
AbstractTexturePack::AbstractTexturePack(DWORD id, File *file, const wstring &name, TexturePack *fallback) : id(id), name(name) AbstractTexturePack::AbstractTexturePack(DWORD id, File *file, const wstring &name, TexturePack *fallback) : id(id), name(name)
{ {

8
Minecraft.Client/AchievementPopup.cpp
View file

@ -4,10 +4,10 @@
#include "Font.h" #include "Font.h"
#include "Textures.h" #include "Textures.h"
#include "Lighting.h" #include "Lighting.h"
#include "..\Minecraft.World\System.h" #include "../Minecraft.World/System.h"
#include "..\Minecraft.World\net.minecraft.locale.h" #include "../Minecraft.World/net.minecraft.locale.h"
#include "..\Minecraft.World\net.minecraft.stats.h" #include "../Minecraft.World/net.minecraft.stats.h"
#include "..\Minecraft.World\SharedConstants.h" #include "../Minecraft.World/SharedConstants.h"
AchievementPopup::AchievementPopup(Minecraft *mc) AchievementPopup::AchievementPopup(Minecraft *mc)
{ {

8
Minecraft.Client/AchievementScreen.cpp
View file

@ -8,10 +8,10 @@
#include "Textures.h" #include "Textures.h"
#include "StatsCounter.h" #include "StatsCounter.h"
#include "ItemRenderer.h" #include "ItemRenderer.h"
#include "..\Minecraft.World\System.h" #include "../Minecraft.World/System.h"
#include "..\Minecraft.World\net.minecraft.locale.h" #include "../Minecraft.World/net.minecraft.locale.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.h" #include "../Minecraft.World/net.minecraft.world.level.tile.h"
#include "..\Minecraft.World\JavaMath.h" #include "../Minecraft.World/JavaMath.h"

2
Minecraft.Client/AchievementScreen.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Screen.h" #include "Screen.h"
#include "..\Minecraft.World\net.minecraft.stats.h" #include "../Minecraft.World/net.minecraft.stats.h"
class StatsCounter; class StatsCounter;
class AchievementScreen : public Screen class AchievementScreen : public Screen

4
Minecraft.Client/ArchiveFile.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\StringHelpers.h" #include "../Minecraft.World/StringHelpers.h"
#include "..\Minecraft.World\compression.h" #include "../Minecraft.World/compression.h"
#include "ArchiveFile.h" #include "ArchiveFile.h"

4
Minecraft.Client/ArchiveFile.h
View file

@ -3,8 +3,8 @@
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
#include "..\Minecraft.World\File.h" #include "../Minecraft.World/File.h"
#include "..\Minecraft.World\ArrayWithLength.h" #include "../Minecraft.World/ArrayWithLength.h"
using namespace std; using namespace std;

4
Minecraft.Client/ArrowRenderer.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "ArrowRenderer.h" #include "ArrowRenderer.h"
#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" #include "../Minecraft.World/net.minecraft.world.entity.projectile.h"
#include "..\Minecraft.World\Mth.h" #include "../Minecraft.World/Mth.h"
void ArrowRenderer::render(shared_ptr<Entity> _arrow, double x, double y, double z, float rot, float a) void ArrowRenderer::render(shared_ptr<Entity> _arrow, double x, double y, double z, float rot, float a)
{ {

2
Minecraft.Client/BlazeModel.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\Mth.h" #include "../Minecraft.World/Mth.h"
#include "BlazeModel.h" #include "BlazeModel.h"
#include "ModelPart.h" #include "ModelPart.h"

2
Minecraft.Client/BlazeRenderer.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "BlazeModel.h" #include "BlazeModel.h"
#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" #include "../Minecraft.World/net.minecraft.world.entity.monster.h"
#include "BlazeRenderer.h" #include "BlazeRenderer.h"
BlazeRenderer::BlazeRenderer() : MobRenderer(new BlazeModel(), 0.5f) BlazeRenderer::BlazeRenderer() : MobRenderer(new BlazeModel(), 0.5f)

4
Minecraft.Client/BoatRenderer.cpp
View file

@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include "BoatRenderer.h" #include "BoatRenderer.h"
#include "BoatModel.h" #include "BoatModel.h"
#include "..\Minecraft.World\net.minecraft.world.entity.item.h" #include "../Minecraft.World/net.minecraft.world.entity.item.h"
#include "..\Minecraft.World\Mth.h" #include "../Minecraft.World/Mth.h"
BoatRenderer::BoatRenderer() : EntityRenderer() BoatRenderer::BoatRenderer() : EntityRenderer()
{ {

2
Minecraft.Client/BookModel.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\Mth.h" #include "../Minecraft.World/Mth.h"
#include "BookModel.h" #include "BookModel.h"
#include "ModelPart.h" #include "ModelPart.h"

6
Minecraft.Client/BreakingItemParticle.cpp
View file

@ -1,9 +1,9 @@
#include "stdafx.h" #include "stdafx.h"
#include "BreakingItemParticle.h" #include "BreakingItemParticle.h"
#include "Tesselator.h" #include "Tesselator.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.h" #include "../Minecraft.World/net.minecraft.world.level.tile.h"
#include "..\Minecraft.World\net.minecraft.world.item.h" #include "../Minecraft.World/net.minecraft.world.item.h"
#include "..\Minecraft.World\net.minecraft.world.h" #include "../Minecraft.World/net.minecraft.world.h"
void BreakingItemParticle::_init(Item *item, Textures *textures, int data) void BreakingItemParticle::_init(Item *item, Textures *textures, int data)
{ {

10
Minecraft.Client/BubbleParticle.cpp
View file

@ -1,10 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include "BubbleParticle.h" #include "BubbleParticle.h"
#include "..\Minecraft.World\Random.h" #include "../Minecraft.World/Random.h"
#include "..\Minecraft.World\Mth.h" #include "../Minecraft.World/Mth.h"
#include "..\Minecraft.World\JavaMath.h" #include "../Minecraft.World/JavaMath.h"
#include "..\Minecraft.World\net.minecraft.world.level.h" #include "../Minecraft.World/net.minecraft.world.level.h"
#include "..\Minecraft.World\net.minecraft.world.level.material.h" #include "../Minecraft.World/net.minecraft.world.level.material.h"
BubbleParticle::BubbleParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za) BubbleParticle::BubbleParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za)
{ {

4
Minecraft.Client/BufferedImage.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\StringHelpers.h" #include "../Minecraft.World/StringHelpers.h"
#include "Textures.h" #include "Textures.h"
#include "..\Minecraft.World\ArrayWithLength.h" #include "../Minecraft.World/ArrayWithLength.h"
#include "BufferedImage.h" #include "BufferedImage.h"
#ifdef _XBOX #ifdef _XBOX

8
Minecraft.Client/Camera.cpp
View file

@ -1,10 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include "Camera.h" #include "Camera.h"
#include "MemoryTracker.h" #include "MemoryTracker.h"
#include "..\Minecraft.World\net.minecraft.world.entity.player.h" #include "../Minecraft.World/net.minecraft.world.entity.player.h"
#include "..\Minecraft.World\net.minecraft.world.level.h" #include "../Minecraft.World/net.minecraft.world.level.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.h" #include "../Minecraft.World/net.minecraft.world.level.tile.h"
#include "..\Minecraft.World\TilePos.h" #include "../Minecraft.World/TilePos.h"
float Camera::xPlayerOffs = 0.0f; float Camera::xPlayerOffs = 0.0f;
float Camera::yPlayerOffs = 0.0f; float Camera::yPlayerOffs = 0.0f;

4
Minecraft.Client/Camera.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "..\Minecraft.World\FloatBuffer.h" #include "../Minecraft.World/FloatBuffer.h"
#include "..\Minecraft.World\IntBuffer.h" #include "../Minecraft.World/IntBuffer.h"
class TilePos; class TilePos;

6
Minecraft.Client/ChatScreen.cpp
View file

@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include "ChatScreen.h" #include "ChatScreen.h"
#include "MultiplayerLocalPlayer.h" #include "MultiPlayerLocalPlayer.h"
#include "..\Minecraft.World\SharedConstants.h" #include "../Minecraft.World/SharedConstants.h"
#include "..\Minecraft.World\StringHelpers.h" #include "../Minecraft.World/StringHelpers.h"
const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters; const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters;

4
Minecraft.Client/ChestRenderer.cpp
View file

@ -3,8 +3,8 @@
#include "ChestModel.h" #include "ChestModel.h"
#include "LargeChestModel.h" #include "LargeChestModel.h"
#include "ModelPart.h" #include "ModelPart.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" #include "../Minecraft.World/net.minecraft.world.level.tile.entity.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.h" #include "../Minecraft.World/net.minecraft.world.level.tile.h"
ChestRenderer::ChestRenderer() ChestRenderer::ChestRenderer()
{ {

2
Minecraft.Client/ChickenModel.cpp
View file

@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\Mth.h" #include "../Minecraft.World/Mth.h"
#include "ChickenModel.h" #include "ChickenModel.h"
#include "ModelPart.h" #include "ModelPart.h"

4
Minecraft.Client/ChickenRenderer.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\Mth.h" #include "../Minecraft.World/Mth.h"
#include "ChickenRenderer.h" #include "ChickenRenderer.h"
#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" #include "../Minecraft.World/net.minecraft.world.entity.animal.h"
ChickenRenderer::ChickenRenderer(Model *model, float shadow) : MobRenderer(model,shadow) ChickenRenderer::ChickenRenderer(Model *model, float shadow) : MobRenderer(model,shadow)
{ {

14
Minecraft.Client/Chunk.cpp
View file

@ -2,16 +2,16 @@
#include "Chunk.h" #include "Chunk.h"
#include "TileRenderer.h" #include "TileRenderer.h"
#include "TileEntityRenderDispatcher.h" #include "TileEntityRenderDispatcher.h"
#include "..\Minecraft.World\net.minecraft.world.level.h" #include "../Minecraft.World/net.minecraft.world.level.h"
#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" #include "../Minecraft.World/net.minecraft.world.level.chunk.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.h" #include "../Minecraft.World/net.minecraft.world.level.tile.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" #include "../Minecraft.World/net.minecraft.world.level.tile.entity.h"
#include "LevelRenderer.h" #include "LevelRenderer.h"
#ifdef __PS3__ #ifdef __PS3__
#include "PS3\SPU_Tasks\ChunkUpdate\ChunkRebuildData.h" #include "PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h"
#include "PS3\SPU_Tasks\ChunkUpdate\TileRenderer_SPU.h" #include "PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.h"
#include "PS3\SPU_Tasks\CompressedTile\CompressedTileStorage_SPU.h" #include "PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h"
#include "C4JThread_SPU.h" #include "C4JThread_SPU.h"
#include "C4JSpursJob.h" #include "C4JSpursJob.h"

2
Minecraft.Client/Chunk.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "AllowAllCuller.h" #include "AllowAllCuller.h"
#include "Tesselator.h" #include "Tesselator.h"
#include "..\Minecraft.World\ArrayWithLength.h" #include "../Minecraft.World/ArrayWithLength.h"
#include "LevelRenderer.h" #include "LevelRenderer.h"
class Level; class Level;

98
Minecraft.Client/ClientConnection.cpp
View file

@ -9,43 +9,46 @@
#include "TakeAnimationParticle.h" #include "TakeAnimationParticle.h"
#include "CritParticle.h" #include "CritParticle.h"
#include "User.h" #include "User.h"
#include "..\Minecraft.World\net.minecraft.world.level.storage.h" #include "../Minecraft.World/net.minecraft.world.level.storage.h"
#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" #include "../Minecraft.World/net.minecraft.world.level.chunk.h"
#include "..\Minecraft.World\net.minecraft.stats.h" #include "../Minecraft.World/net.minecraft.stats.h"
#include "..\Minecraft.World\net.minecraft.world.entity.h" #include "../Minecraft.World/net.minecraft.world.entity.h"
#include "..\Minecraft.World\net.minecraft.world.entity.player.h" #include "../Minecraft.World/net.minecraft.world.entity.player.h"
#include "..\Minecraft.World\net.minecraft.world.entity.npc.h" #include "../Minecraft.World/net.minecraft.world.entity.npc.h"
#include "..\Minecraft.World\net.minecraft.world.entity.item.h" #include "../Minecraft.World/net.minecraft.world.entity.item.h"
#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" #include "../Minecraft.World/net.minecraft.world.entity.projectile.h"
#include "..\Minecraft.World\net.minecraft.world.entity.global.h" #include "../Minecraft.World/net.minecraft.world.entity.global.h"
#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" #include "../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" #include "../Minecraft.World/net.minecraft.world.entity.monster.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" #include "../Minecraft.World/net.minecraft.world.level.tile.entity.h"
#include "..\Minecraft.World\net.minecraft.world.item.h" #include "../Minecraft.World/net.minecraft.world.item.h"
#include "..\Minecraft.World\net.minecraft.world.item.trading.h" #include "../Minecraft.World/net.minecraft.world.item.trading.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.h" #include "../Minecraft.World/net.minecraft.world.level.tile.h"
#include "..\Minecraft.World\net.minecraft.world.inventory.h" #include "../Minecraft.World/net.minecraft.world.inventory.h"
#include "..\Minecraft.World\net.minecraft.world.h" #include "../Minecraft.World/net.minecraft.world.h"
#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h" #include "../Minecraft.World/net.minecraft.world.level.saveddata.h"
#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" #include "../Minecraft.World/net.minecraft.world.level.dimension.h"
#include "..\Minecraft.World\net.minecraft.world.effect.h" #include "../Minecraft.World/net.minecraft.world.effect.h"
#include "..\Minecraft.World\net.minecraft.world.food.h" #include "../Minecraft.World/net.minecraft.world.food.h"
#include "..\Minecraft.World\SharedConstants.h" #include "../Minecraft.World/SharedConstants.h"
#include "..\Minecraft.World\AABB.h" #include "../Minecraft.World/AABB.h"
#include "..\Minecraft.World\Pos.h" #include "../Minecraft.World/Pos.h"
#include "..\Minecraft.World\Socket.h" #include "../Minecraft.World/Socket.h"
#include "Minecraft.h" #include "Minecraft.h"
#include "ProgressRenderer.h" #include "ProgressRenderer.h"
#include "LevelRenderer.h" #include "LevelRenderer.h"
#include "Options.h" #include "Options.h"
#include "MinecraftServer.h" #include "MinecraftServer.h"
#include "ClientConstants.h" #include "ClientConstants.h"
#include "..\Minecraft.World\SoundTypes.h" #include "../Minecraft.World/SoundTypes.h"
#include "TexturePackRepository.h" #include "TexturePackRepository.h"
#ifdef _XBOX #ifdef _XBOX
#include "Common\XUI\XUI_Scene_Trading.h" #include "Common/XUI/XUI_Scene_Trading.h"
#else #else
#include "Common\UI\UI.h" #include "Common/UI/UI.h"
#endif
#if defined(_WINDOWS64) && !defined(_DEDICATED_SERVER)
#include "Windows64/Audio/VoiceChat.h"
#endif #endif
#ifdef __PS3__ #ifdef __PS3__
#include "PS3/Network/SonyVoiceChat.h" #include "PS3/Network/SonyVoiceChat.h"
@ -53,13 +56,13 @@
#include "DLCTexturePack.h" #include "DLCTexturePack.h"
#ifdef _WINDOWS64 #ifdef _WINDOWS64
#include "Xbox\Network\NetworkPlayerXbox.h" #include "Xbox/Network/NetworkPlayerXbox.h"
#include "Common\Network\PlatformNetworkManagerStub.h" #include "Common/Network/PlatformNetworkManagerStub.h"
#endif #endif
#ifdef _DURANGO #ifdef _DURANGO
#include "..\Minecraft.World\DurangoStats.h" #include "../Minecraft.World/DurangoStats.h"
#include "..\Minecraft.World\GenericStats.h" #include "../Minecraft.World/GenericStats.h"
#endif #endif
ClientConnection::ClientConnection(Minecraft *minecraft, const wstring& ip, int port) ClientConnection::ClientConnection(Minecraft *minecraft, const wstring& ip, int port)
@ -3180,6 +3183,37 @@ void ClientConnection::handleSoundEvent(shared_ptr<LevelSoundPacket> packet)
void ClientConnection::handleCustomPayload(shared_ptr<CustomPayloadPacket> customPayloadPacket) void ClientConnection::handleCustomPayload(shared_ptr<CustomPayloadPacket> customPayloadPacket)
{ {
#if defined(_WINDOWS64) && !defined(_DEDICATED_SERVER)
if (customPayloadPacket->identifier == L"MC|VoiceCfg")
{
if (customPayloadPacket->data.data && customPayloadPacket->data.length >= 1)
{
bool enabled = (customPayloadPacket->data.data[0] != 0);
if (enabled && !VoiceChat::isEnabled())
{
VoiceChat::init();
VoiceChat::setEnabled(true);
}
else if (!enabled && VoiceChat::isEnabled())
{
VoiceChat::setEnabled(false);
VoiceChat::shutdown();
}
}
return;
}
if (customPayloadPacket->identifier == L"MC|Voice")
{
if (customPayloadPacket->data.data && customPayloadPacket->data.length > 1)
{
unsigned char senderSmallId = (unsigned char)customPayloadPacket->data.data[0];
VoiceChat::onVoiceReceived(senderSmallId,
(const char *)(customPayloadPacket->data.data + 1),
customPayloadPacket->data.length - 1);
}
return;
}
#endif
if (CustomPayloadPacket::TRADER_LIST_PACKET.compare(customPayloadPacket->identifier) == 0) if (CustomPayloadPacket::TRADER_LIST_PACKET.compare(customPayloadPacket->identifier) == 0)
{ {
ByteArrayInputStream bais(customPayloadPacket->data); ByteArrayInputStream bais(customPayloadPacket->data);

2
Minecraft.Client/ClientConnection.h
View file

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "..\Minecraft.World\net.minecraft.network.h" #include "../Minecraft.World/net.minecraft.network.h"
class Minecraft; class Minecraft;
class MultiPlayerLevel; class MultiPlayerLevel;
class SavedDataStorage; class SavedDataStorage;

8
Minecraft.Client/ClockTexture.cpp
View file

@ -1,9 +1,9 @@
#include "stdafx.h" #include "stdafx.h"
#include "Minecraft.h" #include "Minecraft.h"
#include "..\Minecraft.World\net.minecraft.world.level.h" #include "../Minecraft.World/net.minecraft.world.level.h"
#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" #include "../Minecraft.World/net.minecraft.world.level.dimension.h"
#include "MultiplayerLocalPlayer.h" #include "MultiPlayerLocalPlayer.h"
#include "..\Minecraft.World\JavaMath.h" #include "../Minecraft.World/JavaMath.h"
#include "Texture.h" #include "Texture.h"
#include "ClockTexture.h" #include "ClockTexture.h"

12
Minecraft.Client/Common/Audio/Consoles_SoundEngine.h
View file

@ -1,25 +1,25 @@
#pragma once #pragma once
#include "..\..\..\Minecraft.World\SoundTypes.h" #include "../../../Minecraft.World/SoundTypes.h"
#ifdef _XBOX #ifdef _XBOX
#elif defined (__PS3__) #elif defined (__PS3__)
#undef __in #undef __in
#undef __out #undef __out
#include "..\..\PS3\Miles\include\mss.h" #include "../../PS3/Miles/include/mss.h"
#elif defined (__PSVITA__) #elif defined (__PSVITA__)
#include "..\..\PSVITA\Miles\include\mss.h" #include "../../PSVita/Miles/include/mss.h"
#elif defined _DURANGO #elif defined _DURANGO
// 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
#define _SEKRIT #define _SEKRIT
#include "..\..\Durango\Miles\include\mss.h" #include "../../Durango/Miles/include/mss.h"
#elif defined _WINDOWS64 #elif defined _WINDOWS64
#include "..\..\windows64\Miles\include\mss.h" #include "../../Windows64/Miles/include/mss.h"
#else // PS4 #else // PS4
// 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
#define _SEKRIT2 #define _SEKRIT2
#include "..\..\Orbis\Miles\include\mss.h" #include "../../Orbis/Miles/include/mss.h"
#endif #endif
typedef struct typedef struct

22
Minecraft.Client/Common/Audio/SoundEngine.cpp
View file

@ -1,22 +1,22 @@
#include "stdafx.h" #include "stdafx.h"
#include "SoundEngine.h" #include "SoundEngine.h"
#include "..\Consoles_App.h" #include "../Consoles_App.h"
#include "..\..\MultiplayerLocalPlayer.h" #include "../../MultiPlayerLocalPlayer.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" #include "../../../Minecraft.World/net.minecraft.world.level.h"
#include "..\..\Minecraft.World\leveldata.h" #include "../../Minecraft.World/leveldata.h"
#include "..\..\Minecraft.World\mth.h" #include "../../Minecraft.World/mth.h"
#include "..\..\TexturePackRepository.h" #include "../../TexturePackRepository.h"
#include "..\..\DLCTexturePack.h" #include "../../DLCTexturePack.h"
#include "Common\DLC\DLCAudioFile.h" #include "Common/DLC/DLCAudioFile.h"
#ifdef __PSVITA__ #ifdef __PSVITA__
#include <audioout.h> #include <audioout.h>
#endif #endif
#ifdef _WINDOWS64 #ifdef _WINDOWS64
#include "..\..\Minecraft.Client\Windows64\Windows64_App.h" #include "../../Minecraft.Client/Windows64/Windows64_App.h"
#include "..\..\Minecraft.Client\Windows64\Miles\include\imssapi.h" #include "../../Minecraft.Client/Windows64/Miles/include/imssapi.h"
#endif #endif
#ifdef __ORBIS__ #ifdef __ORBIS__

2
Minecraft.Client/Common/Audio/SoundEngine.h
View file

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

2
Minecraft.Client/Common/C4JMemoryPoolAllocator.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "..\Minecraft.Client\Common\C4JMemoryPool.h" #include "../Minecraft.Client/Common/C4JMemoryPool.h"
// Custom allocator, takes a C4JMemoryPool class, which can be one of a number of pool implementations. // Custom allocator, takes a C4JMemoryPool class, which can be one of a number of pool implementations.

2
Minecraft.Client/Common/Colours/ColourTable.cpp
View file

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

2
Minecraft.Client/Common/ConsoleGameMode.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "ConsoleGameMode.h" #include "ConsoleGameMode.h"
#include "..\Common\Tutorial\Tutorial.h" #include "../Common/Tutorial/Tutorial.h"
ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection) ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
: TutorialMode(iPad, minecraft, connection) : TutorialMode(iPad, minecraft, connection)

2
Minecraft.Client/Common/ConsoleGameMode.h
View file

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "..\Common\Tutorial\TutorialMode.h" #include "../Common/Tutorial/TutorialMode.h"
class ConsoleGameMode : public TutorialMode class ConsoleGameMode : public TutorialMode
{ {

2
Minecraft.Client/Common/Console_Utils.cpp
View file

@ -5,7 +5,7 @@
// Desc: Internal helper function // Desc: Internal helper function
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
#ifndef _CONTENT_PACKAGE #ifndef _CONTENT_PACKAGE
static VOID DebugSpewV( const CHAR* strFormat, const va_list pArgList ) static VOID DebugSpewV( const CHAR* strFormat, va_list pArgList )
{ {
#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ #if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
assert(0); assert(0);

131
Minecraft.Client/Common/Consoles_App.cpp
View file

@ -1,65 +1,65 @@

#include "stdafx.h" #include "stdafx.h"
#include <time.h> #include <time.h>
#include "..\..\Minecraft.World\Recipy.h" #include "../../Minecraft.World/Recipy.h"
#include "..\..\Minecraft.Client\Options.h" #include "../../Minecraft.Client/Options.h"
#include "..\..\Minecraft.World\AABB.h" #include "../../Minecraft.World/AABB.h"
#include "..\..\Minecraft.World\Vec3.h" #include "../../Minecraft.World/Vec3.h"
#include "..\MinecraftServer.h" #include "../MinecraftServer.h"
#include "..\MultiPlayerLevel.h" #include "../MultiPlayerLevel.h"
#include "..\GameRenderer.h" #include "../GameRenderer.h"
#include "..\ProgressRenderer.h" #include "../ProgressRenderer.h"
#include "..\..\Minecraft.Client\LevelRenderer.h" #include "../../Minecraft.Client/LevelRenderer.h"
#include "..\..\Minecraft.Client\MobSkinMemTextureProcessor.h" #include "../../Minecraft.Client/MobSkinMemTextureProcessor.h"
#include "..\..\Minecraft.Client\Minecraft.h" #include "../../Minecraft.Client/Minecraft.h"
#include "..\ClientConnection.h" #include "../ClientConnection.h"
#include "..\MultiPlayerLocalPlayer.h" #include "../MultiPlayerLocalPlayer.h"
#include "..\..\Minecraft.Client\LocalPlayer.h" #include "../../Minecraft.Client/LocalPlayer.h"
#include "..\..\Minecraft.World\Player.h" #include "../../Minecraft.World/Player.h"
#include "..\..\Minecraft.World\Inventory.h" #include "../../Minecraft.World/Inventory.h"
#include "..\..\Minecraft.World\Level.h" #include "../../Minecraft.World/Level.h"
#include "..\..\Minecraft.World\FurnaceTileEntity.h" #include "../../Minecraft.World/FurnaceTileEntity.h"
#include "..\..\Minecraft.World\Container.h" #include "../../Minecraft.World/Container.h"
#include "..\..\Minecraft.World\DispenserTileEntity.h" #include "../../Minecraft.World/DispenserTileEntity.h"
#include "..\..\Minecraft.World\SignTileEntity.h" #include "../../Minecraft.World/SignTileEntity.h"
#include "..\..\Minecraft.Client\StatsCounter.h" #include "../../Minecraft.Client/StatsCounter.h"
#include "..\GameMode.h" #include "../GameMode.h"
#include "..\Xbox\Social\SocialManager.h" #include "../Xbox/Social/SocialManager.h"
#include "Tutorial\TutorialMode.h" #include "Tutorial/TutorialMode.h"
#if defined _XBOX || defined _WINDOWS64 #if defined _XBOX || defined _WINDOWS64
#include "..\..\Minecraft.Client\Xbox\XML\ATGXmlParser.h" #include "../../Minecraft.Client/Xbox/XML/ATGXmlParser.h"
#include "..\..\Minecraft.Client\Xbox\XML\xmlFilesCallback.h" #include "../../Minecraft.Client/Xbox/XML/xmlFilesCallback.h"
#endif #endif
#include "Minecraft_Macros.h" #include "Minecraft_Macros.h"
#include "..\..\Minecraft.Client\PlayerList.h" #include "../../Minecraft.Client/PlayerList.h"
#include "..\..\Minecraft.Client\ServerPlayer.h" #include "../../Minecraft.Client/ServerPlayer.h"
#include "GameRules\ConsoleGameRules.h" #include "GameRules/ConsoleGameRules.h"
#include "GameRules\ConsoleSchematicFile.h" #include "GameRules/ConsoleSchematicFile.h"
#include "..\..\Minecraft.World\InputOutputStream.h" #include "../../Minecraft.World/InputOutputStream.h"
#include "..\..\Minecraft.World\LevelSettings.h" #include "../../Minecraft.World/LevelSettings.h"
#include "..\User.h" #include "../User.h"
#include "..\..\Minecraft.World\LevelData.h" #include "../../Minecraft.World/LevelData.h"
#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h" #include "../../Minecraft.World/net.minecraft.world.entity.player.h"
#include "..\..\Minecraft.Client\EntityRenderDispatcher.h" #include "../../Minecraft.Client/EntityRenderDispatcher.h"
#include "..\..\Minecraft.World\compression.h" #include "../../Minecraft.World/compression.h"
#include "..\TexturePackRepository.h" #include "../TexturePackRepository.h"
#include "..\DLCTexturePack.h" #include "../DLCTexturePack.h"
#include "DLC\DLCPack.h" #include "DLC/DLCPack.h"
#include "..\StringTable.h" #include "../StringTable.h"
#ifndef _XBOX #ifndef _XBOX
#include "..\ArchiveFile.h" #include "../ArchiveFile.h"
#endif #endif
#include "..\Minecraft.h" #include "../Minecraft.h"
#ifdef _XBOX #ifdef _XBOX
#include "..\Xbox\GameConfig\Minecraft.spa.h" #include "../Xbox/GameConfig/Minecraft.spa.h"
#include "..\Xbox\Network\NetworkPlayerXbox.h" #include "../Xbox/Network/NetworkPlayerXbox.h"
#include "XUI\XUI_TextEntry.h" #include "XUI/XUI_TextEntry.h"
#include "XUI\XUI_XZP_Icons.h" #include "XUI/XUI_XZP_Icons.h"
#include "XUI\XUI_PauseMenu.h" #include "XUI/XUI_PauseMenu.h"
#else #else
#include "UI\UI.h" #include "UI/UI.h"
#include "UI\UIScene_PauseMenu.h" #include "UI/UIScene_PauseMenu.h"
#endif #endif
#ifdef __PS3__ #ifdef __PS3__
#include <sys/tty.h> #include <sys/tty.h>
@ -68,7 +68,7 @@
#include <save_data_dialog.h> #include <save_data_dialog.h>
#endif #endif
#include "..\Common\Leaderboards\LeaderboardManager.h" #include "../Common/Leaderboards/LeaderboardManager.h"
//CMinecraftApp app; //CMinecraftApp app;
unsigned int CMinecraftApp::m_uiLastSignInData = 0; unsigned int CMinecraftApp::m_uiLastSignInData = 0;
@ -260,6 +260,7 @@ void CMinecraftApp::DebugPrintf(const char *szFormat, ...)
struct tm t; struct tm t;
localtime_s(&t, &now); localtime_s(&t, &now);
printf("[%02d:%02d:%02d] [Server thread/INFO]: %s\n", t.tm_hour, t.tm_min, t.tm_sec, buf); printf("[%02d:%02d:%02d] [Server thread/INFO]: %s\n", t.tm_hour, t.tm_min, t.tm_sec, buf);
fflush(stdout);
} }
#endif #endif
#endif #endif
@ -4290,6 +4291,18 @@ int CMinecraftApp::SignoutExitWorldThreadProc( void* lpParameter )
case DisconnectPacket::eDisconnect_Kicked: case DisconnectPacket::eDisconnect_Kicked:
exitReasonStringId = IDS_DISCONNECTED_KICKED; exitReasonStringId = IDS_DISCONNECTED_KICKED;
break; break;
case DisconnectPacket::eDisconnect_NotWhitelisted:
exitReasonStringId = IDS_DISCONNECTED_NOT_WHITELISTED;
break;
case DisconnectPacket::eDisconnect_ServerBanned:
exitReasonStringId = IDS_DISCONNECTED_SERVER_BANNED;
break;
case DisconnectPacket::eDisconnect_IPBanned:
exitReasonStringId = IDS_DISCONNECTED_IP_BANNED;
break;
case DisconnectPacket::eDisconnect_InvalidUsername:
exitReasonStringId = IDS_DISCONNECTED_INVALID_USERNAME;
break;
case DisconnectPacket::eDisconnect_NoUGC_AllLocal: case DisconnectPacket::eDisconnect_NoUGC_AllLocal:
exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL; exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL;
break; break;
@ -4346,6 +4359,18 @@ int CMinecraftApp::SignoutExitWorldThreadProc( void* lpParameter )
case DisconnectPacket::eDisconnect_Kicked: case DisconnectPacket::eDisconnect_Kicked:
exitReasonStringId = IDS_DISCONNECTED_KICKED; exitReasonStringId = IDS_DISCONNECTED_KICKED;
break; break;
case DisconnectPacket::eDisconnect_NotWhitelisted:
exitReasonStringId = IDS_DISCONNECTED_NOT_WHITELISTED;
break;
case DisconnectPacket::eDisconnect_ServerBanned:
exitReasonStringId = IDS_DISCONNECTED_SERVER_BANNED;
break;
case DisconnectPacket::eDisconnect_IPBanned:
exitReasonStringId = IDS_DISCONNECTED_IP_BANNED;
break;
case DisconnectPacket::eDisconnect_InvalidUsername:
exitReasonStringId = IDS_DISCONNECTED_INVALID_USERNAME;
break;
case DisconnectPacket::eDisconnect_NoUGC_AllLocal: case DisconnectPacket::eDisconnect_NoUGC_AllLocal:
exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL; exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL;
break; break;

22
Minecraft.Client/Common/Consoles_App.h
View file

@ -5,23 +5,23 @@ using namespace std;
#include "Audio/Consoles_SoundEngine.h" #include "Audio/Consoles_SoundEngine.h"
#include <xuiapp.h> #include <xuiapp.h>
#include "..\Common\Tutorial\TutorialEnum.h" #include "../Common/Tutorial/TutorialEnum.h"
#ifdef _XBOX #ifdef _XBOX
#include "..\Common\XUI\XUI_Helper.h" #include "../Common/XUI/XUI_Helper.h"
#include "..\Common\XUI\XUI_HelpCredits.h" #include "../Common/XUI/XUI_HelpCredits.h"
#endif #endif
#include "UI\UIStructs.h" #include "UI/UIStructs.h"
#include "..\..\Minecraft.World\DisconnectPacket.h" #include "../../Minecraft.World/DisconnectPacket.h"
#include <xsocialpost.h> #include <xsocialpost.h>
#include "..\StringTable.h" #include "../StringTable.h"
#include "..\Common\DLC\DLCManager.h" #include "../Common/DLC/DLCManager.h"
#include "..\Common\GameRules\ConsoleGameRulesConstants.h" #include "../Common/GameRules/ConsoleGameRulesConstants.h"
#include "..\Common\GameRules\GameRuleManager.h" #include "../Common/GameRules/GameRuleManager.h"
#include "..\SkinBox.h" #include "../SkinBox.h"
#include "..\ArchiveFile.h" #include "../ArchiveFile.h"
typedef struct _JoinFromInviteData typedef struct _JoinFromInviteData
{ {

6
Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp
View file

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

8
Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp
View file

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

12
Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp
View file

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

2
Minecraft.Client/Common/GameRules/BiomeOverride.cpp
View file

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

10
Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp
View file

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

6
Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
View file

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

4
Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp
View file

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

10
Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp
View file

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

2
Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h
View file

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

20
Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
View file

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

2
Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h
View file

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

4
Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp
View file

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

2
Minecraft.Client/Common/GameRules/GameRuleDefinition.h
View file

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

20
Minecraft.Client/Common/GameRules/GameRuleManager.cpp
View file

@ -1,14 +1,14 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\compression.h" #include "../../../Minecraft.World/compression.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "../../../Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\File.h" #include "../../../Minecraft.World/File.h"
#include "..\..\..\Minecraft.World\compression.h" #include "../../../Minecraft.World/compression.h"
#include "..\DLC\DLCPack.h" #include "../DLC/DLCPack.h"
#include "..\DLC\DLCLocalisationFile.h" #include "../DLC/DLCLocalisationFile.h"
#include "..\DLC\DLCGameRulesFile.h" #include "../DLC/DLCGameRulesFile.h"
#include "..\DLC\DLCGameRules.h" #include "../DLC/DLCGameRules.h"
#include "..\DLC\DLCGameRulesHeader.h" #include "../DLC/DLCGameRulesHeader.h"
#include "..\..\StringTable.h" #include "../../StringTable.h"
#include "ConsoleGameRules.h" #include "ConsoleGameRules.h"
#include "GameRuleManager.h" #include "GameRuleManager.h"

12
Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
View file

@ -2,12 +2,12 @@
#include <unordered_set> #include <unordered_set>
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "../../../Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\Pos.h" #include "../../../Minecraft.World/Pos.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h" #include "../../../Minecraft.World/net.minecraft.world.phys.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" #include "../../../Minecraft.World/net.minecraft.world.level.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h" #include "../../../Minecraft.World/net.minecraft.world.level.chunk.h"
#include "..\..\StringTable.h" #include "../../StringTable.h"
#include "LevelGenerationOptions.h" #include "LevelGenerationOptions.h"
#include "ConsoleGameRules.h" #include "ConsoleGameRules.h"

2
Minecraft.Client/Common/GameRules/LevelGenerationOptions.h
View file

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

4
Minecraft.Client/Common/GameRules/LevelRuleset.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "../../../Minecraft.World/StringHelpers.h"
#include "..\..\StringTable.h" #include "../../StringTable.h"
#include "ConsoleGameRules.h" #include "ConsoleGameRules.h"
#include "LevelRuleset.h" #include "LevelRuleset.h"

4
Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp
View file

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

2
Minecraft.Client/Common/GameRules/StartFeature.cpp
View file

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

2
Minecraft.Client/Common/GameRules/StartFeature.h
View file

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

10
Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp
View file

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

2
Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp
View file

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

2
Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h
View file

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

4
Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp
View file

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

4
Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp
View file

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

10
Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp
View file

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

8
Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp
View file

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

2
Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
View file

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

62
Minecraft.Client/Common/Network/GameNetworkManager.cpp
View file

@ -1,43 +1,43 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "../../../Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\AABB.h" #include "../../../Minecraft.World/AABB.h"
#include "..\..\..\Minecraft.World\Vec3.h" #include "../../../Minecraft.World/Vec3.h"
#include "..\..\..\Minecraft.World\Socket.h" #include "../../../Minecraft.World/Socket.h"
#include "..\..\..\Minecraft.World\ThreadName.h" #include "../../../Minecraft.World/ThreadName.h"
#include "..\..\..\Minecraft.World\Entity.h" #include "../../../Minecraft.World/Entity.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" #include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
#include "..\..\ClientConnection.h" #include "../../ClientConnection.h"
#include "..\..\Minecraft.h" #include "../../Minecraft.h"
#include "..\..\User.h" #include "../../User.h"
#include "..\..\MinecraftServer.h" #include "../../MinecraftServer.h"
#include "..\..\PlayerList.h" #include "../../PlayerList.h"
#include "..\..\ServerPlayer.h" #include "../../ServerPlayer.h"
#include "..\..\PlayerConnection.h" #include "../../PlayerConnection.h"
#include "..\..\MultiPlayerLevel.h" #include "../../MultiPlayerLevel.h"
#include "..\..\ProgressRenderer.h" #include "../../ProgressRenderer.h"
#include "..\..\MultiPlayerLocalPlayer.h" #include "../../MultiPlayerLocalPlayer.h"
#include "..\..\..\Minecraft.World\DisconnectPacket.h" #include "../../../Minecraft.World/DisconnectPacket.h"
#include "..\..\..\Minecraft.World\compression.h" #include "../../../Minecraft.World/compression.h"
#include "..\..\..\Minecraft.World\OldChunkStorage.h" #include "../../../Minecraft.World/OldChunkStorage.h"
#include "..\..\TexturePackRepository.h" #include "../../TexturePackRepository.h"
#include "..\..\TexturePack.h" #include "../../TexturePack.h"
#include "..\..\Gui.h" #include "../../Gui.h"
#include "..\..\LevelRenderer.h" #include "../../LevelRenderer.h"
#include "..\..\..\Minecraft.World\IntCache.h" #include "../../../Minecraft.World/IntCache.h"
#include "..\GameRules\ConsoleGameRules.h" #include "../GameRules/ConsoleGameRules.h"
#include "GameNetworkManager.h" #include "GameNetworkManager.h"
#ifdef _XBOX #ifdef _XBOX
#include "Common\XUI\XUI_PauseMenu.h" #include "Common/XUI/XUI_PauseMenu.h"
#elif !(defined __PSVITA__) #elif !(defined __PSVITA__)
#include "Common\UI\UI.h" #include "Common/UI/UI.h"
#include "Common\UI\UIScene_PauseMenu.h" #include "Common/UI/UIScene_PauseMenu.h"
#include "..\..\Xbox\Network\NetworkPlayerXbox.h" #include "../../Xbox/Network/NetworkPlayerXbox.h"
#endif #endif
#ifdef _DURANGO #ifdef _DURANGO
#include "..\Minecraft.World\DurangoStats.h" #include "../Minecraft.World/DurangoStats.h"
#endif #endif
// Global instance // Global instance

10
Minecraft.Client/Common/Network/GameNetworkManager.h
View file

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

2
Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h
View file

@ -2,7 +2,7 @@
using namespace std; using namespace std;
#include <vector> #include <vector>
#include <qnet.h> #include <qnet.h>
#include "..\..\..\Minecraft.World\C4JThread.h" #include "../../../Minecraft.World/C4JThread.h"
#include "NetworkPlayerInterface.h" #include "NetworkPlayerInterface.h"
#include "SessionInfo.h" #include "SessionInfo.h"

21
Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
View file

@ -1,12 +1,12 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\Socket.h" #include "../../../Minecraft.World/Socket.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "../../../Minecraft.World/StringHelpers.h"
#include "PlatformNetworkManagerStub.h" #include "PlatformNetworkManagerStub.h"
#include "..\..\Xbox\Network\NetworkPlayerXbox.h" #include "../../Xbox/Network/NetworkPlayerXbox.h"
#ifdef _WINDOWS64 #ifdef _WINDOWS64
#include "..\..\Windows64\Network\WinsockNetLayer.h" #include "../../Windows64/Network/WinsockNetLayer.h"
#include "..\..\Minecraft.h" #include "../../Minecraft.h"
#include "..\..\User.h" #include "../../User.h"
#endif #endif
CPlatformNetworkManagerStub *g_pPlatformNetworkManager; CPlatformNetworkManagerStub *g_pPlatformNetworkManager;
@ -415,7 +415,6 @@ void CPlatformNetworkManagerStub::HostGame(int localUsersMask, bool bOnlineGame,
wcscpy_s(IQNet::m_player[0].m_gamertag, 32, g_Win64UsernameW); wcscpy_s(IQNet::m_player[0].m_gamertag, 32, g_Win64UsernameW);
#endif #endif
#endif #endif
_HostGame( localUsersMask, publicSlots, privateSlots ); _HostGame( localUsersMask, publicSlots, privateSlots );
#ifdef _WINDOWS64 #ifdef _WINDOWS64
@ -423,9 +422,17 @@ void CPlatformNetworkManagerStub::HostGame(int localUsersMask, bool bOnlineGame,
if (!WinsockNetLayer::IsActive()) if (!WinsockNetLayer::IsActive())
WinsockNetLayer::HostGame(port); WinsockNetLayer::HostGame(port);
#ifdef _DEDICATED_SERVER
extern bool g_ServerAdvertiseLAN;
if (g_ServerAdvertiseLAN)
{
#endif
const wchar_t *hostName = IQNet::m_player[0].m_gamertag; const wchar_t *hostName = IQNet::m_player[0].m_gamertag;
unsigned int settings = app.GetGameHostOption(eGameHostOption_All); unsigned int settings = app.GetGameHostOption(eGameHostOption_All);
WinsockNetLayer::StartAdvertising(port, hostName, settings, 0, 0, MINECRAFT_NET_VERSION); WinsockNetLayer::StartAdvertising(port, hostName, settings, 0, 0, MINECRAFT_NET_VERSION);
#ifdef _DEDICATED_SERVER
}
#endif
#endif #endif
} }

2
Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h
View file

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

2
Minecraft.Client/Common/Network/SessionInfo.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#if defined(__PS3__) || defined(__ORBIS__) #if defined(__PS3__) || defined(__ORBIS__)
#include "..\..\Common\Network\Sony\SQRNetworkManager.h" #include "../../Common/Network/Sony/SQRNetworkManager.h"
#endif #endif

10
Minecraft.Client/Common/Telemetry/TelemetryManager.cpp
View file

@ -2,9 +2,9 @@
#include "MultiPlayerLocalPlayer.h" #include "MultiPlayerLocalPlayer.h"
#include "..\Minecraft.World\LevelSettings.h" #include "../Minecraft.World/LevelSettings.h"
#include "..\Minecraft.World\LevelData.h" #include "../Minecraft.World/LevelData.h"
#include "..\Minecraft.World\Level.h" #include "../Minecraft.World/Level.h"
#include "TelemetryManager.h" #include "TelemetryManager.h"
@ -428,7 +428,7 @@ INT CTelemetryManager::GetAudioSettings(DWORD dwUserId)
/* /*
Refers to the highest level performance metric for your game. Refers to the highest level performance metric for your game.
For example, a performance metric could points earned, race time, total kills, etc. For example, a performance metric could points earned, race time, total kills, etc.
This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting. This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
How far did users progress before failing/exiting the level? How far did users progress before failing/exiting the level?
*/ */
INT CTelemetryManager::GetLevelExitProgressStat1() INT CTelemetryManager::GetLevelExitProgressStat1()
@ -440,7 +440,7 @@ INT CTelemetryManager::GetLevelExitProgressStat1()
/* /*
Refers to the highest level performance metric for your game. Refers to the highest level performance metric for your game.
For example, a performance metric could points earned, race time, total kills, etc. For example, a performance metric could points earned, race time, total kills, etc.
This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting. This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
How far did users progress before failing/exiting the level? How far did users progress before failing/exiting the level?
*/ */
INT CTelemetryManager::GetLevelExitProgressStat2() INT CTelemetryManager::GetLevelExitProgressStat2()

2
Minecraft.Client/Common/Telemetry/TelemetryManager.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "..\..\Common\UI\UIEnums.h" #include "../../Common/UI/UIEnums.h"
class CTelemetryManager class CTelemetryManager
{ {

2
Minecraft.Client/Common/Trial/TrialMode.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "TrialMode.h" #include "TrialMode.h"
#include "..\Tutorial\FullTutorial.h" #include "../Tutorial/FullTutorial.h"
TrialMode::TrialMode(int iPad, Minecraft *minecraft, ClientConnection *connection) TrialMode::TrialMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
: FullTutorialMode(iPad, minecraft, connection) : FullTutorialMode(iPad, minecraft, connection)

2
Minecraft.Client/Common/Trial/TrialMode.h
View file

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "..\Tutorial\FullTutorialMode.h" #include "../Tutorial/FullTutorialMode.h"
class TrialMode : public FullTutorialMode class TrialMode : public FullTutorialMode
{ {

6
Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
View file

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

6
Minecraft.Client/Common/Tutorial/AreaHint.cpp
View file

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

12
Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
View file

@ -1,13 +1,13 @@
#include "stdafx.h" #include "stdafx.h"
#include "Tutorial.h" #include "Tutorial.h"
#include "..\..\Minecraft.h" #include "../../Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h" #include "../../MultiPlayerLocalPlayer.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" #include "../../../Minecraft.World/net.minecraft.world.level.h"
#include "ChangeStateConstraint.h" #include "ChangeStateConstraint.h"
#include "..\..\..\Minecraft.World\AABB.h" #include "../../../Minecraft.World/AABB.h"
#include "..\..\ClientConnection.h" #include "../../ClientConnection.h"
#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h" #include "../../../Minecraft.World/net.minecraft.network.packet.h"
ChangeStateConstraint::ChangeStateConstraint( Tutorial *tutorial, eTutorial_State targetState, eTutorial_State sourceStates[], DWORD sourceStatesCount, 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*/ ) double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool changeGameMode /*= false*/, GameType *targetGameMode /*= 0*/ )

8
Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
View file

@ -1,15 +1,15 @@
#include "stdafx.h" #include "stdafx.h"
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include "..\..\Minecraft.h" #include "../../Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h" #include "../../MultiPlayerLocalPlayer.h"
#include "Tutorial.h" #include "Tutorial.h"
#include "TutorialConstraints.h" #include "TutorialConstraints.h"
#include "ChoiceTask.h" #include "ChoiceTask.h"
#include "..\..\..\Minecraft.World\Material.h" #include "../../../Minecraft.World/Material.h"
#ifdef _WINDOWS64 #ifdef _WINDOWS64
#include "..\..\KeyboardMouseInput.h" #include "../../KeyboardMouseInput.h"
static int ActionToVK(int action) static int ActionToVK(int action)
{ {

2
Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp
View file

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

6
Minecraft.Client/Common/Tutorial/ControllerTask.cpp
View file

@ -1,14 +1,14 @@
#include "stdafx.h" #include "stdafx.h"
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include "..\..\Minecraft.h" #include "../../Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h" #include "../../MultiPlayerLocalPlayer.h"
#include "Tutorial.h" #include "Tutorial.h"
#include "TutorialConstraints.h" #include "TutorialConstraints.h"
#include "ControllerTask.h" #include "ControllerTask.h"
#ifdef _WINDOWS64 #ifdef _WINDOWS64
#include "..\..\KeyboardMouseInput.h" #include "../../KeyboardMouseInput.h"
#endif #endif
ControllerTask::ControllerTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, bool showMinimumTime, ControllerTask::ControllerTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, bool showMinimumTime,

2
Minecraft.Client/Common/Tutorial/CraftTask.cpp
View file

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

8
Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp
View file

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

2
Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp
View file

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

12
Minecraft.Client/Common/Tutorial/FullTutorial.cpp
View file

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

2
Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp
View file

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

8
Minecraft.Client/Common/Tutorial/InfoTask.cpp
View file

@ -1,15 +1,15 @@
#include "stdafx.h" #include "stdafx.h"
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include "..\..\Minecraft.h" #include "../../Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h" #include "../../MultiPlayerLocalPlayer.h"
#include "Tutorial.h" #include "Tutorial.h"
#include "TutorialConstraints.h" #include "TutorialConstraints.h"
#include "InfoTask.h" #include "InfoTask.h"
#include "..\..\..\Minecraft.World\Material.h" #include "../../../Minecraft.World/Material.h"
#ifdef _WINDOWS64 #ifdef _WINDOWS64
#include "..\..\KeyboardMouseInput.h" #include "../../KeyboardMouseInput.h"
static int ActionToVK(int action) static int ActionToVK(int action)
{ {

2
Minecraft.Client/Common/Tutorial/LookAtEntityHint.h
View file

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

4
Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp
View file

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

8
Minecraft.Client/Common/Tutorial/StatTask.cpp
View file

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

4
Minecraft.Client/Common/Tutorial/TakeItemHint.cpp
View file

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

26
Minecraft.Client/Common/Tutorial/Tutorial.cpp
View file

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

10
Minecraft.Client/Common/Tutorial/TutorialHint.cpp
View file

@ -1,11 +1,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" #include "../../../Minecraft.World/net.minecraft.world.level.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h" #include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
#include "..\..\..\Minecraft.World\net.minecraft.world.item.h" #include "../../../Minecraft.World/net.minecraft.world.item.h"
#include "Tutorial.h" #include "Tutorial.h"
#include "TutorialHint.h" #include "TutorialHint.h"
#include "..\..\Minecraft.h" #include "../../Minecraft.h"
#include "..\..\MultiplayerLocalPlayer.h" #include "../../MultiPlayerLocalPlayer.h"
TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, eHintType type, bool allowFade /*= true*/) 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 ), : m_id( id ), m_tutorial(tutorial), m_descriptionId( descriptionId ), m_type( type ), m_counter( 0 ),

14
Minecraft.Client/Common/Tutorial/TutorialMode.cpp
View file

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

2
Minecraft.Client/Common/Tutorial/TutorialMode.h
View file

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

6
Minecraft.Client/Common/Tutorial/UseItemTask.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\Entity.h" #include "../../../Minecraft.World/Entity.h"
#include "..\..\..\Minecraft.World\Level.h" #include "../../../Minecraft.World/Level.h"
#include "..\..\..\Minecraft.World\ItemInstance.h" #include "../../../Minecraft.World/ItemInstance.h"
#include "UseItemTask.h" #include "UseItemTask.h"
UseItemTask::UseItemTask(const int itemId, Tutorial *tutorial, int descriptionId, UseItemTask::UseItemTask(const int itemId, Tutorial *tutorial, int descriptionId,

6
Minecraft.Client/Common/Tutorial/UseTileTask.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\Entity.h" #include "../../../Minecraft.World/Entity.h"
#include "..\..\..\Minecraft.World\Level.h" #include "../../../Minecraft.World/Level.h"
#include "..\..\..\Minecraft.World\ItemInstance.h" #include "../../../Minecraft.World/ItemInstance.h"
#include "UseTileTask.h" #include "UseTileTask.h"
UseTileTask::UseTileTask(const int tileId, int x, int y, int z, Tutorial *tutorial, int descriptionId, UseTileTask::UseTileTask(const int tileId, int x, int y, int z, Tutorial *tutorial, int descriptionId,

4
Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\..\..\Minecraft.World\ItemInstance.h" #include "../../../Minecraft.World/ItemInstance.h"
#if !(defined _XBOX) && !(defined __PSVITA__) #if !(defined _XBOX) && !(defined __PSVITA__)
#include "..\UI\UI.h" #include "../UI/UI.h"
#endif #endif
#include "Tutorial.h" #include "Tutorial.h"
#include "XuiCraftingTask.h" #include "XuiCraftingTask.h"

2
Minecraft.Client/Common/Tutorial/XuiCraftingTask.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "TutorialTask.h" #include "TutorialTask.h"
#include "..\..\..\Minecraft.World\Recipy.h" #include "../../../Minecraft.World/Recipy.h"
class XuiCraftingTask : public TutorialTask class XuiCraftingTask : public TutorialTask
{ {

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