feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>

Minecraft.Client/Common/Leaderboards/LeaderboardInterface.cpp

@@ -0,0 +1,88 @@
+#include "stdafx.h"
+#include "LeaderboardInterface.h"
+
+LeaderboardInterface::LeaderboardInterface(LeaderboardManager *man)
+{
+	m_manager = man;
+	m_pending = false;
+
+	m_filter = (LeaderboardManager::EFilterMode) -1;
+	m_callback = NULL;
+	m_difficulty = 0;
+	m_type = LeaderboardManager::eStatsType_UNDEFINED;
+	m_startIndex = 0;
+	m_readCount = 0;
+
+	m_manager->OpenSession();
+}
+
+LeaderboardInterface::~LeaderboardInterface()
+{
+	m_manager->CancelOperation();
+	m_manager->CloseSession();
+}
+
+void LeaderboardInterface::ReadStats_Friends(LeaderboardReadListener *callback, int difficulty, LeaderboardManager::EStatsType type, PlayerUID myUID, unsigned int startIndex, unsigned int readCount)
+{
+	m_filter = LeaderboardManager::eFM_Friends;
+	m_pending = true;
+
+	m_callback = callback;
+	m_difficulty = difficulty;
+	m_type = type;
+	m_myUID = myUID;
+	m_startIndex = startIndex;
+	m_readCount = readCount;
+
+	tick();
+}
+
+void LeaderboardInterface::ReadStats_MyScore(LeaderboardReadListener *callback, int difficulty, LeaderboardManager::EStatsType type, PlayerUID myUID, unsigned int readCount)
+{
+	m_filter = LeaderboardManager::eFM_MyScore;
+	m_pending = true;
+
+	m_callback = callback;
+	m_difficulty = difficulty;
+	m_type = type;
+	m_myUID = myUID;
+	m_readCount = readCount;
+
+	tick();
+}
+
+void LeaderboardInterface::ReadStats_TopRank(LeaderboardReadListener *callback, int difficulty, LeaderboardManager::EStatsType type, unsigned int startIndex, unsigned int readCount)
+{
+	m_filter = LeaderboardManager::eFM_TopRank;
+	m_pending = true;
+
+	m_callback = callback;
+	m_difficulty = difficulty;
+	m_type = type;
+	m_startIndex = startIndex;
+	m_readCount = readCount;
+
+	tick();
+}
+
+void LeaderboardInterface::CancelOperation()
+{
+	m_manager->CancelOperation();
+	m_pending = false;
+}
+
+void LeaderboardInterface::tick()
+{
+	if (m_pending) m_pending = !callManager();
+}
+
+bool LeaderboardInterface::callManager()
+{
+	switch (m_filter)
+	{
+	case LeaderboardManager::eFM_Friends:	return m_manager->ReadStats_Friends(m_callback, m_difficulty, m_type, m_myUID, m_startIndex, m_readCount);
+	case LeaderboardManager::eFM_MyScore:	return m_manager->ReadStats_MyScore(m_callback, m_difficulty, m_type, m_myUID, m_readCount);
+	case LeaderboardManager::eFM_TopRank:	return m_manager->ReadStats_TopRank(m_callback, m_difficulty, m_type, m_startIndex, m_readCount);
+	default:								assert(false); return true;
+	}
+}

Minecraft.Client/Common/Leaderboards/LeaderboardInterface.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include "LeaderboardManager.h"
+
+// 4J-JEV: Simple interface for handling ReadStat failures.
+class LeaderboardInterface
+{
+private:
+	LeaderboardManager				*m_manager;
+	bool							m_pending;
+
+	// Arguments.
+	LeaderboardManager::EFilterMode	m_filter;
+	LeaderboardReadListener			*m_callback;
+	int								m_difficulty;
+	LeaderboardManager::EStatsType	m_type;
+	PlayerUID						m_myUID;
+	unsigned int					m_startIndex;
+	unsigned int					m_readCount;
+
+public:
+	LeaderboardInterface(LeaderboardManager *man);
+	~LeaderboardInterface();
+
+	void ReadStats_Friends(LeaderboardReadListener *callback, int difficulty, LeaderboardManager::EStatsType type, PlayerUID myUID, unsigned int startIndex, unsigned int readCount);
+	void ReadStats_MyScore(LeaderboardReadListener *callback, int difficulty, LeaderboardManager::EStatsType type, PlayerUID myUID, unsigned int readCount);
+	void ReadStats_TopRank(LeaderboardReadListener *callback, int difficulty, LeaderboardManager::EStatsType type, unsigned int startIndex, unsigned int readCount);
+
+	void CancelOperation();
+
+	void tick();
+
+private:
+	bool callManager();
+};

Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.h

