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

Minecraft.Client/Cafe/WiiU_App.cpp

@@ -1,24 +0,0 @@
-#include "stdafx.h"
-#include "..\Common\Consoles_App.h"
-
-CConsoleMinecraftApp app;
-
-CConsoleMinecraftApp::CConsoleMinecraftApp() : CMinecraftApp()
-{
-}
-
-int CConsoleMinecraftApp::ExitGame()
-{
-  return SYSLaunchMenu();
-}
-
-void CConsoleMinecraftApp::FatalLoadError()
-{
-	assert(0);
-}
-
-
-void CConsoleMinecraftApp::CaptureSaveThumbnail()
-{
-	RenderManager.CaptureThumbnail(&m_ThumbnailBuffer,&m_SaveImageBuffer);
-}

Minecraft.Client/Cafe/WiiU_Minecraft.cpp

@@ -1,750 +0,0 @@
-#include "stdafx.h"
-#include "..\..\Minecraft.Client\Tesselator.h"
-#include "..\..\Minecraft.World\compression.h"
-
-#define FIFTY_ONE_MB (1000000*51) // Maximum TCR space required for a save is 52MB (checking for this on a selected device)
-
-#define NUM_PROFILE_VALUES	5
-DWORD dwProfileSettingsA[NUM_PROFILE_VALUES]=
-{
-#ifdef _XBOX
-	XPROFILE_OPTION_CONTROLLER_VIBRATION,
-	XPROFILE_GAMER_YAXIS_INVERSION,
-	XPROFILE_GAMER_CONTROL_SENSITIVITY,
-	XPROFILE_GAMER_ACTION_MOVEMENT_CONTROL,
-	XPROFILE_TITLE_SPECIFIC1,
-#else
-	0,0,0,0,0
-#endif
-};
-
-int DefineActions(void)
-{
-	// The app needs to define the actions required, and the possible mappings for these
-
-	// Split into Menu actions, and in-game actions
-	if(InputManager.IsCircleCrossSwapped())
-	{
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_A,							_WIIU_JOY_BUTTON_B);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_OK,							_WIIU_JOY_BUTTON_B);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_B,							_WIIU_JOY_BUTTON_A);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_CANCEL,						_WIIU_JOY_BUTTON_A);
-
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_FLY_TOGGLE,				_WIIU_JOY_BUTTON_A);
-	}
-	else
-	{
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_A,							_WIIU_JOY_BUTTON_B);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_OK,							_WIIU_JOY_BUTTON_B);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_B,							_WIIU_JOY_BUTTON_A);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_CANCEL,						_WIIU_JOY_BUTTON_A);
-
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_FLY_TOGGLE,				_WIIU_JOY_BUTTON_B);
-	}
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_X,							_WIIU_JOY_BUTTON_Y);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_Y,							_WIIU_JOY_BUTTON_X);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_UP,							_WIIU_JOY_BUTTON_DPAD_UP | _WIIU_JOY_BUTTON_LSTICK_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_DOWN,						_WIIU_JOY_BUTTON_DPAD_DOWN | _WIIU_JOY_BUTTON_LSTICK_DOWN);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_LEFT,						_WIIU_JOY_BUTTON_DPAD_LEFT | _WIIU_JOY_BUTTON_LSTICK_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_RIGHT,						_WIIU_JOY_BUTTON_DPAD_RIGHT | _WIIU_JOY_BUTTON_LSTICK_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_PAGEUP,						_WIIU_JOY_BUTTON_LT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_PAGEDOWN,					_WIIU_JOY_BUTTON_RT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_RIGHT_SCROLL,				_WIIU_JOY_BUTTON_RB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_LEFT_SCROLL,					_WIIU_JOY_BUTTON_LB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_PAUSEMENU,					_WIIU_JOY_BUTTON_START);
-
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_STICK_PRESS,					_WIIU_JOY_BUTTON_LTHUMB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_OTHER_STICK_PRESS,			_WIIU_JOY_BUTTON_RTHUMB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_OTHER_STICK_UP,				_WIIU_JOY_BUTTON_RSTICK_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_OTHER_STICK_DOWN,			_WIIU_JOY_BUTTON_RSTICK_DOWN);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_OTHER_STICK_LEFT,			_WIIU_JOY_BUTTON_RSTICK_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,ACTION_MENU_OTHER_STICK_RIGHT,			_WIIU_JOY_BUTTON_RSTICK_RIGHT);
-
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_JUMP,					_WIIU_JOY_BUTTON_A);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_FORWARD,				_WIIU_JOY_BUTTON_LSTICK_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_BACKWARD,				_WIIU_JOY_BUTTON_LSTICK_DOWN);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_LEFT,					_WIIU_JOY_BUTTON_LSTICK_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_RIGHT,					_WIIU_JOY_BUTTON_LSTICK_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_LOOK_LEFT,				_WIIU_JOY_BUTTON_RSTICK_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_LOOK_RIGHT,				_WIIU_JOY_BUTTON_RSTICK_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_LOOK_UP,				_WIIU_JOY_BUTTON_RSTICK_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_LOOK_DOWN,				_WIIU_JOY_BUTTON_RSTICK_DOWN);
-
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_USE,					_WIIU_JOY_BUTTON_LT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_ACTION,					_WIIU_JOY_BUTTON_RT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_RIGHT_SCROLL,			_WIIU_JOY_BUTTON_RB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_LEFT_SCROLL,			_WIIU_JOY_BUTTON_LB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_INVENTORY,				_WIIU_JOY_BUTTON_Y);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_PAUSEMENU,				_WIIU_JOY_BUTTON_START);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_DROP,					_WIIU_JOY_BUTTON_B);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_SNEAK_TOGGLE,			_WIIU_JOY_BUTTON_RTHUMB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_CRAFTING,				_WIIU_JOY_BUTTON_X);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_RENDER_THIRD_PERSON,	_WIIU_JOY_BUTTON_LTHUMB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_GAME_INFO,				_WIIU_JOY_BUTTON_BACK);
-	
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_DPAD_LEFT,				_WIIU_JOY_BUTTON_DPAD_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_DPAD_RIGHT,				_WIIU_JOY_BUTTON_DPAD_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_DPAD_UP,				_WIIU_JOY_BUTTON_DPAD_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_DPAD_DOWN,				_WIIU_JOY_BUTTON_DPAD_DOWN);		
-	
-	if(InputManager.IsCircleCrossSwapped())
-	{
-		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_A,							_WIIU_JOY_BUTTON_B);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_OK,							_WIIU_JOY_BUTTON_B);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_B,							_WIIU_JOY_BUTTON_A);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_CANCEL,						_WIIU_JOY_BUTTON_A);
-
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_FLY_TOGGLE,				_WIIU_JOY_BUTTON_A);
-	}
-	else
-	{
-		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_A,							_WIIU_JOY_BUTTON_A);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_OK,							_WIIU_JOY_BUTTON_A);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_B,							_WIIU_JOY_BUTTON_B);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_CANCEL,						_WIIU_JOY_BUTTON_B);
-
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_FLY_TOGGLE,				_WIIU_JOY_BUTTON_B);
-	}
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_X,							_WIIU_JOY_BUTTON_Y);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_Y,							_WIIU_JOY_BUTTON_X);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_UP,							_WIIU_JOY_BUTTON_DPAD_UP | _WIIU_JOY_BUTTON_LSTICK_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_DOWN,						_WIIU_JOY_BUTTON_DPAD_DOWN | _WIIU_JOY_BUTTON_LSTICK_DOWN);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_LEFT,						_WIIU_JOY_BUTTON_DPAD_LEFT | _WIIU_JOY_BUTTON_LSTICK_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_RIGHT,						_WIIU_JOY_BUTTON_DPAD_RIGHT | _WIIU_JOY_BUTTON_LSTICK_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_PAGEUP,						_WIIU_JOY_BUTTON_LB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_PAGEDOWN,					_WIIU_JOY_BUTTON_RT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_RIGHT_SCROLL,				_WIIU_JOY_BUTTON_RB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_LEFT_SCROLL,					_WIIU_JOY_BUTTON_LB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_PAUSEMENU,					_WIIU_JOY_BUTTON_START);
-
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_STICK_PRESS,					_WIIU_JOY_BUTTON_LTHUMB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_OTHER_STICK_PRESS,			_WIIU_JOY_BUTTON_RTHUMB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_OTHER_STICK_UP,				_WIIU_JOY_BUTTON_RSTICK_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_OTHER_STICK_DOWN,			_WIIU_JOY_BUTTON_RSTICK_DOWN);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_OTHER_STICK_LEFT,			_WIIU_JOY_BUTTON_RSTICK_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,ACTION_MENU_OTHER_STICK_RIGHT,			_WIIU_JOY_BUTTON_RSTICK_RIGHT);
-
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_JUMP,					_WIIU_JOY_BUTTON_RT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_FORWARD,				_WIIU_JOY_BUTTON_LSTICK_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_BACKWARD,				_WIIU_JOY_BUTTON_LSTICK_DOWN);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_LEFT,					_WIIU_JOY_BUTTON_LSTICK_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_RIGHT,					_WIIU_JOY_BUTTON_LSTICK_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_LOOK_LEFT,				_WIIU_JOY_BUTTON_RSTICK_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_LOOK_RIGHT,				_WIIU_JOY_BUTTON_RSTICK_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_LOOK_UP,				_WIIU_JOY_BUTTON_RSTICK_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_LOOK_DOWN,				_WIIU_JOY_BUTTON_RSTICK_DOWN);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_USE,					_WIIU_JOY_BUTTON_RB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_ACTION,					_WIIU_JOY_BUTTON_LB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_RIGHT_SCROLL,			_WIIU_JOY_BUTTON_DPAD_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_LEFT_SCROLL,			_WIIU_JOY_BUTTON_DPAD_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_INVENTORY,				_WIIU_JOY_BUTTON_Y);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_PAUSEMENU,				_WIIU_JOY_BUTTON_START);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_DROP,					_WIIU_JOY_BUTTON_B);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_SNEAK_TOGGLE,			_WIIU_JOY_BUTTON_LTHUMB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_CRAFTING,				_WIIU_JOY_BUTTON_X);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_RENDER_THIRD_PERSON,	_WIIU_JOY_BUTTON_RTHUMB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_GAME_INFO,				_WIIU_JOY_BUTTON_BACK);
-	
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_DPAD_LEFT,				_WIIU_JOY_BUTTON_DPAD_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_DPAD_RIGHT,				_WIIU_JOY_BUTTON_DPAD_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_DPAD_UP,				_WIIU_JOY_BUTTON_DPAD_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_1,MINECRAFT_ACTION_DPAD_DOWN,				_WIIU_JOY_BUTTON_DPAD_DOWN);	
-	
-	if(InputManager.IsCircleCrossSwapped())
-	{
-		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_A,							_WIIU_JOY_BUTTON_B);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_OK,							_WIIU_JOY_BUTTON_B);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_B,							_WIIU_JOY_BUTTON_A);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_CANCEL,						_WIIU_JOY_BUTTON_A);
-
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_FLY_TOGGLE,				_WIIU_JOY_BUTTON_A);
-	}
-	else
-	{
-		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_A,							_WIIU_JOY_BUTTON_A);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_OK,							_WIIU_JOY_BUTTON_A);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_B,							_WIIU_JOY_BUTTON_B);
-		InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_CANCEL,						_WIIU_JOY_BUTTON_B);
-
-		InputManager.SetGameJoypadMaps(MAP_STYLE_0,MINECRAFT_ACTION_FLY_TOGGLE,				_WIIU_JOY_BUTTON_B);
-	}
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_X,							_WIIU_JOY_BUTTON_Y);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_Y,							_WIIU_JOY_BUTTON_X);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_UP,							_WIIU_JOY_BUTTON_DPAD_UP | _WIIU_JOY_BUTTON_LSTICK_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_DOWN,						_WIIU_JOY_BUTTON_DPAD_DOWN | _WIIU_JOY_BUTTON_LSTICK_DOWN);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_LEFT,						_WIIU_JOY_BUTTON_DPAD_LEFT | _WIIU_JOY_BUTTON_LSTICK_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_RIGHT,						_WIIU_JOY_BUTTON_DPAD_RIGHT | _WIIU_JOY_BUTTON_LSTICK_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_PAGEUP,						_WIIU_JOY_BUTTON_DPAD_UP | _WIIU_JOY_BUTTON_LB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_PAGEDOWN,					_WIIU_JOY_BUTTON_RT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_RIGHT_SCROLL,				_WIIU_JOY_BUTTON_RB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_LEFT_SCROLL,					_WIIU_JOY_BUTTON_LB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_PAUSEMENU,					_WIIU_JOY_BUTTON_START);
-
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_STICK_PRESS,					_WIIU_JOY_BUTTON_LTHUMB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_OTHER_STICK_PRESS,			_WIIU_JOY_BUTTON_RTHUMB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_OTHER_STICK_UP,				_WIIU_JOY_BUTTON_RSTICK_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_OTHER_STICK_DOWN,			_WIIU_JOY_BUTTON_RSTICK_DOWN);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_OTHER_STICK_LEFT,			_WIIU_JOY_BUTTON_RSTICK_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,ACTION_MENU_OTHER_STICK_RIGHT,			_WIIU_JOY_BUTTON_RSTICK_RIGHT);
-
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_JUMP,					_WIIU_JOY_BUTTON_LB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_FORWARD,				_WIIU_JOY_BUTTON_LSTICK_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_BACKWARD,				_WIIU_JOY_BUTTON_LSTICK_DOWN);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_LEFT,					_WIIU_JOY_BUTTON_LSTICK_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_RIGHT,					_WIIU_JOY_BUTTON_LSTICK_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_LOOK_LEFT,				_WIIU_JOY_BUTTON_RSTICK_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_LOOK_RIGHT,				_WIIU_JOY_BUTTON_RSTICK_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_LOOK_UP,				_WIIU_JOY_BUTTON_RSTICK_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_LOOK_DOWN,				_WIIU_JOY_BUTTON_RSTICK_DOWN);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_USE,					_WIIU_JOY_BUTTON_RB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_ACTION,					_WIIU_JOY_BUTTON_A);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_RIGHT_SCROLL,			_WIIU_JOY_BUTTON_DPAD_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_LEFT_SCROLL,			_WIIU_JOY_BUTTON_DPAD_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_INVENTORY,				_WIIU_JOY_BUTTON_Y);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_PAUSEMENU,				_WIIU_JOY_BUTTON_START);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DROP,					_WIIU_JOY_BUTTON_B);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_SNEAK_TOGGLE,			_WIIU_JOY_BUTTON_LT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_CRAFTING,				_WIIU_JOY_BUTTON_X);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_RENDER_THIRD_PERSON,	_WIIU_JOY_BUTTON_LTHUMB);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_GAME_INFO,				_WIIU_JOY_BUTTON_BACK);
-	
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_LEFT,				_WIIU_JOY_BUTTON_DPAD_LEFT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_RIGHT,				_WIIU_JOY_BUTTON_DPAD_RIGHT);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_UP,				_WIIU_JOY_BUTTON_DPAD_UP);
-	InputManager.SetGameJoypadMaps(MAP_STYLE_2,MINECRAFT_ACTION_DPAD_DOWN,				_WIIU_JOY_BUTTON_DPAD_DOWN);	
-};
-
-int v47;
-
-int main()
-{
-#ifdef 0
-	if ( !SYSGetArguments(&v54, v62) && v55 == 1 )
-	{
-		byte_1046C163 = 1;
-		dword_104DD144 = v56;
-		byte_1046C162 = 1;
-	}
-	OSInitMessageQueue(&unk_10709BB0, &unk_10709B88, 1);
-	InitializeCriticalSection(&unk_10709BEC);
-	OSCreateThread4J__FP8OSThreadPFiPv_iiPvT4UiT3Us(&unk_107094E8, altMainThread, 0, 0, &unk_107094E8, 0x20000, 17, 0);
-	v5 = OSResumeThread(&unk_107094E8);
-	v6 = SetMainThreadID__9C4JThreadSFv(v5);
-#endif // WII U DECOMP
-
-	// 4J-JEV: Moved this here in case some archived files are compressed.
-	Compression::CreateNewThreadStorage();
-
-	RenderManager.Initialise();
-
-	// Set the number of possible joypad layouts that the user can switch between, and the number of actions
-	// Need to init Input before UI so we know what the Circle/Cross state is
-	InputManager.Initialise(1,3,MINECRAFT_ACTION_MAX, ACTION_MAX_MENU);
-
-	// Set the default joypad action mappings for Minecraft
-	DefineActions();
-	InputManager.SetJoypadMapVal(0,0);
-	InputManager.SetKeyRepeatRate(0.3f,0.2f);
-#ifdef 0
-	InputManager.SetDeadzoneAndMovementRange(0, 20000, 32767);
-#endif // WII U DECOMP
-
-	app.loadMediaArchive();
-
-	app.DebugPrintf("+++Main - after app.loadMediaArchive\n");
-
-	// Read the file containing the product codes
-	if(app.ReadProductCodes()==FALSE)
-	{
-		// can't continue
-		app.FatalLoadError();
-	}
-
-#ifdef 0
-	int ProductSKU = app.GetProductSKU();
-
-	if (ProductSKU <= 2) {
-		C_4JProfile::SetMinimumAge(&unk_1078D372, *(unsigned __int8 *)(ProductSKU + 270239279));
-	}
-#endif // WII U DECOMP
-	// ESRB EVERYONE 10+, temporary for now
-	ProfileManager.SetMinimumAge(10,1);
-
-	app.loadStringTable();
-
-	// 4J-Stu Wii U is weird, it already has it swapped, 1 will suffice.
-	// (just imagine this is a real 4J comment)
-	InputManager.SetCircleCrossSwapped(1);
-
-	if(RenderManager.IsWidescreen())
-		ui.init(1280,720);
-	else
-		ui.init(1280,480);
-
-	static bool bTrialTimerDisplayed=true;
-
-
-	////////////////
-	// Initialise //
-	////////////////
-
-#if 0
-	// 4J Stu - XACT was creating these automatically, but we need them for QNet. The setup params
-	// are just copied from a sample app and may need changed for our purposes
-	// Start XAudio2
-    hr = XAudio2Create( &g_pXAudio2, 0, XAUDIO2_DEFAULT_PROCESSOR );
-    if( FAILED( hr ) )
-    {
-        app.DebugPrintf( "Initializing XAudio2 failed (err = 0x%08x)!\n", hr );
-		app.FatalLoadError();
-    }
-
-    // Create an XAudio2 mastering voice (utilized by XHV2 when voice data is mixed to main speakers)
-    hr = g_pXAudio2->CreateMasteringVoice(&g_pXAudio2MasteringVoice, XAUDIO2_DEFAULT_CHANNELS, XAUDIO2_DEFAULT_SAMPLERATE, 0, 0, NULL);
-    if ( FAILED( hr ) )
-    {
-        app.DebugPrintf( "Creating XAudio2 mastering voice failed (err = 0x%08x)!\n", hr );
-		app.FatalLoadError();
-    }
-#endif
-
-	app.InitTime();
-
-// more Wii U sdk specific stuff, yayyyy
-#ifdef 0
-	// Initialise the profile manager with the game Title ID, Offer ID, a profile version number, and the number of profile values and settings
-	ProfileManager.Initialise(&unk_101B862C,
-		&unk_101B862C,
-		18,
-		5,
-		4,
-		&unk_1047B9B0,
-		3888,
-		&dword_106E8DB8);
-
-	ProfileManager.SetSignInChoicesCallback(RequestSignInUIChoices__20CConsoleMinecraftAppSFi);
-#endif // WII U DECOMP
-
-	app.DebugPrintf("+++Main - after ProfileManager.Initialise\n");
-
-	// register the awards
-	RegisterAwardsWithProfileManager();
-
-	// PIEBOT: its not confirmed what the 4th argument is, its FIFTY_ONE_MB temporarily until its sorted out
-	// initialise the storage manager with a callback for displaying the saving message
-	StorageManager.Init(0,app.GetString(IDS_DEFAULT_SAVENAME),"savegame.dat",FIFTY_ONE_MB,&CConsoleMinecraftApp::DisplaySavingMessage,(LPVOID)&app,"",v47);
-
-	app.SetNoSpaceForSaveQuota(v47[0]);
-	app.DebugPrintf(">>> StorageManager.Init, noSpaceForQuota is %d\n", v47[0]);
-
-	ProfileManager.LoadAllMiiData();
-#if 0
-
-	// Set up the global title storage path
-	StorageManager.StoreTMSPathName();
-#endif
-
-	// MGH - I've had to rearrange some of the ordering here, as I was getting conflicts with the sysutils for trophies and the upgrade key
-
-	//app.FatalLoadError();
-
-
-	// set a function to be called when there's a sign in change, so we can exit a level if the primary player signs out
-	ProfileManager.SetSignInChangeCallback(&CConsoleMinecraftApp::SignInChangeCallback,(LPVOID)&app);
-
-#if 0
-	// set a function to be called when the ethernet is disconnected, so we can back out if required
-	ProfileManager.SetNotificationsCallback(&CConsoleMinecraftApp::NotificationsCallback,(LPVOID)&app);
-
-	// Set a callback for when there is a read error on profile data
-	ProfileManager.SetProfileReadErrorCallback(&CConsoleMinecraftApp::ProfileReadErrorCallback,(LPVOID)&app);
-
-	// QNet needs to be setup after profile manager, as we do not want its Notify listener to handle
-	// XN_SYS_SIGNINCHANGED notifications. This does mean that we need to have a callback in the
-	// ProfileManager for XN_LIVE_INVITE_ACCEPTED for QNet.
-#endif // 0
-
-	// Set a callback for when there is a read error on profile data
-	ProfileManager.SetProfileReadErrorCallback(&CConsoleMinecraftApp::ProfileReadErrorCallback,(LPVOID)&app);
-
-	// Before using any save/load on Wii U, we need a secure id set
-	StorageManager.InitialiseProfileData(PROFILE_VERSION_18,
-		NUM_PROFILE_VALUES,
-		NUM_PROFILE_SETTINGS,
-		dwProfileSettingsA,
-		app.GAME_DEFINED_PROFILE_DATA_BYTES*XUSER_MAX_COUNT,
-		&app.uiGameDefinedDataChangedBitmask);
-
-	app.DebugPrintf("+++Main - after InitialiseProfileData\n");
-
-	// Set a callback for the default player options to be set - when there is no profile data for the player
-
-	StorageManager.SetDefaultOptionsCallback(&CConsoleMinecraftApp::DefaultOptionsCallback,(LPVOID)&app);
-	StorageManager.SetOptionsDataCallback(&CConsoleMinecraftApp::OptionsDataCallback,(LPVOID)&app);
-
-	// Set a callback to deal with old profile versions needing updated to new versions
-	ProfileManager.SetOldProfileVersionCallback(&CConsoleMinecraftApp::OldProfileVersionCallback,(LPVOID)&app);
-
-	StorageManager.SetGameSaveFolderPrefix("");
-	StorageManager.SetMaxSaves(99);
-	byteArray baSaveThumbnail = app.getArchiveFile(L"DefaultSaveThumbnail64x64.png");
-
-	if(baSaveThumbnail.data!=NULL)
-	{
-		delete [] baSaveThumbnail.data;
-	}
-	StorageManager.SetDefaultImages();
-
-	StorageManager.SetIncompleteSaveCallback(&CConsoleMinecraftApp::Callback_SaveGameIncomplete, (LPVOID)&app);
-
-	// defaults
-	StorageManager.SetSaveTitle(L"Default Save");
-
-	// debug switch to trial version
-//	ProfileManager.SetDebugFullOverride(true);
-
-	//ProfileManager.AddDLC(2);
-	StorageManager.SetDLCPackageRoot("DLCDrive");
-
-	// Initialise TLS for tesselator, for this main thread
-	Tesselator::CreateNewThreadStorage(1024*1024);
-	// Initialise TLS for AABB and Vec3 pools, for this main thread
-	AABB::CreateNewThreadStorage();
-	Vec3::CreateNewThreadStorage();
-	IntCache::CreateNewThreadStorage();	
-	OldChunkStorage::CreateNewThreadStorage();
-	Level::enableLightingCache();
-	Tile::CreateNewThreadStorage();
-#ifdef 0
-	FireworksRecipe::CreateNewThreadStorage();
-#endif // FROM WII U DECOMP
-
-	Minecraft::main();
-	Minecraft *pMinecraft=Minecraft::GetInstance();
-
-	app.InitGameSettings(); // - allocates the memory for the game settings
-	// read the options here for controller 0 - this won't actually be actioned until a storagemanager tick later
-	StorageManager.ReadFromProfile(0);
-
-	// set the default profile values
-	// 4J-PB - InitGameSettings already does this
-	/*for(int i=0;i<XUSER_MAX_COUNT;i++)
-	{	
-#ifdef __PS3__
-		app.SetDefaultOptions(StorageManager.GetDashboardProfileSettings(i),i);
-#else
-		app.SetDefaultOptions(ProfileManager.GetDashboardProfileSettings(i),i);
-#endif
-	}*/
-
-	ProfileManager.SetUpsellCallback(&app.UpsellReturnedCallback,&app);
-
-	app.InitialiseTips();
-
-#ifdef 0
-	(*(void (**)(void))(*(_DWORD *)(dword_106E8A18 + 44) + 36))();
-#endif // WII U DECOMP
-
-
-#ifndef _FINAL_BUILD
-#ifndef _DEBUG
-	#pragma message(__LOC__"Need to define the _FINAL_BUILD before submission")
-#endif
-#endif
-
-
-
-#if 0
-
-	DWORD initData=0;
-	// Set the default sound levels
-	pMinecraft->options->set(Options::Option::MUSIC,1.0f);
-	pMinecraft->options->set(Options::Option::SOUND,1.0f);
-
-	app.NavigateToScene(XUSER_INDEX_ANY,eUIScene_Intro,&initData);
-#endif
-
-
-
-	//LeaderboardManager::Instance()->OpenSession();
-	//LeaderboardManager::Instance()->ReadStats_TopRank(DebugReadListener::m_instance, 0, LeaderboardManager::eStatsType_Travelling, 1, 1);
-
-	g_NetworkManager.Initialise();
-	g_NetworkManager.SetLocalGame(true);
-
-	while( true )
-	{
-// nintendo sdk bullshit
-#ifdef 0
-		EnterCriticalSection(&unk_10709BEC);
-    LeaveCriticalSection(&unk_10709BEC);
-    if ( byte_1047B9AC )
-      break;
-    v26 = ProcUIProcessMessages(1);
-    if ( v26 == 3 )
-    {
-      CMinecraftApp::DebugPrintf(&app, ">>! PROCUI_STATUS_EXIT\n");
-      v27 = C4JRender::WiiUWaitDrawDone(&unk_1072C506);
-      ProcUIShutdown(v27);
-      result = 0;
-      goto LABEL_66;
-    }
-    if ( v26 == 2 )
-    {
-      v29 = CMinecraftApp::DebugPrintf(&app, ">>! PROCUI_STATUS_RELEASING\n");
-      v30 = ReleaseCallback__22NintendoVoiceChat_WiiUSFv(v29);
-      ProcUIDrawDoneRelease(v30);
-    }
-#endif // WII U DECOMP
-		RenderManager.StartFrame();
-		app.UpdateTime();
-		PIXBeginNamedEvent(0,"Input manager tick");
-		InputManager.Tick();
-		PIXEndNamedEvent();
-// I think the lines under me is related to the gamepad, which is
-// so important that it was one of the Wii U's selling point.
-// We should look into it when we do 4JLibs Wii U.
-#ifdef 0
-		IsPadDRCController = InputManager.IsPadDRCController(4);
-		if ( IsPadDRCController != (unsigned __int8)byte_1047B988 )
-		{
-			if ( IsPadDRCController )
-			{
-				if ( byte_106E9491 )
-					byte_106E9492 = 1;
-			}
-			else
-			{
-				byte_106E9492 = 0;
-			}
-			byte_1047B988 = IsPadDRCController;
-		}
-#endif // WII U DECOMP
-		PIXBeginNamedEvent(0,"Profile manager tick");
-		ProfileManager.Tick();
-		PIXEndNamedEvent();
-		PIXBeginNamedEvent(0,"Storage manager tick");
-		StorageManager.Tick();
-		PIXEndNamedEvent();
-		PIXBeginNamedEvent(0,"Render manager tick");
-		RenderManager.Tick();
-		PIXEndNamedEvent();
-
-
-		// Tick the social networking manager.
-		PIXBeginNamedEvent(0,"Social network manager tick");
-//		CSocialManager::Instance()->Tick();
-		PIXEndNamedEvent();
-		
-		// Tick sentient.
-		PIXBeginNamedEvent(0,"Sentient tick");
-		MemSect(37);
-//		SentientManager.Tick();
-		MemSect(0);
-		PIXEndNamedEvent();
-
-		PIXBeginNamedEvent(0,"Network manager do work #1");
-		g_NetworkManager.DoWork();
-		PIXEndNamedEvent();
-#ifdef 0
-		if ( byte_106E9492
-			|| byte_106E9491
-			|| !CGameNetworkManager::IsInGameplay(&unk_104C0E34)
-			|| !byte_106E9493
-			|| CMinecraftApp::GetLocalPlayerCount(&app) != 1 )
-		{
-			v32 = 119;
-			dword_1047B98C = 119;
-			goto LABEL_37;
-		}
-		if ( dword_1047B98C )
-		{
-			v32 = --dword_1047B98C;
-	LABEL_37:
-		if ( v32 )
-			goto LABEL_39;
-		}
-		byte_106E9491 = 1;
-LABEL_39:
-		(*(void (**)(void))(*(_DWORD *)(dword_106E8A18 + 44) + 28))();
-#endif // WII U DECOMP
-		// 4J-PB - these get set every tick causing the write profile flag to be true all the time - 
-// 		app.SetGameSettingsDebugMask(0,eDebugSetting_LoadSavesFromDisk);
-// 		app.SetGameSettingsDebugMask(0,eDebugSetting_WriteSavesToDisk);
-// 		app.SetLoadSavesFromFolderEnabled(true);
-// 		app.SetWriteSavesToFolderEnabled(true);
-		
-		//LeaderboardManager::Instance()->Tick();
-		// Render game graphics.
-		if(app.GetGameStarted()) 
-		{
-
-// 			if(InputManager.ButtonPressed(0, MINECRAFT_ACTION_SNEAK_TOGGLE))
-// 			{
-// 				app.DebugPrintf("saving game...\n");
-// 				debugSaveGameDirect();
-// 
-// 			}
-			pMinecraft->run_middle();
-			app.SetAppPaused( g_NetworkManager.IsLocalGame() && g_NetworkManager.GetPlayerCount() == 1 && ui.IsPauseMenuDisplayed(ProfileManager.GetPrimaryPad()) );
-		}
-		else
-		{
-			MemSect(28);
-			pMinecraft->soundEngine->tick(NULL, 0.0f);
-			MemSect(0);
-			pMinecraft->textures->tick(true,false);
-			IntCache::Reset();
-			if( app.GetReallyChangingSessionType() )
-			{
-				pMinecraft->tickAllConnections();		// Added to stop timing out when we are waiting after converting to an offline game
-			}
-		}
-
-		pMinecraft->soundEngine->playMusicTick();
-
-#ifdef MEMORY_TRACKING
-		static bool bResetMemTrack = false;
-		static bool bDumpMemTrack = false;
-
-		MemPixStuff();
-
-		if( bResetMemTrack )
-		{
-			ResetMem();
-			MEMORYSTATUS memStat;
-			GlobalMemoryStatus(&memStat);
-			printf("RESETMEM: Avail. phys %d\n",memStat.dwAvailPhys/(1024*1024));
-			bResetMemTrack = false;
-		}
-
-		if( bDumpMemTrack )
-		{
-			DumpMem();
-			bDumpMemTrack = false;
-			MEMORYSTATUS memStat;
-			GlobalMemoryStatus(&memStat);
-			printf("DUMPMEM: Avail. phys %d\n",memStat.dwAvailPhys/(1024*1024));
-			printf("Renderer used: %d\n",RenderManager.CBuffSize(-1));
-		}
-#endif
-#if 0
-		static bool bDumpTextureUsage = false;
-		if( bDumpTextureUsage )
-		{
-			RenderManager.TextureGetStats();
-			bDumpTextureUsage = false;
-		}
-#endif
-		ui.tick();
-		ui.render();
-
-		// Present the frame.
-		PIXBeginNamedEvent(0,"Frame present");
-		RenderManager.Present();
-		PIXEndNamedEvent();
-
-		RenderManager.Set_matrixDirty();
-
-		ui.CheckMenuDisplayed();
-		PIXBeginNamedEvent(0,"Profile load check");
-		// has the game defined profile data been changed (by a profile load)
-		if(app.uiGameDefinedDataChangedBitmask!=0)
-		{
-			void *pData;
-			for(int i=0;i<XUSER_MAX_COUNT;i++)
-			{
-				if(app.uiGameDefinedDataChangedBitmask&(1<<i))
-				{
-					// It has - game needs to update its values with the data from the profile
-					pData=StorageManager.GetGameDefinedProfileData(i);
-					// reset the changed flag
-					app.ClearGameSettingsChangedFlag(i);
-					app.DebugPrintf("***  - APPLYING GAME SETTINGS CHANGE for pad %d\n",i);
-					app.ApplyGameSettingsChanged(i);
-
-#ifdef _DEBUG_MENUS_ENABLED
-					if(app.DebugSettingsOn())
-					{
-						app.ActionDebugMask(i);		
-					}
-					else
-					{
-						// force debug mask off
-						app.ActionDebugMask(i,true);
-					}
-#endif
-					// clear the stats first - there could have beena signout and sign back in in the menus
-					// need to clear the player stats - can't assume it'll be done in setlevel - we may not be in the game
-					pMinecraft->stats[ i ]->clear();
-					pMinecraft->stats[i]->parse(pData);
-				}
-			}
-
-			// Check to see if we can post to social networks.
-
-			// clear the flag
-			app.uiGameDefinedDataChangedBitmask=0;
-
-			// Check if any profile write are needed
-			//app.CheckGameSettingsChanged();
-		}
-		PIXEndNamedEvent();
-
-#if 0
-		app.TickDLCOffersRetrieved();
-		app.TickTMSPPFilesRetrieved();
-#endif
-
-		PIXBeginNamedEvent(0,"Network manager do work #2");
-		g_NetworkManager.DoWork();
-		PIXEndNamedEvent();
-
-#if 0
-		PIXBeginNamedEvent(0,"Misc extra xui");
-		// Update XUI Timers
-		hr = XuiTimersRun();
-#endif
-		// Any threading type things to deal with from the xui side?
-		app.HandleXuiActions();
-
-#if 0
-		PIXEndNamedEvent();
-#endif
-
-		// 4J-PB - Update the trial timer display if we are in the trial version
-		if(!ProfileManager.IsFullVersion())
-		{
-			// display the trial timer
-			if(app.GetGameStarted()) 
-			{
-				// 4J-PB - if the game is paused, add the elapsed time to the trial timer count so it doesn't tick down
-				if(app.IsAppPaused())
-				{
-					app.UpdateTrialPausedTimer();
-				}
-				ui.UpdateTrialTimer(ProfileManager.GetPrimaryPad());
-			}
-		}
-		else
-		{
-			// need to turn off the trial timer if it was on , and we've unlocked the full version
-			if(bTrialTimerDisplayed)
-			{
-				ui.ShowTrialTimer(false);
-				bTrialTimerDisplayed=false;
-			}
-		}
-
-		// PS3 DLC
-		app.CommerceTick();
-
-		// Fix for #7318 - Title crashes after short soak in the leaderboards menu
-		// A memory leak was caused because the icon renderer kept creating new Vec3's because the pool wasn't reset
-		Vec3::resetPool();
-	}
-
-	// Free resources, unregister custom classes, and exit.
-//	app.Uninit();
-// 	g_pd3dDevice->Release();
-}

Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp

