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

fix: shuffle around remaining paths to get everything building again/home/tropical/Documents/GitHub/4jcraft-real/Minecraft.World/Level/../../Minecraft.Client/Textures/Packs/TexturePack.h

Browse source
This commit is contained in:
Tropical 2026-03-09 00:34:09 -05:00
parent dec2f8d8d0
commit 5a36950239
337 changed files with 483 additions and 483 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Minecraft.Assets/meson.build
View file

@ -24,7 +24,7 @@ localisation = custom_target('Minecraft.Assets_Localisation',
colour_table = custom_target('Minecraft.Assets_Colour_Table',
output : 'HTMLColours.col',
input : meson.current_source_dir() / 'Common/HTMLColours.xml',
input : meson.current_source_dir() / 'Common/Media/HTMLColours.xml',
command : [
'python3', meson.project_source_root() / 'scripts/build_col.py',
'@INPUT@',
@ -35,7 +35,7 @@ colour_table = custom_target('Minecraft.Assets_Colour_Table',
archive_sources = [
localisation[0], # client_platform_path / 'Windows64Media/Media/languages.loc',
colour_table,
'Common/splashes.txt',
'Common/Media/splashes.txt',
'Common/Media/Graphics/SaveChest.png',
'Common/Media/Graphics/MinecraftIcon.png',
'Common/Media/Graphics/TexturePackIcon.png',

2
Minecraft.Client/ClientConstants.cpp
View file

@ -1,4 +1,4 @@
#include "Build/stdafx.h"
#include "Platform/stdafx.h"
#include "ClientConstants.h"
const std::wstring ClientConstants::VERSION_STRING = std::wstring(L"Minecraft Xbox ") + VER_FILEVERSION_STR_W;//+ SharedConstants::VERSION_STRING;

2
Minecraft.Client/Commands/TeleportCommand.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "../MinecraftServer.h"
#include "../Network/PlayerList.h"
#include "../Player/ServerPlayer.h"

2
Minecraft.Client/GameState/CreativeMode.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "CreativeMode.h"
#include "../Player/User.h"
#include "../Player/LocalPlayer.h"

2
Minecraft.Client/GameState/DemoMode.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "DemoMode.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.h"

2
Minecraft.Client/GameState/DemoUser.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "DemoUser.h"
DemoUser::DemoUser() : User(L"DemoUser", L"n/a")

2
Minecraft.Client/GameState/GameMode.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "GameMode.h"
#include "../Player/LocalPlayer.h"
#include "../Level/MultiPlayerLevel.h"

2
Minecraft.Client/GameState/Options.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "Options.h"
#include "../Input/KeyMapping.h"
#include "../Rendering/LevelRenderer.h"

2
Minecraft.Client/GameState/Settings.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "Settings.h"
#include "../../Minecraft.World/Util/StringHelpers.h"

2
Minecraft.Client/GameState/StatsCounter.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "StatsCounter.h"
#include "../../Minecraft.World/Stats/Stat.h"
#include "../../Minecraft.World/Stats/Stats.h"

2
Minecraft.Client/GameState/StatsSyncer.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "StatsSyncer.h"
// 4J - TODO

2
Minecraft.Client/GameState/SurvivalMode.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "SurvivalMode.h"
#include "DemoMode.h"
#include "../Rendering/LevelRenderer.h"

2
Minecraft.Client/Input/ConsoleInput.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "ConsoleInput.h"
ConsoleInput::ConsoleInput(const std::wstring& msg, ConsoleInputSource *source)

2
Minecraft.Client/Input/Input.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "../Minecraft.h"
#include "../GameState/GameMode.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"

2
Minecraft.Client/Input/KeyMapping.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "KeyMapping.h"
KeyMapping::KeyMapping(const std::wstring& name, int key)

2
Minecraft.Client/Level/DemoLevel.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "DemoLevel.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.storage.h"

2
Minecraft.Client/Level/DerivedServerLevel.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "DerivedServerLevel.h"
#include "../../Minecraft.World/Level/Storage/SavedDataStorage.h"
#include "../../Minecraft.World/Level/DerivedLevelData.h"

2
Minecraft.Client/Level/MultiPlayerLevel.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "MultiPlayerLevel.h"
#include "../Player/MultiPlayerLocalPlayer.h"
#include "../Network/ClientConnection.h"

2
Minecraft.Client/Level/ServerLevel.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "ServerLevel.h"
#include "../MinecraftServer.h"
#include "../Network/ServerChunkCache.h"

2
Minecraft.Client/Level/ServerLevelListener.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "ServerLevelListener.h"
#include "../Player/EntityTracker.h"
#include "../MinecraftServer.h"

6
Minecraft.Client/Minecraft.cpp
View file

@ -1,4 +1,4 @@
#include "Build/stdafx.h"
#include "Platform/stdafx.h"
#include "Minecraft.h"
#include "GameState/GameMode.h"
#include "Utils/Timer.h"
@ -65,8 +65,8 @@
#ifdef _XBOX
#include "Platform/Xbox/Network/NetworkPlayerXbox.h"
#endif
#include "Platform/UI/IUIScene_CreativeMenu.h"
#include "Platform/UI/UIFontData.h"
#include "Platform/Common/UI/IUIScene_CreativeMenu.h"
#include "Platform/Common/UI/UIFontData.h"
#include "Textures/Packs/DLCTexturePack.h"
#ifdef __ORBIS__

4
Minecraft.Client/MinecraftServer.cpp
View file

@ -1,4 +1,4 @@
#include "Build/stdafx.h"
#include "Platform/stdafx.h"
//#include "Minecraft.h"
#include <ctime>
@ -47,7 +47,7 @@
#include "Network/ServerCommandDispatcher.h"
#include "../Minecraft.World/WorldGen/Biomes/BiomeSource.h"
#include "Network/PlayerChunkMap.h"
#include "Platform/Telemetry/TelemetryManager.h"
#include "Platform/Common/Telemetry/TelemetryManager.h"
#define DEBUG_SERVER_DONT_SPAWN_MOBS 0

2
Minecraft.Client/Network/ClientConnection.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "ClientConnection.h"
#include "../Level/MultiPlayerLevel.h"
#include "../Player/MultiPlayerLocalPlayer.h"

2
Minecraft.Client/Network/MultiPlayerChunkCache.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "MultiPlayerChunkCache.h"
#include "ServerChunkCache.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.chunk.h"

2
Minecraft.Client/Network/PendingConnection.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "PendingConnection.h"
#include "PlayerConnection.h"
#include "ServerConnection.h"

2
Minecraft.Client/Network/PlayerChunkMap.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "PlayerChunkMap.h"
#include "PlayerConnection.h"
#include "../Level/ServerLevel.h"

2
Minecraft.Client/Network/PlayerConnection.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "PlayerConnection.h"
#include "../Player/ServerPlayer.h"
#include "../Level/ServerLevel.h"

2
Minecraft.Client/Network/PlayerList.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "PlayerList.h"
#include "PlayerChunkMap.h"
#include "../MinecraftServer.h"

2
Minecraft.Client/Network/ServerChunkCache.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "ServerChunkCache.h"
#include "../Level/ServerLevel.h"
#include "../MinecraftServer.h"

2
Minecraft.Client/Network/ServerCommandDispatcher.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "../MinecraftServer.h"
#include "PlayerList.h"
#include "../Player/ServerPlayer.h"

2
Minecraft.Client/Network/ServerConnection.cpp
View file

@ -1,4 +1,4 @@
#include "../Build/stdafx.h"
#include "../Platform/stdafx.h"
#include "../GameState/Options.h"
#include "ServerConnection.h"
#include "PendingConnection.h"

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

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

2
Minecraft.Client/Platform/Durango/Durango_App.cpp
View file

@ -1,5 +1,5 @@
#include "../../../Minecraft.World/Platform/stdafx.h"
#include "../../../Common/Consoles_App.h"
#include "../Common/Consoles_App.h"
#include "../../Player/User.h"
#include "../../Minecraft.h"
#include "../../MinecraftServer.h"

2
Minecraft.Client/Platform/Durango/Durango_UIController.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../Common/UI/UIController.h"
#include "../Common/UI/UIController.h"
class ConsoleUIController : public UIController
{

2
Minecraft.Client/Platform/Durango/Leaderboards/DurangoLeaderboardManager.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../../Common/Leaderboards/LeaderboardManager.h"
#include "../../Common/Leaderboards/LeaderboardManager.h"
namespace P = Platform;
namespace PC = Platform::Collections;

2
Minecraft.Client/Platform/Durango/Leaderboards/DurangoStatsDebugger.cpp
View file

@ -9,7 +9,7 @@
#include "../../../../Minecraft.World/Util/StringHelpers.h"
#include "../../../../Common/Console_Awards_enum.h"
#include "../../Common/Console_Awards_enum.h"
#include "DurangoStatsDebugger.h"

2
Minecraft.Client/Platform/Durango/Network/NetworkPlayerDurango.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../../Common/Network/NetworkPlayerInterface.h"
#include "../../Common/Network/NetworkPlayerInterface.h"
#include "DQRNetworkPlayer.h"
// This is an implementation of the INetworkPlayer interface, for Durango. It effectively wraps the DQRNetworkPlayer class in a non-platform-specific way.

6
Minecraft.Client/Platform/Durango/Network/PlatformNetworkManagerDurango.h
View file

@ -2,9 +2,9 @@
#include <vector>
#include "../../../../Minecraft.World/Util/C4JThread.h"
#include "../../../../Common/Network/NetworkPlayerInterface.h"
#include "../../../../Common/Network/PlatformNetworkManagerInterface.h"
#include "../../../../Common/Network/SessionInfo.h"
#include "../../Common/Network/NetworkPlayerInterface.h"
#include "../../Common/Network/PlatformNetworkManagerInterface.h"
#include "../../Common/Network/SessionInfo.h"
#include "DQRNetworkManager.h"
#define MINECRAFT_DURANGO_PARTY_SEARCH_DELAY_MILLISECONDS 30000

2
Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.cpp
View file

@ -7,7 +7,7 @@
#include "../../../../Minecraft.World/Level/LevelData.h"
#include "../../../../Minecraft.World/Level/Storage/LevelSettings.h"
#include "../../../../Common/Network/GameNetworkManager.h"
#include "../../Common/Network/GameNetworkManager.h"
#include "../../../Player/MultiPlayerLocalPlayer.h"
#include "../ServiceConfig/Events-XBLA.8-149E11AEEvents.h"

2
Minecraft.Client/Platform/Durango/Sentient/DurangoTelemetry.h
View file

@ -2,7 +2,7 @@
#include "../../../../Minecraft.World/Stats/DurangoStats.h"
#include "../../../../Common/Telemetry/TelemetryManager.h"
#include "../../Common/Telemetry/TelemetryManager.h"
class CDurangoTelemetryManager : public CTelemetryManager
{

2
Minecraft.Client/Platform/Durango/XboxGameMode.cpp
View file

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

2
Minecraft.Client/Platform/Durango/XboxGameMode.h
View file

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

0
Minecraft.Client/Build/Extrax64Stubs.cpp → Minecraft.Client/Platform/Extrax64Stubs.cpp
View file

2
Minecraft.Client/Platform/Linux/Linux_App.cpp
View file

@ -1,5 +1,5 @@
#include "../../../Minecraft.World/Platform/stdafx.h"
#include "../../../Common/Consoles_App.h"
#include "../Common/Consoles_App.h"
#include "../../Player/User.h"
#include "../../Minecraft.h"
#include "../../MinecraftServer.h"

4
Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp
View file

@ -50,8 +50,8 @@ static void sigsegv_handler(int sig) {
#include "../../GameState/StatsCounter.h"
#include "../../UI/Screens/ConnectScreen.h"
//#include "../Durango/Social/SocialManager.h"
//#include "../../../Common/Leaderboards/LeaderboardManager.h"
//#include "../../../Common/XUI/XUI_Scene_Container.h"
//#include "../Common/Leaderboards/LeaderboardManager.h"
//#include "../Common/XUI/XUI_Scene_Container.h"
//#include "NetworkManager.h"
#include "../../Rendering/Tesselator.h"
#include "../../GameState/Options.h"

2
Minecraft.Client/Platform/Linux/Linux_ShutdownManager.cpp
View file

@ -1,6 +1,6 @@
// Linux stub implementations for ShutdownManager
// The PS3/PSVita versions have full implementations; on Linux these are no-ops.
#include "../../Build/stdafx.h"
#include "../../Platform/stdafx.h"
#include "../PS3/PS3Extras/ShutdownManager.h"
void ShutdownManager::Initialise() {}

2
Minecraft.Client/Platform/Linux/Linux_UIController.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../Common/UI/UIController.h"
#include "../Common/UI/UIController.h"
class ConsoleUIController : public UIController
{

2
Minecraft.Client/Platform/Linux/linux_game_stubs.cpp
View file

@ -6,7 +6,7 @@
#include <pthread.h>
#include "Stubs/LinuxStubs.h"
#include "../../../Common/Consoles_App.h"
#include "../Common/Consoles_App.h"
void Display::update() {}

4
Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.cpp
View file

@ -5,9 +5,9 @@
#include "base64.h"
#include "../Orbis_App.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/Util/StringHelpers.h"

2
Minecraft.Client/Platform/Orbis/Leaderboards/OrbisLeaderboardManager.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../../Common/Leaderboards/LeaderboardManager.h"
#include "../../Common/Leaderboards/LeaderboardManager.h"
class OrbisLeaderboardManager : public LeaderboardManager
{

2
Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.cpp
View file

@ -12,7 +12,7 @@
#include "../ps4__np_conf.h"
#include "Orbis_NPToolkit.h"
#include "SonyVoiceChat_Orbis.h"
#include "../../../../Common/Network/Sony/SonyHttp.h"
#include "../../Common/Network/Sony/SonyHttp.h"
#include "../../../../Minecraft.World/Util/C4JThread.h"

2
Minecraft.Client/Platform/Orbis/Network/SQRNetworkManager_Orbis.h
View file

@ -8,7 +8,7 @@
#include <unordered_map>
// #include "SonyVoiceChat_Orbis.h"
#include "../../../../Common/Network/Sony/SQRNetworkManager.h"
#include "../../Common/Network/Sony/SQRNetworkManager.h"
class SQRNetworkPlayer;
class ISQRNetworkManagerListener;

2
Minecraft.Client/Platform/Orbis/Network/SonyCommerce_Orbis.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../../Common/Network/Sony/SonyCommerce.h"
#include "../../Common/Network/Sony/SonyCommerce.h"
class OrbisNPToolkit;
class SonyCommerce_Orbis : public SonyCommerce

2
Minecraft.Client/Platform/Orbis/Network/SonyRemoteStorage_Orbis.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "../../../../Common/Network/Sony/SonyRemoteStorage.h"
#include "../../Common/Network/Sony/SonyRemoteStorage.h"
class SonyRemoteStorage_Orbis : public SonyRemoteStorage
{

2
Minecraft.Client/Platform/Orbis/Network/SonyVoiceChat_Orbis.h
View file

@ -4,7 +4,7 @@
#include <stdlib.h>
#include <string.h>
#include <voice_qos.h>
#include "../../../../Common/Network/Sony/SQRNetworkPlayer.h"
#include "../../Common/Network/Sony/SQRNetworkPlayer.h"
static const int sc_maxVoiceDataSize = 2048;

4
Minecraft.Client/Platform/Orbis/Orbis_App.cpp
View file

@ -1,6 +1,6 @@

#include "../../../Minecraft.World/Platform/stdafx.h"
#include "../../../Common/Consoles_App.h"
#include "../Common/Consoles_App.h"
#include "../../Player/User.h"
#include "../../Minecraft.h"
#include "../../MinecraftServer.h"
@ -16,7 +16,7 @@
#include "Network/SonyRemoteStorage_Orbis.h"
#include <system_service.h>
#include "../../../Common/Network/Sony/SonyRemoteStorage.h"
#include "../Common/Network/Sony/SonyRemoteStorage.h"
#include <save_data_dialog.h>
#include <error_dialog.h>

4
Minecraft.Client/Platform/Orbis/Orbis_App.h
View file

@ -3,8 +3,8 @@
class C4JStringTable;
#include <np_toolkit.h>
#include "../../../Common/Network/Sony/SonyCommerce.h"
#include "../../../Common/Network/Sony/SonyRemoteStorage.h"
#include "../Common/Network/Sony/SonyCommerce.h"
#include "../Common/Network/Sony/SonyRemoteStorage.h"
#define PRODUCT_CODE_SIZE 9
#define SAVEFOLDERPREFIX_SIZE 10

4
Minecraft.Client/Platform/Orbis/Orbis_Minecraft.cpp
View file

@ -27,8 +27,8 @@
#include "../../GameState/StatsCounter.h"
#include "../../UI/Screens/ConnectScreen.h"
//#include "Social/SocialManager.h"
//#include "../../../Common/Leaderboards/LeaderboardManager.h"
//#include "../../../Common/XUI/XUI_Scene_Container.h"
//#include "../Common/Leaderboards/LeaderboardManager.h"
//#include "../Common/XUI/XUI_Scene_Container.h"
//#include "NetworkManager.h"
#include "../../Rendering/Tesselator.h"
#include "../../GameState/Options.h"

2
Minecraft.Client/Platform/Orbis/Orbis_UIController.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../Common/UI/UIController.h"
#include "../Common/UI/UIController.h"
class ConsoleUIController : public UIController
{

4
Minecraft.Client/Platform/PS3/Audio/PS3_SoundEngine.cpp
View file

@ -5,8 +5,8 @@
#include <fcntl.h>
#include <unistd.h>
#include <cell/audio.h>
#include "../../../../Common/Audio/SoundEngine.h"
#include "../../../../Common/Consoles_App.h"
#include "../../Common/Audio/SoundEngine.h"
#include "../../Common/Consoles_App.h"
#include "../Miles/include/mss.h"
// This file has the platform specific functions required for PS3 audio

4
Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.cpp
View file

@ -5,9 +5,9 @@
#include "base64.h"
#include "../PS3_App.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/Util/StringHelpers.h"

2
Minecraft.Client/Platform/PS3/Leaderboards/PS3LeaderboardManager.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../../Common/Leaderboards/LeaderboardManager.h"
#include "../../Common/Leaderboards/LeaderboardManager.h"
#include "../../../../Minecraft.World/Platform/x64headers/extraX64.h"
#include "../Passphrase/ps3__np_conf.h"

4
Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.cpp
View file

@ -1,6 +1,6 @@
#include "../../../../Minecraft.World/Platform/stdafx.h"
#include "SQRNetworkManager_PS3.h"
#include "../../../../Common/Network/Sony/SQRNetworkPlayer.h"
#include "../../Common/Network/Sony/SQRNetworkPlayer.h"
#ifdef __PS3__
#include <sys/random_number.h>
#include <sys/event.h>
@ -13,7 +13,7 @@
#include "../Passphrase/ps3__np_conf.h"
#ifdef __PS3__
#include "SonyVoiceChat.h"
#include "../../../../Common/Network/Sony/SonyHttp.h"
#include "../../Common/Network/Sony/SonyHttp.h"
#endif
#include "../../../../Minecraft.World/Util/C4JThread.h"
#include "../PS3Extras/PS3Strings.h"

2
Minecraft.Client/Platform/PS3/Network/SQRNetworkManager_PS3.h
View file

@ -9,7 +9,7 @@
#endif
#include <queue>
#include "../../../../Common/Network/Sony/SQRNetworkManager.h"
#include "../../Common/Network/Sony/SQRNetworkManager.h"
class SQRNetworkPlayer;
class ISQRNetworkManagerListener;

2
Minecraft.Client/Platform/PS3/Network/SonyCommerce_PS3.h
View file

@ -6,7 +6,7 @@
#include <np.h>
#include <np/drm.h>
#include <np/commerce2.h>
#include "../../../../Common/Network/Sony/SonyCommerce.h"
#include "../../Common/Network/Sony/SonyCommerce.h"
#define SCE_TOOLKIT_NP_SKU_PRICE_LEN (SCE_NP_COMMERCE2_CURRENCY_CODE_LEN \
+ SCE_NP_COMMERCE2_CURRENCY_SYMBOL_LEN \

2
Minecraft.Client/Platform/PS3/Network/SonyRemoteStorage_PS3.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "../../../../Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h"
#include "../../Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h"
class SonyRemoteStorage_PS3 : public SonyRemoteStorage
{

2
Minecraft.Client/Platform/PS3/PS3Extras/ShutdownManager.cpp
View file

@ -1,6 +1,6 @@
#include "../../../../Minecraft.World/Platform/stdafx.h"
#include "ShutdownManager.h"
#include "../../../../Common/Leaderboards/LeaderboardManager.h"
#include "../../Common/Leaderboards/LeaderboardManager.h"
#include "../../../MinecraftServer.h"
#ifdef __PS3__
#include "C4JSpursJob.h"

2
Minecraft.Client/Platform/PS3/PS3_App.cpp
View file

@ -1,6 +1,6 @@

#include "../../../Minecraft.World/Platform/stdafx.h"
#include "../../../Common/Consoles_App.h"
#include "../Common/Consoles_App.h"
#include "../../Player/User.h"
#include "../../Minecraft.h"
#include "../../MinecraftServer.h"

4
Minecraft.Client/Platform/PS3/PS3_App.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "../../../Common/Network/Sony/SonyCommerce.h"
#include "../../../Common/Network/Sony/SonyRemoteStorage.h"
#include "../Common/Network/Sony/SonyCommerce.h"
#include "../Common/Network/Sony/SonyRemoteStorage.h"
#define PRODUCT_CODE_SIZE 9
#define SAVEFOLDERPREFIX_SIZE 10

10
Minecraft.Client/Platform/PS3/PS3_Minecraft.cpp
View file

@ -80,11 +80,11 @@ char secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE] =
#include "../../GameState/StatsCounter.h"
#include "../../UI/Screens/ConnectScreen.h"
//#include "Social/SocialManager.h"
//#include "../../../Common/Leaderboards/LeaderboardManager.h"
//#include "../../../Common/XUI/XUI_Scene_Container.h"
//#include "../Common/Leaderboards/LeaderboardManager.h"
//#include "../Common/XUI/XUI_Scene_Container.h"
//#include "NetworkManager.h"
#include "../../Rendering/Tesselator.h"
#include "../../../Common/Console_Awards_enum.h"
#include "../Common/Console_Awards_enum.h"
#include "../../GameState/Options.h"
#include "Sentient/SentientManager.h"
#include "../../../Minecraft.World/Util/IntCache.h"
@ -94,8 +94,8 @@ char secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE] =
#include "../../../Minecraft.World/Level/Storage/OldChunkStorage.h"
#include "PS3Extras/EdgeZLib.h"
#include "PS3Extras/C4JThread_SPU.h"
#include "../../../Common/Network/Sony/SQRNetworkManager.h"
#include "../../../Common/UI/IUIScene_PauseMenu.h"
#include "../Common/Network/Sony/SQRNetworkManager.h"
#include "../Common/UI/IUIScene_PauseMenu.h"
#include <cell/sysmodule.h>

2
Minecraft.Client/Platform/PS3/PS3_UIController.cpp
View file

@ -1,6 +1,6 @@
#include "../../../Minecraft.World/Platform/stdafx.h"
#include "PS3_UIController.h"
#include "../../../Common/UI/UIController.h"
#include "../Common/UI/UIController.h"
#include <cell/gcm.h>
// Temp

2
Minecraft.Client/Platform/PS3/PS3_UIController.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../Common/UI/UIController.h"
#include "../Common/UI/UIController.h"
class ConsoleUIController : public UIController
{

2
Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h"
#ifdef __PS3__
#ifndef SN_TARGET_PS3_SPU
// #include "../../../../Build/stdafx.h"
// #include "../../../../Platform/stdafx.h"
#endif
#endif

2
Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h
View file

@ -1,7 +1,7 @@
#pragma once
#ifndef SN_TARGET_PS3_SPU
#include "../../../../Build/stdafx.h"
#include "../../../../Platform/stdafx.h"
#include "../../../../../Minecraft.World/Level/Storage/Region.h"
#include "../../../../Rendering/Tesselator.h"
#include "../../../../../Minecraft.World/Util/LightLayer.h"

2
Minecraft.Client/Platform/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h
View file

@ -6,7 +6,7 @@ typedef unsigned int DWORD;
typedef unsigned char byte;
#include <float.h>
#else
#include "../../../../Build/stdafx.h"
#include "../../../../Platform/stdafx.h"
class ChunkRebuildData;
#endif
#endif

2
Minecraft.Client/Platform/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h
View file

@ -6,7 +6,7 @@
#include "SparseDataStorage_SPU.h"
#ifndef SN_TARGET_PS3_SPU
#include "../../../../Build/stdafx.h"
#include "../../../../Platform/stdafx.h"
#include "../../../../../Minecraft.World/Level/Storage/Region.h"
#endif // SN_TARGET_PS3_SPU

2
Minecraft.Client/Platform/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h
View file

@ -4,7 +4,7 @@
#ifndef SN_TARGET_PS3_SPU
#include "../../../../Build/stdafx.h"
#include "../../../../Platform/stdafx.h"
#include "../../../../../Minecraft.World/Level/Storage/Region.h"
#endif // SN_TARGET_PS3_SPU

2
Minecraft.Client/Platform/PS3/XboxGameMode.cpp
View file

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

2
Minecraft.Client/Platform/PS3/XboxGameMode.h
View file

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

4
Minecraft.Client/Platform/PS3/Xbox_Minecraft.cpp
View file

@ -27,8 +27,8 @@
#include "../../GameState/StatsCounter.h"
#include "../../UI/Screens/ConnectScreen.h"
//#include "Social/SocialManager.h"
//#include "../../../Common/Leaderboards/LeaderboardManager.h"
//#include "../../../Common/XUI/XUI_Scene_Container.h"
//#include "../Common/Leaderboards/LeaderboardManager.h"
//#include "../Common/XUI/XUI_Scene_Container.h"
//#include "QNetManager.h"
#include "../../Rendering/Tesselator.h"
#include "Xbox_Awards_enum.h"

4
Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp
View file

@ -5,9 +5,9 @@
#include "base64.h"
#include "../PSVita_App.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/Util/StringHelpers.h"

2
Minecraft.Client/Platform/PSVita/Leaderboards/PSVitaLeaderboardManager.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../../Common/Leaderboards/LeaderboardManager.h"
#include "../../Common/Leaderboards/LeaderboardManager.h"
#include "../PSVitaExtras/Conf.h"
class PSVitaLeaderboardManager : public LeaderboardManager

4
Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp
View file

@ -1,7 +1,7 @@
#include "../../../../Minecraft.World/Platform/stdafx.h"
#include "SQRNetworkManager_AdHoc_Vita.h"
#include "SonyVoiceChat_Vita.h"
#include "../../../../Common/Network/Sony/PlatformNetworkManagerSony.h"
#include "../../Common/Network/Sony/PlatformNetworkManagerSony.h"
#include <np.h>
#include <rudp.h>
@ -12,7 +12,7 @@
#include <adhoc_matching.h>
#include "../PSVitaExtras/Conf.h"
#include "../../../../Common/Network/Sony/SonyHttp.h"
#include "../../Common/Network/Sony/SonyHttp.h"
#include "../../../../Minecraft.World/Util/C4JThread.h"

2
Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h
View file

@ -8,7 +8,7 @@
#include <unordered_map>
#include "../../../../Common/Network/Sony/SQRNetworkManager.h"
#include "../../Common/Network/Sony/SQRNetworkManager.h"
//
class SQRNetworkPlayer;
class ISQRNetworkManagerListener;

4
Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.cpp
View file

@ -1,7 +1,7 @@
#include "../../../../Minecraft.World/Platform/stdafx.h"
#include "SQRNetworkManager_Vita.h"
#include "SonyVoiceChat_Vita.h"
#include "../../../../Common/Network/Sony/PlatformNetworkManagerSony.h"
#include "../../Common/Network/Sony/PlatformNetworkManagerSony.h"
#include <np.h>
#include <rudp.h>
@ -10,7 +10,7 @@
#include <netcheck_dialog.h>
#include "../PSVitaExtras/Conf.h"
#include "../../../../Common/Network/Sony/SonyHttp.h"
#include "../../Common/Network/Sony/SonyHttp.h"
#include "../../../../Minecraft.World/Util/C4JThread.h"
// image used for the invite gui, filesize must be smaller than SCE_NP_MESSAGE_DIALOG_MAX_INDEX_ICON_SIZE ( 64K )

2
Minecraft.Client/Platform/PSVita/Network/SQRNetworkManager_Vita.h
View file

@ -8,7 +8,7 @@
#include <unordered_map>
#include "../../../../Common/Network/Sony/SQRNetworkManager.h"
#include "../../Common/Network/Sony/SQRNetworkManager.h"
class SQRNetworkPlayer;
class ISQRNetworkManagerListener;

2
Minecraft.Client/Platform/PSVita/Network/SonyCommerce_Vita.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../../Common/Network/Sony/SonyCommerce.h"
#include "../../Common/Network/Sony/SonyCommerce.h"
#include <np_toolkit.h>
#include <libsysmodule.h>
#include <netcheck_dialog.h>

2
Minecraft.Client/Platform/PSVita/Network/SonyRemoteStorage_Vita.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "../../../../Common/Network/Sony/SonyRemoteStorage.h"
#include "../../Common/Network/Sony/SonyRemoteStorage.h"
class SonyRemoteStorage_Vita : public SonyRemoteStorage
{

2
Minecraft.Client/Platform/PSVita/Network/SonyVoiceChat_Vita.h
View file

@ -4,7 +4,7 @@
#include <stdlib.h>
#include <string.h>
#include <voice.h>
#include "../../../../Common/Network/Sony/SQRNetworkPlayer.h"
#include "../../Common/Network/Sony/SQRNetworkPlayer.h"
static const int sc_maxVoiceDataSize = 2048;

2
Minecraft.Client/Platform/PSVita/PSVitaExtras/ShutdownManager.cpp
View file

@ -1,6 +1,6 @@
#include "../../../../Minecraft.World/Platform/stdafx.h"
#include "ShutdownManager.h"
#include "../../../../Common/Leaderboards/LeaderboardManager.h"
#include "../../Common/Leaderboards/LeaderboardManager.h"
#include "../../../MinecraftServer.h"
#ifdef __PS3__
#include "../../PS3/PS3Extras/C4JSpursJob.h"

4
Minecraft.Client/Platform/PSVita/PSVita_App.cpp
View file

@ -1,6 +1,6 @@

#include "../../../Minecraft.World/Platform/stdafx.h"
#include "../../../Common/Consoles_App.h"
#include "../Common/Consoles_App.h"
#include "../../Player/User.h"
#include "../../Minecraft.h"
#include "../../MinecraftServer.h"
@ -13,7 +13,7 @@
#include "../../../Minecraft.World/Util/StringHelpers.h"
#include "Network/SonyRemoteStorage_Vita.h"
#include "Network/SonyCommerce_Vita.h"
#include "../../../Common/Network/Sony/SonyRemoteStorage.h"
#include "../Common/Network/Sony/SonyRemoteStorage.h"
#include "Network/PSVita_NPToolkit.h"
#include <message_dialog.h>
#include <savedata_dialog.h>

4
Minecraft.Client/Platform/PSVita/PSVita_App.h
View file

@ -3,8 +3,8 @@
class C4JStringTable;
//#include <np_toolkit.h>
#include "../../../Common/Network/Sony/SonyCommerce.h"
#include "../../../Common/Network/Sony/SonyRemoteStorage.h"
#include "../Common/Network/Sony/SonyCommerce.h"
#include "../Common/Network/Sony/SonyRemoteStorage.h"
#define PRODUCT_CODE_SIZE 9
#define SAVEFOLDERPREFIX_SIZE 10

10
Minecraft.Client/Platform/PSVita/PSVita_Minecraft.cpp
View file

@ -40,11 +40,11 @@
#include "../../GameState/StatsCounter.h"
#include "../../UI/Screens/ConnectScreen.h"
//#include "Social/SocialManager.h"
//#include "../../../Common/Leaderboards/LeaderboardManager.h"
//#include "../../../Common/XUI/XUI_Scene_Container.h"
//#include "../Common/Leaderboards/LeaderboardManager.h"
//#include "../Common/XUI/XUI_Scene_Container.h"
//#include "NetworkManager.h"
#include "../../Rendering/Tesselator.h"
#include "../../../Common/Console_Awards_enum.h"
#include "../Common/Console_Awards_enum.h"
#include "../../GameState/Options.h"
#include "Sentient/SentientManager.h"
#include "../../../Minecraft.World/Util/IntCache.h"
@ -54,8 +54,8 @@
#include "../../../Minecraft.World/Level/Storage/OldChunkStorage.h"
//#include "../PS3/PS3Extras/EdgeZLib.h"
#include "../../../Minecraft.World/Util/C4JThread.h"
#include "../../../Common/Network/Sony/SQRNetworkManager.h"
#include "../../../Common/UI/IUIScene_PauseMenu.h"
#include "../Common/Network/Sony/SQRNetworkManager.h"
#include "../Common/UI/IUIScene_PauseMenu.h"
#include "PSVitaExtras/Conf.h"
#include "Network/PSVita_NPToolkit.h"
#include "Network/SonyVoiceChat_Vita.h"

2
Minecraft.Client/Platform/PSVita/PSVita_UIController.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../Common/UI/UIController.h"
#include "../Common/UI/UIController.h"
class ConsoleUIController : public UIController
{

2
Minecraft.Client/Platform/Windows64/Leaderboards/WindowsLeaderboardManager.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../../Common/Leaderboards/LeaderboardManager.h"
#include "../../Common/Leaderboards/LeaderboardManager.h"
class WindowsLeaderboardManager : public LeaderboardManager
{

2
Minecraft.Client/Platform/Windows64/Windows64_App.cpp
View file

@ -1,5 +1,5 @@
#include "../../../Minecraft.World/Platform/stdafx.h"
#include "../../../Common/Consoles_App.h"
#include "../Common/Consoles_App.h"
#include "../../Player/User.h"
#include "../../Minecraft.h"
#include "../../MinecraftServer.h"

4
Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp
View file

@ -25,8 +25,8 @@
#include "../../GameState/StatsCounter.h"
#include "../../UI/Screens/ConnectScreen.h"
//#include "Social/SocialManager.h"
//#include "../../../Common/Leaderboards/LeaderboardManager.h"
//#include "../../../Common/XUI/XUI_Scene_Container.h"
//#include "../Common/Leaderboards/LeaderboardManager.h"
//#include "../Common/XUI/XUI_Scene_Container.h"
//#include "NetworkManager.h"
#include "../../Rendering/Tesselator.h"
#include "../../GameState/Options.h"

2
Minecraft.Client/Platform/Windows64/Windows64_UIController.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../../Common/UI/UIController.h"
#include "../Common/UI/UIController.h"
class ConsoleUIController : public UIController
{

2
Minecraft.Client/Platform/Xbox/Audio/SoundEngine.cpp
View file

@ -8,7 +8,7 @@
#include "SoundEngine.h"
#include "../../../Textures/Packs/TexturePackRepository.h"
#include "../../../Textures/Packs/TexturePack.h"
#include "../../../../Common/DLC/DLCAudioFile.h"
#include "../../Common/DLC/DLCAudioFile.h"
#include "../../../Textures/Packs/DLCTexturePack.h"

2
Minecraft.Client/Platform/Xbox/Font/XUI_FontData.h
View file

@ -2,7 +2,7 @@
#include <xuirender.h>
#include "../../../../Common/UI/UIFontData.h"
#include "../../Common/UI/UIFontData.h"
// 4J This class is partially based of the ATG font implementation
//--------------------------------------------------------------------------------------

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