wip_feat(PS3): Implement SPU variants for a portion of TU19's blocks

crashes at a stack overflow, cant be assed to fix it atm

.gitea/workflows/release.yaml

@@ -1,106 +0,0 @@
-name: Build & Release
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version tag for release (e.g. v1.0.0).'
-        required: true
-        default: ''
-      notes:
-        description: 'URL to notes for release.'
-        required: false
-        default: ''
-
-jobs:
-  validate:
-    runs-on: windows-2022
-    steps:
-      - name: Validate version format
-        run: |
-          if (-not ("${{ inputs.version }}" -match '^v\d+\.\d+\.\d+[a-zA-Z0-9.-]*$')) {
-            Write-Error "Version '${{ inputs.version }}' doesn't match expected format (e.g. v1.0.0)"
-            exit 1
-          }
-
-  build:
-    runs-on: windows-2022
-
-    strategy:
-      matrix:
-        configuration: [Release]
-        platform: [PS3, Windows64] #[PS3, PSVita, Xbox 360, ORBIS, Windows64]
-
-    steps:
-      - name: Checkout Repository
-        uses: https://github.com/actions/checkout@v4
-
-      - name: Build Cafeberry
-        run: |
-          & "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" MinecraftConsoles.sln `
-            /p:Configuration=${{ matrix.configuration }} `
-            /p:Platform=${{ matrix.platform }} `
-            /m
-
-      - name: Zip Build (Consoles)
-        if: matrix.platform != 'Windows64'
-        run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
-
-      - name: Zip Build (Windows64)
-        if: matrix.platform == 'Windows64'
-        run: 7z a -r LCE${{ matrix.platform }}.zip ./x64/${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj"
-
-      - name: Stage artifacts
-        run: |
-          New-Item -ItemType Directory -Force -Path staging
-          Copy-Item LCE${{ matrix.platform }}.zip staging/ 
-
-      - name: Stage exe
-        if: matrix.platform == 'Windows64'
-        run: |
-          Copy-Item ./x64/${{ matrix.configuration }}/Minecraft.Client.exe staging/
-
-      - name: Upload artifacts
-        uses: https://github.com/actions/upload-artifact@v3
-        with:
-          name: build-${{ matrix.platform }}
-          path: staging/*
-
-  release:
-    needs: build
-    runs-on: windows-2022
-    steps:
-      - name: Download all build artifacts
-        uses: https://github.com/actions/download-artifact@v3
-        with:
-          path: downloaded
-
-      - name: Fetch release notes
-        id: notes
-        run: |
-          $notesSource = "${{ inputs.notes }}"
-          $fallback = "## Cafeberry`n`n### Whoever made this release forgot to put notes, sorry!"
-
-          if ($notesSource -match '^https?://') {
-            try {
-              $body = (Invoke-WebRequest -Uri $notesSource -UseBasicParsing).Content
-              if ([string]::IsNullOrWhiteSpace($body)) { $body = $fallback }
-            } catch {
-              $body = $fallback
-            }
-          }
-
-          "description<<EOF`n$body`nEOF" | Out-File -Append -Encoding utf8 -NoNewline:$false $env:GITHUB_OUTPUT
-
-      - name: Publish Release
-        uses: akkuman/gitea-release-action@v1
-        with:
-          name: ${{ inputs.version }}
-          server_url: ${{ gitea.server_url }}
-          repository: ${{ gitea.repository }}
-          token: ${{ gitea.token }}
-          tag_name: ${{ inputs.version }}
-          prerelease: false
-          verbose: true
-          files: downloaded/**/*
-          body: ${{ steps.notes.outputs.description }}

Minecraft.Client/Common/Audio/Consoles_SoundEngine.h

@@ -15,6 +15,7 @@
 #define _SEKRIT
 #include "..\..\Durango\Miles\include\mss.h"
 #elif defined _WINDOWS64
+#include "..\..\windows64\Miles\include\mss.h"
 #else // PS4
 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
 #define _SEKRIT2

Minecraft.Client/Common/Audio/SoundEngine.cpp

@@ -16,17 +16,7 @@
 
 #ifdef _WINDOWS64
 #include "..\..\Minecraft.Client\Windows64\Windows64_App.h"
-std::vector<MiniAudioSound*> m_activeSounds;
-#include "stb_vorbis.h"
-
-#define MA_NO_DSOUND
-#define MA_NO_WINMM
-#define MINIAUDIO_IMPLEMENTATION
-#include "miniaudio.h"
-#include <vector>
-#include <memory>
-#include <mutex>
-#include "..\Filesystem\Filesystem.h"
+#include "..\..\Minecraft.Client\Windows64\Miles\include\imssapi.h"
 #endif
 
 #ifdef __ORBIS__
@@ -103,13 +93,11 @@ char SoundEngine::m_szSoundPath[]={"Sound/"};
 
 #endif
 
-#ifndef _WINDOWS64
 F32 AILCALLBACK custom_falloff_function (HSAMPLE   S, 
 										 F32       distance,
 										 F32       rolloff_factor,
 										 F32       min_dist,
 										 F32       max_dist);
-#endif
 
 char *SoundEngine::m_szStreamFileA[eStream_Max]=
 {
@@ -167,7 +155,6 @@ char *SoundEngine::m_szStreamFileA[eStream_Max]=
 //	ErrorCallback
 //
 /////////////////////////////////////////////
-#ifndef _WINDOWS64
 void AILCALL ErrorCallback(S64 i_Id, char const* i_Details)
 {
 	char *pchLastError=AIL_last_error();
@@ -182,7 +169,6 @@ void AILCALL ErrorCallback(S64 i_Id, char const* i_Details)
 		app.DebugPrintf("ErrorCallback - Details: %s\n", i_Details);
 	}
 }
-#endif
 
 #ifdef __PSVITA__
 // AP - this is the callback when the driver is about to mix. At this point the mutex is locked by Miles so we can now call all Miles functions without
@@ -215,7 +201,6 @@ void AILCALL MilesMixerCB(HDIGDRIVER dig)
 /////////////////////////////////////////////
 void SoundEngine::init(Options *pOptions)
 {
-#ifndef _WINDOWS64
 	app.DebugPrintf("---SoundEngine::init\n");
 #ifdef __DISABLE_MILES__
 	return;
@@ -385,31 +370,6 @@ void SoundEngine::init(Options *pOptions)
 	// wait for 1 mix...
 	AIL_release_sample_handle(Sample);
 #endif
-#else
-    app.DebugPrintf("---SoundEngine::init\n");
-
-    m_engineConfig = ma_engine_config_init();
-    m_engineConfig.listenerCount = MAX_LOCAL_PLAYERS;
-
-    if (ma_engine_init(&m_engineConfig, &m_engine) != MA_SUCCESS)
-    {
-        app.DebugPrintf("Failed to initialize miniaudio engine\n");
-        return;
-    }
-
-    ma_engine_set_volume(&m_engine, 1.0f);
-
-    m_MasterMusicVolume = 1.0f;
-    m_MasterEffectsVolume = 1.0f;
-
-    m_validListenerCount = 1;
-    
-    m_bSystemMusicPlaying = false;
-
-    app.DebugPrintf("---miniaudio initialized\n");
-	
-    return;
-#endif
 }
 
 #ifdef __ORBIS__
@@ -439,7 +399,6 @@ void SoundEngine::SetStreamingSounds(int iOverworldMin, int iOverWorldMax, int i
 }
 
 // AP - moved to a separate function so it can be called from the mixer callback on Vita
-#ifndef _WINDOWS64
 void SoundEngine::updateMiles()
 {
 #ifdef __PSVITA__ 
@@ -652,110 +611,6 @@ void SoundEngine::updateMiles()
 	}
 	AIL_complete_event_queue_processing();
 }
-#else
-void SoundEngine::updateMiniAudio()
-{
-    if (m_validListenerCount == 1)
-    {
-        for (size_t i = 0; i < MAX_LOCAL_PLAYERS; i++)
-        {
-            if (m_ListenerA[i].bValid)
-            {
-                ma_engine_listener_set_position(
-                    &m_engine,
-                    0,
-                    m_ListenerA[i].vPosition.x,
-                    m_ListenerA[i].vPosition.y,
-                    m_ListenerA[i].vPosition.z);
-
-                ma_engine_listener_set_direction(
-                    &m_engine,
-                    0,
-                    m_ListenerA[i].vOrientFront.x,
-                    m_ListenerA[i].vOrientFront.y,
-                    m_ListenerA[i].vOrientFront.z);
-
-                ma_engine_listener_set_world_up(
-                    &m_engine,
-                    0,
-                    0.0f, 1.0f, 0.0f);
-
-                break;
-            }
-        }
-    }
-    else
-    {
-        ma_engine_listener_set_position(&m_engine, 0, 0.0f, 0.0f, 0.0f);
-        ma_engine_listener_set_direction(&m_engine, 0, 0.0f, 0.0f, 1.0f);
-        ma_engine_listener_set_world_up(&m_engine, 0, 0.0f, 1.0f, 0.0f);
-    }
-
-    for (auto it = m_activeSounds.begin(); it != m_activeSounds.end(); )
-    {
-        MiniAudioSound* s = *it;
-
-        if (!ma_sound_is_playing(&s->sound))
-        {
-            ma_sound_uninit(&s->sound);
-            delete s;
-            it = m_activeSounds.erase(it);
-            continue;
-        }
-
-        float finalVolume = s->info.volume * m_MasterEffectsVolume * SFX_VOLUME_MULTIPLIER;
-        if (finalVolume > SFX_MAX_GAIN)
-            finalVolume = SFX_MAX_GAIN;
-
-        ma_sound_set_volume(&s->sound, finalVolume);
-        ma_sound_set_pitch(&s->sound, s->info.pitch);
-
-        if (s->info.bIs3D)
-        {
-            if (m_validListenerCount > 1)
-            {
-                float fClosest=10000.0f;
-				int iClosestListener=0;
-				float fClosestX=0.0f,fClosestY=0.0f,fClosestZ=0.0f,fDist;
-				for( size_t i = 0; i < MAX_LOCAL_PLAYERS; i++ )
-				{
-					if( m_ListenerA[i].bValid )
-					{
-						float x,y,z;
-
-						x=fabs(m_ListenerA[i].vPosition.x-s->info.x);
-						y=fabs(m_ListenerA[i].vPosition.y-s->info.y);
-						z=fabs(m_ListenerA[i].vPosition.z-s->info.z);
-						fDist=x+y+z;
-
-						if(fDist<fClosest)
-						{
-							fClosest=fDist;
-							fClosestX=x;
-							fClosestY=y;
-							fClosestZ=z;
-							iClosestListener=i;
-						}
-					}
-				}
-
-                float realDist = sqrtf((fClosestX*fClosestX)+(fClosestY*fClosestY)+(fClosestZ*fClosestZ));
-                ma_sound_set_position(&s->sound, 0, 0, realDist);
-            }
-            else
-            {
-                ma_sound_set_position(
-                    &s->sound,
-                    s->info.x,
-                    s->info.y,
-                    s->info.z);
-            }
-        }
-
-        ++it;
-    }
-}
-#endif
 
 //#define DISTORTION_TEST
 #ifdef DISTORTION_TEST
@@ -842,11 +697,7 @@ void SoundEngine::tick(shared_ptr<Mob> *players, float a)
 
 	LeaveCriticalSection(&SoundEngine_MixerMutex);
 #else
-#ifndef _WINDOWS64
 	updateMiles();
-#else
-	updateMiniAudio();
-#endif
 #endif
 }
 
@@ -858,13 +709,7 @@ void SoundEngine::tick(shared_ptr<Mob> *players, float a)
 SoundEngine::SoundEngine()
 {
 	random = new Random();
-#ifndef _WINDOWS64
 	m_hStream=0;
-#else
-	memset(&m_engine, 0, sizeof(ma_engine));
-    memset(&m_engineConfig, 0, sizeof(ma_engine_config));
-    m_musicStreamActive = false;
-#endif
 	m_StreamState=eMusicStreamState_Idle;
 	m_iMusicDelay=0;
 	m_validListenerCount=0; 
@@ -946,7 +791,7 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa
 	strcat((char *)szSoundName,SoundName);
 
 //	app.DebugPrintf(6,"PlaySound - %d - %s - %s (%f %f %f, vol %f, pitch %f)\n",iSound, SoundName, szSoundName,x,y,z,volume,pitch);
-#ifndef _WINDOWS64
+
 	AUDIO_INFO AudioInfo;
 	AudioInfo.x=x;
 	AudioInfo.y=y;
@@ -963,124 +808,6 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa
 	S32 token = AIL_enqueue_event_start();
 	AIL_enqueue_event_buffer(&token, &AudioInfo, sizeof(AUDIO_INFO), 0);
 	AIL_enqueue_event_end_named(token, (char *)szSoundName);
-#else
-    app.DebugPrintf(6,
-        "PlaySound - %d - %s - %s (%f %f %f, vol %f, pitch %f)\n",
-        iSound, SoundName, szSoundName, x, y, z, volume, pitch);
-
-    char basePath[256];
-    sprintf_s(basePath, "Windows64Media/Sound/%s", (char*)szSoundName);
-
-    char finalPath[256];
-
-	// Check path cache first to avoid expensive filesystem probing
-	auto cacheIt = m_soundPathCache.find(iSound);
-	if (cacheIt != m_soundPathCache.end())
-	{
-		const auto& paths = cacheIt->second;
-		if (paths.empty())
-			return; // previously probed, no files found
-		const std::string& chosen = paths[rand() % paths.size()];
-		sprintf_s(finalPath, "%s", chosen.c_str());
-	}
-	else
-	{
-		// Cache miss — probe filesystem and store results
-		std::vector<std::string> validPaths;
-		const char* extensions[] = { ".ogg", ".wav", ".mp3" };
-		size_t extCount = sizeof(extensions) / sizeof(extensions[0]);
-		bool found = false;
-
-		// Check base name with each extension (non-numbered)
-		for (size_t extIdx = 0; extIdx < extCount; extIdx++)
-		{
-			char basePlusExt[256];
-			sprintf_s(basePlusExt, "%s%s", basePath, extensions[extIdx]);
-
-			DWORD attr = GetFileAttributesA(basePlusExt);
-			if (attr != INVALID_FILE_ATTRIBUTES && !(attr & FILE_ATTRIBUTE_DIRECTORY))
-			{
-				validPaths.push_back(basePlusExt);
-				found = true;
-				break; // non-numbered: only one base file needed
-			}
-		}
-
-		if (!found)
-		{
-			// Check numbered variants (e.g. sound1.ogg, sound2.ogg, ...)
-			for (size_t extIdx = 0; extIdx < extCount; extIdx++)
-			{
-				for (int i = 1; i < 32; i++)
-				{
-					char numberedPath[256];
-					sprintf_s(numberedPath, "%s%d%s", basePath, i, extensions[extIdx]);
-
-					DWORD attr = GetFileAttributesA(numberedPath);
-					if (attr != INVALID_FILE_ATTRIBUTES && !(attr & FILE_ATTRIBUTE_DIRECTORY))
-					{
-						validPaths.push_back(numberedPath);
-					}
-				}
-			}
-		}
-
-		m_soundPathCache[iSound] = validPaths;
-
-		if (validPaths.empty())
-		{
-			sprintf_s(finalPath, "%s.wav", basePath); // fallback for debug print
-		}
-		else
-		{
-			const std::string& chosen = validPaths[rand() % validPaths.size()];
-			sprintf_s(finalPath, "%s", chosen.c_str());
-		}
-	}
-
-    MiniAudioSound* s = new MiniAudioSound();
-    memset(&s->info, 0, sizeof(AUDIO_INFO));
-
-	s->info.x = x;
-    s->info.y = y;
-   	s->info.z = z;
-	
-    s->info.volume = volume;
-    s->info.pitch = pitch;
-    s->info.bIs3D = true;
-    s->info.bUseSoundsPitchVal = false;
-    s->info.iSound = iSound + eSFX_MAX;
-
-    if (ma_sound_init_from_file(
-            &m_engine,
-            finalPath,
-            MA_SOUND_FLAG_DECODE | MA_SOUND_FLAG_ASYNC,
-            NULL,
-            NULL,
-            &s->sound) != MA_SUCCESS)
-    {
-        app.DebugPrintf("Failed to initialize sound from file: %s\n", finalPath);
-        delete s;
-        return;
-    }
-
-    ma_sound_set_spatialization_enabled(&s->sound, MA_TRUE);
-    ma_sound_set_min_distance(&s->sound, SFX_3D_MIN_DISTANCE);
-    ma_sound_set_max_distance(&s->sound, SFX_3D_MAX_DISTANCE);
-    ma_sound_set_rolloff(&s->sound, SFX_3D_ROLLOFF);
-
-    float finalVolume = volume * m_MasterEffectsVolume * SFX_VOLUME_MULTIPLIER;
-    if (finalVolume > SFX_MAX_GAIN)
-        finalVolume = SFX_MAX_GAIN;
-
-    ma_sound_set_volume(&s->sound, finalVolume);
-    ma_sound_set_pitch(&s->sound, pitch);
-    ma_sound_set_position(&s->sound, x, y, z);
-
-    ma_sound_start(&s->sound);
-
-    m_activeSounds.push_back(s);
-#endif
 }
 
 /////////////////////////////////////////////
@@ -1092,9 +819,6 @@ void SoundEngine::playUI(int iSound, float volume, float pitch)
 {
 	U8 szSoundName[256];
 	wstring name;
-#ifdef _WINDOWS64
-	const char* soundDir;
-#endif
 	// we have some game sounds played as UI sounds...
 	// Not the best way to do this, but it seems to only be the portal sounds
 
@@ -1107,9 +831,6 @@ void SoundEngine::playUI(int iSound, float volume, float pitch)
 		// build the name
 		strcpy((char *)szSoundName,"Minecraft/");
 		name = wchSoundNames[iSound];
-#ifdef _WINDOWS64
-		soundDir = "Minecraft";
-#endif
 	}
 	else
 	{
@@ -1120,9 +841,6 @@ void SoundEngine::playUI(int iSound, float volume, float pitch)
 		// build the name
 		strcpy((char *)szSoundName,"Minecraft/UI/");
 		name = wchUISoundNames[iSound];
-#ifdef _WINDOWS64
-		soundDir = "Minecraft/UI";
-#endif
 	}
 
 	char *SoundName = (char *)ConvertSoundPathToName(name);
@@ -1130,7 +848,6 @@ void SoundEngine::playUI(int iSound, float volume, float pitch)
 //	app.DebugPrintf("UI: Playing %s, volume %f, pitch %f\n",SoundName,volume,pitch);
 
 	//app.DebugPrintf("PlaySound - %d - %s\n",iSound, SoundName);
-#ifndef _WINDOWS64
 
 	AUDIO_INFO AudioInfo;
 	memset(&AudioInfo,0,sizeof(AUDIO_INFO));
@@ -1153,82 +870,6 @@ void SoundEngine::playUI(int iSound, float volume, float pitch)
 	S32 token = AIL_enqueue_event_start();
 	AIL_enqueue_event_buffer(&token, &AudioInfo, sizeof(AUDIO_INFO), 0);
 	AIL_enqueue_event_end_named(token, (char *)szSoundName);
-#else
-    char basePath[256];
-    sprintf_s(basePath, "Windows64Media/Sound/%s/%s", soundDir, ConvertSoundPathToName(name));
-
-    char finalPath[256];
-
-	// Check UI sound path cache first
-	auto cacheIt = m_uiSoundPathCache.find(iSound);
-	if (cacheIt != m_uiSoundPathCache.end())
-	{
-		if (cacheIt->second.empty())
-		{
-			app.DebugPrintf("No sound file found for UI sound (cached): %s\n", basePath);
-			return;
-		}
-		sprintf_s(finalPath, "%s", cacheIt->second.c_str());
-	}
-	else
-	{
-		// Cache miss — probe filesystem and store result
-		const char* extensions[] = { ".ogg", ".wav", ".mp3" };
-		size_t count = sizeof(extensions) / sizeof(extensions[0]);
-		bool found = false;
-		for (size_t i = 0; i < count; i++)
-		{
-			sprintf_s(finalPath, "%s%s", basePath, extensions[i]);
-			if (FileExists(finalPath))
-			{
-				found = true;
-				break;
-			}
-		}
-		if (!found)
-		{
-			m_uiSoundPathCache[iSound] = ""; // cache negative result
-			app.DebugPrintf("No sound file found for UI sound: %s\n", basePath);
-			return;
-		}
-		m_uiSoundPathCache[iSound] = finalPath;
-	}
-
-    MiniAudioSound* s = new MiniAudioSound();
-    memset(&s->info, 0, sizeof(AUDIO_INFO));
-
-    s->info.volume = volume;
-    s->info.pitch = pitch;
-    s->info.bIs3D = false;
-    s->info.bUseSoundsPitchVal = true;
-
-    if (ma_sound_init_from_file(
-            &m_engine,
-            finalPath,
-            MA_SOUND_FLAG_DECODE | MA_SOUND_FLAG_ASYNC,
-            NULL,
-            NULL,
-            &s->sound) != MA_SUCCESS)
-    {
-        delete s;
-        app.DebugPrintf("ma_sound_init_from_file failed: %s\n", finalPath);
-        return;
-    }
-
-    ma_sound_set_spatialization_enabled(&s->sound, MA_FALSE);
-
-    float finalVolume = volume * m_MasterEffectsVolume;
-    if (finalVolume > 1.0f)
-        finalVolume = 1.0f;
-	printf("UI Sound volume set to %f\nEffects volume: %f\n", finalVolume, m_MasterEffectsVolume);
-
-    ma_sound_set_volume(&s->sound, finalVolume);
-    ma_sound_set_pitch(&s->sound, pitch);
-
-    ma_sound_start(&s->sound);
-
-    m_activeSounds.push_back(s);
-#endif
 }
 
 /////////////////////////////////////////////
@@ -1492,42 +1133,12 @@ int SoundEngine::OpenStreamThreadProc( void* lpParameter )
 	return 0;
 #endif
 	SoundEngine *soundEngine = (SoundEngine *)lpParameter;
-#ifndef _WINDOWS64
 	soundEngine->m_hStream = AIL_open_stream(soundEngine->m_hDriver,soundEngine->m_szStreamName,0);
 
 	if(soundEngine->m_hStream==0)
 	{
 		app.DebugPrintf("SoundEngine::OpenStreamThreadProc - Could not open - %s\n",soundEngine->m_szStreamName);
 	}
-#else
-	const char* ext = strrchr(soundEngine->m_szStreamName, '.');
-    
-    if (soundEngine->m_musicStreamActive)
-    {
-        ma_sound_stop(&soundEngine->m_musicStream);
-        ma_sound_uninit(&soundEngine->m_musicStream);
-        soundEngine->m_musicStreamActive = false;
-    }
-
-    ma_result result = ma_sound_init_from_file(
-            &soundEngine->m_engine,
-            soundEngine->m_szStreamName,
-            MA_SOUND_FLAG_STREAM,
-            NULL,
-            NULL,
-            &soundEngine->m_musicStream);
-
-    if (result != MA_SUCCESS)
-    {
-		app.DebugPrintf("SoundEngine::OpenStreamThreadProc - Failed to open stream: %s\n", soundEngine->m_szStreamName);
-        return 0;
-    }
-
-    ma_sound_set_spatialization_enabled(&soundEngine->m_musicStream, MA_FALSE);
-    ma_sound_set_looping(&soundEngine->m_musicStream, MA_FALSE);
-
-    soundEngine->m_musicStreamActive = true;
-#endif
 	return 0;
 }
 
@@ -1547,7 +1158,6 @@ void SoundEngine::playMusicTick()
 // AP - moved to a separate function so it can be called from the mixer callback on Vita
 void SoundEngine::playMusicUpdate() 
 {
-#ifndef _WINDOWS64
 	//return;
 	static bool firstCall = true;
 	static float fMusicVol = 0.0f;
@@ -1730,150 +1340,10 @@ void SoundEngine::playMusicUpdate()
 			m_openStreamThread->Run();
 			m_StreamState = eMusicStreamState_Opening;
 		}
-#else
-	static float fMusicVol = 0.0f;
-	fMusicVol = getMasterMusicVolume();
-
-	switch(m_StreamState)
-	{
-	case eMusicStreamState_Idle:
-
-		// start a stream playing
-		if (m_iMusicDelay > 0)
-		{
-			m_iMusicDelay--;
-			return;
-		}
-
-		if (m_musicStreamActive)
-		{
-			app.DebugPrintf("WARNING: m_musicStreamActive already true in Idle state, resetting to Playing\n");
-			m_StreamState = eMusicStreamState_Playing;
-			return;
-		}
-
-		if(m_musicID!=-1)
-		{
-			// start playing it
-			strcpy((char *)m_szStreamName,m_szMusicPath);
-			
-			// are we using a mash-up pack?
-			//if(pMinecraft && !pMinecraft->skins->isUsingDefaultSkin() && pMinecraft->skins->getSelected()->hasAudio())
-			if(Minecraft::GetInstance()->skins->getSelected()->hasAudio())
-			{
-				// It's a mash-up - need to use the DLC path for the music
-				TexturePack *pTexPack=Minecraft::GetInstance()->skins->getSelected();
-				DLCTexturePack *pDLCTexPack=(DLCTexturePack *)pTexPack;
-				DLCPack *pack = pDLCTexPack->getDLCInfoParentPack();
-				DLCAudioFile *dlcAudioFile = (DLCAudioFile *) pack->getFile(DLCManager::e_DLCType_Audio, 0);
-
-				app.DebugPrintf("Mashup pack \n");
-
-				// build the name
-
-				// if the music ID is beyond the end of the texture pack music files, then it's a CD
-				if(m_musicID<m_iStream_CD_1)
-				{
-					SetIsPlayingStreamingGameMusic(true);
-					SetIsPlayingStreamingCDMusic(false);
-					m_MusicType=eMusicType_Game;
-					m_StreamingAudioInfo.bIs3D=false;
-				
-					wstring &wstrSoundName=dlcAudioFile->GetSoundName(m_musicID);
-					char szName[255];
-					wcstombs(szName,wstrSoundName.c_str(),255);
-
-					string strFile="TPACK:\\Data\\" + string(szName) + ".wav";
-					std::string mountedPath = StorageManager.GetMountedPath(strFile);
-					strcpy(m_szStreamName,mountedPath.c_str());
-				}
-				else
-				{
-					SetIsPlayingStreamingGameMusic(false);
-					SetIsPlayingStreamingCDMusic(true);
-					m_MusicType=eMusicType_CD;
-					m_StreamingAudioInfo.bIs3D=true;
-
-					// Need to adjust to index into the cds in the game's m_szStreamFileA
-					strcat((char *)m_szStreamName,"cds/");
-					strcat((char *)m_szStreamName,m_szStreamFileA[m_musicID-m_iStream_CD_1+eStream_CD_1]);
-					strcat((char *)m_szStreamName,".wav");
-				}
-			}
-			else
-			{	
-				if(m_musicID<m_iStream_CD_1)
-				{
-					SetIsPlayingStreamingGameMusic(true);
-					SetIsPlayingStreamingCDMusic(false);
-					m_MusicType=eMusicType_Game;
-					m_StreamingAudioInfo.bIs3D=false;
-					// build the name
-					strcat((char *)m_szStreamName,"music/");
-				}
-				else
-				{
-					SetIsPlayingStreamingGameMusic(false);
-					SetIsPlayingStreamingCDMusic(true);
-					m_MusicType=eMusicType_CD;
-					m_StreamingAudioInfo.bIs3D=true;
-					// build the name
-					strcat((char *)m_szStreamName,"cds/");
-				}
-				strcat((char *)m_szStreamName,m_szStreamFileA[m_musicID]);
-				strcat((char *)m_szStreamName,".wav");
-			}
-
-			FILE* pFile = NULL;
-			
-			if (fopen_s(&pFile, reinterpret_cast<char*>(m_szStreamName), "rb") == 0 && pFile)
-			{
-				fclose(pFile);
-			}
-			else
-			{
-				const char* extensions[] = { ".ogg", ".mp3", ".wav" };
-				size_t extCount = sizeof(extensions) / sizeof(extensions[0]);
-				bool found = false;
-
-				char* dotPos = strrchr(reinterpret_cast<char*>(m_szStreamName), '.');
-				if (dotPos != NULL && (dotPos - reinterpret_cast<char*>(m_szStreamName)) < 250)
-				{
-					for (size_t i = 0; i < extCount; i++)
-					{
-						strcpy_s(dotPos, 5, extensions[i]);
-						
-						if (fopen_s(&pFile, reinterpret_cast<char*>(m_szStreamName), "rb") == 0 && pFile)
-						{
-							fclose(pFile);
-							found = true;
-							break;
-						}
-					}
-				}
-
-				if (!found)
-				{
-					if (dotPos != NULL)
-					{
-						strcpy_s(dotPos, 5, ".wav");
-					}
-					app.DebugPrintf("WARNING: No audio file found for music ID %d (tried .ogg, .mp3, .wav)\n", m_musicID);
-					return;
-				}
-			}
-
-			app.DebugPrintf("Starting streaming - %s\n",m_szStreamName);
-			m_openStreamThread = new C4JThread(OpenStreamThreadProc, this, "OpenStreamThreadProc");
-			m_openStreamThread->Run();
-			m_StreamState = eMusicStreamState_Opening;
-		}
-#endif
 		break;
 
 	case eMusicStreamState_Opening:
 		// If the open stream thread is complete, then we are ready to proceed to actually playing
-#ifndef _WINDOWS64
 		if( !m_openStreamThread->isRunning() )
 		{
 			delete m_openStreamThread;
@@ -1939,63 +1409,6 @@ void SoundEngine::playMusicUpdate()
 
 			m_StreamState=eMusicStreamState_Playing;
 		}
-#else
-		if( !m_openStreamThread->isRunning() )
-		{
-			delete m_openStreamThread;
-			m_openStreamThread = NULL;
-
-			app.DebugPrintf("OpenStreamThreadProc finished. m_musicStreamActive=%d\n", m_musicStreamActive);
-
-			if (!m_musicStreamActive)
-			{
-				const char* currentExt = strrchr(reinterpret_cast<char*>(m_szStreamName), '.');
-				if (currentExt && _stricmp(currentExt, ".wav") == 0)
-				{
-					const bool isCD = (m_musicID >= m_iStream_CD_1);
-					const char* folder = isCD ? "cds/" : "music/";
-					
-					int n = sprintf_s(reinterpret_cast<char*>(m_szStreamName), 512, "%s%s%s.wav", m_szMusicPath, folder, m_szStreamFileA[m_musicID]);
-					
-					if (n > 0)
-					{
-						FILE* pFile = NULL;
-						if (fopen_s(&pFile, reinterpret_cast<char*>(m_szStreamName), "rb") == 0 && pFile)
-						{
-							fclose(pFile);
-													
-							m_openStreamThread = new C4JThread(OpenStreamThreadProc, this, "OpenStreamThreadProc");
-							m_openStreamThread->Run();
-							break;
-						}
-					}
-				}
-				
-				m_StreamState = eMusicStreamState_Idle;
-				break;
-			}
-			
-			if (m_StreamingAudioInfo.bIs3D)
-			{
-				ma_sound_set_spatialization_enabled(&m_musicStream, MA_TRUE);
-				ma_sound_set_position(&m_musicStream, m_StreamingAudioInfo.x, m_StreamingAudioInfo.y, m_StreamingAudioInfo.z);
-			}
-			else
-			{
-				ma_sound_set_spatialization_enabled(&m_musicStream, MA_FALSE);
-			}
-
-			ma_sound_set_pitch(&m_musicStream, m_StreamingAudioInfo.pitch);
-
-			float finalVolume = m_StreamingAudioInfo.volume * getMasterMusicVolume();
-
-			ma_sound_set_volume(&m_musicStream, finalVolume);
-			ma_result startResult = ma_sound_start(&m_musicStream);
-			app.DebugPrintf("ma_sound_start result: %d\n", startResult);
-
-			m_StreamState=eMusicStreamState_Playing;
-		}
-#endif
 		break;
 	case eMusicStreamState_OpeningCancel:
 		if( !m_openStreamThread->isRunning() )
@@ -2007,46 +1420,18 @@ void SoundEngine::playMusicUpdate()
 		break;
 	case eMusicStreamState_Stop:
 		// should gradually take the volume down in steps
-#ifndef _WINDOWS64
 		AIL_pause_stream(m_hStream,1);
 		AIL_close_stream(m_hStream);
 		m_hStream=0;
 		SetIsPlayingStreamingCDMusic(false);
 		SetIsPlayingStreamingGameMusic(false);
 		m_StreamState=eMusicStreamState_Idle;
-#else
-		if (m_musicStreamActive)
-		{
-			ma_sound_stop(&m_musicStream);
-			ma_sound_uninit(&m_musicStream);
-			m_musicStreamActive = false;
-		}
-
-		SetIsPlayingStreamingCDMusic(false);
-		SetIsPlayingStreamingGameMusic(false);
-
-		m_StreamState = eMusicStreamState_Idle;
-#endif
 		break;
 	case eMusicStreamState_Stopping:
 		break;
 	case eMusicStreamState_Play:
 		break;
 	case eMusicStreamState_Playing:
-#ifdef _WINDOWS64
-		{
-			static int frameCount = 0;
-			if (frameCount++ % 60 == 0)
-			{
-				if (m_musicStreamActive)
-				{
-					bool isPlaying = ma_sound_is_playing(&m_musicStream);
-					float vol = ma_sound_get_volume(&m_musicStream);
-					bool isAtEnd = ma_sound_at_end(&m_musicStream);
-				}
-			}
-		}
-#endif
 		if(GetIsPlayingStreamingGameMusic())
 		{
 			//if(m_MusicInfo.pCue!=NULL)
@@ -2128,7 +1513,6 @@ void SoundEngine::playMusicUpdate()
 				}
 
 				// volume change required?
-#ifndef _WINDOWS64
 				if(fMusicVol!=getMasterMusicVolume())
 				{
 					fMusicVol=getMasterMusicVolume();
@@ -2136,14 +1520,6 @@ void SoundEngine::playMusicUpdate()
 					//AIL_set_sample_3D_position( hSample, m_StreamingAudioInfo.x, m_StreamingAudioInfo.y, m_StreamingAudioInfo.z );
 					AIL_set_sample_volume_levels( hSample, fMusicVol, fMusicVol);
 				}
-#else
-				if (m_musicStreamActive)
-				{
-					float finalVolume = m_StreamingAudioInfo.volume * fMusicVol;
-
-					ma_sound_set_volume(&m_musicStream, finalVolume);
-				}
-#endif
 			}
 		}
 		else
@@ -2151,7 +1527,6 @@ void SoundEngine::playMusicUpdate()
 			// Music disc playing - if it's a 3D stream, then set the position - we don't have any streaming audio in the world that moves, so this isn't
 			// required unless we have more than one listener, and are setting the listening position to the origin and setting a fake position
 			// for the sound down  the z axis
-#ifndef _WINDOWS64
 			if(m_StreamingAudioInfo.bIs3D)
 			{
 				if(m_validListenerCount>1)
@@ -2190,40 +1565,6 @@ void SoundEngine::playMusicUpdate()
 				}
 			}
 		}
-#else
-			if (m_StreamingAudioInfo.bIs3D && m_validListenerCount > 1)
-			{
-				int iClosestListener = 0;
-				float fClosestDist = 1e6f;
-
-				for (size_t i = 0; i < MAX_LOCAL_PLAYERS; i++)
-				{
-					if (m_ListenerA[i].bValid)
-					{
-						float dx = m_StreamingAudioInfo.x - m_ListenerA[i].vPosition.x;
-						float dy = m_StreamingAudioInfo.y - m_ListenerA[i].vPosition.y;
-						float dz = m_StreamingAudioInfo.z - m_ListenerA[i].vPosition.z;
-						float dist = sqrtf(dx*dx + dy*dy + dz*dz);
-
-						if (dist < fClosestDist)
-						{
-							fClosestDist = dist;
-							iClosestListener = i;
-						}
-					}
-				}
-
-				float relX = m_StreamingAudioInfo.x - m_ListenerA[iClosestListener].vPosition.x;
-				float relY = m_StreamingAudioInfo.y - m_ListenerA[iClosestListener].vPosition.y;
-				float relZ = m_StreamingAudioInfo.z - m_ListenerA[iClosestListener].vPosition.z;
-
-				if (m_musicStreamActive)
-				{
-					ma_sound_set_position(&m_musicStream, relX, relY, relZ);
-				}
-			}
-		}
-#endif
 
 		break;
 
@@ -2275,7 +1616,7 @@ void SoundEngine::playMusicUpdate()
 	}
 
 	// check the status of the stream - this is for when a track completes rather than is stopped by the user action
-#ifndef _WINDOWS64
+
 	if(m_hStream!=0)
 	{
 		if(AIL_stream_status(m_hStream)==SMP_DONE ) // SMP_DONE
@@ -2288,7 +1629,6 @@ void SoundEngine::playMusicUpdate()
 			m_StreamState=eMusicStreamState_Completed;
 		}
 	}
-#endif
 }
 
 
@@ -2317,7 +1657,7 @@ char *SoundEngine::ConvertSoundPathToName(const wstring& name, bool bConvertSpac
 
 #endif
 
-#ifndef _WINDOWS64
+
 F32 AILCALLBACK custom_falloff_function (HSAMPLE   S, 
 										 F32       distance,
 										 F32       rolloff_factor,
@@ -2340,4 +1680,3 @@ F32 AILCALLBACK custom_falloff_function (HSAMPLE   S,
 
 	return result;
 }
-#endif

Minecraft.Client/Common/Audio/SoundEngine.h

@@ -3,17 +3,6 @@ class Mob;
 class Options;
 using namespace std;
 #include "..\..\Minecraft.World\SoundTypes.h"
-#ifdef _WINDOWS64
-#include "miniaudio.h"
-#include <unordered_map>
-#include <string>
-
-const float SFX_3D_MIN_DISTANCE = 1.0f;
-const float SFX_3D_MAX_DISTANCE = 16.0f;
-const float SFX_3D_ROLLOFF = 0.5f;
-const float SFX_VOLUME_MULTIPLIER = 1.5f;
-const float SFX_MAX_GAIN = 1.5f;
-#endif
 
 enum eMUSICFILES
 {
@@ -87,11 +76,7 @@ enum MUSIC_STREAMSTATE
 
 typedef struct
 {
-#ifndef _WINDOWS64
-	F32 x, y, z, volume, pitch;
-#else
-	float x, y, z, volume, pitch;
-#endif
+	F32 x,y,z,volume,pitch;
 	int iSound;
 	bool bIs3D;	
 	bool bUseSoundsPitchVal;	
@@ -101,17 +86,6 @@ typedef struct
 }
 AUDIO_INFO;
 
-#ifdef _WINDOWS64
-struct MiniAudioSound
-{
-    ma_sound sound;
-    AUDIO_INFO info;
-    bool active;
-};
-
-extern std::vector<MiniAudioSound*> m_activeSounds;
-#endif
-
 class SoundEngine : public ConsoleSoundEngine
 {
 	static const int MAX_SAME_SOUNDS_PLAYING = 8; // 4J added
@@ -138,11 +112,7 @@ public:
 	int getMusicID(int iDomain);
 	int getMusicID(const wstring& name);
 	void SetStreamingSounds(int iOverworldMin, int iOverWorldMax, int iNetherMin, int iNetherMax, int iEndMin, int iEndMax, int iCD1);
-#ifdef _WINDOWS64
-	void updateMiniAudio();
-#else
-	void updateMiles();	// AP added so Vita can update all the Miles functions during the mixer callback
-#endif
+	void updateMiles();			// AP added so Vita can update all the Miles functions during the mixer callback
 	void playMusicUpdate();
 
 private:
@@ -156,18 +126,9 @@ private:
 	
 	int GetRandomishTrack(int iStart,int iEnd);
 
-#ifdef _WINDOWS64
-	ma_engine m_engine;
-	ma_engine_config m_engineConfig;
-	ma_sound m_musicStream;
-	bool m_musicStreamActive;
-	std::unordered_map<int, std::vector<std::string>> m_soundPathCache;
-	std::unordered_map<int, std::string> m_uiSoundPathCache;
-#else
 	HMSOUNDBANK m_hBank;
 	HDIGDRIVER m_hDriver;
 	HSTREAM m_hStream;
-#endif
 
 	static char m_szSoundPath[];
 	static char m_szMusicPath[];

Minecraft.Client/Common/Filesystem/Filesystem.cpp

@@ -1,62 +0,0 @@
-#include "stdafx.h"
-#include "Filesystem.h"
-
-#ifdef _WINDOWS64
-#include <windows.h>
-#endif
-
-#include <stdio.h>
-
-bool FileOrDirectoryExists(const char* path)
-{
-#ifdef _WINDOWS64
-    DWORD attribs = GetFileAttributesA(path);
-    return (attribs != INVALID_FILE_ATTRIBUTES);
-#endif
-}
-
-bool FileExists(const char* path)
-{
-#ifdef _WINDOWS64
-    DWORD attribs = GetFileAttributesA(path);
-    return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY));
-#endif
-}
-
-bool DirectoryExists(const char* path)
-{
-#ifdef _WINDOWS64
-    DWORD attribs = GetFileAttributesA(path);
-    return (attribs != INVALID_FILE_ATTRIBUTES && (attribs & FILE_ATTRIBUTE_DIRECTORY));
-#endif
-}
-
-bool GetFirstFileInDirectory(const char* directory, char* outFilePath, size_t outFilePathSize)
-{
-#ifdef _WINDOWS64
-    char searchPath[MAX_PATH];
-    printf(searchPath, MAX_PATH, "%s\\*", directory);
-
-    WIN32_FIND_DATAA findData;
-    HANDLE hFind = FindFirstFileA(searchPath, &findData);
-
-    if (hFind == INVALID_HANDLE_VALUE)
-    {
-        return false;
-    }
-
-    do
-    {
-        if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
-        {
-            // Found a file, copy its path to the output buffer
-            printf(outFilePath, outFilePathSize, "%s\\%s", directory, findData.cFileName);
-            FindClose(hFind);
-            return true;
-        }
-    } while (FindNextFileA(hFind, &findData) != 0);
-
-    FindClose(hFind);
-    return false; // No files found in the directory
-#endif
-}

Minecraft.Client/Common/Filesystem/Filesystem.h

@@ -1,7 +0,0 @@
-#pragma once
-
-bool FileOrDirectoryExists(const char* path);
-bool FileExists(const char* path);
-bool DirectoryExists(const char* path);
-bool GetFirstFileInDirectory(const char* directory, char* outFilePath, size_t outFilePathSize);
-#pragma once

Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp

@@ -9,9 +9,7 @@ const wstring LeaderboardManager::filterNames[eNumFilterModes] =
 		L"Friends", L"MyScore", L"TopRank"
 	};
 
-#if !defined(_DURANGO) && !defined(_WINDOWS64) && !defined(_XBOX) && !defined(__ORBIS__) // str1k3r - some platforms complain about this, also this wasnt in the leak?
 LeaderboardManager *LeaderboardManager::m_instance = NULL;
-#endif
 
 void LeaderboardManager::DeleteInstance()
 {

Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1

@@ -20,7 +20,7 @@ foreach ($dir in $directories) {
 }
 
 $folderCopies = @(
-    @{ Source = "music\Miles";	   Dest = "PS4_GAME\music" },
+    @{ Source = "music";		   Dest = "PS4_GAME\music" },
     @{ Source = "Common\Media";    Dest = "PS4_GAME\Common\Media" },
     @{ Source = "Common\res";      Dest = "PS4_GAME\Common\res" },
     @{ Source = "PSVita\Tutorial"; Dest = "PS4_GAME\Common\Tutorial" },

Minecraft.Client/Common/Postbuilds/PS3-postbuild.ps1

@@ -19,7 +19,7 @@ foreach ($dir in $directories) {
 }
 
 $folderCopies = @(
-    @{ Source = "music\Miles";		Dest = "PS3_GAME\USRDIR\music" },
+    @{ Source = "music";            Dest = "PS3_GAME\USRDIR\music" },
     @{ Source = "Common\Media";     Dest = "PS3_GAME\USRDIR\Common\Media" },
     @{ Source = "Common\res";       Dest = "PS3_GAME\USRDIR\Common\res" },
 	@{ Source = "PS3Media\DLC";		Dest = "PS3_GAME\USRDIR\DLC" },

Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1

@@ -19,7 +19,7 @@ foreach ($dir in $directories) {
 }
 
 $folderCopies = @(
-    @{ Source = "music\Miles";	   Dest = "PSVITA_GAME\music" },
+    @{ Source = "music";		   Dest = "PSVITA_GAME\music" },
     @{ Source = "Common\Media";    Dest = "PSVITA_GAME\Common\Media" },
     @{ Source = "Common\res";      Dest = "PSVITA_GAME\Common\res" },
 	@{ Source = "PSVita\Sound";    Dest = "PSVITA_GAME\Sound" },

Minecraft.Client/Common/Postbuilds/Windows64-postbuild.ps1

@@ -21,10 +21,12 @@ foreach ($dir in $directories) {
 $folderCopies = @(
     @{ Source = "Common\Media";    		Dest = "Common\Media" },
     @{ Source = "Common\res";      		Dest = "Common\res" },
-	@{ Source = "music\Miniaudio";		Dest = "music" },
-	@{ Source = "Windows64Media\DLC";	Dest = "Windows64Media\DLC" },
+    @{ Source = "DurangoMedia";    		Dest = "Windows64Media" },
+    @{ Source = "Windows64Media";  		Dest = "Windows64Media" },
+	@{ Source = "PSVita\Tutorial"; 		Dest = "Windows64Media\Tutorial" },
+	@{ Source = "Windows64Media\music"; Dest = "Windows64Media\music" },
 	@{ Source = "Windows64Media\Sound"; Dest = "Windows64Media\Sound" },
-	@{ Source = "PSVita\Tutorial"; 		Dest = "Windows64Media\Tutorial" }
+	@{ Source = "Common\Postbuilds\Contents\Windows64\redist64"; Dest = "redist64" }
 )
 
 foreach ($copy in $folderCopies) {
@@ -37,7 +39,9 @@ foreach ($copy in $folderCopies) {
 }
 
 $fileCopies = @(
-	@{ Source = "Common\Postbuilds\Contents\Windows64\iggy_w64.dll"; Dest = "iggy_w64.dll" }
+    @{ Source = "Common\Postbuilds\Contents\Windows64\Effects.msscmp"; Dest = "Effects.msscmp" },
+	@{ Source = "Common\Postbuilds\Contents\Windows64\iggy_w64.dll"; Dest = "iggy_w64.dll" },
+	@{ Source = "Common\Postbuilds\Contents\Windows64\mss64.dll"; Dest = "mss64.dll" }
 )
 
 foreach ($copy in $fileCopies) {

Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp

@@ -402,7 +402,7 @@ wstring CScene_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil, LPCWS
 		}
 		else if(temp.find(L"{*StoneIcon*}")!=wstring::npos)
 		{
-			m_pCraftingPic->SetIcon(m_iPad, Tile::rock_Id,0,1,10,31,false);
+			m_pCraftingPic->SetIcon(m_iPad, Tile::stone_Id,0,1,10,31,false);
 		}
 		else
 		{

Minecraft.Client/CreeperModel.cpp

@@ -6,7 +6,7 @@
 // 4J - added
 void CreeperModel::_init(float g)
 {
-    int yo = 6;
+    int yo = 4;
 
     head = new ModelPart(this, 0, 0);
     head->addBox(-4, - 8, -4, 8, 8, 8, g); // Head

Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp

@@ -112,22 +112,22 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize()
 	sp->addArgs(1, Tile::dirt_Id, 0); // works
 	sp->addArgs(2, Tile::dirt_Id, 0); // works
 
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  0); // fixed (+ach 'Rainbow Collection')
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  1);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  2);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  3);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  4);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  5);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  6);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  7);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  8);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  9);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 10);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 11);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 12);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 13);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 14);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 15);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  0); // fixed (+ach 'Rainbow Collection')
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  1);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  2);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  3);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  4);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  5);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  6);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  7);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  8);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  9);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 10);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 11);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 12);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 13);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 14);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 15);
 
 	out->m_stats.push_back(sp);
 
@@ -166,20 +166,20 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize()
 
 	sp = new StatParam(L"BlockBroken.BlockId.*");
 	sp->addArgs( Tile::dirt_Id );
-	sp->addArgs( Tile::rock_Id ); 
+	sp->addArgs( Tile::stone_Id ); 
 	sp->addArgs( Tile::emeraldOre_Id );
 	out->m_stats.push_back(sp);
 
 	sp = new StatParam(L"BlockBroken.BlockId.*.BlockAux.*");
 	sp->addArgs( Tile::dirt_Id, 0 );
-	sp->addArgs( Tile::rock_Id, 0 );
+	sp->addArgs( Tile::stone_Id, 0 );
 	out->m_stats.push_back(sp);
 
 	sp = new StatParam(L"BlockBroken.DifficultyLevelId.*.BlockId.*");
 	sp->addArgs( 1, Tile::dirt_Id );
 	sp->addArgs( 2, Tile::dirt_Id );
-	sp->addArgs( 1, Tile::rock_Id );
-	sp->addArgs( 2, Tile::rock_Id );
+	sp->addArgs( 1, Tile::stone_Id );
+	sp->addArgs( 2, Tile::stone_Id );
 	out->m_stats.push_back(sp);
 
 	sp = new StatParam(L"BlockBroken");
@@ -188,7 +188,7 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize()
 
 	sp = new StatParam(L"BlockPlaced.BlockId.*");
 	sp->addArgs( Tile::dirt_Id );
-	sp->addArgs( Tile::stoneBrick_Id ); 
+	sp->addArgs( Tile::cobblestone_Id ); 
 	sp->addArgs( Tile::sand_Id );		// works
 	sp->addArgs( Tile::sign_Id );		// fixed
 	sp->addArgs( Tile::wallSign_Id );	// fixed

Minecraft.Client/HorseRenderer.cpp

@@ -46,35 +46,9 @@ void HorseRenderer::renderModel(shared_ptr<LivingEntity> mob, float wp, float ws
     }
 	else
 	{
-		shared_ptr<EntityHorse> horse = dynamic_pointer_cast<EntityHorse>(mob);
-		ResourceLocation *location = getTextureLocation(mob);
-
-		// Pass 1: Bind only the coat texture (first valid layer) and render opaque
-		int coatTex = location->getTexture(0);
-		if( coatTex != -1 )
-		{
-			RenderManager.TextureBind(entityRenderDispatcher->textures->loadTexture(coatTex));
-		}
-		model->render(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale, true);
-
-		// Pass 2: If horse has armor, find the armor texture in the layers and render with blending
-		int armorType = horse->getArmorType();
-		if( armorType > 0 )
-		{
-			glEnable(GL_BLEND);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			for( int i = 1; i < location->getTextureCount(); i++ )
-			{
-				int texId = location->getTexture(i);
-				if( texId != -1 )
-				{
-					RenderManager.TextureBind(entityRenderDispatcher->textures->loadTexture(texId));
-					model->render(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale, true);
-				}
-			}
-			glDisable(GL_BLEND);
-		}
-
+        EntityRenderer::bindTexture(mob);
+        model->render(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale, true);
+		// Ensure that any extra layers of texturing are disabled after rendering this horse
 		RenderManager.TextureBind(-1);
     }
 }

Minecraft.Client/LivingEntityRenderer.cpp

@@ -491,7 +491,7 @@ void LivingEntityRenderer::renderNameTag(shared_ptr<LivingEntity> mob, const wst
 	float s = 1 / 60.0f * size;
 
 	glPushMatrix();
-	glTranslatef((float) x, (float) y + mob->bbHeight + 0.5f, (float) z);
+	glTranslatef((float) x, (float) y + 2.3f, (float) z);
 	glNormal3f(0, 1, 0);
 
 	glRotatef(-this->entityRenderDispatcher->playerRotY, 0, 1, 0);

Minecraft.Client/Minecraft.Client.vcxproj

@@ -630,6 +630,7 @@
     <ImageXexOutput>$(OutDir)$(ProjectName)_D.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\..\Minecraft.Client\PS3\Assert;$(SCE_PS3_ROOT)\target\ppu\include;$(SCE_PS3_ROOT)\target\common\include;$(SCE_PS3_ROOT)\host-win32\sn\ppu\include;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras\boost_1_53_0\boost\tr1\tr1;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras\boost_1_53_0;$(ProjectDir)..\Minecraft.World\x64headers</IncludePath>
     <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">
     <LinkIncremental>true</LinkIncremental>
@@ -641,6 +642,7 @@
     <LinkIncremental>true</LinkIncremental>
     <ImageXexOutput>$(OutDir)$(ProjectName)_D.xex</ImageXexOutput>
     <IncludePath>$(ProjectDir)\..\Minecraft.Client\PS3\Assert;$(SCE_PS3_ROOT)\target\ppu\include;$(SCE_PS3_ROOT)\target\common\include;$(SCE_PS3_ROOT)\host-win32\sn\ppu\include;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras\boost_1_53_0\boost\tr1\tr1;$(ProjectDir)\..\Minecraft.Client\PS3\PS3Extras\boost_1_53_0;$(ProjectDir)..\Minecraft.World\x64headers</IncludePath>
+    <PostBuildEventUseInBuild>true</PostBuildEventUseInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">
     <LinkIncremental>true</LinkIncremental>
@@ -1435,7 +1437,7 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata"</Command>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CallAttributedProfiling>Disabled</CallAttributedProfiling>
       <AdditionalIncludeDirectories>Windows64\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -1447,7 +1449,7 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata"</Command>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_Debug\Minecraft.World.lib;%(AdditionalDependencies);XInput9_1_0.lib;wsock32.lib</AdditionalDependencies>
+      <AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_Debug\Minecraft.World.lib;%(AdditionalDependencies);XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib</AdditionalDependencies>
       <ShowProgress>NotSet</ShowProgress>
       <SuppressStartupBanner>false</SuppressStartupBanner>
     </Link>
@@ -1472,6 +1474,46 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata"</Command>
       <Message>Run Windows64 postbuild script</Message>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CallAttributedProfiling>Disabled</CallAttributedProfiling>
+      <AdditionalIncludeDirectories>Windows64\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <ShowIncludes>false</ShowIncludes>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <AdditionalDependencies>d3d11.lib;..\Minecraft.World\x64_Debug\Minecraft.World.lib;%(AdditionalDependencies);XInput9_1_0.lib;..\Minecraft.Client\Windows64\Miles\Lib\mss64.lib;wsock32.lib</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <SuppressStartupBanner>false</SuppressStartupBanner>
+    </Link>
+    <ImageXex>
+      <ConfigurationFile>$(ProjectDir)xbox\xex-dev.xml</ConfigurationFile>
+    </ImageXex>
+    <ImageXex>
+      <TitleID>1480659447</TitleID>
+    </ImageXex>
+    <ImageXex>
+      <AdditionalSections>584111F7=$(ProjectDir)xbox\GameConfig\Minecraft.spa,RO;media=$(ProjectDir)xbox\XZP\Minecraft.xzp,RO</AdditionalSections>
+      <Pal50Incompatible>true</Pal50Incompatible>
+    </ImageXex>
+    <Deploy>
+      <DeploymentType>CopyToHardDrive</DeploymentType>
+      <DeploymentFiles>$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\res=Xbox\res;$(RemoteRoot)=Xbox\AvatarAwards;$(RemoteRoot)\Tutorial=Xbox\Tutorial\Tutorial;$(RemoteRoot)=Xbox\584111F70AAAAAAA;$(RemoteRoot)=Xbox\kinect\speech;$(RemoteRoot)=Xbox\XZP\TMSFiles.xzp</DeploymentFiles>
+    </Deploy>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -4996,67 +5038,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     <ClInclude Include="Common\App_enums.h" />
     <ClInclude Include="Common\App_structs.h" />
     <ClInclude Include="Common\Audio\Consoles_SoundEngine.h" />
-    <ClInclude Include="Common\Audio\miniaudio.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
-    </ClInclude>
     <ClInclude Include="Common\Audio\SoundEngine.h" />
-    <ClInclude Include="Common\Audio\stb_vorbis.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
-    </ClInclude>
     <ClInclude Include="Common\BuildVer.h" />
     <ClInclude Include="Common\Colours\ColourTable.h" />
     <ClInclude Include="Common\Consoles_App.h" />
@@ -5073,36 +5055,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     <ClInclude Include="Common\DLC\DLCSkinFile.h" />
     <ClInclude Include="Common\DLC\DLCTextureFile.h" />
     <ClInclude Include="Common\DLC\DLCUIDataFile.h" />
-    <ClInclude Include="Common\Filesystem\Filesystem.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
-    </ClInclude>
     <ClInclude Include="Common\GameRules\AddEnchantmentRuleDefinition.h" />
     <ClInclude Include="Common\GameRules\AddItemRuleDefinition.h" />
     <ClInclude Include="Common\GameRules\ApplySchematicRuleDefinition.h" />
@@ -13004,6 +12956,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BaseRailTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BedTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -13544,6 +13497,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DaylightDetectorTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DetectorRailTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -13859,6 +13813,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DropperTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\EggTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -14444,6 +14399,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\HayBlockTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\HugeMushroomTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -15164,7 +15120,8 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.h">
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PoweredRailTile_SPU.h" />
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BasePressurePlateTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
@@ -15209,6 +15166,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PumpkinTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -15254,51 +15212,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RailTile_SPU.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugContentPackage|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
-    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RailTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RecordPlayerTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -15479,6 +15393,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RotatedPillarTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\SandStoneTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -16559,6 +16474,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\WeightedPressurePlateTile_SPU.h" />
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\WoodTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -19109,6 +19025,40 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="Windows64\Miles\include\mss.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="Windows64\Miles\include\rrcore.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="Windows64\Minecraft_Macros.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
@@ -25233,36 +25183,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     <ClCompile Include="Common\DLC\DLCSkinFile.cpp" />
     <ClCompile Include="Common\DLC\DLCTextureFile.cpp" />
     <ClCompile Include="Common\DLC\DLCUIDataFile.cpp" />
-    <ClCompile Include="Common\Filesystem\Filesystem.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="Common\GameRules\AddEnchantmentRuleDefinition.cpp" />
     <ClCompile Include="Common\GameRules\AddItemRuleDefinition.cpp" />
     <ClCompile Include="Common\GameRules\ApplySchematicRuleDefinition.cpp" />
@@ -32423,7 +32343,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.cpp">
+    <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\BasePressurePlateTile_SPU.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
@@ -34094,7 +34014,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Win32'">false</ExcludedFromBuild>
@@ -40575,42 +40495,12 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     </Library>
     <Library Include="PSVita\4JLibs\libs\libSceNpToolkitUtils_rtti.a">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
-    </Library>
-    <Library Include="PSVita\4JLibs\libs\libSceNpToolkitUtils_rtti_dbg.a">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
     </Library>
+    <Library Include="PSVita\4JLibs\libs\libSceNpToolkitUtils_rtti_dbg.a" />
     <Library Include="PSVita\4JLibs\libs\libSceNpToolkit_rtti.a">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
-    </Library>
-    <Library Include="PSVita\4JLibs\libs\libSceNpToolkit_rtti_dbg.a">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
     </Library>
+    <Library Include="PSVita\4JLibs\libs\libSceNpToolkit_rtti_dbg.a" />
     <Library Include="PSVita\Iggy\lib\libiggyperfmon_psp2.a">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
@@ -40699,42 +40589,10 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
     </Library>
-    <Library Include="PSVita\Miles\lib\binkapsp2.a">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
-    </Library>
-    <Library Include="PSVita\Miles\lib\fltpsp2.a">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
-    </Library>
-    <Library Include="PSVita\Miles\lib\msspsp2.a">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
-    </Library>
-    <Library Include="PSVita\Miles\lib\msspsp2midi.a">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">true</ExcludedFromBuild>
-    </Library>
+    <Library Include="PSVita\Miles\lib\binkapsp2.a" />
+    <Library Include="PSVita\Miles\lib\fltpsp2.a" />
+    <Library Include="PSVita\Miles\lib\msspsp2.a" />
+    <Library Include="PSVita\Miles\lib\msspsp2midi.a" />
     <Library Include="Windows64\4JLibs\libs\4J_Input.lib">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
@@ -41095,6 +40953,23 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
     </Library>
+    <Library Include="Windows64\Miles\lib\mss64.lib">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PS3'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|PSVita'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Xbox 360'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
+    </Library>
     <Library Include="Xbox\4JLibs\libs\4J_Input.lib">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>

Minecraft.Client/Minecraft.Client.vcxproj.filters

@@ -2446,6 +2446,12 @@
     <ClInclude Include="VillagerGolemRenderer.h">
       <Filter>net\minecraft\client\renderer\entity</Filter>
     </ClInclude>
+    <ClInclude Include="Windows64\Miles\include\mss.h">
+      <Filter>Windows64\Miles Sound System\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="Windows64\Miles\include\rrcore.h">
+      <Filter>Windows64\Miles Sound System\Include</Filter>
+    </ClInclude>
     <ClInclude Include="Orbis\Miles\include\mss.h">
       <Filter>Orbis\Miles Sound System\include</Filter>
     </ClInclude>
@@ -2659,15 +2665,9 @@
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PortalTile_SPU.h">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
-    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.h">
-      <Filter>PS3\ChunkRebuild_SPU</Filter>
-    </ClInclude>
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PumpkinTile_SPU.h">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
-    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RailTile_SPU.h">
-      <Filter>PS3\ChunkRebuild_SPU</Filter>
-    </ClInclude>
     <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RecordPlayerTile_SPU.h">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
@@ -3769,14 +3769,35 @@
     <ClInclude Include="PSVita\OldSdk.h">
       <Filter>PSVita</Filter>
     </ClInclude>
-    <ClInclude Include="Common\Filesystem\Filesystem.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BaseRailTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
-    <ClInclude Include="Common\Audio\miniaudio.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RailTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
-    <ClInclude Include="Common\Audio\stb_vorbis.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PoweredRailTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DropperTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\HayBlockTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RotatedPillarTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BasePressurePlateTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\WeightedPressurePlateTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\DaylightDetectorTile_SPU.h">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -5004,9 +5025,6 @@
     <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\LiquidTile_SPU.cpp">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClCompile>
-    <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\PressurePlateTile_SPU.cpp">
-      <Filter>PS3\ChunkRebuild_SPU</Filter>
-    </ClCompile>
     <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\StairTile_SPU.cpp">
       <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClCompile>
@@ -5922,8 +5940,8 @@
     <ClCompile Include="PSVita\OldSdk.cpp">
       <Filter>PSVita</Filter>
     </ClCompile>
-    <ClCompile Include="Common\Filesystem\Filesystem.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\BasePressurePlateTile_SPU.cpp">
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -5984,6 +6002,9 @@
     <Library Include="Windows64\4JLibs\libs\4J_Input_d.lib">
       <Filter>Windows64\4JLibs\libs</Filter>
     </Library>
+    <Library Include="Windows64\Miles\lib\mss64.lib">
+      <Filter>Windows64\Miles Sound System\lib</Filter>
+    </Library>
     <Library Include="Windows64\Iggy\lib\iggy_w64.lib">
       <Filter>Windows64\Iggy\lib</Filter>
     </Library>

Minecraft.Client/Minecraft.cpp

@@ -1858,7 +1858,7 @@ void Minecraft::run_middle()
 			achievementPopup->render();
 
 			PIXBeginNamedEvent(0,"Sleeping");
-			//Sleep(0);	// 4J - was Thread.yield()
+			Sleep(0);	// 4J - was Thread.yield()
 			PIXEndNamedEvent();
 
 			//        if (Keyboard::isKeyDown(Keyboard::KEY_F7)) Display.update();	// 4J - removed condition

Minecraft.Client/Options.cpp

@@ -116,11 +116,7 @@ void Options::init()
     bobView = true;
     anaglyph3d = false;
     advancedOpengl = false;
-#ifdef _WINDOWS64
-    framerateLimit = 0;
-#else
-	framerateLimit = 2;
-#endif
+    framerateLimit = 2;
     fancyGraphics = true;
     ambientOcclusion = true;
 	renderClouds = true;

Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h

@@ -1,32 +1,109 @@
 #pragma once
 
-#include "Common\Leaderboards\SonyLeaderboardManager.h"
 #include "Common\Leaderboards\LeaderboardManager.h"
 
-#include <np.h>
-
-class OrbisLeaderboardManager : public SonyLeaderboardManager
+class OrbisLeaderboardManager : public LeaderboardManager
 {
+protected:
+	enum EStatsState
+	{
+		eStatsState_Idle,
+		eStatsState_Getting,
+		eStatsState_Failed,
+		eStatsState_Ready,
+		eStatsState_Canceled,
+		//eStatsState_Writing,
+		eStatsState_Max
+	};
+
 public:
 	OrbisLeaderboardManager();
+	virtual ~OrbisLeaderboardManager();
 
-protected:
+private:
+	unsigned short m_openSessions;
 
-	virtual HRESULT initialiseScoreUtility();
+	C4JThread *m_threadScoreboard;
+	bool m_running;
 
-	virtual bool scoreUtilityAlreadyInitialised(HRESULT hr);
+	int		m_titleContext;
+	int32_t m_requestId;
 
-	virtual HRESULT createTitleContext(const SceNpId &npId);
+	//SceNpId m_myNpId;
 
-	virtual HRESULT destroyTitleContext(int titleContext);
+	static int scoreboardThreadEntry(LPVOID lpParam);
+	void scoreboardThreadInternal();
 
-	virtual HRESULT createTransactionContext(int titleContext);
+	bool getScoreByIds();
+	bool getScoreByRange();
 
-	virtual HRESULT abortTransactionContext(int transactionContext);
+	bool setScore();
+	queue<RegisterScore> m_views;
 
-	virtual HRESULT destroyTransactionContext(int transactionContext);
+	CRITICAL_SECTION m_csViewsLock;
 
-	virtual HRESULT getFriendsList(sce::Toolkit::NP::Utilities::Future<sce::Toolkit::NP::FriendsList> &friendsList);
+	EStatsState		m_eStatsState;			//State of the stats read
+	//	EFilterMode		m_eFilterMode;
 
-	virtual char *	getComment(SceNpScoreComment *comment);
+	ReadScore *m_scores;
+	unsigned int m_maxRank;
+	//SceNpScoreRankData *m_stats;
+
+public:
+	virtual void Tick();// {}
+
+	//Open a session
+	virtual bool OpenSession();// { return true; }
+
+	//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);// { return false; }
+
+	virtual bool ReadStats_Friends(LeaderboardReadListener *callback, int difficulty, EStatsType type, PlayerUID myUID, unsigned int startIndex, unsigned int readCount);// { return false; }
+	virtual bool ReadStats_MyScore(LeaderboardReadListener *callback, int difficulty, EStatsType type, PlayerUID myUID, unsigned int readCount);// { return false; }
+	virtual bool ReadStats_TopRank(LeaderboardReadListener *callback, int difficulty, EStatsType type, unsigned int startIndex, unsigned int readCount);// { return false; }
+
+	//Perform a flush of the stats
+	virtual void FlushStats();// {}
+
+	//Cancel the current operation
+	virtual void CancelOperation();// {}
+
+	//Is the leaderboard manager idle.
+	virtual bool isIdle();// { return true; }
+
+
+private:
+	int getBoardId(int difficulty, EStatsType);
+
+	//LeaderboardManager::ReadScore *filterJustScorers(unsigned int &num, LeaderboardManager::ReadScore *friendsData);
+
+	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);
+
+	//void NotifyAsyncPlusFeature();
 };

Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp

@@ -242,11 +242,10 @@ C4JSpursJob_ChunkUpdate::C4JSpursJob_ChunkUpdate(ChunkRebuildData* pDataIn, Chun
 	extern const CellSpursJobHeader JOBHEADER_SYMBOL(ChunkUpdate);
 	//E create job
 	m_job256.header   = JOBHEADER_SYMBOL(ChunkUpdate);
-	m_job256.header.sizeStack = (60*1024)>>4;
+	m_job256.header.sizeStack = (58*1024)>>4;
 	m_job256.workArea.userData[0] = (uintptr_t)pDataIn;
 	m_job256.workArea.userData[1] = (uintptr_t)pDataOut;
 	assert(cellSpursJobQueueCheckJob(&m_job256, 256, 256) == CELL_OK);
-
 }
 
 C4JSpursJob_LevelRenderer_cull::C4JSpursJob_LevelRenderer_cull(LevelRenderer_cull_DataIn* pDataIn) 

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ActivatorRailTile_SPU.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "BaseRailTile_SPU.h"
+
+class ActivatorRailTile_SPU : public BaseRailTile_SPU
+{
+public:
+	ActivatorRailTile_SPU(int id) : BaseRailTile_SPU(id) {}
+
+	Icon_SPU *getTexture(int face, int data)
+	{
+		if ((data & RAIL_DATA_BIT) == 0)
+		{
+			return &ms_pTileData->activatorRailTile_icon;
+		}
+		else
+		{
+			return &ms_pTileData->activatorRailTile_iconPowered;
+		}
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BasePressurePlateTile_SPU.cpp

@@ -0,0 +1,41 @@
+#include "stdafx.h"
+#include "BasePressurePlateTile_SPU.h"
+#include "ChunkRebuildData.h"
+
+
+bool BasePressurePlateTile_SPU::isSolidRender(bool isServerLevel)
+{
+	return false;
+}
+
+bool BasePressurePlateTile_SPU::blocksLight()
+{
+	return false;
+}
+
+
+void BasePressurePlateTile_SPU::updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData, TileEntity* forceEntity) // 4J added forceData, forceEntity param
+{
+	int data = level->getData(x, y, z);
+    bool pressed = getSignalForData(data) > 0; // 0 is Redstone::SIGNAL_NONE
+	float o = 1 / 16.0f;
+
+	if (pressed)
+	{
+		setShape(o, 0, o, 1 - o, 0.5f / 16.0f, 1 - o);
+	}
+	else
+	{
+		setShape(o, 0, o, 1 - o, 1 / 16.0f, 1 - o);
+	}
+}
+
+
+void BasePressurePlateTile_SPU::updateDefaultShape()
+{
+    float x = 8 / 16.0f;
+	float y = 2 / 16.0f;
+	float z = 8 / 16.0f;
+	setShape(0.5f - x, 0.5f - y, 0.5f - z, 0.5f + x, 0.5f + y, 0.5f + z);
+}
+

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BasePressurePlateTile_SPU.h

@@ -0,0 +1,16 @@
+#pragma once
+#include "Tile_SPU.h"
+
+
+class BasePressurePlateTile_SPU : public Tile_SPU
+{
+public:
+	BasePressurePlateTile_SPU(int id) : Tile_SPU(id) {}
+    virtual bool isSolidRender(bool isServerLevel = false);
+	virtual bool blocksLight();
+
+	virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = NULL);	// 4J added forceData, forceEntity param
+    virtual void updateDefaultShape();
+protected:
+	virtual int getSignalForData(int data) = 0;
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BaseRailTile_SPU.h

@@ -0,0 +1,31 @@
+#pragma once
+#include "Tile_SPU.h"
+
+class BaseRailTile_SPU : public Tile_SPU
+{
+
+public:
+	static const int RAIL_DATA_BIT = 8;
+	static const int RAIL_DIRECTION_MASK = 7;
+
+	BaseRailTile_SPU(int id) : Tile_SPU(id) {}
+    virtual bool isSolidRender(bool isServerLevel = false) { return false; }
+    virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = NULL)	// 4J added forceData, forceEntity param
+	{
+		int data = level->getData(x, y, z);
+		if (data >= 2 && data <= 5)
+		{
+			setShape(0, 0, 0, 1, 2 / 16.0f + 0.5f, 1);
+		} else
+		{
+			setShape(0, 0, 0, 1, 2 / 16.0f, 1);
+		}
+	}
+    virtual int getRenderShape() { return Tile_SPU::SHAPE_RAIL; }
+	bool isUsesDataBit()
+	{
+		if(id == goldenRail_Id || id == detectorRail_Id || id == activatorRail_Id)
+			return true;
+		return false;
+	}
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ButtonTile_SPU.h

@@ -13,7 +13,7 @@ public:
 		if(id == Tile_SPU::button_wood_Id) 
 			return TileRef_SPU(wood_Id)->getTexture(Facing::UP);
 		else 
-			return TileRef_SPU(rock_Id)->getTexture(Facing::UP);
+			return TileRef_SPU(stone_Id)->getTexture(Facing::UP);
 	}
     virtual bool blocksLight() { return false; }
     virtual bool isSolidRender(bool isServerLevel = false) { return false; }

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp

@@ -39,7 +39,7 @@ static const int Level_MAX_BRIGHTNESS = 15;
 #include "TileRenderer_SPU.h"
 #include "Tile_SPU.h"
 #include "ChunkRebuildData.h"
-TileData_SPU g_tileSPUData;
+//TileData_SPU g_tileSPUData;
 
 static const int MAX_LEVEL_SIZE = 30000000;
 static const int MAX_BRIGHTNESS = 15;
@@ -89,30 +89,30 @@ void ChunkRebuildData::disableUnseenTiles()
 
 				// Establish whether this tile and its neighbours are all made of rock, dirt, unbreakable tiles, or have already
 				// been determined to meet this criteria themselves and have a tile of 255 set.
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				tileID = getTile(iX-1, iY, iZ);
 				flags = getFlags(iX-1, iY, iZ);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				tileID = getTile(iX+1, iY, iZ);
 				flags = getFlags(iX+1, iY, iZ);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				tileID = getTile(iX, iY, iZ-1);
 				flags = getFlags(iX, iY, iZ-1);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				tileID = getTile(iX, iY, iZ+1);
 				flags = getFlags(iX, iY, iZ+1);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				// Treat the bottom of the world differently - we shouldn't ever be able to look up at this, so consider tiles as invisible
 				// if they are surrounded on sides other than the bottom
 				if( iY > 0 )
 				{
 					tileID = getTile(iX, iY-1, iZ);
 					flags = getFlags(iX, iY-1, iZ);
-					if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+					if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 				}
 				tileID = getTile(iX, iY+1, iZ);
 				flags = getFlags(iX, iY+1, iZ);
-				if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
+				if( !( ( tileID == Tile_SPU::stone_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
 
 				// This tile is surrounded. Flag it as not requiring to be rendered by setting its id to 255.
 				setFlag(iX, iY, iZ, e_flag_NoRender);
@@ -157,7 +157,7 @@ void ChunkRebuildData::buildMaterials()
 	buildMaterial(Material_SPU::plant_Id,				Material::plant);				
 	buildMaterial(Material_SPU::replaceable_plant_Id,	Material::replaceable_plant);	
 	buildMaterial(Material_SPU::sponge_Id,				Material::sponge);				
-	buildMaterial(Material_SPU::cloth_Id,				Material::cloth);				
+	buildMaterial(Material_SPU::wool_Id,				Material::cloth);				
 	buildMaterial(Material_SPU::fire_Id,				Material::fire);				
 	buildMaterial(Material_SPU::sand_Id,				Material::sand);				
 	buildMaterial(Material_SPU::decoration_Id,			Material::decoration);		
@@ -195,7 +195,7 @@ int ChunkRebuildData::getMaterialID(Tile* pTile)
 	if(m == Material::plant)  			return Material_SPU::plant_Id;					
 	if(m == Material::replaceable_plant)return Material_SPU::replaceable_plant_Id;		
 	if(m == Material::sponge)  			return Material_SPU::sponge_Id;					
-	if(m == Material::cloth)  			return Material_SPU::cloth_Id;					
+	if(m == Material::cloth)  			return Material_SPU::wool_Id;					
 	if(m == Material::fire)  			return Material_SPU::fire_Id;				
 	if(m == Material::sand)  			return Material_SPU::sand_Id;				
 	if(m == Material::decoration)  		return Material_SPU::decoration_Id;			
@@ -341,9 +341,17 @@ void ChunkRebuildData::createTileData()
 	setIconSPUFromIcon(&m_tileData.dispenserTile_iconFront, ((DispenserTile*)Tile::dispenser)->iconFront);
 	setIconSPUFromIcon(&m_tileData.dispenserTile_iconFrontVertical, ((DispenserTile*)Tile::dispenser)->iconFrontVertical);
 
+	setIconSPUFromIcon(&m_tileData.dropperTile_iconFront, ((DropperTile*)Tile::dropper)->iconFront);
+	setIconSPUFromIcon(&m_tileData.dropperTile_iconFrontVertical, ((DropperTile*)Tile::dropper)->iconFrontVertical);
+
 	// RailTile
 	setIconSPUFromIcon(&m_tileData.railTile_iconTurn, ((RailTile*)Tile::rail)->iconTurn);
-	setIconSPUFromIcon(&m_tileData.railTile_iconTurnGolden, ((RailTile*)Tile::goldenRail)->iconTurn);
+
+	setIconSPUFromIcon(&m_tileData.poweredRailTile_icon, ((PoweredRailTile*)Tile::goldenRail)->icon);
+	setIconSPUFromIcon(&m_tileData.poweredRailTile_iconPowered, ((PoweredRailTile*)Tile::goldenRail)->iconPowered);
+
+	setIconSPUFromIcon(&m_tileData.activatorRailTile_icon, ((PoweredRailTile*)Tile::activatorRail)->icon);
+	setIconSPUFromIcon(&m_tileData.activatorRailTile_iconPowered, ((PoweredRailTile*)Tile::activatorRail)->iconPowered);
 
 	for(int i=0;i<2;i++)
 		setIconSPUFromIcon(&m_tileData.detectorRailTile_icons[i], ((DetectorRailTile*)Tile::detectorRail)->icons[i]);
@@ -413,8 +421,12 @@ void ChunkRebuildData::createTileData()
 
 	setIconSPUFromIcon(&m_tileData.stoneSlab_iconSide, ((StoneSlabTile*)(Tile::stoneSlab))->iconSide);
 
+	//ColoredTile
 	for(int i=0;i<16;i++)
-		setIconSPUFromIcon(&m_tileData.clothTile_icons[i], ((ColoredTile*)Tile::wool)->icons[i]);
+		setIconSPUFromIcon(&m_tileData.woolTile_icons[i], ((ColoredTile*)Tile::wool)->icons[i]);
+
+	for(int i=0;i<16;i++)
+		setIconSPUFromIcon(&m_tileData.clayHardened_colored_icons[i], ((ColoredTile*)Tile::clayHardened_colored)->icons[i]);
 
 	// CarrotTile
 	for(int i=0;i<4;i++)
@@ -438,6 +450,13 @@ void ChunkRebuildData::createTileData()
 	setIconSPUFromIcon(&m_tileData.quartzBlock_iconTop, ((QuartzBlockTile*)Tile::quartzBlock)->iconTop);
 	setIconSPUFromIcon(&m_tileData.quartzBlock_iconBottom, ((QuartzBlockTile*)Tile::quartzBlock)->iconBottom);
 
+	// HayBlockTile
+	setIconSPUFromIcon(&m_tileData.hayBlockTile_iconTop, ((HayBlockTile*)Tile::hayBlock)->iconTop);
+	setIconSPUFromIcon(&m_tileData.hayBlockTile_icon, ((HayBlockTile*)Tile::hayBlock)->icon);
+
+	// DaylightDetectorTile
+	for(int i=0;i<1;i++)
+		setIconSPUFromIcon(&m_tileData.daylightDetector_icons[i], ((DaylightDetectorTile*)Tile::daylightDetector)->icons[i]);
 }
 
 // extern int g_lastHitBlockX;

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h

@@ -59,7 +59,7 @@ public:
 	int m_lastHitBlockX;
 	int m_lastHitBlockY;
 	int m_lastHitBlockZ;
- 	unsigned int	m_pad[5];// padding to 16 byte alignment
+ 	unsigned int	m_pad[3];// padding to 16 byte alignment
 
 
 	int getTileIdx(int x, int y, int z) 	{	return (( x - m_x0 )*sc_size*sc_size) + (( y - m_y0 )*sc_size) + ( z - m_z0 );	}

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkUpdate.spu.vcxproj

@@ -115,6 +115,7 @@
     <ClInclude Include="WorkbenchTile_SPU.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="BasePressurePlateTile_SPU.cpp" />
     <ClCompile Include="ChunkRebuildData.cpp" />
     <ClCompile Include="DiodeTile_SPU.cpp" />
     <ClCompile Include="Direction_SPU.cpp" />
@@ -126,7 +127,6 @@
     <ClCompile Include="Icon_SPU.cpp" />
     <ClCompile Include="LeafTile_SPU.cpp" />
     <ClCompile Include="LiquidTile_SPU.cpp" />
-    <ClCompile Include="PressurePlateTile_SPU.cpp" />
     <ClCompile Include="StairTile_SPU.cpp" />
     <ClCompile Include="TallGrass_SPU.cpp" />
     <ClCompile Include="task.cpp" />

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkUpdate.spu.vcxproj.filters

@@ -142,9 +142,6 @@
     <ClCompile Include="LiquidTile_SPU.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PressurePlateTile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="StairTile_SPU.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -166,5 +163,8 @@
     <ClCompile Include="TileRenderer_SPU.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="BasePressurePlateTile_SPU.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ClothTile_SPU.h

@@ -1,11 +0,0 @@
-#pragma once
-#include "Tile_SPU.h"
-
-class ClothTile_SPU : public Tile_SPU
-{
-public:
-	ClothTile_SPU(int id) : Tile_SPU(id) {}
-	virtual Icon_SPU *getTexture(int face, int data) {	return &ms_pTileData->clothTile_icons[data]; }
-
-
-};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ColoredClay_SPU.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "Tile_SPU.h"
+
+class ColoredClay_SPU : public Tile_SPU
+{
+public:
+	ColoredClay_SPU(int id) : Tile_SPU(id) {}
+	virtual Icon_SPU *getTexture(int face, int data) {	return &ms_pTileData->clayHardened_colored_icons[data]; }
+
+
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DaylightDetectorTile_SPU.h

@@ -0,0 +1,21 @@
+#pragma once
+#include "EntityTile_SPU.h"
+
+class DaylightDetectorTile_SPU : public EntityTile_SPU
+{
+public:
+	DaylightDetectorTile_SPU(int id) : EntityTile_SPU(id) {}
+
+	Icon_SPU *getTexture(int face, int data) {
+		if (face == Facing::UP)
+		{
+			return &ms_pTileData->daylightDetector_icons[0];
+		}
+		return &ms_pTileData->daylightDetector_icons[1];
+	};
+
+	virtual bool isSolidRender(bool isServerLevel = false) { return false; }
+
+	virtual void updateDefaultShape() { setShape(0, 0, 0, 1, 6.0f / 16.0f, 1); };
+	virtual void updateShape() { setShape(0, 0, 0, 1, 6.0f / 16.0f, 1); };
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DetectorRailTile_SPU.h

@@ -2,10 +2,10 @@
 #include "RailTile_SPU.h"
 
 
-class DetectorRailTile_SPU : public RailTile_SPU
+class DetectorRailTile_SPU : public BaseRailTile_SPU
 {
 public:
-	DetectorRailTile_SPU(int id) : RailTile_SPU(id) {}
+	DetectorRailTile_SPU(int id) : BaseRailTile_SPU(id) {}
 	Icon_SPU *getTexture(int face, int data)
 	{
 		if ((data & RAIL_DATA_BIT) != 0)

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DiodeTile_SPU.h

@@ -21,9 +21,9 @@ public:
 		{
 			if (id==diode_on_Id)
 			{
-				return TileRef_SPU(notGate_on_Id)->getTexture(face);
+				return TileRef_SPU(redstoneTorch_on_Id)->getTexture(face);
 			}
-			return TileRef_SPU(notGate_off_Id)->getTexture(face);
+			return TileRef_SPU(redstoneTorch_off_Id)->getTexture(face);
 		}
 		if (face == Facing::UP)
 		{

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DropperTile_SPU.h

@@ -0,0 +1,37 @@
+#pragma once
+#include "DispenserTile_SPU.h"
+#include "Facing_SPU.h"
+
+
+class DropperTile_SPU : public DispenserTile_SPU
+{
+public:
+	DropperTile_SPU(int id) : DispenserTile_SPU(id) {}
+
+public:
+	virtual Icon_SPU *getTexture(int face, int data)
+	{
+		int dir = data & FACING_MASK;
+		if (face == dir)
+		{
+			if (dir == Facing::UP || dir == Facing::DOWN)
+			{
+				return &ms_pTileData->dropperTile_iconFrontVertical;
+			}
+			else
+			{
+				return &ms_pTileData->dropperTile_iconFront;
+			}
+		}
+
+		if (dir == Facing::UP || dir == Facing::DOWN)
+		{
+			return &ms_pTileData->dispenserTile_iconTop;
+		}
+		else if (face == Facing::UP || face == Facing::DOWN)
+		{
+			return &ms_pTileData->dispenserTile_iconTop;
+		}
+		return icon();
+	}
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FireTile_SPU.h

@@ -33,7 +33,7 @@ public:
 		case Tile_SPU::bookshelf_Id:
 		case Tile_SPU::tnt_Id:
 		case Tile_SPU::tallgrass_Id:
-		case Tile_SPU::cloth_Id:
+		case Tile_SPU::wool_Id:
 		case Tile_SPU::vine_Id:
 			return true;
 		default:

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/HayBlockTile_SPU.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "RotatedPillarTile_SPU.h"
+
+class HayBlockTile_SPU : public RotatedPillarTile_SPU
+{
+	friend class ChunkRebuildData;
+public:
+	HayBlockTile_SPU(int id) : RotatedPillarTile_SPU(id) {}
+
+protected:
+	Icon_SPU *getTopTexture(int type) {
+		return &ms_pTileData->hayBlockTile_iconTop;
+	};
+
+	Icon_SPU *getTypeTexture(int type) {
+		return &ms_pTileData->hayBlockTile_icon;
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/HugeMushroomTile_SPU.h

@@ -14,8 +14,8 @@ public:
     Icon_SPU *getTexture(int face, int data)
 	{
 		Icon_SPU* icons = ms_pTileData->hugeMushroom_icons;
-		int type = 0; // hugeMushroom1_Id
-		if(id == hugeMushroom2_Id)
+		int type = 0; // hugemushroom_brown_Id
+		if(id == hugeMushroom_red_Id)
 			type = 1;
 		// 123
 		// 456 10

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Material_SPU.h

@@ -19,7 +19,7 @@ public:
 	static const int plant_Id = 9;
 	static const int replaceable_plant_Id = 10;
 	static const int sponge_Id = 11;
-	static const int cloth_Id = 12;
+	static const int wool_Id = 12;
 	static const int fire_Id = 13;
 	static const int sand_Id = 14;
 	static const int decoration_Id = 15;

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PoweredRailTile_SPU.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "BaseRailTile_SPU.h"
+
+class PoweredRailTile_SPU : public BaseRailTile_SPU
+{
+public:
+	PoweredRailTile_SPU(int id) : BaseRailTile_SPU(id) {}
+
+	Icon_SPU *getTexture(int face, int data)
+	{
+		if ((data & RAIL_DATA_BIT) == 0)
+		{
+			return &ms_pTileData->poweredRailTile_icon;
+		}
+		else
+		{
+			return &ms_pTileData->poweredRailTile_iconPowered;
+		}
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PressurePlateTile_SPU.cpp

@@ -1,41 +0,0 @@
-#include "stdafx.h"
-#include "PressurePlateTile_SPU.h"
-#include "ChunkRebuildData.h"
-
-
-bool PressurePlateTile_SPU::isSolidRender(bool isServerLevel)
-{
-	return false;
-}
-
-bool PressurePlateTile_SPU::blocksLight()
-{
-	return false;
-}
-
-
-void PressurePlateTile_SPU::updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData, TileEntity* forceEntity) // 4J added forceData, forceEntity param
-{
-    bool pressed = level->getData(x, y, z) == 1;
-
-    float o = 1 / 16.0f;
-    if (pressed)
-	{
-        this->setShape(o, 0, o, 1 - o, 0.5f / 16.0f, 1 - o);
-    }
-	else
-	{
-        setShape(o, 0, o, 1 - o, 1 / 16.0f, 1 - o);
-    }
-}
-
-
-void PressurePlateTile_SPU::updateDefaultShape()
-{
-    float x = 8 / 16.0f;
-    float y = 2 / 16.0f;
-    float z = 8 / 16.0f;
-    setShape(0.5f - x, 0.5f - y, 0.5f - z, 0.5f + x, 0.5f + y, 0.5f + z);
-
-}
-

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PressurePlateTile_SPU.h

@@ -1,21 +1,23 @@
 #pragma once
-#include "Tile_SPU.h"
+#include "BasePressurePlateTile_SPU.h"
 
-
-class PressurePlateTile_SPU : public Tile_SPU
+class PressurePlateTile_SPU : public BasePressurePlateTile_SPU
 {
 public:
-    enum Sensitivity
+	enum Sensitivity
 	{
-        everything,
-		mobs,
-		players
-    };
+		everything, mobs, players
+	};
 
-	PressurePlateTile_SPU(int id) : Tile_SPU(id) {}
-    virtual bool isSolidRender(bool isServerLevel = false);
-    virtual bool blocksLight();
+private:
+	Sensitivity sensitivity;
 
-	virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = NULL);	// 4J added forceData, forceEntity param
-    virtual void updateDefaultShape();
-};
+public:
+	PressurePlateTile_SPU(int id) : BasePressurePlateTile_SPU(id) {}
+
+protected:
+	virtual int getSignalForData(int data) {
+		// 15 is Redstone::SIGNAL_MAX
+		return data == 1 ? 15 : 0;
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RailTile_SPU.h

@@ -1,58 +1,21 @@
 #pragma once
-#include "Tile_SPU.h"
 
-class RailTile_SPU : public Tile_SPU
+#include "BaseRailTile_SPU.h"
+
+class RailTile_SPU : public BaseRailTile_SPU
 {
-
 public:
-	static const int RAIL_DATA_BIT = 8;
-	static const int RAIL_DIRECTION_MASK = 7;
+	RailTile_SPU(int id) : BaseRailTile_SPU(id) {}
 
-	RailTile_SPU(int id) : Tile_SPU(id) {}
-    virtual bool isSolidRender(bool isServerLevel = false) { return false; }
-    virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = NULL)	// 4J added forceData, forceEntity param
+	Icon_SPU *getTexture(int face, int data)
 	{
-		int data = level->getData(x, y, z);
-		if (data >= 2 && data <= 5)
+		if (data >= 6)
 		{
-			setShape(0, 0, 0, 1, 2 / 16.0f + 0.5f, 1);
-		} else
-		{
-			setShape(0, 0, 0, 1, 2 / 16.0f, 1);
+			return &ms_pTileData->railTile_iconTurn;
 		}
-	}
-    virtual Icon_SPU *getTexture(int face, int data)
-	{
-		bool usesDataBit = false;
-		Icon_SPU* iconTurn = &ms_pTileData->railTile_iconTurn;
-		if(id == goldenRail_Id)
+		else
 		{
-			usesDataBit = true;
-			iconTurn = &ms_pTileData->railTile_iconTurnGolden;
+			return icon();
 		}
-
-		if (usesDataBit)
-		{
-// 			if (id == Tile::goldenRail_Id)
-// 			{
-				if ((data & RAIL_DATA_BIT) == 0)
-				{
-					return icon();
-				}
-				else
-				{
-					return iconTurn; // Actually the powered rail on version
-				}
-// 			}
-		} else if (data >= 6) return iconTurn;
-		return icon();
-
-	}
-    virtual int getRenderShape() { return Tile_SPU::SHAPE_RAIL; }
-	bool isUsesDataBit()
-	{
-		if(id == goldenRail_Id || id == detectorRail_Id)
-			return true;
-		return false;
-	}
+	};
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RotatedPillarTile_SPU.h

@@ -0,0 +1,45 @@
+#pragma once
+
+#include "Tile_SPU.h"
+#include "Facing_SPU.h"
+
+class RotatedPillarTile_SPU : public Tile_SPU
+{
+public:
+	static const int MASK_TYPE = 0x3;
+	static const int MASK_FACING = 0xC;
+	static const int FACING_Y = 0 << 2;
+	static const int FACING_X = 1 << 2;
+	static const int FACING_Z = 2 << 2;
+
+protected:
+	RotatedPillarTile_SPU(int id) : Tile_SPU(id) {}
+
+public:
+	virtual int getRenderShape() { return Tile_SPU::SHAPE_TREE; };
+
+	virtual Icon_SPU *getTexture(int face, int data) {
+		int dir = data & MASK_FACING;
+		int type = data & MASK_TYPE;
+
+		if (dir == FACING_Y && (face == Facing::UP || face == Facing::DOWN))
+		{
+			return getTopTexture(type);
+		}
+		else if (dir == FACING_X && (face == Facing::EAST || face == Facing::WEST))
+		{
+			return getTopTexture(type);
+		}
+		else if (dir == FACING_Z && (face == Facing::NORTH || face == Facing::SOUTH))
+		{
+			return getTopTexture(type);
+		}
+
+		return getTypeTexture(type);
+	};
+
+protected:
+	virtual Icon_SPU *getTypeTexture(int type) = 0;
+
+	virtual Icon_SPU *getTopTexture(int type) = 0;
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/SkullTile_SPU.h

@@ -43,5 +43,5 @@ public:
 		}
 	}
 
-	Icon_SPU *getTexture(int face, int data) { 	return TileRef_SPU(hellSand_Id)->getTexture(face); }
+	Icon_SPU *getTexture(int face, int data) { 	return TileRef_SPU(netherRack_Id)->getTexture(face); }
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StairTile_SPU.cpp

@@ -39,7 +39,7 @@ bool StairTile_SPU::isStairs(int id)
 	case Tile_SPU::stairs_wood_Id:
 	case Tile_SPU::stairs_stone_Id:
 	case Tile_SPU::stairs_bricks_Id:	
-	case Tile_SPU::stairs_stoneBrickSmooth_Id:
+	case Tile_SPU::stairs_stoneBrick_Id:
 	case Tile_SPU::stairs_netherBricks_Id:
 	case Tile_SPU::stairs_sandstone_Id:
 	case Tile_SPU::stairs_sprucewood_Id:

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneMonsterTile_SPU.h

@@ -21,12 +21,12 @@ public:
 	{
 		if (data == HOST_COBBLE)
 		{
-			return TileRef_SPU(stoneBrick_Id)->getTexture(face);
+			return TileRef_SPU(cobblestone_Id)->getTexture(face);
 		}
 		if (data == HOST_STONEBRICK)
 		{
-			return TileRef_SPU(stoneBrickSmooth_Id)->getTexture(face);
+			return TileRef_SPU(stoneBrick_Id)->getTexture(face);
 		}
-		return TileRef_SPU(rock_Id)->getTexture(face);
+		return TileRef_SPU(stone_Id)->getTexture(face);
 	}
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneSlabTile_SPU.h

@@ -41,11 +41,11 @@ public:
 		case WOOD_SLAB:
 			return TileRef_SPU(wood_Id)->getTexture(face); //Tile::wood->getTexture(face);
 		case COBBLESTONE_SLAB:
-			return TileRef_SPU(stoneBrick_Id)->getTexture(face); //Tile::stoneBrick->getTexture(face);
+			return TileRef_SPU(cobblestone_Id)->getTexture(face); //Tile::stoneBrick->getTexture(face);
 		case BRICK_SLAB:
 			return TileRef_SPU(redBrick_Id)->getTexture(face); //Tile::redBrick->getTexture(face);
  		case SMOOTHBRICK_SLAB:
- 			return TileRef_SPU(stoneBrickSmooth_Id)->getTexture(face); //Tile::stoneBrickSmooth->getTexture(face, SmoothStoneBrickTile::TYPE_DEFAULT);
+ 			return TileRef_SPU(stoneBrick_Id)->getTexture(face); //Tile::stoneBrickSmooth->getTexture(face, SmoothStoneBrickTile::TYPE_DEFAULT);
  		case NETHERBRICK_SLAB:
  			return TileRef_SPU(netherBrick_Id)->getTexture(Facing::UP); //Tile::netherBrick->getTexture(Facing::UP);
 		case QUARTZ_SLAB:

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp

@@ -12,6 +12,7 @@
 #include "DirtTile_SPU.h"
 #include "DoorTile_SPU.h"
 #include "PressurePlateTile_SPU.h"
+#include "WeightedPressurePlateTile_SPU.h"
 #include "FarmTile_SPU.h"
 #include "Bush_SPU.h"
 #include "TallGrass_SPU.h"
@@ -32,7 +33,10 @@
 #include "IceTile_SPU.h"
 #include "PortalTile_SPU.h"
 #include "DispenserTile_SPU.h"
+#include "DropperTile_SPU.h"
 #include "RailTile_SPU.h"
+#include "PoweredRailTile_SPU.h"
+#include "ActivatorRailTile_SPU.h"
 #include "DetectorRailTile_SPU.h"
 #include "TntTile_SPU.h"
 #include "BookshelfTile_SPU.h"
@@ -71,7 +75,7 @@
 #include "EggTile_SPU.h"
 #include "CocoaTile_SPU.h"
 #include "RedlightTile_SPU.h"
-#include "ClothTile_SPU.h"
+#include "WoolTile_SPU.h"
 #include "SkullTile_SPU.h"
 #include "MobSpawnerTile_SPU.h"
 #include "EnderChestTile_SPU.h"
@@ -83,6 +87,9 @@
 #include "PotatoTile_SPU.h"
 #include "QuartzBlockTile_SPU.h"
 #include "WoolCarpetTile_SPU.h"
+#include "ColoredClay_SPU.h"
+#include "HayBlockTile_SPU.h"
+#include "DaylightDetectorTile_SPU.h"
 
 #ifdef SN_TARGET_PS3_SPU
 #include "..\Common\spu_assert.h"
@@ -514,7 +521,7 @@ void Tile_SPU::updateDefaultShape()
 // void Tile_SPU::playerDestroy(Level *level, shared_ptr<Player> player, int x, int y, int z, int data)
 // {
 // 	// 4J Stu - Special case - only record a crop destroy if is fully grown
-// 	if(id==Tile_SPU::crops_Id)
+// 	if(id==Tile_SPU::wheat_Id)
 // 	{
 // 		if( Tile_SPU::crops->getResource(data, NULL, 0) > 0 )
 // 			player->awardStat(Stats::blocksMined[id], 1);
@@ -681,6 +688,7 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(woodSlabHalf_Id, WoodSlabTile_SPU);
 
 	CREATE_TILE_TYPE(chest_Id, ChestTile_SPU);
+	CREATE_TILE_TYPE(chest_trap_Id, ChestTile_SPU);
 
 	CREATE_TILE_TYPE(ironFence_Id, ThinFenceTile_SPU);
 	CREATE_TILE_TYPE(thinGlass_Id, ThinFenceTile_SPU);
@@ -691,7 +699,7 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(stairs_wood_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_stone_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_bricks_Id, StairTile_SPU);	
-	CREATE_TILE_TYPE(stairs_stoneBrickSmooth_Id, StairTile_SPU);
+	CREATE_TILE_TYPE(stairs_stoneBrick_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_netherBricks_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_sandstone_Id, StairTile_SPU);
 	CREATE_TILE_TYPE(stairs_sprucewood_Id, StairTile_SPU);
@@ -706,6 +714,9 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(pressurePlate_stone_Id, PressurePlateTile_SPU);
 	CREATE_TILE_TYPE(pressurePlate_wood_Id, PressurePlateTile_SPU);
 
+	CREATE_TILE_TYPE(weightedPlate_light_Id, WeightedPressurePlateTile_SPU);
+	CREATE_TILE_TYPE(weightedPlate_heavy_Id, WeightedPressurePlateTile_SPU);
+
 	CREATE_TILE_TYPE(farmland_Id, FarmTile_SPU);
 
 	CREATE_TILE_TYPE(flower_Id, Bush_SPU);
@@ -722,19 +733,19 @@ void Tile_SPU::initTilePointers()
 
 	CREATE_TILE_TYPE(leaves_Id, LeafTile_SPU);
 
-	CREATE_TILE_TYPE(crops_Id, CropTile_SPU);
+	CREATE_TILE_TYPE(wheat_Id, CropTile_SPU);
 
 	CREATE_TILE_TYPE(reeds_Id, ReedTile_SPU);
 
 	CREATE_TILE_TYPE(torch_Id, TorchTile_SPU);
-	CREATE_TILE_TYPE(notGate_off_Id, TorchTile_SPU); // TorchTile->NotGateTile
-	CREATE_TILE_TYPE(notGate_on_Id, TorchTile_SPU);	// TorchTile->NotGateTile
+	CREATE_TILE_TYPE(redstoneTorch_off_Id, TorchTile_SPU); // TorchTile->NotGateTile
+	CREATE_TILE_TYPE(redstoneTorch_on_Id, TorchTile_SPU);	// TorchTile->NotGateTile
 
-	CREATE_TILE_TYPE(mushroom1_Id, Mushroom_SPU);
-	CREATE_TILE_TYPE(mushroom2_Id, Mushroom_SPU);
+	CREATE_TILE_TYPE(mushroom_brown_Id, Mushroom_SPU);
+	CREATE_TILE_TYPE(mushroom_red_Id, Mushroom_SPU);
 
 	CREATE_TILE_TYPE(mobSpawner_Id, MobSpawnerTile_SPU);
-	CREATE_TILE_TYPE(musicBlock_Id, EntityTile_SPU);	// MusicTile->EntityTile
+	CREATE_TILE_TYPE(noteblock_Id, EntityTile_SPU);	// MusicTile->EntityTile
 
 	CREATE_TILE_TYPE(furnace_Id, FurnaceTile_SPU);
 	CREATE_TILE_TYPE(furnace_lit_Id, FurnaceTile_SPU);
@@ -757,9 +768,12 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(portalTile_Id, PortalTile_SPU);
 
 	CREATE_TILE_TYPE(dispenser_Id, DispenserTile_SPU);
+	CREATE_TILE_TYPE(dropper_Id, DropperTile_SPU);
 
 	CREATE_TILE_TYPE(rail_Id, RailTile_SPU);
-	CREATE_TILE_TYPE(goldenRail_Id, RailTile_SPU);
+
+	CREATE_TILE_TYPE(goldenRail_Id, PoweredRailTile_SPU);
+	CREATE_TILE_TYPE(activatorRail_Id, ActivatorRailTile_SPU);
 
 	CREATE_TILE_TYPE(detectorRail_Id, DetectorRailTile_SPU);
 
@@ -781,7 +795,7 @@ void Tile_SPU::initTilePointers()
 
 	CREATE_TILE_TYPE(cactus_Id, CactusTile_SPU);
 
-	CREATE_TILE_TYPE(recordPlayer_Id, RecordPlayerTile_SPU);
+	CREATE_TILE_TYPE(jukebox_Id, RecordPlayerTile_SPU);
 
 	CREATE_TILE_TYPE(pumpkin_Id, PumpkinTile_SPU);
 	CREATE_TILE_TYPE(litPumpkin_Id, PumpkinTile_SPU);
@@ -792,10 +806,10 @@ void Tile_SPU::initTilePointers()
 
 	CREATE_TILE_TYPE(monsterStoneEgg_Id, StoneMonsterTile_SPU);
 
-	CREATE_TILE_TYPE(stoneBrickSmooth_Id, SmoothStoneBrickTile_SPU);
+	CREATE_TILE_TYPE(stoneBrick_Id, SmoothStoneBrickTile_SPU);
 
-	CREATE_TILE_TYPE(hugeMushroom1_Id, HugeMushroomTile_SPU);
-	CREATE_TILE_TYPE(hugeMushroom2_Id, HugeMushroomTile_SPU);
+	CREATE_TILE_TYPE(hugeMushroom_brown_Id, HugeMushroomTile_SPU);
+	CREATE_TILE_TYPE(hugeMushroom_red_Id, HugeMushroomTile_SPU);
 
 	CREATE_TILE_TYPE(melon_Id, MelonTile_SPU);
 
@@ -847,16 +861,18 @@ void Tile_SPU::initTilePointers()
 
 	CREATE_TILE_TYPE(skull_Id, SkullTile_SPU);
 
-		// these tile types don't have any additional code that we need.
-	CREATE_TILE_TYPE(stoneBrick_Id, Tile_SPU);		// Tile
+	// these tile types don't have any additional code that we need.
+	CREATE_TILE_TYPE(cobblestone_Id, Tile_SPU);		// Tile
 	CREATE_TILE_TYPE(lapisBlock_Id, Tile_SPU);
 	CREATE_TILE_TYPE(redBrick_Id, Tile_SPU);
-	CREATE_TILE_TYPE(mossStone_Id, Tile_SPU);
+	CREATE_TILE_TYPE(mossyCobblestone_Id, Tile_SPU);
 	CREATE_TILE_TYPE(netherBrick_Id, Tile_SPU);
-	CREATE_TILE_TYPE(whiteStone_Id, Tile_SPU);
+	CREATE_TILE_TYPE(endStone_Id, Tile_SPU);
 	CREATE_TILE_TYPE(unbreakable_Id, Tile_SPU);
 	CREATE_TILE_TYPE(sponge_Id, Tile_SPU);
-	CREATE_TILE_TYPE(rock_Id, Tile_SPU);			// StoneTile
+	CREATE_TILE_TYPE(coalBlock_Id, Tile_SPU);
+	CREATE_TILE_TYPE(redstoneBlock_Id, Tile_SPU);
+	CREATE_TILE_TYPE(stone_Id, Tile_SPU);			// StoneTile
 	CREATE_TILE_TYPE(obsidian_Id, Tile_SPU);		// StoneTile->ObsidianTile
 	CREATE_TILE_TYPE(sand_Id, Tile_SPU);			// HeavyTile
 	CREATE_TILE_TYPE(gravel_Id, Tile_SPU);			// GravelTile
@@ -872,12 +888,15 @@ void Tile_SPU::initTilePointers()
 	CREATE_TILE_TYPE(ironBlock_Id, Tile_SPU);		// MetalTile
 	CREATE_TILE_TYPE(diamondBlock_Id, Tile_SPU);	// MetalTile
 	CREATE_TILE_TYPE(snow_Id, Tile_SPU);			// SnowTile
-	CREATE_TILE_TYPE(hellRock_Id, Tile_SPU);		// HellStoneTile
-	CREATE_TILE_TYPE(hellSand_Id, Tile_SPU);		// HellSandTile
-	CREATE_TILE_TYPE(lightGem_Id, Tile_SPU);		// LightGemTile
-	CREATE_TILE_TYPE(aprilFoolsJoke_Id, Tile_SPU); // LockedChestTile
+	CREATE_TILE_TYPE(netherRack_Id, Tile_SPU);		// NetherrackTile
+	CREATE_TILE_TYPE(soulsand_Id, Tile_SPU);		// SoulSandTile
+	CREATE_TILE_TYPE(glowstone_Id, Tile_SPU);		// Glowstonetile
+	// got replaced by stained_glass_Id, rest in peace locked chest
+	//CREATE_TILE_TYPE(aprilFoolsJoke_Id , Tile_SPU); // LockedChestTile
+	CREATE_TILE_TYPE(clayHardened_Id, Tile_SPU); // ColoredTile
 
-	CREATE_TILE_TYPE(cloth_Id, ClothTile_SPU); // wool
+	CREATE_TILE_TYPE(wool_Id, WoolTile_SPU); // wool
+	CREATE_TILE_TYPE(clayHardened_colored_Id, ColoredClay_SPU); // wool
 
 
 	CREATE_TILE_TYPE(emeraldOre_Id, Tile_SPU);		// OreTile
@@ -895,5 +914,6 @@ void Tile_SPU::initTilePointers()
  	CREATE_TILE_TYPE(quartzBlock_Id, QuartzBlockTile_SPU);
 	CREATE_TILE_TYPE(stairs_quartz_Id, StairTile_SPU);
  	CREATE_TILE_TYPE(woolCarpet_Id, WoolCarpetTile_SPU);
-
+	CREATE_TILE_TYPE(hayBlock_Id, HayBlockTile_SPU);
+	CREATE_TILE_TYPE(daylightDetector_Id, DaylightDetectorTile_SPU);
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h

@@ -129,8 +129,14 @@ public:
 	Icon_SPU dispenserTile_iconFront;
 	Icon_SPU dispenserTile_iconFrontVertical;
 
+	Icon_SPU dropperTile_iconFront;
+	Icon_SPU dropperTile_iconFrontVertical;
+
 	Icon_SPU railTile_iconTurn;
-	Icon_SPU railTile_iconTurnGolden;
+	Icon_SPU poweredRailTile_icon;
+	Icon_SPU poweredRailTile_iconPowered;
+	Icon_SPU activatorRailTile_icon;
+	Icon_SPU activatorRailTile_iconPowered;
 
 	Icon_SPU detectorRailTile_icons[2];
 
@@ -178,7 +184,7 @@ public:
 	Icon_SPU redStoneDust_iconCrossOver;
 	Icon_SPU redStoneDust_iconLineOver;
 
-	Icon_SPU clothTile_icons[16];	
+	Icon_SPU woolTile_icons[16];	
 
 	Icon_SPU stoneSlab_iconSide;
 
@@ -193,6 +199,12 @@ public:
 	Icon_SPU quartzBlock_iconTop;
 	Icon_SPU quartzBlock_iconBottom;
 
+	Icon_SPU clayHardened_colored_icons[16];	
+	Icon_SPU hayBlockTile_icon;
+	Icon_SPU hayBlockTile_iconTop;
+
+	Icon_SPU daylightDetector_icons[2];
+
 
 	int anvilPart; // normally part of the AnvilTile class
 
@@ -296,19 +308,24 @@ public:
 	static const int SHAPE_FLOWER_POT = 33;
 	static const int SHAPE_BEACON = 34;
 	static const int SHAPE_ANVIL = 35;
+	static const int SHAPE_HOPPER = 38;
 	static const int SHAPE_QUARTZ = 39;
+	static const int SHAPE_THIN_PANE = 40;
+
+	static const int SHAPE_COUNT = 41;
 
 	// 4J - this array of simple constants made so the compiler can optimise references to Ids that were previous of the form Tile_SPU::<whatever>->id, and are now simply Tile_SPU::whatever_Id
-	static const int rock_Id = 1;
+	static const int stone_Id = 1;
 	static const int grass_Id = 2;
 	static const int dirt_Id = 3;
-	static const int stoneBrick_Id = 4;
+	static const int cobblestone_Id = 4;
 	static const int wood_Id = 5;
 	static const int sapling_Id = 6;
 	static const int unbreakable_Id = 7;
 	static const int water_Id = 8;
 	static const int calmWater_Id = 9;
 	static const int lava_Id = 10;
+
 	static const int calmLava_Id = 11;
 	static const int sand_Id = 12;
 	static const int gravel_Id = 13;
@@ -319,26 +336,29 @@ public:
 	static const int leaves_Id = 18;
 	static const int sponge_Id = 19;
 	static const int glass_Id = 20;
+
 	static const int lapisOre_Id = 21;
 	static const int lapisBlock_Id = 22;
 	static const int dispenser_Id = 23;
 	static const int sandStone_Id = 24;
-	static const int musicBlock_Id = 25;
+	static const int noteblock_Id = 25;
 	static const int bed_Id = 26;
 	static const int goldenRail_Id = 27;
 	static const int detectorRail_Id = 28;
 	static const int pistonStickyBase_Id = 29;
 	static const int web_Id = 30;
+
 	static const int tallgrass_Id = 31;
 	static const int deadBush_Id = 32;
 	static const int pistonBase_Id = 33;
 	static const int pistonExtensionPiece_Id = 34;
-	static const int cloth_Id = 35;
+	static const int wool_Id = 35;
 	static const int pistonMovingPiece_Id = 36;
 	static const int flower_Id = 37;
 	static const int rose_Id = 38;
-	static const int mushroom1_Id = 39;
-	static const int mushroom2_Id = 40;
+	static const int mushroom_brown_Id = 39;
+	static const int mushroom_red_Id = 40;
+
 	static const int goldBlock_Id = 41;
 	static const int ironBlock_Id = 42;
 	static const int stoneSlab_Id = 43;
@@ -346,9 +366,10 @@ public:
 	static const int redBrick_Id = 45;
 	static const int tnt_Id = 46;
 	static const int bookshelf_Id = 47;
-	static const int mossStone_Id = 48;
+	static const int mossyCobblestone_Id = 48;
 	static const int obsidian_Id = 49;
 	static const int torch_Id = 50;
+
 	static const int fire_Id = 51;
 	static const int mobSpawner_Id = 52;
 	static const int stairs_wood_Id = 53;
@@ -357,8 +378,9 @@ public:
 	static const int diamondOre_Id = 56;
 	static const int diamondBlock_Id = 57;
 	static const int workBench_Id = 58;
-	static const int crops_Id = 59;
+	static const int wheat_Id = 59;
 	static const int farmland_Id = 60;
+
 	static const int furnace_Id = 61;
 	static const int furnace_lit_Id = 62;
 	static const int sign_Id = 63;
@@ -369,37 +391,40 @@ public:
 	static const int wallSign_Id = 68;
 	static const int lever_Id = 69;
 	static const int pressurePlate_stone_Id = 70;
+
 	static const int door_iron_Id = 71;
 	static const int pressurePlate_wood_Id = 72;
 	static const int redStoneOre_Id = 73;
 	static const int redStoneOre_lit_Id = 74;
-	static const int notGate_off_Id = 75;
-	static const int notGate_on_Id = 76;
+	static const int redstoneTorch_off_Id = 75;
+	static const int redstoneTorch_on_Id = 76;
 	static const int button_stone_Id = 77;
 	static const int topSnow_Id = 78;
 	static const int ice_Id = 79;
 	static const int snow_Id = 80;
+
 	static const int cactus_Id = 81;
 	static const int clay_Id = 82;
 	static const int reeds_Id = 83;
-	static const int recordPlayer_Id = 84;
+	static const int jukebox_Id = 84;
 	static const int fence_Id = 85;
 	static const int pumpkin_Id = 86;
-	static const int hellRock_Id = 87;
-	static const int hellSand_Id = 88;
-	static const int lightGem_Id = 89;
+	static const int netherRack_Id = 87;
+	static const int soulsand_Id = 88;
+	static const int glowstone_Id = 89;
 	static const int portalTile_Id = 90;
+
 	static const int litPumpkin_Id = 91;
 	static const int cake_Id = 92;
 	static const int diode_off_Id = 93;
 	static const int diode_on_Id = 94;
-	static const int aprilFoolsJoke_Id = 95;
+	static const int stained_glass_Id = 95;
 	static const int trapdoor_Id = 96;
-
 	static const int monsterStoneEgg_Id = 97;
-	static const int stoneBrickSmooth_Id = 98;
-	static const int hugeMushroom1_Id = 99;
-	static const int hugeMushroom2_Id = 100;
+	static const int stoneBrick_Id = 98;
+	static const int hugeMushroom_brown_Id = 99;
+	static const int hugeMushroom_red_Id = 100;
+
 	static const int ironFence_Id = 101;
 	static const int thinGlass_Id = 102;
 	static const int melon_Id = 103;
@@ -408,9 +433,9 @@ public:
 	static const int vine_Id = 106;
 	static const int fenceGate_Id = 107;
 	static const int stairs_bricks_Id = 108;
-	static const int stairs_stoneBrickSmooth_Id = 109;
-
+	static const int stairs_stoneBrick_Id = 109;
 	static const int mycel_Id = 110;
+
 	static const int waterLily_Id = 111;
 	static const int netherBrick_Id = 112;
 	static const int netherFence_Id = 113;
@@ -421,36 +446,55 @@ public:
 	static const int cauldron_Id = 118;
 	static const int endPortalTile_Id = 119;
 	static const int endPortalFrameTile_Id = 120;
-	static const int whiteStone_Id = 121;
+
+	static const int endStone_Id = 121;
 	static const int dragonEgg_Id = 122;
 	static const int redstoneLight_Id = 123;
 	static const int redstoneLight_lit_Id = 124;
-
-
 	static const int woodSlab_Id = 125;
 	static const int woodSlabHalf_Id = 126;
 	static const int cocoa_Id = 127;
 	static const int stairs_sandstone_Id = 128;
-	static const int stairs_sprucewood_Id = 134;
-	static const int stairs_birchwood_Id = 135;
-	static const int stairs_junglewood_Id = 136;
 	static const int emeraldOre_Id = 129;
 	static const int enderChest_Id = 130;
+
 	static const int tripWireSource_Id = 131;
 	static const int tripWire_Id = 132;
 	static const int emeraldBlock_Id = 133;
-
+	static const int stairs_sprucewood_Id = 134;
+	static const int stairs_birchwood_Id = 135;
+	static const int stairs_junglewood_Id = 136;
+	static const int commandBlock_Id = 137;
+	static const int beacon_Id = 138;
 	static const int cobbleWall_Id = 139;
 	static const int flowerPot_Id = 140;
+
 	static const int carrots_Id = 141;
 	static const int potatoes_Id = 142;
-	static const int anvil_Id = 145;
 	static const int button_wood_Id = 143;
 	static const int skull_Id = 144;
+	static const int anvil_Id = 145;
+	static const int chest_trap_Id = 146;
+	static const int weightedPlate_light_Id = 147;
+	static const int weightedPlate_heavy_Id = 148;
+	static const int comparator_off_Id = 149;
+	static const int comparator_on_Id = 150;
+
+	static const int daylightDetector_Id = 151;
+	static const int redstoneBlock_Id = 152;
 	static const int netherQuartz_Id = 153;
+	static const int hopper_Id = 154;
 	static const int quartzBlock_Id = 155;
 	static const int stairs_quartz_Id = 156;
+	static const int activatorRail_Id = 157;
+	static const int dropper_Id = 158;
+	static const int clayHardened_colored_Id = 159;
+	static const int stained_glass_pane_Id = 160;
+
+	static const int hayBlock_Id = 170;
 	static const int woolCarpet_Id = 171;
+	static const int clayHardened_Id = 172;
+	static const int coalBlock_Id = 173;
 
 	static Tile_SPU m_tiles[256];
 

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TreeTile_SPU.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "Tile_SPU.h"
+#include "RotatedPillarTile_SPU.h"
 
 class Player;
 
-class TreeTile_SPU : public Tile_SPU
+class TreeTile_SPU : public RotatedPillarTile_SPU
 {	
 public:
 	static const int DARK_TRUNK = 1;
@@ -19,29 +19,14 @@ public:
 
 	static const int TREE_NAMES_LENGTH = 4;
 
-	TreeTile_SPU(int id) : Tile_SPU(id) {}
-	int getRenderShape() {	return Tile_SPU::SHAPE_TREE; }
-
+	TreeTile_SPU(int id) : RotatedPillarTile_SPU(id) {}
 
 public:
-	Icon_SPU *getTexture(int face, int data)
-	{
-		int dir = data & MASK_FACING;
-		int type = data & MASK_TYPE;
-
-		if (dir == FACING_Y && (face == Facing::UP || face == Facing::DOWN))
-		{
-			return &ms_pTileData->treeTile_icons_top[type];
-		}
-		else if (dir == FACING_X && (face == Facing::EAST || face == Facing::WEST))
-		{
-			return &ms_pTileData->treeTile_icons_top[type];
-		}
-		else if (dir == FACING_Z && (face == Facing::NORTH || face == Facing::SOUTH))
-		{
-			return &ms_pTileData->treeTile_icons_top[type];
-		}
-
+	Icon_SPU *getTypeTexture(int type) {
 		return &ms_pTileData->treeTile_icons_side[type];
-	}
+	};
+
+	Icon_SPU *getTopTexture(int type) {
+		return &ms_pTileData->treeTile_icons_top[type];
+	};
 };

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/WallTile_SPU.h

@@ -22,7 +22,7 @@ public:
 	{
 		if (data == TYPE_MOSSY)
 		{
-			return TileRef_SPU(mossStone_Id)->getTexture(face);
+			return TileRef_SPU(mossyCobblestone_Id)->getTexture(face);
 		}
 		return TileRef_SPU(stoneBrick_Id)->getTexture(face);
 

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/WeightedPressurePlateTile_SPU.h

@@ -0,0 +1,22 @@
+#pragma once
+#include "BasePressurePlateTile_SPU.h"
+
+class WeightedPressurePlateTile_SPU : public BasePressurePlateTile_SPU
+{
+public:
+	enum Sensitivity
+	{
+		everything, mobs, players
+	};
+
+private:
+	Sensitivity sensitivity;
+
+public:
+	WeightedPressurePlateTile_SPU(int id) : BasePressurePlateTile_SPU(id) {}
+
+protected:
+	virtual int getSignalForData(int data) {
+		return data;
+	};
+};

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/WoolCarpetTile_SPU.h

@@ -7,7 +7,7 @@ class WoolCarpetTile_SPU : public Tile_SPU
 public:
 	WoolCarpetTile_SPU(int id) : Tile_SPU(id) {}
 
-	Icon_SPU *getTexture(int face, int data) { return TileRef_SPU(cloth_Id)->getTexture(face, data); }
+	Icon_SPU *getTexture(int face, int data) { return TileRef_SPU(wool_Id)->getTexture(face, data); }
 	bool isSolidRender(bool isServerLevel = false) { return false; }
 	void updateDefaultShape() { updateShape(0); }
 	void updateShape(ChunkRebuildData *level, int x, int y, int z) { updateShape(level->getData(x, y, z)); }

Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/WoolTile_SPU.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "Tile_SPU.h"
+
+class WoolTile_SPU : public Tile_SPU
+{
+public:
+	WoolTile_SPU(int id) : Tile_SPU(id) {}
+	virtual Icon_SPU *getTexture(int face, int data) {	return &ms_pTileData->woolTile_icons[data]; }
+
+
+};

Minecraft.Client/PSVita/OldSdk.cpp

@@ -1,4 +1,3 @@
-#include "stdafx.h"
 #include "OldSdk.h"
 #ifdef __PSVITA__
 

Minecraft.Client/Tesselator.cpp

@@ -832,7 +832,7 @@ void Tesselator::vertex(float x, float y, float z)
 		pShortData[5] = (((int)(v * 8192.0f))&0xffff);
 		int16_t u2 = ((int16_t*)&_tex2)[0];
 		int16_t v2 = ((int16_t*)&_tex2)[1];
-#if defined _XBOX_ONE || defined __ORBIS__
+#if defined _XBOX_ONE || defined __ORBIS__ || defined _WINDOWS64
 		// Optimisation - pack the second UVs into a single short (they could actually go in a byte), which frees up a short to store the x offset for this chunk in the vertex itself.
 		// This means that when rendering chunks, we don't need to update the vertex constants that specify the location for a chunk, when only the x offset has changed.
 		pShortData[6] = ( u2 << 8 ) | v2;

Minecraft.Client/Textures.cpp

@@ -434,11 +434,7 @@ void Textures::bindTextureLayers(ResourceLocation *resource)
 
 	for( int i = 0; i < layers; i++ )
 	{
-		int texId = resource->getTexture(i);
-		if( texId != -1 )
-		{
-			RenderManager.TextureBind(loadTexture(texId));
-		}
+		RenderManager.TextureBind(loadTexture(resource->getTexture(i)));
 	}
 }
 

Minecraft.Client/Windows64/Miles/include/tmapi.h

@@ -0,0 +1,36 @@
+// This is the null header file used to remove Telemetry calls.
+
+#define TMERR_DISABLED 1
+
+#define tmTick(...)
+#define tmPause(...)
+#define tmEnter(...)
+#define tmLeave(...)
+#define tmThreadName(...) TMERR_DISABLED
+#define tmMutexName(...) TMERR_DISABLED
+#define tmTryLock(...) TMERR_DISABLED
+#define tmEndTryLock(...)
+#define tmSetMutexState(...)
+#define tmAlloc(...)
+#define tmRealloc(...)
+#define tmFree(...) 
+#define tmPlot(...)
+#define tmBlob(...) TMERR_DISABLED
+#define tmBlobEx(...) TMERR_DISABLED
+#define tmMessage(...)
+#define tmEmitAccumulationZones(...) TMERR_DISABLED
+#define tmEnterAccumulationZone(...) TMERR_DISABLED
+#define tmLeaveAccumulationZone(...) TMERR_DISABLED
+#define tmZone(...) 
+#define tmSetLockState(...)
+#define tmLockName(...)
+#define tmSendCallStack(...)
+#define tmAllocEx(...)
+
+#define NTELEMETRY 1
+
+#define TM_CONTEXT_LITE(val) ((char*)(val))
+#define TM_CONTEXT_FULL(val) ((char*)(val))
+
+typedef char *HTELEMETRY;
+

Minecraft.Client/Windows64/Windows64_Minecraft.cpp

@@ -498,7 +498,7 @@ app.DebugPrintf("width: %d, height: %d\n", width, height);
 
 	DXGI_SWAP_CHAIN_DESC sd;
 	ZeroMemory( &sd, sizeof( sd ) );
-	sd.BufferCount = 2;
+	sd.BufferCount = 1;
 	sd.BufferDesc.Width = width;
 	sd.BufferDesc.Height = height;
 	sd.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;