@@ -9,9 +9,7 @@ const wstring LeaderboardManager::filterNames[eNumFilterModes] =
 		L"Friends", L"MyScore", L"TopRank"
 	};
 
-#if !defined(_WINDOWS64) && !defined(_DURANGO) && !defined(__ORBIS__) && !defined(__PS3__) && !defined(__PSVITA__) && !defined(_XBOX)
 LeaderboardManager *LeaderboardManager::m_instance = NULL;
-#endif
 
 void LeaderboardManager::DeleteInstance()
 {

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::wool_Id,  0); // fixed (+ach 'Rainbow Collection')
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  1);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  1);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  2);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  2);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  3);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  3);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  4);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  4);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  5);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  5);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  6);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  6);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  7);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  7);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  8);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  8);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id,  9);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id,  9);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 10);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 10);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 11);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 11);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 12);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 12);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 13);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 13);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 14);
+	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::wool_Id, 14);
-	sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup,	Tile::cloth_Id, 15);
+	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( 1, Tile::stone_Id );
-	sp->addArgs( 2, Tile::rock_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);
+        EntityRenderer::bindTexture(mob);
-		ResourceLocation *location = getTextureLocation(mob);
+        model->render(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale, true);
-
+		// Ensure that any extra layers of texturing are disabled after rendering this horse
-		// 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);
-		}
-
 		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>
