Minecraft/Revelations
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support for linux clang cross compiles

Browse Source
This commit is contained in:
ryleu
2026-03-24 10:05:40 -05:00
committed by neoapps-dev
parent b2f00d16e6
commit 5eab358dde
889 changed files with 4170 additions and 3569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+7
View File
@@ -421,3 +421,10 @@ tools/*.class
tools/*.swf tools/*.swf
tools/staging/ tools/staging/
tools/server-monitor/ tools/server-monitor/
# Nix
result
result-*
.direnv/
.xwin-cache/
CMakeLists.txt
+2 -2
View File
@@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
if(NOT WIN32) if(NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
message(FATAL_ERROR "This CMake build currently supports Windows only.") message(FATAL_ERROR "This CMake build currently supports Windows only. For cross-compilation from Linux, use the clang-cl toolchain.")
endif() endif()
if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8) if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
Minecraft.Client/AbstractContainerScreen.cpp
+4 -4
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();
Minecraft.Client/AbstractProjectileDispenseBehavior.cpp
+4 -4
View File
@@ -1,8 +1,8 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\net.minecraft.core.h" #include "../Minecraft.World/net.minecraft.core.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.level.tile.h" #include "../Minecraft.World/net.minecraft.world.level.tile.h"
#include "..\Minecraft.World\net.minecraft.world.level.h" #include "../Minecraft.World/net.minecraft.world.level.h"
#include "AbstractProjectileDispenseBehavior.h" #include "AbstractProjectileDispenseBehavior.h"
shared_ptr<ItemInstance> AbstractProjectileDispenseBehavior::execute(BlockSource *source, shared_ptr<ItemInstance> dispensed) shared_ptr<ItemInstance> AbstractProjectileDispenseBehavior::execute(BlockSource *source, shared_ptr<ItemInstance> dispensed)
Minecraft.Client/AbstractProjectileDispenseBehavior.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "..\Minecraft.World\DefaultDispenseItemBehavior.h" #include "../Minecraft.World/DefaultDispenseItemBehavior.h"
class Projectile; class Projectile;
Minecraft.Client/AbstractTexturePack.cpp
+2 -2
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"
#include "Common/UI/UI.h" #include "Common/UI/UI.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)
Minecraft.Client/AchievementPopup.cpp
+4 -4
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)
{ {
Minecraft.Client/AchievementScreen.cpp
+4 -4
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"
Minecraft.Client/AchievementScreen.h
+1 -1
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
Minecraft.Client/ArchiveFile.cpp
+2 -2
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"
Minecraft.Client/ArchiveFile.h
+2 -2
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;
Minecraft.Client/ArrowRenderer.cpp
+2 -2
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"
ResourceLocation ArrowRenderer::ARROW_LOCATION = ResourceLocation(TN_ITEM_ARROWS); ResourceLocation ArrowRenderer::ARROW_LOCATION = ResourceLocation(TN_ITEM_ARROWS);
Minecraft.Client/BatModel.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h" #include "../Minecraft.World/net.minecraft.world.entity.ambient.h"
#include "BatModel.h" #include "BatModel.h"
#include "ModelPart.h" #include "ModelPart.h"
Minecraft.Client/BatRenderer.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h" #include "../Minecraft.World/net.minecraft.world.entity.ambient.h"
#include "BatRenderer.h" #include "BatRenderer.h"
#include "BatModel.h" #include "BatModel.h"
Minecraft.Client/BeaconRenderer.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.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.h" #include "../Minecraft.World/net.minecraft.world.level.h"
#include "BeaconRenderer.h" #include "BeaconRenderer.h"
#include "Tesselator.h" #include "Tesselator.h"
Minecraft.Client/BlazeModel.cpp
+1 -1
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"
Minecraft.Client/BlazeRenderer.cpp
+1 -1
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"
ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE); ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE);
Minecraft.Client/BoatRenderer.cpp
+2 -2
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"
ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT); ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT);
Minecraft.Client/BookModel.cpp
+1 -1
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"
Minecraft.Client/BreakingItemParticle.cpp
+3 -3
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)
{ {
Minecraft.Client/BubbleParticle.cpp
+5 -5
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)
{ {
Minecraft.Client/BufferedImage.cpp
+2 -2
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
Minecraft.Client/Camera.cpp
+4 -4
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;
Minecraft.Client/Camera.h
+2 -2
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;
Minecraft.Client/ChatScreen.cpp
+5 -5
View File
@@ -2,11 +2,11 @@
#include "ChatScreen.h" #include "ChatScreen.h"
#include "ClientConnection.h" #include "ClientConnection.h"
#include "Font.h" #include "Font.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"
#include "..\Minecraft.World\ChatPacket.h" #include "../Minecraft.World/ChatPacket.h"
#include "..\Minecraft.World\ArabicShaping.h" #include "../Minecraft.World/ArabicShaping.h"
const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters; const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters;
vector<wstring> ChatScreen::s_chatHistory; vector<wstring> ChatScreen::s_chatHistory;
Minecraft.Client/ChestRenderer.cpp
+3 -3
View File
@@ -3,9 +3,9 @@
#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"
#include "..\Minecraft.World\Calendar.h" #include "../Minecraft.World/Calendar.h"
ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION = ResourceLocation(TN_TILE_LARGE_TRAP_CHEST); ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION = ResourceLocation(TN_TILE_LARGE_TRAP_CHEST);
//ResourceLocation ChestRenderer::CHEST_LARGE_XMAS_LOCATION = ResourceLocation(TN_TILE_LARGE_XMAS_CHEST); //ResourceLocation ChestRenderer::CHEST_LARGE_XMAS_LOCATION = ResourceLocation(TN_TILE_LARGE_XMAS_CHEST);
Minecraft.Client/ChickenModel.cpp
+1 -1
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"
Minecraft.Client/ChickenRenderer.cpp
+2 -2
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"
ResourceLocation ChickenRenderer::CHICKEN_LOCATION = ResourceLocation(TN_MOB_CHICKEN); ResourceLocation ChickenRenderer::CHICKEN_LOCATION = ResourceLocation(TN_MOB_CHICKEN);
Minecraft.Client/Chunk.cpp
+7 -7
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"
Minecraft.Client/Chunk.h
+1 -1
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;
Minecraft.Client/ClientConnection.cpp
+38 -37
View File
@@ -9,46 +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.ai.attributes.h" #include "../Minecraft.World/net.minecraft.world.entity.ai.attributes.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.animal.h" #include "../Minecraft.World/net.minecraft.world.entity.animal.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 "..\Minecraft.World\BasicTypeContainers.h" #include "../Minecraft.World/BasicTypeContainers.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 #endif
#ifdef __PS3__ #ifdef __PS3__
#include "PS3/Network/SonyVoiceChat.h" #include "PS3/Network/SonyVoiceChat.h"
@@ -56,15 +56,15 @@
#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"
#include "Windows64\Network\WinsockNetLayer.h" #include "Windows64/Network/WinsockNetLayer.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
namespace namespace
@@ -4251,7 +4251,8 @@ void ClientConnection::handleSetPlayerTeamPacket(shared_ptr<SetPlayerTeamPacket>
void ClientConnection::handleParticleEvent(shared_ptr<LevelParticlesPacket> packet) void ClientConnection::handleParticleEvent(shared_ptr<LevelParticlesPacket> packet)
{ {
ePARTICLE_TYPE particleId = (ePARTICLE_TYPE)Integer::parseInt(packet->getName()); wstring particleName = packet->getName();
ePARTICLE_TYPE particleId = (ePARTICLE_TYPE)Integer::parseInt(particleName);
for (int i = 0; i < packet->getCount(); i++) for (int i = 0; i < packet->getCount(); i++)
{ {
Minecraft.Client/ClientConnection.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once #pragma once
#include <unordered_set> #include <unordered_set>
#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;
Minecraft.Client/ClockTexture.cpp
+4 -4
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"
Minecraft.Client/Common/Audio/Consoles_SoundEngine.h
+5 -5
View File
@@ -1,24 +1,24 @@
#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
#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
Minecraft.Client/Common/Audio/SoundEngine.cpp
+12 -12
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 "..\..\MultiPlayerGameMode.h" #include "../../MultiPlayerGameMode.h"
#include "..\..\Minecraft.World\LevelSettings.h" #include "../../Minecraft.World/LevelSettings.h"
#include "Common\DLC\DLCAudioFile.h" #include "Common/DLC/DLCAudioFile.h"
#ifdef __PSVITA__ #ifdef __PSVITA__
#include <audioout.h> #include <audioout.h>
#endif #endif
#include "..\..\Minecraft.Client\Windows64\Windows64_App.h" #include "../../Minecraft.Client/Windows64/Windows64_App.h"
#include "stb_vorbis.h" #include "stb_vorbis.h"
@@ -27,7 +27,7 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <lce_filesystem\lce_filesystem.h> #include <lce_filesystem/lce_filesystem.h>
#ifdef __ORBIS__ #ifdef __ORBIS__
#include <audioout.h> #include <audioout.h>
Minecraft.Client/Common/Audio/SoundNames.cpp
+22 -22
View File
@@ -187,28 +187,28 @@ const WCHAR *ConsoleSoundEngine::wchSoundNames[eSoundType_MAX]=
L"liquid.swim", //eSoundType_LIQUID_SWIM, L"liquid.swim", //eSoundType_LIQUID_SWIM,
L"mob.horse.land", //eSoundType_MOB_HORSE_LAND, L"Mob.horse.land", //eSoundType_MOB_HORSE_LAND,
L"mob.horse.armor", //eSoundType_MOB_HORSE_ARMOR, L"Mob.horse.armor", //eSoundType_MOB_HORSE_ARMOR,
L"mob.horse.leather", //eSoundType_MOB_HORSE_LEATHER, L"Mob.horse.leather", //eSoundType_MOB_HORSE_LEATHER,
L"mob.horse.zombie.death", //eSoundType_MOB_HORSE_ZOMBIE_DEATH, L"Mob.horse.zombie.death", //eSoundType_MOB_HORSE_ZOMBIE_DEATH,
L"mob.horse.skeleton.death", //eSoundType_MOB_HORSE_SKELETON_DEATH, L"Mob.horse.skeleton.death", //eSoundType_MOB_HORSE_SKELETON_DEATH,
L"mob.horse.donkey.death", //eSoundType_MOB_HORSE_DONKEY_DEATH, L"Mob.horse.donkey.death", //eSoundType_MOB_HORSE_DONKEY_DEATH,
L"mob.horse.death", //eSoundType_MOB_HORSE_DEATH, L"Mob.horse.death", //eSoundType_MOB_HORSE_DEATH,
L"mob.horse.zombie.hit", //eSoundType_MOB_HORSE_ZOMBIE_HIT, L"Mob.horse.zombie.hit", //eSoundType_MOB_HORSE_ZOMBIE_HIT,
L"mob.horse.skeleton.hit", //eSoundType_MOB_HORSE_SKELETON_HIT, L"Mob.horse.skeleton.hit", //eSoundType_MOB_HORSE_SKELETON_HIT,
L"mob.horse.donkey.hit", //eSoundType_MOB_HORSE_DONKEY_HIT, L"Mob.horse.donkey.hit", //eSoundType_MOB_HORSE_DONKEY_HIT,
L"mob.horse.hit", //eSoundType_MOB_HORSE_HIT, L"Mob.horse.hit", //eSoundType_MOB_HORSE_HIT,
L"mob.horse.zombie.idle", //eSoundType_MOB_HORSE_ZOMBIE_IDLE, L"Mob.horse.zombie.idle", //eSoundType_MOB_HORSE_ZOMBIE_IDLE,
L"mob.horse.skeleton.idle", //eSoundType_MOB_HORSE_SKELETON_IDLE, L"Mob.horse.skeleton.idle", //eSoundType_MOB_HORSE_SKELETON_IDLE,
L"mob.horse.donkey.idle", //eSoundType_MOB_HORSE_DONKEY_IDLE, L"Mob.horse.donkey.idle", //eSoundType_MOB_HORSE_DONKEY_IDLE,
L"mob.horse.idle", //eSoundType_MOB_HORSE_IDLE, L"Mob.horse.idle", //eSoundType_MOB_HORSE_IDLE,
L"mob.horse.donkey.angry", //eSoundType_MOB_HORSE_DONKEY_ANGRY, L"Mob.horse.donkey.angry", //eSoundType_MOB_HORSE_DONKEY_ANGRY,
L"mob.horse.angry", //eSoundType_MOB_HORSE_ANGRY, L"Mob.horse.angry", //eSoundType_MOB_HORSE_ANGRY,
L"mob.horse.gallop", //eSoundType_MOB_HORSE_GALLOP, L"Mob.horse.gallop", //eSoundType_MOB_HORSE_GALLOP,
L"mob.horse.breathe", //eSoundType_MOB_HORSE_BREATHE, L"Mob.horse.breathe", //eSoundType_MOB_HORSE_BREATHE,
L"mob.horse.wood", //eSoundType_MOB_HORSE_WOOD, L"Mob.horse.wood", //eSoundType_MOB_HORSE_WOOD,
L"mob.horse.soft", //eSoundType_MOB_HORSE_SOFT, L"Mob.horse.soft", //eSoundType_MOB_HORSE_SOFT,
L"mob.horse.jump", //eSoundType_MOB_HORSE_JUMP, L"Mob.horse.jump", //eSoundType_MOB_HORSE_JUMP,
L"mob.witch.ambient", //eSoundType_MOB_WITCH_IDLE, L"mob.witch.ambient", //eSoundType_MOB_WITCH_IDLE,
L"mob.witch.hurt", //eSoundType_MOB_WITCH_HURT, L"mob.witch.hurt", //eSoundType_MOB_WITCH_HURT,
Minecraft.Client/Common/C4JMemoryPoolAllocator.h
+1 -1
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.
Minecraft.Client/Common/Colours/ColourTable.cpp
+1 -1
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;
Minecraft.Client/Common/ConsoleGameMode.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "ConsoleGameMode.h" #include "ConsoleGameMode.h"
#include ".\Tutorial\Tutorial.h" #include "./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)
Minecraft.Client/Common/ConsoleGameMode.h
+1 -1
View File
@@ -1,5 +1,5 @@
#pragma once #pragma once
#include ".\Tutorial\TutorialMode.h" #include "./Tutorial/TutorialMode.h"
class ConsoleGameMode : public TutorialMode class ConsoleGameMode : public TutorialMode
{ {
Minecraft.Client/Common/Console_Utils.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD) #if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
#include "..\..\Minecraft.Server\ServerLogManager.h" #include "../../Minecraft.Server/ServerLogManager.h"
#endif #endif
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
Minecraft.Client/Common/Consoles_App.cpp
+54 -54
View File
@@ -1,66 +1,66 @@
#include "stdafx.h" #include "stdafx.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.player.h" #include "../../Minecraft.World/net.minecraft.world.entity.player.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.phys.h" #include "../../Minecraft.World/net.minecraft.world.phys.h"
#include "..\..\Minecraft.World\InputOutputStream.h" #include "../../Minecraft.World/InputOutputStream.h"
#include "..\..\Minecraft.World\compression.h" #include "../../Minecraft.World/compression.h"
#include "..\Options.h" #include "../Options.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 "..\LevelRenderer.h" #include "../LevelRenderer.h"
#include "..\MobSkinMemTextureProcessor.h" #include "../MobSkinMemTextureProcessor.h"
#include "..\Minecraft.h" #include "../Minecraft.h"
#include "..\ClientConnection.h" #include "../ClientConnection.h"
#include "..\MultiPlayerLocalPlayer.h" #include "../MultiPlayerLocalPlayer.h"
#include "..\LocalPlayer.h" #include "../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 "..\StatsCounter.h" #include "../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 "..\Xbox\XML\ATGXmlParser.h" #include "../Xbox/XML/ATGXmlParser.h"
#include "..\Xbox\XML\xmlFilesCallback.h" #include "../Xbox/XML/xmlFilesCallback.h"
#endif #endif
#include "Minecraft_Macros.h" #include "Minecraft_Macros.h"
#include "..\PlayerList.h" #include "../PlayerList.h"
#include "..\ServerPlayer.h" #include "../ServerPlayer.h"
#include "GameRules\ConsoleGameRules.h" #include "GameRules/ConsoleGameRules.h"
#include "GameRules\ConsoleSchematicFile.h" #include "GameRules/ConsoleSchematicFile.h"
#include "..\User.h" #include "../User.h"
#include "..\..\Minecraft.World\LevelData.h" #include "../../Minecraft.World/LevelData.h"
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD) #if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
#include "..\..\Minecraft.Server\ServerLogManager.h" #include "../../Minecraft.Server/ServerLogManager.h"
#endif #endif
#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h" #include "../../Minecraft.World/net.minecraft.world.entity.player.h"
#include "..\EntityRenderDispatcher.h" #include "../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>
@@ -69,7 +69,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;
Minecraft.Client/Common/Consoles_App.h
+11 -11
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 ".\Tutorial\TutorialEnum.h" #include "./Tutorial/TutorialEnum.h"
#ifdef _XBOX #ifdef _XBOX
#include ".\XUI\XUI_Helper.h" #include "./XUI/XUI_Helper.h"
#include ".\XUI\XUI_HelpCredits.h" #include "./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 ".\DLC\DLCManager.h" #include "./DLC/DLCManager.h"
#include ".\GameRules\ConsoleGameRulesConstants.h" #include "./GameRules/ConsoleGameRulesConstants.h"
#include ".\GameRules\GameRuleManager.h" #include "./GameRules/GameRuleManager.h"
#include "..\SkinBox.h" #include "../SkinBox.h"
#include "..\ArchiveFile.h" #include "../ArchiveFile.h"
typedef struct _JoinFromInviteData typedef struct _JoinFromInviteData
{ {
Minecraft.Client/Common/DLC/DLCAudioFile.cpp
+2 -2
View File
@@ -2,8 +2,8 @@
#include "DLCManager.h" #include "DLCManager.h"
#include "DLCAudioFile.h" #include "DLCAudioFile.h"
#if defined _XBOX || defined _WINDOWS64 #if defined _XBOX || defined _WINDOWS64
#include "..\..\Xbox\XML\ATGXmlParser.h" #include "../../Xbox/XML/ATGXmlParser.h"
#include "..\..\Xbox\XML\xmlFilesCallback.h" #include "../../Xbox/XML/xmlFilesCallback.h"
#endif #endif
DLCAudioFile::DLCAudioFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path) DLCAudioFile::DLCAudioFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path)
Minecraft.Client/Common/DLC/DLCColourTableFile.cpp
+3 -3
View File
@@ -1,9 +1,9 @@
#include "stdafx.h" #include "stdafx.h"
#include "DLCManager.h" #include "DLCManager.h"
#include "DLCColourTableFile.h" #include "DLCColourTableFile.h"
#include "..\..\Minecraft.h" #include "../../Minecraft.h"
#include "..\..\TexturePackRepository.h" #include "../../TexturePackRepository.h"
#include "..\..\TexturePack.h" #include "../../TexturePack.h"
DLCColourTableFile::DLCColourTableFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path) DLCColourTableFile::DLCColourTableFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path)
{ {
Minecraft.Client/Common/DLC/DLCGameRules.h
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once #pragma once
#include "DLCFile.h" #include "DLCFile.h"
#include "..\GameRules\LevelGenerationOptions.h" #include "../GameRules/LevelGenerationOptions.h"
class DLCGameRules : public DLCFile class DLCGameRules : public DLCFile
{ {
Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp
+3 -3
View File
@@ -2,9 +2,9 @@
#include <string> #include <string>
#include "..\..\..\Minecraft.World\File.h" #include "../../../Minecraft.World/File.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "../../../Minecraft.World/StringHelpers.h"
#include "..\..\..\Minecraft.World\InputOutputStream.h" #include "../../../Minecraft.World/InputOutputStream.h"
#include "DLCManager.h" #include "DLCManager.h"
#include "DLCGameRulesHeader.h" #include "DLCGameRulesHeader.h"
Minecraft.Client/Common/DLC/DLCGameRulesHeader.h
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once #pragma once
#include "DLCGameRules.h" #include "DLCGameRules.h"
#include "..\GameRules\LevelGenerationOptions.h" #include "../GameRules/LevelGenerationOptions.h"
class DLCGameRulesHeader : public DLCGameRules, public JustGrSource class DLCGameRulesHeader : public DLCGameRules, public JustGrSource
{ {
Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "DLCManager.h" #include "DLCManager.h"
#include "DLCLocalisationFile.h" #include "DLCLocalisationFile.h"
#include "..\..\StringTable.h" #include "../../StringTable.h"
DLCLocalisationFile::DLCLocalisationFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path) DLCLocalisationFile::DLCLocalisationFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path)
{ {
Minecraft.Client/Common/DLC/DLCManager.cpp
+3 -3
View File
@@ -3,9 +3,9 @@
#include "DLCManager.h" #include "DLCManager.h"
#include "DLCPack.h" #include "DLCPack.h"
#include "DLCFile.h" #include "DLCFile.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "../../../Minecraft.World/StringHelpers.h"
#include "..\..\Minecraft.h" #include "../../Minecraft.h"
#include "..\..\TexturePackRepository.h" #include "../../TexturePackRepository.h"
#include "Common/UI/UI.h" #include "Common/UI/UI.h"
const WCHAR *DLCManager::wchTypeNamesA[]= const WCHAR *DLCManager::wchTypeNamesA[]=
Minecraft.Client/Common/DLC/DLCPack.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include "DLCGameRulesHeader.h" #include "DLCGameRulesHeader.h"
#include "DLCAudioFile.h" #include "DLCAudioFile.h"
#include "DLCColourTableFile.h" #include "DLCColourTableFile.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "../../../Minecraft.World/StringHelpers.h"
DLCPack::DLCPack(const wstring &name,DWORD dwLicenseMask) DLCPack::DLCPack(const wstring &name,DWORD dwLicenseMask)
{ {
Minecraft.Client/Common/DLC/DLCSkinFile.cpp
+5 -5
View File
@@ -1,11 +1,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "DLCManager.h" #include "DLCManager.h"
#include "DLCSkinFile.h" #include "DLCSkinFile.h"
#include "..\..\ModelPart.h" #include "../../ModelPart.h"
#include "..\..\EntityRenderer.h" #include "../../EntityRenderer.h"
#include "..\..\EntityRenderDispatcher.h" #include "../../EntityRenderDispatcher.h"
#include "..\..\..\Minecraft.World\Player.h" #include "../../../Minecraft.World/Player.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "../../../Minecraft.World/StringHelpers.h"
DLCSkinFile::DLCSkinFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path) DLCSkinFile::DLCSkinFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path)
{ {
Minecraft.Client/Common/DLC/DLCSkinFile.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "DLCFile.h" #include "DLCFile.h"
#include "..\..\..\Minecraft.Client\HumanoidModel.h" #include "../../../Minecraft.Client/HumanoidModel.h"
class DLCSkinFile : public DLCFile class DLCSkinFile : public DLCFile
{ {
Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp
+3 -3
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()
Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp
+4 -4
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"
Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp
+6 -6
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"
Minecraft.Client/Common/GameRules/BiomeOverride.cpp
+1 -1
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()
Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp
+5 -5
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()
{ {
Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
+3 -3
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)
{ {
Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp
+2 -2
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"
Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp
+5 -5
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)
{ {
Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h
+1 -1
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;
Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
+10 -10
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()
{ {
Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h
+1 -1
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;
Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp
+2 -2
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()
Minecraft.Client/Common/GameRules/GameRuleDefinition.h
+1 -1
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"
Minecraft.Client/Common/GameRules/GameRuleManager.cpp
+10 -10
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"
Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
+7 -7
View File
@@ -2,13 +2,13 @@
#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 "Common\DLC\DLCGameRulesHeader.h" #include "Common/DLC/DLCGameRulesHeader.h"
#include "..\..\StringTable.h" #include "../../StringTable.h"
#include "LevelGenerationOptions.h" #include "LevelGenerationOptions.h"
#include "ConsoleGameRules.h" #include "ConsoleGameRules.h"
Minecraft.Client/Common/GameRules/LevelGenerationOptions.h
+1 -1
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;
Minecraft.Client/Common/GameRules/LevelRuleset.cpp
+2 -2
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"
Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp
+2 -2
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()
{ {
Minecraft.Client/Common/GameRules/StartFeature.cpp
+1 -1
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()
Minecraft.Client/Common/GameRules/StartFeature.h
+1 -1
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
{ {
Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp
+5 -5
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()
{ {
Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp
+1 -1
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()
Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h
+1 -1
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
{ {
Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp
+2 -2
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()
{ {
Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp
+2 -2
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()
{ {
Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp
+5 -5
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()
{ {
Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp
+4 -4
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()
{ {
Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
+1 -1
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"
Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp
+9 -9
View File
@@ -8,21 +8,21 @@
#include "base64.h" #include "base64.h"
#include "Common\Consoles_App.h" #include "Common/Consoles_App.h"
#include "Common\Network\Sony\SQRNetworkManager.h" #include "Common/Network/Sony/SQRNetworkManager.h"
#include "..\..\..\Minecraft.World\StringHelpers.h" #include "../../../Minecraft.World/StringHelpers.h"
#ifdef __ORBIS__ #ifdef __ORBIS__
#include "Orbis\OrbisExtras\ShutdownManager.h" #include "Orbis/OrbisExtras/ShutdownManager.h"
#include "Orbis\Orbis_App.h" #include "Orbis/Orbis_App.h"
#elif defined __PSVITA__ #elif defined __PSVITA__
#include "PSVita\PSVitaExtras\ShutdownManager.h" #include "PSVita/PSVitaExtras/ShutdownManager.h"
#include "PSVita\PSVita_App.h" #include "PSVita/PSVita_App.h"
#elif defined __PS3__ #elif defined __PS3__
#include "PS3\PS3Extras\ShutdownManager.h" #include "PS3/PS3Extras/ShutdownManager.h"
#include "PS3\PS3_App.h" #include "PS3/PS3_App.h"
#else #else
#error "SonyLeaderboardManager is included for a non-sony platform." #error "SonyLeaderboardManager is included for a non-sony platform."
#endif #endif
Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Common\Leaderboards\LeaderboardManager.h" #include "Common/Leaderboards/LeaderboardManager.h"
#ifdef __PS3__ #ifdef __PS3__
typedef CellRtcTick SonyRtcTick; typedef CellRtcTick SonyRtcTick;
Minecraft.Client/Common/Network/GameNetworkManager.cpp
+34 -34
View File
@@ -1,49 +1,49 @@
#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 "..\..\..\Minecraft.World\FireworksRecipe.h" #include "../../../Minecraft.World/FireworksRecipe.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"
#else #else
#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
#ifdef _WINDOWS64 #ifdef _WINDOWS64
#include "..\..\Windows64\Network\WinsockNetLayer.h" #include "../../Windows64/Network/WinsockNetLayer.h"
#include "..\..\Windows64\Windows64_Xuid.h" #include "../../Windows64/Windows64_Xuid.h"
#endif #endif
// Global instance // Global instance
Minecraft.Client/Common/Network/GameNetworkManager.h
+5 -5
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;
Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h
+1 -1
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"
Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
+9 -9
View File
@@ -1,15 +1,15 @@
#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 "..\..\Windows64\Windows64_Xuid.h" #include "../../Windows64/Windows64_Xuid.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 <iostream> #include <iostream>
#endif #endif
Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h
+1 -1
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"
Minecraft.Client/Common/Network/SessionInfo.h
+1 -1
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
Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "..\..\Common\Network\NetworkPlayerInterface.h" #include "../../Common/Network/NetworkPlayerInterface.h"
#include "SQRNetworkPlayer.h" #include "SQRNetworkPlayer.h"
// This is an implementation of the INetworkPlayer interface, for Sony platforms. It effectively wraps the SQRNetworkPlayer class in a non-platform-specific way. // This is an implementation of the INetworkPlayer interface, for Sony platforms. It effectively wraps the SQRNetworkPlayer class in a non-platform-specific way.
Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
+3 -3
View File
@@ -1,9 +1,9 @@
#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 "PlatformNetworkManagerSony.h" #include "PlatformNetworkManagerSony.h"
#include "NetworkPlayerSony.h" #include "NetworkPlayerSony.h"
#include "..\..\Common\Network\GameNetworkManager.h" #include "../../Common/Network/GameNetworkManager.h"
CPlatformNetworkManagerSony *g_pPlatformNetworkManager; CPlatformNetworkManagerSony *g_pPlatformNetworkManager;
Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h
+4 -4
View File
@@ -1,10 +1,10 @@
#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 "..\..\Common\Network\NetworkPlayerInterface.h" #include "../../Common/Network/NetworkPlayerInterface.h"
#include "..\..\Common\Network\PlatformNetworkManagerInterface.h" #include "../../Common/Network/PlatformNetworkManagerInterface.h"
#include "..\..\Common\Network\SessionInfo.h" #include "../../Common/Network/SessionInfo.h"
#include "SQRNetworkPlayer.h" #include "SQRNetworkPlayer.h"
// This is how often we allow a search for new games // This is how often we allow a search for new games
Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h
+1 -1
View File
@@ -12,7 +12,7 @@
#include <unordered_map> #include <unordered_map>
#if defined __PSVITA__ #if defined __PSVITA__
#include "..\..\Minecraft.Client\PSVita\4JLibs\inc\4J_Profile.h" #include "../../Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.h"
#endif #endif
class SQRNetworkPlayer; class SQRNetworkPlayer;
Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "SonyCommerce.h" #include "SonyCommerce.h"
#include "..\PS3Extras\ShutdownManager.h" #include "../PS3Extras/ShutdownManager.h"
#include <sys/event.h> #include <sys/event.h>
Minecraft.Client/Common/Network/Sony/SonyHttp.cpp
+3 -3
View File
@@ -3,15 +3,15 @@
#ifdef __PS3__ #ifdef __PS3__
#include "PS3\Network\SonyHttp_PS3.h" #include "PS3/Network/SonyHttp_PS3.h"
SonyHttp_PS3 g_SonyHttp; SonyHttp_PS3 g_SonyHttp;
#elif defined __ORBIS__ #elif defined __ORBIS__
#include "Orbis\Network\SonyHttp_Orbis.h" #include "Orbis/Network/SonyHttp_Orbis.h"
SonyHttp_Orbis g_SonyHttp; SonyHttp_Orbis g_SonyHttp;
#elif defined __PSVITA__ #elif defined __PSVITA__
#include "PSVita\Network\SonyHttp_Vita.h" #include "PSVita/Network/SonyHttp_Vita.h"
SonyHttp_Vita g_SonyHttp; SonyHttp_Vita g_SonyHttp;
#endif #endif
Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once #pragma once
#include "..\..\Common\Network\Sony\sceRemoteStorage\header\sceRemoteStorage.h" #include "../../Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h"
class SonyRemoteStorage class SonyRemoteStorage
{ {
Minecraft.Client/Common/Telemetry/TelemetryManager.cpp
+3 -3
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"
Minecraft.Client/Common/Telemetry/TelemetryManager.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "..\..\Common\UI\UIEnums.h" #include "../../Common/UI/UIEnums.h"
class CTelemetryManager class CTelemetryManager
{ {
Minecraft.Client/Common/Trial/TrialMode.cpp
+1 -1
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)
Minecraft.Client/Common/Trial/TrialMode.h
+1 -1
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
{ {

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