@@ -0,0 +1,133 @@
+#pragma once
+
+#include "Common\Leaderboards\LeaderboardManager.h"
+
+#ifdef __PS3__
+typedef CellRtcTick SonyRtcTick;
+#else
+typedef SceRtcTick SonyRtcTick;
+#endif
+
+class SonyLeaderboardManager : public LeaderboardManager
+{
+protected:
+	enum EStatsState
+	{
+		eStatsState_Idle,
+		eStatsState_Getting,
+		eStatsState_Failed,
+		eStatsState_Ready,
+		eStatsState_Canceled,
+		eStatsState_Max
+	};
+
+public:
+	SonyLeaderboardManager();
+	virtual ~SonyLeaderboardManager();
+
+protected:
+	unsigned short m_openSessions;
+
+	C4JThread *m_threadScoreboard;
+	bool m_running;
+
+	int		m_titleContext;
+	int32_t m_requestId;
+
+	//SceNpId m_myNpId;
+
+	static int scoreboardThreadEntry(LPVOID lpParam);
+	void scoreboardThreadInternal();
+
+	virtual bool getScoreByIds();
+	virtual bool getScoreByRange();
+
+	virtual bool setScore();
+
+	queue<RegisterScore> m_views;
+
+	CRITICAL_SECTION m_csViewsLock;
+
+	EStatsState		m_eStatsState;			//State of the stats read
+	//	EFilterMode		m_eFilterMode;
+
+	ReadScore *m_scores;
+	unsigned int m_maxRank;
+	//SceNpScoreRankData *m_stats;
+
+public:
+	virtual void Tick();
+
+	//Open a session
+	virtual bool OpenSession();
+
+	//Close a session
+	virtual void CloseSession();
+
+	//Delete a session
+	virtual void DeleteSession();
+
+	//Write the given stats
+	//This is called synchronously and will not free any memory allocated for views when it is done
+
+	virtual bool WriteStats(unsigned int viewCount, ViewIn views);
+
+	virtual bool ReadStats_Friends(LeaderboardReadListener *callback, int difficulty, EStatsType type, PlayerUID myUID, unsigned int startIndex, unsigned int readCount);
+	virtual bool ReadStats_MyScore(LeaderboardReadListener *callback, int difficulty, EStatsType type, PlayerUID myUID, unsigned int readCount);
+	virtual bool ReadStats_TopRank(LeaderboardReadListener *callback, int difficulty, EStatsType type, unsigned int startIndex, unsigned int readCount);
+
+	//Perform a flush of the stats
+	virtual void FlushStats();
+
+	//Cancel the current operation
+	virtual void CancelOperation();
+
+	//Is the leaderboard manager idle.
+	virtual bool isIdle();
+
+protected:
+	int getBoardId(int difficulty, EStatsType);
+
+	SceNpScorePlayerRankData *addPadding(unsigned int num, SceNpScoreRankData *rankData);
+
+	void convertToOutput(unsigned int &num, ReadScore *out, SceNpScorePlayerRankData *rankData, SceNpScoreComment *comm);
+
+	void toBinary(void *out, SceNpScoreComment *in);
+	void fromBinary(SceNpScoreComment **out, void *in);
+
+	void toBase32(SceNpScoreComment *out, void *in);
+	void fromBase32(void *out, SceNpScoreComment *in);
+
+	void toSymbols(char *);
+	void fromSymbols(char *);
+
+	bool test_string(string);
+
+	void initReadScoreStruct(ReadScore &out, SceNpScoreRankData &);
+	void fillReadScoreStruct(ReadScore &out, SceNpScoreComment &comment);
+
+	static bool SortByRank(const ReadScore &lhs, const ReadScore &rhs);
+
+	
+protected:
+	// 4J-JEV: Interface differences:
+	
+	// Sce NP score library function redirects.
+	virtual HRESULT initialiseScoreUtility() { return ERROR_SUCCESS; }
+	virtual bool	scoreUtilityAlreadyInitialised(HRESULT hr) { return false; }
+
+	virtual HRESULT createTitleContext(const SceNpId &npId) = 0;
+	virtual HRESULT destroyTitleContext(int titleContext) = 0;
+	
+	virtual HRESULT createTransactionContext(int titleContext) = 0;
+	virtual HRESULT abortTransactionContext(int transactionContext) = 0;
+	virtual HRESULT destroyTransactionContext(int transactionContext) = 0;
+
+	virtual HRESULT fillByIdsQuery(const SceNpId &myNpId, SceNpId* &npIds, uint32_t &len); 
+
+#if (defined __ORBIS__) || (defined __PSVITA__)
+	virtual HRESULT getFriendsList(sce::Toolkit::NP::Utilities::Future<sce::Toolkit::NP::FriendsList> &friendsList) = 0;
+#endif
+
+	virtual char *	getComment(SceNpScoreComment *comment) = 0;
+};