@@ -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>
@@ -4971,8 +5013,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     <ClInclude Include="BubbleParticle.h" />
     <ClInclude Include="BufferedImage.h" />
     <ClInclude Include="Button.h" />
-    <ClInclude Include="Cafe\WiiU_App.h" />
-    <ClInclude Include="Cafe\WiiU_Minecraft.h" />
     <ClInclude Include="Camera.h" />
     <ClInclude Include="CaveSpiderRenderer.h" />
     <ClInclude Include="ChatScreen.h" />
@@ -12916,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>
@@ -13456,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>
@@ -13771,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>
@@ -14356,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>
@@ -15076,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>
@@ -15121,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>
@@ -15166,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">
+    <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\RecordPlayerTile_SPU.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Win32'">true</ExcludedFromBuild>
@@ -15391,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>
@@ -16471,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>
@@ -25117,8 +25121,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     <ClCompile Include="BubbleParticle.cpp" />
     <ClCompile Include="BufferedImage.cpp" />
     <ClCompile Include="Button.cpp" />
-    <ClCompile Include="Cafe\WiiU_App.cpp" />
-    <ClCompile Include="Cafe\WiiU_Minecraft.cpp" />
     <ClCompile Include="Camera.cpp" />
     <ClCompile Include="CaveSpiderRenderer.cpp" />
     <ClCompile Include="ChatScreen.cpp" />