Minecraft.Client/Common/Leaderboards/base64.cpp

@@ -0,0 +1,131 @@
+/* 
+   base64.cpp and base64.h
+
+   Copyright (C) 2004-2008 Ren<65> Nyffenegger
+
+   This source code is provided 'as-is', without any express or implied
+   warranty. In no event will the author be held liable for any damages
+   arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any purpose,
+   including commercial applications, and to alter it and redistribute it
+   freely, subject to the following restrictions:
+
+   1. The origin of this source code must not be misrepresented; you must not
+      claim that you wrote the original source code. If you use this source code
+      in a product, an acknowledgment in the product documentation would be
+      appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and must not be
+      misrepresented as being the original source code.
+
+   3. This notice may not be removed or altered from any source distribution.
+
+   Ren<65> Nyffenegger rene.nyffenegger@adp-gmbh.ch
+
+*/
+
+#include "stdafx.h"
+
+#include "base64.h"
+#include <iostream>
+
+static const std::string base64_chars = 
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+             "abcdefghijklmnopqrstuvwxyz"
+             "0123456789+/";
+
+
+static inline bool is_base64(unsigned char c) {
+  return (isalnum(c) || (c == '+') || (c == '/'));
+}
+
+// 4J ADDED,
+std::string base64_encode(std::string str)
+{
+	return base64_encode( reinterpret_cast<const unsigned char*>(str.c_str()), str.length() );
+}
+
+std::string base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len) {
+  std::string ret;
+  int i = 0;
+  int j = 0;
+  unsigned char char_array_3[3];
+  unsigned char char_array_4[4];
+
+  while (in_len--) {
+    char_array_3[i++] = *(bytes_to_encode++);
+    if (i == 3) {
+      char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
+      char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
+      char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
+      char_array_4[3] = char_array_3[2] & 0x3f;
+
+      for(int ii = 0; (ii <4) ; ii++)
+        ret += base64_chars[char_array_4[ii]];
+      i = 0;
+    }
+  }
+
+  if (i)
+  {
+    for(j = i; j < 3; j++)
+      char_array_3[j] = '\0';
+
+    char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
+    char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
+    char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
+    char_array_4[3] = char_array_3[2] & 0x3f;
+
+    for (j = 0; (j < i + 1); j++)
+      ret += base64_chars[char_array_4[j]];
+
+    while((i++ < 3))
+      ret += '=';
+
+  }
+
+  return ret;
+
+}
+
+std::string base64_decode(std::string const& encoded_string) {
+  int in_len = encoded_string.size();
+  int i = 0;
+  int j = 0;
+  int in_ = 0;
+  unsigned char char_array_4[4], char_array_3[3];
+  std::string ret;
+
+  while (in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_])) {
+    char_array_4[i++] = encoded_string[in_]; in_++;
+    if (i ==4) {
+      for (i = 0; i <4; i++)
+        char_array_4[i] = base64_chars.find(char_array_4[i]);
+
+      char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+      char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+      char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+
+      for (i = 0; (i < 3); i++)
+        ret += char_array_3[i];
+      i = 0;
+    }
+  }
+
+  if (i) {
+    for (j = i; j <4; j++)
+      char_array_4[j] = 0;
+
+    for (j = 0; j <4; j++)
+      char_array_4[j] = base64_chars.find(char_array_4[j]);
+
+    char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+    char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+    char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+
+    for (j = 0; (j < i - 1); j++) ret += char_array_3[j];
+  }
+
+  return ret;
+}

Minecraft.Client/Common/Leaderboards/base64.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <string>
+
+std::string base64_encode(std::string str);
+std::string base64_encode(unsigned char const* , unsigned int len);
+std::string base64_decode(std::string const& s);