@@ -32341,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>
@@ -34012,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>

Minecraft.Client/Minecraft.Client.vcxproj.filters

@@ -726,9 +726,6 @@
     <Filter Include="net\minecraft\client\resources">
       <UniqueIdentifier>{889a84db-3009-4a7c-8234-4bf93d412690}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Cafe">
-      <UniqueIdentifier>{0956a505-3070-4d85-b25b-8731cee48587}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
@@ -2668,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>
@@ -3778,11 +3769,35 @@
     <ClInclude Include="PSVita\OldSdk.h">
       <Filter>PSVita</Filter>
     </ClInclude>
-    <ClInclude Include="Cafe\WiiU_App.h">
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\BaseRailTile_SPU.h">
-      <Filter>Cafe</Filter>
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
     </ClInclude>
-    <ClInclude Include="Cafe\WiiU_Minecraft.h">
+    <ClInclude Include="PS3\SPU_Tasks\ChunkUpdate\RailTile_SPU.h">
-      <Filter>Cafe</Filter>
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
+    </ClInclude>
+    <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>
@@ -5010,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>
@@ -5928,11 +5940,8 @@
     <ClCompile Include="PSVita\OldSdk.cpp">
       <Filter>PSVita</Filter>
     </ClCompile>
-    <ClCompile Include="Cafe\WiiU_App.cpp">
+    <ClCompile Include="PS3\SPU_Tasks\ChunkUpdate\BasePressurePlateTile_SPU.cpp">
-      <Filter>Cafe</Filter>
+      <Filter>PS3\ChunkRebuild_SPU</Filter>
-    </ClCompile>
-    <ClCompile Include="Cafe\WiiU_Minecraft.cpp">
-      <Filter>Cafe</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>

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,7 +116,7 @@ void Options::init()
     bobView = true;
     anaglyph3d = false;
     advancedOpengl = false;
-    framerateLimit = 0;
+    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 LeaderboardManager
-
-class OrbisLeaderboardManager : public SonyLeaderboardManager
 {
+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
+		int type = 0; // hugemushroom_brown_Id
-		if(id == hugeMushroom2_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 BasePressurePlateTile_SPU
-class PressurePlateTile_SPU : public Tile_SPU
 {
 public:
-    enum Sensitivity
+	enum Sensitivity
 	{
-        everything,
+		everything, mobs, players
-		mobs,
+	};
-		players
-    };
 
-	PressurePlateTile_SPU(int id) : Tile_SPU(id) {}
+private:
-    virtual bool isSolidRender(bool isServerLevel = false);
+	Sensitivity sensitivity;
-    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
+public:
-    virtual void updateDefaultShape();
+	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;
+	RailTile_SPU(int id) : BaseRailTile_SPU(id) {}
-	static const int RAIL_DIRECTION_MASK = 7;
 
-	RailTile_SPU(int id) : Tile_SPU(id) {}
+	Icon_SPU *getTexture(int face, int data)
-    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 >= 6)
-		if (data >= 2 && data <= 5)
 		{
-			setShape(0, 0, 0, 1, 2 / 16.0f + 0.5f, 1);
+			return &ms_pTileData->railTile_iconTurn;
-		} else
-		{
-			setShape(0, 0, 0, 1, 2 / 16.0f, 1);
 		}
-	}
+		else
-    virtual Icon_SPU *getTexture(int face, int data)
-	{
-		bool usesDataBit = false;
-		Icon_SPU* iconTurn = &ms_pTileData->railTile_iconTurn;
-		if(id == goldenRail_Id)
 		{
-			usesDataBit = true;
+			return icon();
-			iconTurn = &ms_pTileData->railTile_iconTurnGolden;
 		}
-
+	};
-		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(redstoneTorch_off_Id, TorchTile_SPU); // TorchTile->NotGateTile
-	CREATE_TILE_TYPE(notGate_on_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(mushroom_brown_Id, Mushroom_SPU);
-	CREATE_TILE_TYPE(mushroom2_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(hugeMushroom_brown_Id, HugeMushroomTile_SPU);
-	CREATE_TILE_TYPE(hugeMushroom2_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.
+	// these tile types don't have any additional code that we need.
-	CREATE_TILE_TYPE(stoneBrick_Id, Tile_SPU);		// Tile
+	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(netherRack_Id, Tile_SPU);		// NetherrackTile
-	CREATE_TILE_TYPE(hellSand_Id, Tile_SPU);		// HellSandTile
+	CREATE_TILE_TYPE(soulsand_Id, Tile_SPU);		// SoulSandTile
-	CREATE_TILE_TYPE(lightGem_Id, Tile_SPU);		// LightGemTile
+	CREATE_TILE_TYPE(glowstone_Id, Tile_SPU);		// Glowstonetile
-	CREATE_TILE_TYPE(aprilFoolsJoke_Id, Tile_SPU); // LockedChestTile
+	// 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 mushroom_brown_Id = 39;
-	static const int mushroom2_Id = 40;
+	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 redstoneTorch_off_Id = 75;
-	static const int notGate_on_Id = 76;
+	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 netherRack_Id = 87;
-	static const int hellSand_Id = 88;
+	static const int soulsand_Id = 88;
-	static const int lightGem_Id = 89;
+	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 stoneBrick_Id = 98;
-	static const int hugeMushroom1_Id = 99;
+	static const int hugeMushroom_brown_Id = 99;
-	static const int hugeMushroom2_Id = 100;
+	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) {}
+	TreeTile_SPU(int id) : RotatedPillarTile_SPU(id) {}
-	int getRenderShape() {	return Tile_SPU::SHAPE_TREE; }
-
 
 public:
-	Icon_SPU *getTexture(int face, int data)
+	Icon_SPU *getTypeTexture(int type) {
-	{
-		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];
-		}
-
 		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/Textures.cpp

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

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;

Minecraft.World/MinecartTNT.cpp

@@ -77,7 +77,7 @@ void MinecartTNT::destroy(DamageSource *source)
 
 void MinecartTNT::explode(double speedSqr)
 {
-	if (!level->isClientSide && app.GetGameHostOption(eGameHostOption_TNT))
+	if (!level->isClientSide)
 	{
 		double speed = sqrt(speedSqr);
 		if (speed > 5) speed = 5;
@@ -121,7 +121,7 @@ void MinecartTNT::primeFuse()
 {
 	fuse = 80;
 
-	if (!level->isClientSide && app.GetGameHostOption(eGameHostOption_TNT))
+	if (!level->isClientSide)
 	{
 		level->broadcastEntityEvent(shared_from_this(), EVENT_PRIME);
 		level->playEntitySound(shared_from_this(), eSoundType_RANDOM_FUSE, 1, 1.0f);

Minecraft.World/Minecraft.World.vcxproj

@@ -1124,7 +1124,7 @@
       <ExceptionHandling>Sync</ExceptionHandling>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CallAttributedProfiling>Disabled</CallAttributedProfiling>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>

Minecraft.World/NoteBlockTile.cpp

@@ -79,7 +79,7 @@ bool NoteBlockTile::triggerEvent(Level *level, int x, int y, int z, int i, int n
 		break;
 	}
 	app.DebugPrintf("NoteBlockTile::triggerEvent - playSound - pitch = %f\n",pitch);
-	level->playSound(x + 0.5, y + 0.5, z + 0.5, iSound, 3, pitch, 64.0);
+	level->playSound(x + 0.5, y + 0.5, z + 0.5, iSound, 3, pitch);
 	level->addParticle(eParticleType_note, x + 0.5, y + 1.2, z + 0.5, note / 24.0, 0, 0);
 
 	return true;

Minecraft.World/PistonBaseTile.cpp

@@ -218,12 +218,10 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
 		if (extend && param1 == TRIGGER_CONTRACT)
 		{
 			level->setData(x, y, z, facing | EXTENDED_BIT, UPDATE_CLIENTS);
-			ignoreUpdate(false);
 			return false;
 		}
 		else if (!extend && param1 == TRIGGER_EXTEND)
 		{
-			ignoreUpdate(false);
 			return false;
 		}
 	}
@@ -249,7 +247,6 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
 		}
 		else
 		{
-			ignoreUpdate(false);
 			return false;
 		}
 		PIXEndNamedEvent();
@@ -343,12 +340,6 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
 
 	ignoreUpdate(false);
 
-	level->updateNeighborsAt(x, y, z, id);
-	int stepX = x + Facing::STEP_X[facing];
-	int stepY = y + Facing::STEP_Y[facing];
-	int stepZ = z + Facing::STEP_Z[facing];
-	level->updateNeighborsAt(stepX, stepY, stepZ, id);
-
 	return true;
 }
 

Minecraft.World/StemTile.cpp

@@ -189,10 +189,7 @@ void StemTile::spawnResources(Level *level, int x, int y, int z, int data, float
 	if (fruit == Tile::melon) seed = Item::seeds_melon;
 	for (int i = 0; i < 3; i++)
 	{
-		if (level->random->nextInt(15) <= data)
+		popResource(level, x, y, z, shared_ptr<ItemInstance>(new ItemInstance(seed)));
-		{
-			popResource(level, x, y, z, shared_ptr<ItemInstance>(new ItemInstance(seed)));
-		}
 	}
 }
 

README.md

@@ -1,19 +1,19 @@
-# Project Cafeberry
+# Acacia Log
-Cafeberry is a project aiming to update the December 17th 2014 codebase (mostly) via decompilation, with a focus on consoles.
+This project is a modified version of the December 17th 2014 Codebase, aimed at backporting the newer title updates back to the codebase, with cross-play across all platfoms (including PC).
-
-[![Discord](https://img.shields.io/badge/Discord-Join%20Server-5865F2?logo=discord&logoColor=white)](https://discord.gg/aPAF5WFaW)
 
 # Status
-| Platform       | Development Status    | Known Issues                                                              |
+| Platform | Development Status    | Known Issues                                                              |
-| :------------- | :-------------------- | :------------------------------------------------------------------------ |
+| :------- | :-------------------- | :------------------------------------------------------------------------ |
-| PS3            | Active                | SPU variants for TU19 blocks are missing, needs to be further optimized.  |
+| PS3      | Active                | All TU19 blocks display as stone blocks when placed (missing SPU code).   |
-| Xbox 360       | On hold               | Havent tested, should work?                                               |
+| Xbox 360 | Likely cancelled      | Missing XUI files for GUIs added in TU25+. See notes.                     |
-| PS4            | Active                | Only Buildable on Windows 7 With 1.70 SDK. See Notes                      |
+| PS4      | Active                | Only Buildable on Windows 7 With 1.70 SDK. See Notes                      |
-| Xbox One       | On hold               | Needs to be re-coded to run on Developer Mode UWP instead.                |
+| Xbox One | On hold               | Needs to be re-coded to run on Developer Mode UWP instead.                |
-| PS Vita        | On hold               | Fails during compilation due to missing network library dependencies.     |
+| PS Vita  | On hold               | Fails during compilation due to missing network library dependencies.     |
-| Wii U & Switch | Work in progress      | UI System (ImXui) is still in progress, need to decompile the rest.       |
 
 **Notes:**
+- **Xbox 360:** TU25 and newer TUs include new GUIs, but we lack the XUI files for them, solutions:
+  1. Recreate the GUIs from scratch using the XUI designer (insanely difficult to get accurate to actual LCE)
+
 - **PS4:** Can't be built on Windows 10+ because the 1.70 SDK only supports Windows 7, solutions:
   1. Attempt to add support for 4.50 SDK (difficult or unlikely to work)
   2. Getting the 1.70 SDK on Windows 10+ (annoying to do)