Merge branch 'smartcmd:main' into main

135 files changed, 5111 insertions, 2784 deletions

diff --git a/Minecraft.Client/Common/UI/IUIController.h b/Minecraft.Client/Common/UI/IUIController.h
index 3040c2cc..35a808c5 100644
--- a/Minecraft.Client/Common/UI/IUIController.h
+++ b/Minecraft.Client/Common/UI/IUIController.h
@@ -12,7 +12,7 @@ public:
 	virtual void StartReloadSkinThread() = 0;
 	virtual bool IsReloadingSkin() = 0;
 	virtual void CleanUpSkinReload() = 0;
-	virtual bool NavigateToScene(int iPad, EUIScene scene, void *initData = NULL, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD) = 0;
+	virtual bool NavigateToScene(int iPad, EUIScene scene, void *initData = nullptr, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD) = 0;
 	virtual bool NavigateBack(int iPad, bool forceUsePad = false, EUIScene eScene = eUIScene_COUNT, EUILayer eLayer = eUILayer_COUNT) = 0;
 	virtual void CloseUIScenes(int iPad, bool forceIPad = false) = 0;
 	virtual void CloseAllPlayersScenes() = 0;
diff --git a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
index 88258421..7502d6bf 100644
--- a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
@@ -2,6 +2,7 @@
 
 #include "IUIScene_AbstractContainerMenu.h"
 
+#include "UI.h"
 #include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 #include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 #include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h"
@@ -21,9 +22,9 @@ SavedInventoryCursorPos g_savedInventoryCursorPos = { 0.0f, 0.0f, false };
 
 IUIScene_AbstractContainerMenu::IUIScene_AbstractContainerMenu()
 {
-	m_menu = NULL;
+	m_menu = nullptr;
 	m_autoDeleteMenu = false;
-	m_lastPointerLabelSlot = NULL;
+	m_lastPointerLabelSlot = nullptr;
 
 	m_pointerPos.x = 0.0f;
 	m_pointerPos.y = 0.0f;
@@ -41,7 +42,7 @@ IUIScene_AbstractContainerMenu::~IUIScene_AbstractContainerMenu()
 
 void IUIScene_AbstractContainerMenu::Initialize(int iPad, AbstractContainerMenu* menu, bool autoDeleteMenu, int startIndex,ESceneSection firstSection,ESceneSection maxSection, bool bNavigateBack)
 {
-	assert( menu != NULL );
+	assert( menu != nullptr );
 
 	m_menu = menu;
 	m_autoDeleteMenu = autoDeleteMenu;
@@ -267,10 +268,10 @@ void IUIScene_AbstractContainerMenu::UpdateTooltips()
 void IUIScene_AbstractContainerMenu::onMouseTick()
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[getPad()] != NULL)
+	if( pMinecraft->localgameModes[getPad()] != nullptr)
 	{
 		Tutorial *tutorial = pMinecraft->localgameModes[getPad()]->getTutorial();
-		if(tutorial != NULL)
+		if(tutorial != nullptr)
 		{
 			if(ui.IsTutorialVisible(getPad()) && !tutorial->isInputAllowed(ACTION_MENU_UP))
 			{
@@ -296,8 +297,8 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 	int iPad = getPad();
 
 	bool bStickInput = false;
-	float fInputX = InputManager.GetJoypadStick_LX( iPad, false )*((float)app.GetGameSettings(iPad,eGameSetting_Sensitivity_InMenu)/100.0f); // apply the sensitivity
-	float fInputY = InputManager.GetJoypadStick_LY( iPad, false )*((float)app.GetGameSettings(iPad,eGameSetting_Sensitivity_InMenu)/100.0f); // apply the sensitivity
+	float fInputX = InputManager.GetJoypadStick_LX( iPad, false )*(static_cast<float>(app.GetGameSettings(iPad, eGameSetting_Sensitivity_InMenu))/100.0f); // apply the sensitivity
+	float fInputY = InputManager.GetJoypadStick_LY( iPad, false )*(static_cast<float>(app.GetGameSettings(iPad, eGameSetting_Sensitivity_InMenu))/100.0f); // apply the sensitivity
 
 #ifdef __ORBIS__
 	// should have sensitivity for the touchpad
@@ -406,7 +407,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 		if ( m_iConsectiveInputTicks < MAX_INPUT_TICKS_FOR_SCALING )
 		{
 			++m_iConsectiveInputTicks;
-			fInputScale = ( (float)( m_iConsectiveInputTicks) / (float)(MAX_INPUT_TICKS_FOR_SCALING) );
+			fInputScale = ( static_cast<float>(m_iConsectiveInputTicks) / static_cast<float>((MAX_INPUT_TICKS_FOR_SCALING)) );
 		}
 #ifdef TAP_DETECTION
 		else if ( m_iConsectiveInputTicks < MAX_INPUT_TICKS_FOR_TAPPING )
@@ -481,25 +482,14 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 #endif
 
 #ifdef _WINDOWS64
-	if (!g_KBMInput.IsMouseGrabbed() && g_KBMInput.IsKBMActive())
+	if (iPad == 0 && !g_KBMInput.IsMouseGrabbed() && g_KBMInput.IsKBMActive())
 	{
 		int deltaX = g_KBMInput.GetMouseDeltaX();
 		int deltaY = g_KBMInput.GetMouseDeltaY();
-
-		extern HWND g_hWnd;
-		RECT rc;
-		GetClientRect(g_hWnd, &rc);
-		int winW = rc.right - rc.left;
-		int winH = rc.bottom - rc.top;
-
-		if (winW > 0 && winH > 0)
-		{
-			float scaleX = (float)getMovieWidth() / (float)winW;
-			float scaleY = (float)getMovieHeight() / (float)winH;
-
-			vPointerPos.x += (float)deltaX * scaleX;
-			vPointerPos.y += (float)deltaY * scaleY;
-		}
+		float scaleX, scaleY;
+		getMouseToSWFScale(scaleX, scaleY);
+		vPointerPos.x += static_cast<float>(deltaX) * scaleX;
+		vPointerPos.y += static_cast<float>(deltaY) * scaleY;
 
 		if (deltaX != 0 || deltaY != 0)
 		{
@@ -527,7 +517,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 		}
 		else if ( eSectionUnderPointer == eSectionNone )
 		{
-			ESceneSection eSection = ( ESceneSection )( iSection );
+			ESceneSection eSection = static_cast<ESceneSection>(iSection);
 
 			// Get position of this section.
 			UIVec2D sectionPos;
@@ -758,17 +748,17 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 	// What are we carrying on pointer.
 	shared_ptr<LocalPlayer> player = Minecraft::GetInstance()->localplayers[getPad()];
 	shared_ptr<ItemInstance> carriedItem = nullptr;
-	if(player != NULL) carriedItem = player->inventory->getCarried();
+	if(player != nullptr) carriedItem = player->inventory->getCarried();
 
 	shared_ptr<ItemInstance> slotItem = nullptr;
-	Slot *slot = NULL;
+	Slot *slot = nullptr;
 	int slotIndex = 0;
 	if(bPointerIsOverSlot)
 	{
 		slotIndex = iNewSlotIndex + getSectionStartOffset( eSectionUnderPointer );
 		slot = m_menu->getSlot(slotIndex);
 	}
-	bool bIsItemCarried = carriedItem != NULL;
+	bool bIsItemCarried = carriedItem != nullptr;
 	int iCarriedCount = 0;
 	bool bCarriedIsSameAsSlot = false;	// Indicates if same item is carried on pointer as is in slot under pointer.
 	if ( bIsItemCarried )
@@ -788,7 +778,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 	if ( bPointerIsOverSlot )
 	{
 		slotItem = slot->getItem();
-		bSlotHasItem = slotItem != NULL;
+		bSlotHasItem = slotItem != nullptr;
 		if ( bSlotHasItem )
 		{
 			iSlotCount = slotItem->GetCount();
@@ -829,13 +819,13 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 	{
 		vector<HtmlString> *desc = GetSectionHoverText(eSectionUnderPointer);
 		SetPointerText(desc, false);
-		m_lastPointerLabelSlot = NULL;
+		m_lastPointerLabelSlot = nullptr;
 		delete desc;
 	}
 	else
 	{
-		SetPointerText(NULL, false);
-		m_lastPointerLabelSlot = NULL;
+		SetPointerText(nullptr, false);
+		m_lastPointerLabelSlot = nullptr;
 	}
 
 	EToolTipItem buttonA, buttonX, buttonY, buttonRT, buttonBack;
@@ -1021,7 +1011,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 				// Get the info on this item.
 				shared_ptr<ItemInstance> item = getSlotItem(eSectionUnderPointer, iNewSlotIndex);
 				bool bValidFuel = FurnaceTileEntity::isFuel(item);
-				bool bValidIngredient = FurnaceRecipes::getInstance()->getResult(item->getItem()->id) != NULL;
+				bool bValidIngredient = FurnaceRecipes::getInstance()->getResult(item->getItem()->id) != nullptr;
 
 				if(bValidIngredient)
 				{
@@ -1036,7 +1026,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 						}
 						else
 						{
-							if(FurnaceRecipes::getInstance()->getResult(item->id)==NULL)
+							if(FurnaceRecipes::getInstance()->getResult(item->id)==nullptr)
 							{
 								buttonY = eToolTipQuickMove;
 							}
@@ -1076,7 +1066,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 								}
 								else
 								{
-									if(FurnaceRecipes::getInstance()->getResult(item->id)==NULL)
+									if(FurnaceRecipes::getInstance()->getResult(item->id)==nullptr)
 									{
 										buttonY = eToolTipQuickMove;
 									}
@@ -1308,10 +1298,8 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
 		}
 	}
 
-	vPointerPos.x = floor(vPointerPos.x);
-	vPointerPos.x += ( (int)vPointerPos.x%2);
-	vPointerPos.y = floor(vPointerPos.y);
-	vPointerPos.y += ( (int)vPointerPos.y%2);
+	vPointerPos.x = static_cast<float>(floor(vPointerPos.x + 0.5f));
+	vPointerPos.y = static_cast<float>(floor(vPointerPos.y + 0.5f));
 	m_pointerPos = vPointerPos;
 
 	adjustPointerForSafeZone();
@@ -1322,10 +1310,10 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 	bool bHandled = false;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[getPad()] != NULL )
+	if( pMinecraft->localgameModes[getPad()] != nullptr )
 	{
 		Tutorial *tutorial = pMinecraft->localgameModes[getPad()]->getTutorial();
-		if(tutorial != NULL)
+		if(tutorial != nullptr)
 		{
 			tutorial->handleUIInput(iAction);
 			if(ui.IsTutorialVisible(getPad()) && !tutorial->isInputAllowed(iAction))
@@ -1379,8 +1367,8 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 					{
 						int currentIndex = getCurrentIndex(m_eCurrSection) - getSectionStartOffset(m_eCurrSection);
 
-						bool bSlotHasItem = !isSlotEmpty(m_eCurrSection, currentIndex);
-						if (bSlotHasItem)
+						bool bcanPlaySound = !isSlotEmpty(m_eCurrSection, currentIndex);
+						if (bcanPlaySound)
 							ui.PlayUISFX(eSFX_Press);
 					}
 				}
@@ -1390,8 +1378,8 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 				{
 					int currentIndex = getCurrentIndex(m_eCurrSection) - getSectionStartOffset(m_eCurrSection);
 
-					bool bSlotHasItem = !isSlotEmpty(m_eCurrSection, currentIndex);
-					if (bSlotHasItem)
+					bool bcanPlaySound = !isSlotEmpty(m_eCurrSection, currentIndex);
+					if (bcanPlaySound)
 						ui.PlayUISFX(eSFX_Press);
 				}
 				//
@@ -1486,12 +1474,26 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 		}
 		break;
 	case ACTION_MENU_UP:
+#ifdef _WINDOWS64
+		if (g_KBMInput.WasMouseWheelConsumed())
+		{
+			handleAdditionalKeyPress(ACTION_MENU_OTHER_STICK_UP);
+			break;
+		}
+#endif
 		{
 			//ui.PlayUISFX(eSFX_Focus);
 			m_eCurrTapState = eTapStateUp;
 		}
 		break;
 	case ACTION_MENU_DOWN:
+#ifdef _WINDOWS64
+		if (g_KBMInput.WasMouseWheelConsumed())
+		{
+			handleAdditionalKeyPress(ACTION_MENU_OTHER_STICK_DOWN);
+			break;
+		}
+#endif
 		{
 			//ui.PlayUISFX(eSFX_Focus);
 			m_eCurrTapState = eTapStateDown;
@@ -1513,20 +1515,20 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 				if ( bSlotHasItem )
 				{
 					shared_ptr<ItemInstance> item = getSlotItem(m_eCurrSection, currentIndex);
-					if( Minecraft::GetInstance()->localgameModes[iPad] != NULL )
+					if( Minecraft::GetInstance()->localgameModes[iPad] != nullptr )
 					{
 						Tutorial::PopupMessageDetails *message = new Tutorial::PopupMessageDetails;
 						message->m_messageId = item->getUseDescriptionId();
 
-						if(Item::items[item->id] != NULL) message->m_titleString = Item::items[item->id]->getHoverName(item);
+						if(Item::items[item->id] != nullptr) message->m_titleString = Item::items[item->id]->getHoverName(item);
 						message->m_titleId = item->getDescriptionId();
 
 						message->m_icon = item->id;
 						message->m_iAuxVal = item->getAuxValue();
 						message->m_forceDisplay = true;
 
-						TutorialMode *gameMode = (TutorialMode *)Minecraft::GetInstance()->localgameModes[iPad];
-						gameMode->getTutorial()->setMessage(NULL, message);
+						TutorialMode *gameMode = static_cast<TutorialMode *>(Minecraft::GetInstance()->localgameModes[iPad]);
+						gameMode->getTutorial()->setMessage(nullptr, message);
 						ui.PlayUISFX(eSFX_Press);
 					}
 				}
@@ -1628,7 +1630,7 @@ void IUIScene_AbstractContainerMenu::handleSlotListClicked(ESceneSection eSectio
 void IUIScene_AbstractContainerMenu::slotClicked(int slotId, int buttonNum, bool quickKey)
 {
 	// 4J Stu - Removed this line as unused
-	//if (slot != NULL) slotId = slot->index;
+	//if (slot != nullptr) slotId = slot->index;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	pMinecraft->localgameModes[getPad()]->handleInventoryMouseClick(m_menu->containerId, slotId, buttonNum, quickKey, pMinecraft->localplayers[getPad()] );
@@ -1645,7 +1647,7 @@ int IUIScene_AbstractContainerMenu::getCurrentIndex(ESceneSection eSection)
 
 bool IUIScene_AbstractContainerMenu::IsSameItemAs(shared_ptr<ItemInstance> itemA, shared_ptr<ItemInstance> itemB)
 {
-	if(itemA == NULL || itemB == NULL) return false;
+	if(itemA == nullptr || itemB == nullptr) return false;
 
 	return (itemA->id == itemB->id && (!itemB->isStackedByData() || itemB->getAuxValue() == itemA->getAuxValue()) && ItemInstance::tagMatches(itemB, itemA) );
 }
@@ -1654,7 +1656,7 @@ int IUIScene_AbstractContainerMenu::GetEmptyStackSpace(Slot *slot)
 {
 	int iResult = 0;
 
-	if(slot != NULL && slot->hasItem())
+	if(slot != nullptr && slot->hasItem())
 	{
 		shared_ptr<ItemInstance> item = slot->getItem();
 		if ( item->isStackable() )
@@ -1673,7 +1675,7 @@ int IUIScene_AbstractContainerMenu::GetEmptyStackSpace(Slot *slot)
 
 vector<HtmlString> *IUIScene_AbstractContainerMenu::GetItemDescription(Slot *slot)
 {
-	if(slot == NULL) return NULL;
+	if(slot == nullptr) return nullptr;
 
 	vector<HtmlString> *lines = slot->getItem()->getHoverText(nullptr, false);
 
@@ -1693,5 +1695,5 @@ vector<HtmlString> *IUIScene_AbstractContainerMenu::GetItemDescription(Slot *slo
 
 vector<HtmlString> *IUIScene_AbstractContainerMenu::GetSectionHoverText(ESceneSection eSection)
 {
-	return NULL;
+	return nullptr;
 }
diff --git a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.h b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.h
index 4877cfce..718a2d44 100644
--- a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.h
@@ -277,4 +277,5 @@ public:
 	virtual int getPad() = 0;
 	virtual int getMovieWidth() = 0;
 	virtual int getMovieHeight() = 0;
+	virtual void getMouseToSWFScale(float &scaleX, float &scaleY) = 0;
 };
diff --git a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
index 10d1bcc4..1e6fa6fa 100644
--- a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
@@ -10,7 +10,7 @@
 IUIScene_AnvilMenu::IUIScene_AnvilMenu()
 {
 	m_inventory = nullptr;
-	m_repairMenu = NULL;
+	m_repairMenu = nullptr;
 	m_itemName = L"";
 }
 
@@ -231,7 +231,7 @@ void IUIScene_AnvilMenu::handleTick()
 void IUIScene_AnvilMenu::updateItemName()
 {
 	Slot *slot = m_repairMenu->getSlot(AnvilMenu::INPUT_SLOT);
-	if (slot != NULL && slot->hasItem())
+	if (slot != nullptr && slot->hasItem())
 	{
 		if (!slot->getItem()->hasCustomHoverName() && m_itemName.compare(slot->getItem()->getHoverName())==0)
 		{
@@ -245,7 +245,7 @@ void IUIScene_AnvilMenu::updateItemName()
 	ByteArrayOutputStream baos;
 	DataOutputStream dos(&baos);
 	dos.writeUTF(m_itemName);
-	Minecraft::GetInstance()->localplayers[getPad()]->connection->send(shared_ptr<CustomPayloadPacket>(new CustomPayloadPacket(CustomPayloadPacket::SET_ITEM_NAME_PACKET, baos.toByteArray())));
+	Minecraft::GetInstance()->localplayers[getPad()]->connection->send(std::make_shared<CustomPayloadPacket>(CustomPayloadPacket::SET_ITEM_NAME_PACKET, baos.toByteArray()));
 }
 
 void IUIScene_AnvilMenu::refreshContainer(AbstractContainerMenu *container, vector<shared_ptr<ItemInstance> > *items)
@@ -257,10 +257,10 @@ void IUIScene_AnvilMenu::slotChanged(AbstractContainerMenu *container, int slotI
 {
 	if (slotIndex == AnvilMenu::INPUT_SLOT)
 	{
-		m_itemName = item == NULL ? L"" : item->getHoverName();
+		m_itemName = item == nullptr ? L"" : item->getHoverName();
 		setEditNameValue(m_itemName);
-		setEditNameEditable(item != NULL);
-		if (item != NULL)
+		setEditNameEditable(item != nullptr);
+		if (item != nullptr)
 		{
 			updateItemName();
 		}
diff --git a/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp
index bb13deb8..3dede3d9 100644
--- a/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_BeaconMenu.cpp
@@ -216,13 +216,13 @@ void IUIScene_BeaconMenu::handleOtherClicked(int iPad, ESceneSection eSection, i
 	{
 	case eSectionBeaconConfirm:
 		{
-			if( (m_beacon->getItem(0) == NULL) || (m_beacon->getPrimaryPower() <= 0) ) return;
+			if( (m_beacon->getItem(0) == nullptr) || (m_beacon->getPrimaryPower() <= 0) ) return;
 			ByteArrayOutputStream baos;
 			DataOutputStream dos(&baos);
 			dos.writeInt(m_beacon->getPrimaryPower());
 			dos.writeInt(m_beacon->getSecondaryPower());
 
-			Minecraft::GetInstance()->localplayers[getPad()]->connection->send(shared_ptr<CustomPayloadPacket>(new CustomPayloadPacket(CustomPayloadPacket::SET_BEACON_PACKET, baos.toByteArray())));
+			Minecraft::GetInstance()->localplayers[getPad()]->connection->send(std::make_shared<CustomPayloadPacket>(CustomPayloadPacket::SET_BEACON_PACKET, baos.toByteArray()));
 
 			if (m_beacon->getPrimaryPower() > 0)
 			{
@@ -286,7 +286,7 @@ void IUIScene_BeaconMenu::handleTick()
 
 			for (int c = 0; c < count; c++)
 			{
-				if(BeaconTileEntity::BEACON_EFFECTS[tier][c] == NULL) continue;
+				if(BeaconTileEntity::BEACON_EFFECTS[tier][c] == nullptr) continue;
 
 				int effectId = BeaconTileEntity::BEACON_EFFECTS[tier][c]->id;
 				int icon = BeaconTileEntity::BEACON_EFFECTS[tier][c]->getIcon();
@@ -315,7 +315,7 @@ void IUIScene_BeaconMenu::handleTick()
 
 			for (int c = 0; c < count - 1; c++)
 			{
-				if(BeaconTileEntity::BEACON_EFFECTS[tier][c] == NULL) continue;
+				if(BeaconTileEntity::BEACON_EFFECTS[tier][c] == nullptr) continue;
 
 				int effectId = BeaconTileEntity::BEACON_EFFECTS[tier][c]->id;
 				int icon = BeaconTileEntity::BEACON_EFFECTS[tier][c]->getIcon();
@@ -355,7 +355,7 @@ void IUIScene_BeaconMenu::handleTick()
 		}
 	}
 
-	SetConfirmButtonEnabled( (m_beacon->getItem(0) != NULL) && (m_beacon->getPrimaryPower() > 0) );
+	SetConfirmButtonEnabled( (m_beacon->getItem(0) != nullptr) && (m_beacon->getPrimaryPower() > 0) );
 }
 
 int IUIScene_BeaconMenu::GetId(int tier, int effectId)
@@ -365,7 +365,7 @@ int IUIScene_BeaconMenu::GetId(int tier, int effectId)
 
 vector<HtmlString> *IUIScene_BeaconMenu::GetSectionHoverText(ESceneSection eSection)
 {
-	vector<HtmlString> *desc = NULL;
+	vector<HtmlString> *desc = nullptr;
 	switch(eSection)
 	{
 	case eSectionBeaconSecondaryTwo:
diff --git a/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp
index 4371b4e5..3af01678 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CommandBlockMenu.cpp
@@ -20,6 +20,6 @@ void IUIScene_CommandBlockMenu::ConfirmButtonClicked()
 	dos.writeInt(m_commandBlock->z);
 	dos.writeUTF(GetCommand());
 
-	Minecraft::GetInstance()->localplayers[GetPad()]->connection->send(shared_ptr<CustomPayloadPacket>(new CustomPayloadPacket(CustomPayloadPacket::SET_ADVENTURE_COMMAND_PACKET, baos.toByteArray())));
+	Minecraft::GetInstance()->localplayers[GetPad()]->connection->send(std::make_shared<CustomPayloadPacket>(CustomPayloadPacket::SET_ADVENTURE_COMMAND_PACKET, baos.toByteArray()));
 }
 
diff --git a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
index fc012be3..6fddece9 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
@@ -6,6 +6,8 @@
 #include "..\..\LocalPlayer.h"
 #include "IUIScene_CraftingMenu.h"
 
+#include "UI.h"
+
 Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA[IUIScene_CraftingMenu::m_iMaxGroup2x2]=
 {
 	Recipy::eGroupType_Structure,
@@ -154,10 +156,10 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if( pMinecraft->localgameModes[getPad()] != NULL )
+	if( pMinecraft->localgameModes[getPad()] != nullptr )
 	{
 		Tutorial *tutorial = pMinecraft->localgameModes[getPad()]->getTutorial();
-		if(tutorial != NULL)
+		if(tutorial != nullptr)
 		{
 			tutorial->handleUIInput(iAction);
 			if(ui.IsTutorialVisible(getPad()) && !tutorial->isInputAllowed(iAction))
@@ -211,10 +213,10 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 					shared_ptr<ItemInstance> pTempItemInst=pRecipeIngredientsRequired[iRecipe].pRecipy->assemble(nullptr);
 					//int iIcon=pTempItemInst->getItem()->getIcon(pTempItemInst->getAuxValue());
 
-					if( pMinecraft->localgameModes[iPad] != NULL)
+					if( pMinecraft->localgameModes[iPad] != nullptr)
 					{
 						Tutorial *tutorial = pMinecraft->localgameModes[iPad]->getTutorial();
-						if(tutorial != NULL)
+						if(tutorial != nullptr)
 						{
 							tutorial->onCrafted(pTempItemInst);
 						}
@@ -247,10 +249,10 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 				shared_ptr<ItemInstance> pTempItemInst=pRecipeIngredientsRequired[iRecipe].pRecipy->assemble(nullptr);
 				//int iIcon=pTempItemInst->getItem()->getIcon(pTempItemInst->getAuxValue());
 
-				if( pMinecraft->localgameModes[iPad] != NULL )
+				if( pMinecraft->localgameModes[iPad] != nullptr )
 				{
 					Tutorial *tutorial = pMinecraft->localgameModes[iPad]->getTutorial();
-					if(tutorial != NULL)
+					if(tutorial != nullptr)
 					{
 						tutorial->createItemSelected(pTempItemInst, pRecipeIngredientsRequired[iRecipe].bCanMake[iPad]);
 					}
@@ -288,12 +290,12 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 								}
 
 								// 4J Stu - Fix for #13097 - Bug: Milk Buckets are removed when crafting Cake
-								if (ingItemInst != NULL)
+								if (ingItemInst != nullptr)
 								{
 									if (ingItemInst->getItem()->hasCraftingRemainingItem())
 									{
 										// replace item with remaining result
-										m_pPlayer->inventory->add( shared_ptr<ItemInstance>( new ItemInstance(ingItemInst->getItem()->getCraftingRemainingItem()) ) );
+										m_pPlayer->inventory->add(std::make_shared<ItemInstance>(ingItemInst->getItem()->getCraftingRemainingItem()));
 									}
 
 								}
@@ -608,7 +610,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
 		// dump out the inventory
 		/*		for (unsigned int k = 0; k < m_pPlayer->inventory->items.length; k++)
 		{
-		if (m_pPlayer->inventory->items[k] != NULL)
+		if (m_pPlayer->inventory->items[k] != nullptr)
 		{
 		wstring itemstring=m_pPlayer->inventory->items[k]->toString();
 
@@ -620,15 +622,15 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
 		*/
 		RecipyList *recipes = ((Recipes *)Recipes::getInstance())->getRecipies();
 		Recipy::INGREDIENTS_REQUIRED *pRecipeIngredientsRequired=Recipes::getInstance()->getRecipeIngredientsArray();
-		int iRecipeC=(int)recipes->size();
+		int iRecipeC=static_cast<int>(recipes->size());
         auto itRecipe = recipes->begin();
 
         // dump out the recipe products
 
 		// 		for (int i = 0; i < iRecipeC; i++)
 		// 		{
-		// 			shared_ptr<ItemInstance> pTempItemInst=pRecipeIngredientsRequired[i].pRecipy->assemble(NULL);
-		// 			if (pTempItemInst != NULL)
+		// 			shared_ptr<ItemInstance> pTempItemInst=pRecipeIngredientsRequired[i].pRecipy->assemble(nullptr);
+		// 			if (pTempItemInst != nullptr)
 		// 			{
 		// 				wstring itemstring=pTempItemInst->toString();
 		//
@@ -683,7 +685,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
 				// Does the player have this ingredient?
 				for (unsigned int k = 0; k < m_pPlayer->inventory->items.length; k++)
 				{
-					if (m_pPlayer->inventory->items[k] != NULL)
+					if (m_pPlayer->inventory->items[k] != nullptr)
 					{
 						// do they have the ingredient, and the aux value matches, and enough off it?
 						if((m_pPlayer->inventory->items[k]->id == pRecipeIngredientsRequired[i].iIngIDA[j]) &&
@@ -703,7 +705,7 @@ void IUIScene_CraftingMenu::CheckRecipesAvailable()
 
 								for(unsigned int l=0;l<m_pPlayer->inventory->items.length;l++)
 								{
-									if (m_pPlayer->inventory->items[l] != NULL)
+									if (m_pPlayer->inventory->items[l] != nullptr)
 									{
 										if(
 											(m_pPlayer->inventory->items[l]->id == pRecipeIngredientsRequired[i].iIngIDA[j]) &&
@@ -1071,7 +1073,7 @@ void IUIScene_CraftingMenu::DisplayIngredients()
 			int iAuxVal=pRecipeIngredientsRequired[iRecipe].iIngAuxValA[i];
 			Item *item = Item::items[id];
 
-			shared_ptr<ItemInstance> itemInst= shared_ptr<ItemInstance>(new ItemInstance(item,pRecipeIngredientsRequired[iRecipe].iIngValA[i],iAuxVal));
+			shared_ptr<ItemInstance> itemInst= std::make_shared<ItemInstance>(item, pRecipeIngredientsRequired[iRecipe].iIngValA[i], iAuxVal);
 
 			// 4J-PB - a very special case - the bed can use any kind of wool, so we can't use the item description
 			// and the same goes for the painting
@@ -1156,7 +1158,7 @@ void IUIScene_CraftingMenu::DisplayIngredients()
 					{
 						iAuxVal = 1;
 					}
-					shared_ptr<ItemInstance> itemInst= shared_ptr<ItemInstance>(new ItemInstance(id,1,iAuxVal));
+					shared_ptr<ItemInstance> itemInst= std::make_shared<ItemInstance>(id, 1, iAuxVal);
 					setIngredientSlotItem(getPad(),index,itemInst);
 					// show the ingredients we don't have if we can't make the recipe
 					if(app.DebugSettingsOn() && app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_CraftAnything))
diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
index 0d3f7dac..a0c0ebdd 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "IUIScene_CreativeMenu.h"
 
+#include "UI.h"
 #include "..\..\Minecraft.h"
 #include "..\..\MultiplayerLocalPlayer.h"
 #include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
@@ -13,7 +14,7 @@
 #include "..\..\..\Minecraft.World\JavaMath.h"
 
 // 4J JEV - Images for each tab.
-IUIScene_CreativeMenu::TabSpec **IUIScene_CreativeMenu::specs = NULL;
+IUIScene_CreativeMenu::TabSpec **IUIScene_CreativeMenu::specs = nullptr;
 
 vector< shared_ptr<ItemInstance> > IUIScene_CreativeMenu::categoryGroups[eCreativeInventoryGroupsCount];
 
@@ -21,7 +22,6 @@ vector< shared_ptr<ItemInstance> > IUIScene_CreativeMenu::categoryGroups[eCreati
 #define ITEM_AUX(id, aux) list->push_back( shared_ptr<ItemInstance>(new ItemInstance(id, 1, aux)) );
 #define DEF(index) list = &categoryGroups[index];
 
-
 void IUIScene_CreativeMenu::staticCtor()
 {
 	vector< shared_ptr<ItemInstance> > *list;
@@ -488,14 +488,14 @@ void IUIScene_CreativeMenu::staticCtor()
 		for(unsigned int i = 0; i < Enchantment::enchantments.length; ++i)
 		{
 			Enchantment *enchantment = Enchantment::enchantments[i];
-			if (enchantment == NULL || enchantment->category == NULL) continue;
+			if (enchantment == nullptr || enchantment->category == nullptr) continue;
 			list->push_back(Item::enchantedBook->createForEnchantment(new EnchantmentInstance(enchantment, enchantment->getMaxLevel())));
 		}
 
 #ifndef _CONTENT_PACKAGE
 		if(app.DebugSettingsOn())
 		{
-			shared_ptr<ItemInstance> debugSword = shared_ptr<ItemInstance>(new ItemInstance(Item::sword_diamond_Id, 1, 0));
+			shared_ptr<ItemInstance> debugSword = std::make_shared<ItemInstance>(Item::sword_diamond_Id, 1, 0);
 			debugSword->enchant( Enchantment::damageBonus, 50 );
 			debugSword->setHoverName(L"Sword of Debug");
 			list->push_back(debugSword);
@@ -673,7 +673,7 @@ void IUIScene_CreativeMenu::staticCtor()
 #ifndef _CONTENT_PACKAGE
 	ECreative_Inventory_Groups decorationsGroup[] = {eCreativeInventory_Decoration};
 	ECreative_Inventory_Groups debugDecorationsGroup[] = {eCreativeInventory_ArtToolsDecorations};
-	specs[eCreativeInventoryTab_Decorations] = new TabSpec(L"Decoration", IDS_GROUPNAME_DECORATIONS, 1, decorationsGroup, 0, NULL, 1, debugDecorationsGroup);
+	specs[eCreativeInventoryTab_Decorations] = new TabSpec(L"Decoration", IDS_GROUPNAME_DECORATIONS, 1, decorationsGroup, 0, nullptr, 1, debugDecorationsGroup);
 #else
 	ECreative_Inventory_Groups decorationsGroup[] = {eCreativeInventory_Decoration};
 	specs[eCreativeInventoryTab_Decorations] = new TabSpec(L"Decoration", IDS_GROUPNAME_DECORATIONS, 1, decorationsGroup);
@@ -707,7 +707,7 @@ void IUIScene_CreativeMenu::staticCtor()
 #ifndef _CONTENT_PACKAGE
 	ECreative_Inventory_Groups miscGroup[] = {eCreativeInventory_Misc};
 	ECreative_Inventory_Groups debugMiscGroup[] = {eCreativeInventory_ArtToolsMisc};
-	specs[eCreativeInventoryTab_Misc] = new TabSpec(L"Misc", IDS_GROUPNAME_MISCELLANEOUS, 1, miscGroup, 0, NULL, 1, debugMiscGroup);
+	specs[eCreativeInventoryTab_Misc] = new TabSpec(L"Misc", IDS_GROUPNAME_MISCELLANEOUS, 1, miscGroup, 0, nullptr, 1, debugMiscGroup);
 #else
 	ECreative_Inventory_Groups miscGroup[] = {eCreativeInventory_Misc};
 	specs[eCreativeInventoryTab_Misc] = new TabSpec(L"Misc", IDS_GROUPNAME_MISCELLANEOUS, 1, miscGroup);
@@ -766,12 +766,12 @@ void IUIScene_CreativeMenu::ScrollBar(UIVec2D pointerPos)
 
 // 4J JEV - Tab Spec Struct
 
-IUIScene_CreativeMenu::TabSpec::TabSpec(LPCWSTR icon, int descriptionId, int staticGroupsCount, ECreative_Inventory_Groups *staticGroups, int dynamicGroupsCount, ECreative_Inventory_Groups *dynamicGroups, int debugGroupsCount /*= 0*/, ECreative_Inventory_Groups *debugGroups /*= NULL*/)
+IUIScene_CreativeMenu::TabSpec::TabSpec(LPCWSTR icon, int descriptionId, int staticGroupsCount, ECreative_Inventory_Groups *staticGroups, int dynamicGroupsCount, ECreative_Inventory_Groups *dynamicGroups, int debugGroupsCount /*= 0*/, ECreative_Inventory_Groups *debugGroups /*= nullptr*/)
 	: m_icon(icon), m_descriptionId(descriptionId), m_staticGroupsCount(staticGroupsCount), m_dynamicGroupsCount(dynamicGroupsCount), m_debugGroupsCount(debugGroupsCount)
 {
 
 	m_pages = 0;
-	m_staticGroupsA = NULL;
+	m_staticGroupsA = nullptr;
 
 	unsigned int dynamicItems = 0;
 	m_staticItems = 0;
@@ -786,7 +786,7 @@ IUIScene_CreativeMenu::TabSpec::TabSpec(LPCWSTR icon, int descriptionId, int sta
 		}
 	}
 
-	m_debugGroupsA = NULL;
+	m_debugGroupsA = nullptr;
 	m_debugItems = 0;
 	if(debugGroupsCount > 0)
 	{
@@ -798,8 +798,8 @@ IUIScene_CreativeMenu::TabSpec::TabSpec(LPCWSTR icon, int descriptionId, int sta
 		}
 	}
 
-	m_dynamicGroupsA = NULL;
-	if(dynamicGroupsCount > 0 && dynamicGroups != NULL)
+	m_dynamicGroupsA = nullptr;
+	if(dynamicGroupsCount > 0 && dynamicGroups != nullptr)
 	{
 		m_dynamicGroupsA  = new ECreative_Inventory_Groups[dynamicGroupsCount];
 		for(int i = 0; i < dynamicGroupsCount; ++i)
@@ -816,9 +816,9 @@ IUIScene_CreativeMenu::TabSpec::TabSpec(LPCWSTR icon, int descriptionId, int sta
 
 IUIScene_CreativeMenu::TabSpec::~TabSpec()
 {
-	if(m_staticGroupsA != NULL) delete [] m_staticGroupsA;
-	if(m_dynamicGroupsA != NULL) delete [] m_dynamicGroupsA;
-	if(m_debugGroupsA != NULL) delete [] m_debugGroupsA;
+	if(m_staticGroupsA != nullptr) delete [] m_staticGroupsA;
+	if(m_dynamicGroupsA != nullptr) delete [] m_dynamicGroupsA;
+	if(m_debugGroupsA != nullptr) delete [] m_debugGroupsA;
 }
 
 void IUIScene_CreativeMenu::TabSpec::populateMenu(AbstractContainerMenu *menu, int dynamicIndex, unsigned int page)
@@ -826,7 +826,7 @@ void IUIScene_CreativeMenu::TabSpec::populateMenu(AbstractContainerMenu *menu, i
 	int lastSlotIndex = 0;
 
 	// Fill the dynamic group
-	if(m_dynamicGroupsCount > 0 && m_dynamicGroupsA != NULL)
+	if(m_dynamicGroupsCount > 0 && m_dynamicGroupsA != nullptr)
 	{
         for (auto it = categoryGroups[m_dynamicGroupsA[dynamicIndex]].rbegin(); it != categoryGroups[m_dynamicGroupsA[dynamicIndex]].rend() && lastSlotIndex < MAX_SIZE; ++it)
         {
@@ -957,7 +957,7 @@ IUIScene_CreativeMenu::ItemPickerMenu::ItemPickerMenu(	shared_ptr<SimpleContaine
 
 	//int startLength = slots->size();
 
-	Slot *slot = NULL;
+	Slot *slot = nullptr;
 	for (int i = 0; i < TabSpec::MAX_SIZE; i++)
 	{
 		// 4J JEV -  These values get set by addSlot anyway.
@@ -1036,11 +1036,11 @@ bool IUIScene_CreativeMenu::handleValidKeyPress(int iPad, int buttonNum, BOOL qu
 		{
 			shared_ptr<ItemInstance> newItem = m_menu->getSlot(i)->getItem();
 
-			if(newItem != NULL)
+			if(newItem != nullptr)
 			{
 				m_menu->getSlot(i)->set(nullptr);
 				// call this function to synchronize multiplayer item bar
-				pMinecraft->localgameModes[iPad]->handleCreativeModeItemAdd(nullptr, i - (int)m_menu->slots.size() + 9 + InventoryMenu::USE_ROW_SLOT_START);
+				pMinecraft->localgameModes[iPad]->handleCreativeModeItemAdd(nullptr, i - static_cast<int>(m_menu->slots.size()) + 9 + InventoryMenu::USE_ROW_SLOT_START);
 			}
 		}
 		return true;
@@ -1054,7 +1054,7 @@ void IUIScene_CreativeMenu::handleOutsideClicked(int iPad, int buttonNum, BOOL q
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 	shared_ptr<Inventory> playerInventory = pMinecraft->localplayers[iPad]->inventory;
-	if (playerInventory->getCarried() != NULL)
+	if (playerInventory->getCarried() != nullptr)
 	{
 		if (buttonNum == 0)
 		{
@@ -1082,8 +1082,8 @@ void IUIScene_CreativeMenu::handleAdditionalKeyPress(int iAction)
 		// Fall through intentional
 	case ACTION_MENU_RIGHT_SCROLL:
 		{
-			ECreativeInventoryTabs tab = (ECreativeInventoryTabs)(m_curTab + dir);
-			if (tab < 0) tab = (ECreativeInventoryTabs)(eCreativeInventoryTab_COUNT - 1);
+			ECreativeInventoryTabs tab = static_cast<ECreativeInventoryTabs>(m_curTab + dir);
+			if (tab < 0) tab = static_cast<ECreativeInventoryTabs>(eCreativeInventoryTab_COUNT - 1);
 			if (tab >= eCreativeInventoryTab_COUNT) tab = eCreativeInventoryTab_BuildingBlocks;
 			switchTab(tab);
 			ui.PlayUISFX(eSFX_Focus);
@@ -1099,13 +1099,7 @@ void IUIScene_CreativeMenu::handleAdditionalKeyPress(int iAction)
 		break;
 	case ACTION_MENU_OTHER_STICK_DOWN:
 		{
-			int pageStep = TabSpec::rows;
-#ifdef _WINDOWS64
-			if (g_KBMInput.WasMouseWheelConsumed())
-			{
-				pageStep = 1;
-			}
-#endif
+			int pageStep = 1;
 			m_tabPage[m_curTab] += pageStep;
 			if(m_tabPage[m_curTab] >= specs[m_curTab]->getPageCount())
 			{
@@ -1119,13 +1113,7 @@ void IUIScene_CreativeMenu::handleAdditionalKeyPress(int iAction)
 		break;
 	case ACTION_MENU_OTHER_STICK_UP:
 		{
-			int pageStep = TabSpec::rows;
-#ifdef _WINDOWS64
-			if (g_KBMInput.WasMouseWheelConsumed())
-			{
-				pageStep = 1;
-			}
-#endif
+			int pageStep = 1;
 			m_tabPage[m_curTab] -= pageStep;
 			if(m_tabPage[m_curTab] < 0)
 			{
@@ -1155,7 +1143,7 @@ void IUIScene_CreativeMenu::handleSlotListClicked(ESceneSection eSection, int bu
 			shared_ptr<Inventory> playerInventory = pMinecraft->localplayers[getPad()]->inventory;
 			shared_ptr<ItemInstance> carried = playerInventory->getCarried();
 			shared_ptr<ItemInstance> clicked = m_menu->getSlot(currentIndex)->getItem();
-			if (clicked != NULL)
+			if (clicked != nullptr)
 			{
 				playerInventory->setCarried(ItemInstance::clone(clicked));
 				carried = playerInventory->getCarried();
@@ -1188,7 +1176,7 @@ void IUIScene_CreativeMenu::handleSlotListClicked(ESceneSection eSection, int bu
 		m_menu->clicked(currentIndex, buttonNum, quickKeyHeld?AbstractContainerMenu::CLICK_QUICK_MOVE:AbstractContainerMenu::CLICK_PICKUP, pMinecraft->localplayers[getPad()]);
 		shared_ptr<ItemInstance> newItem = m_menu->getSlot(currentIndex)->getItem();
 		// call this function to synchronize multiplayer item bar
-		pMinecraft->localgameModes[getPad()]->handleCreativeModeItemAdd(newItem, currentIndex - (int)m_menu->slots.size() + 9 + InventoryMenu::USE_ROW_SLOT_START);
+		pMinecraft->localgameModes[getPad()]->handleCreativeModeItemAdd(newItem, currentIndex - static_cast<int>(m_menu->slots.size()) + 9 + InventoryMenu::USE_ROW_SLOT_START);
 
 		if(m_bCarryingCreativeItem)
 		{
@@ -1236,7 +1224,7 @@ bool IUIScene_CreativeMenu::getEmptyInventorySlot(shared_ptr<ItemInstance> item,
 	for(unsigned int i = TabSpec::MAX_SIZE; i < TabSpec::MAX_SIZE + 9; ++i)
 	{
 		shared_ptr<ItemInstance> slotItem = m_menu->getSlot(i)->getItem();
-		if( slotItem != NULL && slotItem->sameItemWithTags(item) && (slotItem->GetCount() + item->GetCount() <= item->getMaxStackSize() ))
+		if( slotItem != nullptr && slotItem->sameItemWithTags(item) && (slotItem->GetCount() + item->GetCount() <= item->getMaxStackSize() ))
 		{
 			sameItemFound = true;
 			slotX = i - TabSpec::MAX_SIZE;
@@ -1249,7 +1237,7 @@ bool IUIScene_CreativeMenu::getEmptyInventorySlot(shared_ptr<ItemInstance> item,
 		// Find an empty slot
 		for(unsigned int i = TabSpec::MAX_SIZE; i < TabSpec::MAX_SIZE + 9; ++i)
 		{
-			if( m_menu->getSlot(i)->getItem() == NULL )
+			if( m_menu->getSlot(i)->getItem() == nullptr )
 			{
 				slotX = i - TabSpec::MAX_SIZE;
 				emptySlotFound = true;
@@ -1328,7 +1316,7 @@ void IUIScene_CreativeMenu::BuildFirework(vector<shared_ptr<ItemInstance> > *lis
 	// diamonds give trails
 	if (trail) expTag->putBoolean(FireworksItem::TAG_E_TRAIL, true);
 
-	intArray colorArray(colors.size());
+	intArray colorArray(static_cast<unsigned int>(colors.size()));
 	for (int i = 0; i < colorArray.length; i++)
 	{
 		colorArray[i] = colors.at(i);
@@ -1347,7 +1335,7 @@ void IUIScene_CreativeMenu::BuildFirework(vector<shared_ptr<ItemInstance> > *lis
 		vector<int> colors;
 		colors.push_back(DyePowderItem::COLOR_RGB[fadeColor]);
 
-		intArray colorArray(colors.size());
+		intArray colorArray(static_cast<unsigned int>(colors.size()));
 		for (int i = 0; i < colorArray.length; i++)
 		{
 			colorArray[i] = colors.at(i);
@@ -1362,7 +1350,7 @@ void IUIScene_CreativeMenu::BuildFirework(vector<shared_ptr<ItemInstance> > *lis
 	shared_ptr<ItemInstance> firework;
 
 	{
-		firework = shared_ptr<ItemInstance>( new ItemInstance(Item::fireworks) );
+		firework = std::make_shared<ItemInstance>(Item::fireworks);
 		CompoundTag *itemTag = new CompoundTag();
 		CompoundTag *fireTag = new CompoundTag(FireworksItem::TAG_FIREWORKS);
 		ListTag<CompoundTag> *expTags = new ListTag<CompoundTag>(FireworksItem::TAG_EXPLOSIONS);
@@ -1370,7 +1358,7 @@ void IUIScene_CreativeMenu::BuildFirework(vector<shared_ptr<ItemInstance> > *lis
 		expTags->add(expTag);
 
 		fireTag->put(FireworksItem::TAG_EXPLOSIONS, expTags);
-		fireTag->putByte(FireworksItem::TAG_FLIGHT, (byte) sulphur);
+		fireTag->putByte(FireworksItem::TAG_FLIGHT, static_cast<byte>(sulphur));
 
 		itemTag->put(FireworksItem::TAG_FIREWORKS, fireTag);
 
diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
index 64b78029..864fb560 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
@@ -69,7 +69,7 @@ public:
 		unsigned int m_debugItems;
 
 	public:
-		TabSpec( LPCWSTR icon, int descriptionId, int staticGroupsCount, ECreative_Inventory_Groups *staticGroups, int dynamicGroupsCount = 0, ECreative_Inventory_Groups *dynamicGroups = NULL, int debugGroupsCount = 0, ECreative_Inventory_Groups *debugGroups = NULL );
+		TabSpec( LPCWSTR icon, int descriptionId, int staticGroupsCount, ECreative_Inventory_Groups *staticGroups, int dynamicGroupsCount = 0, ECreative_Inventory_Groups *dynamicGroups = nullptr, int debugGroupsCount = 0, ECreative_Inventory_Groups *debugGroups = nullptr );
 		~TabSpec();
 
 		void populateMenu(AbstractContainerMenu *menu, int dynamicIndex, unsigned int page);
diff --git a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
index c73f7dc5..fbbf7c24 100644
--- a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
@@ -181,5 +181,5 @@ bool IUIScene_EnchantingMenu::IsSectionSlotList( ESceneSection eSection )
 
 EnchantmentMenu *IUIScene_EnchantingMenu::getMenu()
 {
-	return (EnchantmentMenu *)m_menu;
+	return static_cast<EnchantmentMenu *>(m_menu);
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/IUIScene_HUD.cpp b/Minecraft.Client/Common/UI/IUIScene_HUD.cpp
index 03adbd2c..d2754789 100644
--- a/Minecraft.Client/Common/UI/IUIScene_HUD.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_HUD.cpp
@@ -7,6 +7,8 @@
 #include "..\..\..\Minecraft.World\net.minecraft.world.entity.monster.h"
 #include "IUIScene_HUD.h"
 
+#include "UI.h"
+
 IUIScene_HUD::IUIScene_HUD()
 {
 	m_lastActiveSlot = -1;
@@ -79,7 +81,7 @@ void IUIScene_HUD::updateFrameTick()
 	{
 		//SetRidingHorse(false, 0);
 		shared_ptr<Entity> riding = pMinecraft->localplayers[iPad]->riding;
-		if(riding == NULL)
+		if(riding == nullptr)
 		{
 			SetRidingHorse(false, false, 0);
 		}
@@ -146,8 +148,8 @@ void IUIScene_HUD::updateFrameTick()
 		{
 			if(uiOpacityTimer<10)
 			{
-				float fStep=(80.0f-(float)ucAlpha)/10.0f;
-				fVal=0.01f*(80.0f-((10.0f-(float)uiOpacityTimer)*fStep));
+				float fStep=(80.0f-static_cast<float>(ucAlpha))/10.0f;
+				fVal=0.01f*(80.0f-((10.0f-static_cast<float>(uiOpacityTimer))*fStep));
 			}
 			else
 			{
@@ -156,7 +158,7 @@ void IUIScene_HUD::updateFrameTick()
 		}
 		else
 		{
-			fVal=0.01f*(float)ucAlpha;
+			fVal=0.01f*static_cast<float>(ucAlpha);
 		}
 	}
 	else
@@ -166,12 +168,12 @@ void IUIScene_HUD::updateFrameTick()
 		{
 			ucAlpha=15;
 		}
-		fVal=0.01f*(float)ucAlpha;
+		fVal=0.01f*static_cast<float>(ucAlpha);
 	}
 	SetOpacity(fVal);
 
 	bool bDisplayGui=app.GetGameStarted() && !ui.GetMenuDisplayed(iPad) && !(app.GetXuiAction(iPad)==eAppAction_AutosaveSaveGameCapturedThumbnail) && app.GetGameSettings(iPad,eGameSetting_DisplayHUD)!=0;
-	if(bDisplayGui && pMinecraft->localplayers[iPad] != NULL)
+	if(bDisplayGui && pMinecraft->localplayers[iPad] != nullptr)
 	{
 		SetVisible(true);			
 	}
@@ -193,12 +195,12 @@ void IUIScene_HUD::renderPlayerHealth()
 	// Update health
 	bool blink = pMinecraft->localplayers[iPad]->invulnerableTime / 3 % 2 == 1;
 	if (pMinecraft->localplayers[iPad]->invulnerableTime < 10) blink = false;
-	int currentHealth = pMinecraft->localplayers[iPad]->getHealth();
-	int oldHealth = pMinecraft->localplayers[iPad]->lastHealth;
+	int currentHealth = static_cast<int>(ceil(pMinecraft->localplayers[iPad]->getHealth()));
+    int oldHealth = static_cast<int>(ceil(pMinecraft->localplayers[iPad]->lastHealth));
 	bool bHasPoison = pMinecraft->localplayers[iPad]->hasEffect(MobEffect::poison);
 	bool bHasWither = pMinecraft->localplayers[iPad]->hasEffect(MobEffect::wither);
 	AttributeInstance *maxHealthAttribute = pMinecraft->localplayers[iPad]->getAttribute(SharedMonsterAttributes::MAX_HEALTH);
-	float maxHealth = (float)maxHealthAttribute->getValue();
+	float maxHealth = static_cast<float>(maxHealthAttribute->getValue());
 	float totalAbsorption = pMinecraft->localplayers[iPad]->getAbsorptionAmount();
 
 	// Update armour
@@ -219,7 +221,7 @@ void IUIScene_HUD::renderPlayerHealth()
 
 	shared_ptr<Entity> riding = pMinecraft->localplayers[iPad]->riding;
 
-	if(riding == NULL || riding && !riding->instanceof(eTYPE_LIVINGENTITY))
+	if(riding == nullptr || riding && !riding->instanceof(eTYPE_LIVINGENTITY))
 	{
 		SetRidingHorse(false, false, 0);
 
@@ -242,8 +244,8 @@ void IUIScene_HUD::renderPlayerHealth()
 		if (pMinecraft->localplayers[iPad]->isUnderLiquid(Material::water))
 		{
 			ShowAir(true);
-			int count = (int) ceil((pMinecraft->localplayers[iPad]->getAirSupply() - 2) * 10.0f / Player::TOTAL_AIR_SUPPLY);
-			int extra = (int) ceil((pMinecraft->localplayers[iPad]->getAirSupply()) * 10.0f / Player::TOTAL_AIR_SUPPLY) - count;
+			int count = static_cast<int>(ceil((pMinecraft->localplayers[iPad]->getAirSupply() - 2) * 10.0f / Player::TOTAL_AIR_SUPPLY));
+			int extra = static_cast<int>(ceil((pMinecraft->localplayers[iPad]->getAirSupply()) * 10.0f / Player::TOTAL_AIR_SUPPLY)) - count;
 			SetAir(count, extra);
 		}
 		else
@@ -254,7 +256,7 @@ void IUIScene_HUD::renderPlayerHealth()
 	else if(riding->instanceof(eTYPE_LIVINGENTITY) )
 	{
 		shared_ptr<LivingEntity> living = dynamic_pointer_cast<LivingEntity>(riding);
-		int riderCurrentHealth = (int) ceil(living->getHealth());
+		int riderCurrentHealth = static_cast<int>(ceil(living->getHealth()));
 		float maxRiderHealth = living->getMaxHealth();
 
 		SetRidingHorse(true, pMinecraft->localplayers[iPad]->isRidingJumpable(), maxRiderHealth);
diff --git a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
index ab1767d4..e88ed08c 100644
--- a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
@@ -52,7 +52,7 @@ int IUIScene_PauseMenu::ExitGameSaveDialogReturned(void *pParam,int iPad,C4JStor
 			if(!Minecraft::GetInstance()->skins->isUsingDefaultSkin())
 			{
 				TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
-				DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tPack;
+				DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(tPack);
 
 				DLCPack *pDLCPack=pDLCTexPack->getDLCInfoParentPack();//tPack->getDLCPack();
 				if(!pDLCPack->hasPurchasedFile( DLCManager::e_DLCType_Texture, L"" ))
@@ -229,7 +229,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4
 		{
 			// 4J-PB - need to check this user can access the store
 			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(iPad,true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(iPad,true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -248,7 +248,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4
 				app.DebugPrintf("Texture Pack - %s\n",pchPackName);
 				SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName);		
 
-				if(pSONYDLCInfo!=NULL)
+				if(pSONYDLCInfo!=nullptr)
 				{
 					char chName[42];
 					char chSkuID[SCE_NP_COMMERCE2_SKU_ID_LEN];
@@ -300,7 +300,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4
 
 				DLC_INFO *pDLCInfo=app.GetDLCInfoForProductName((WCHAR *)pDLCPack->getName().c_str());
 
-				StorageManager.InstallOffer(1,(WCHAR *)pDLCInfo->wsProductId.c_str(),NULL,NULL);
+				StorageManager.InstallOffer(1,(WCHAR *)pDLCInfo->wsProductId.c_str(),nullptr,nullptr);
 
 				// the license change coming in when the offer has been installed will cause this scene to refresh	
 			}
@@ -336,7 +336,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4
 			// need to allow downloads here, or the player would need to quit the game to let the download of a texture pack happen. This might affect the network traffic, since the download could take all the bandwidth...
 			XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
 
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 		}
 	}
 	else
@@ -352,7 +352,7 @@ int IUIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4
 
 int IUIScene_PauseMenu::SaveWorldThreadProc( LPVOID lpParameter )
 {
-	bool bAutosave=(bool)lpParameter;
+	bool bAutosave=static_cast<bool>(lpParameter);
 	if(bAutosave)
 	{
 		app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_AutoSaveGame);
@@ -421,7 +421,7 @@ void IUIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 	bool saveStats = true;
 	if (pMinecraft->isClientSide() || g_NetworkManager.IsInSession())
 	{
-		if(lpParameter != NULL )
+		if(lpParameter != nullptr )
 		{
 			// 4J-PB - check if we have lost connection to Live
 			if(ProfileManager.GetLiveConnectionStatus()!=XONLINE_S_LOGON_CONNECTION_ESTABLISHED )
@@ -522,17 +522,17 @@ void IUIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 			exitReasonStringId = -1;
 
 			// 4J - Force a disconnection, this handles the situation that the server has already disconnected
-			if( pMinecraft->levels[0] != NULL ) pMinecraft->levels[0]->disconnect(false);
-			if( pMinecraft->levels[1] != NULL ) pMinecraft->levels[1]->disconnect(false);
-			if( pMinecraft->levels[2] != NULL ) pMinecraft->levels[2]->disconnect(false);
+			if( pMinecraft->levels[0] != nullptr ) pMinecraft->levels[0]->disconnect(false);
+			if( pMinecraft->levels[1] != nullptr ) pMinecraft->levels[1]->disconnect(false);
+			if( pMinecraft->levels[2] != nullptr ) pMinecraft->levels[2]->disconnect(false);
 		}
 		else
 		{
 			exitReasonStringId = IDS_EXITING_GAME;
 			pMinecraft->progressRenderer->progressStartNoAbort( IDS_EXITING_GAME );
-			if( pMinecraft->levels[0] != NULL ) pMinecraft->levels[0]->disconnect();
-			if( pMinecraft->levels[1] != NULL ) pMinecraft->levels[1]->disconnect();
-			if( pMinecraft->levels[2] != NULL ) pMinecraft->levels[2]->disconnect();
+			if( pMinecraft->levels[0] != nullptr ) pMinecraft->levels[0]->disconnect();
+			if( pMinecraft->levels[1] != nullptr ) pMinecraft->levels[1]->disconnect();
+			if( pMinecraft->levels[2] != nullptr ) pMinecraft->levels[2]->disconnect();
 		}
 
 		// 4J Stu - This only does something if we actually have a server, so don't need to do any other checks
@@ -548,7 +548,7 @@ void IUIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 	}
 	else
 	{
-		if(lpParameter != NULL && ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad()) )
+		if(lpParameter != nullptr && ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad()) )
 		{
 			switch( app.GetDisconnectReason() )
 			{
@@ -625,7 +625,7 @@ void IUIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 	{
 		Sleep(1);
 	}
-	pMinecraft->setLevel(NULL,exitReasonStringId,nullptr,saveStats);
+	pMinecraft->setLevel(nullptr,exitReasonStringId,nullptr,saveStats);
 
 	TelemetryManager->Flush();
 	
diff --git a/Minecraft.Client/Common/UI/IUIScene_StartGame.cpp b/Minecraft.Client/Common/UI/IUIScene_StartGame.cpp
index d3a9e8f0..735da438 100644
--- a/Minecraft.Client/Common/UI/IUIScene_StartGame.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_StartGame.cpp
@@ -45,7 +45,7 @@ void IUIScene_StartGame::HandleDLCMountingComplete()
 
 	// 4J-PB - there may be texture packs we don't have, so use the info from TMS for this
 	// REMOVE UNTIL WORKING
-	DLC_INFO *pDLCInfo=NULL;
+	DLC_INFO *pDLCInfo=nullptr;
 
 	// first pass - look to see if there are any that are not in the list
 	bool bTexturePackAlreadyListed;
@@ -86,7 +86,7 @@ void IUIScene_StartGame::HandleDLCMountingComplete()
 		// add a TMS request for them
 		app.DebugPrintf("+++ Adding TMSPP request for texture pack data\n");
 		app.AddTMSPPFileTypeRequest(e_DLC_TexturePackData);
-		if(m_iConfigA!=NULL)
+		if(m_iConfigA!=nullptr)
 		{
 			delete m_iConfigA;
 		}
@@ -123,7 +123,7 @@ void IUIScene_StartGame::HandleDLCMountingComplete()
 
 void IUIScene_StartGame::handleSelectionChanged(F64 selectedId)
 {
-	m_iSetTexturePackDescription = (int)selectedId;
+	m_iSetTexturePackDescription = static_cast<int>(selectedId);
 
 	if(!m_texturePackDescDisplayed)
 	{	
@@ -135,13 +135,13 @@ void IUIScene_StartGame::UpdateTexturePackDescription(int index)
 {
 	TexturePack *tp = Minecraft::GetInstance()->skins->getTexturePackByIndex(index);
 
-	if(tp==NULL)
+	if(tp==nullptr)
 	{
 #if TO_BE_IMPLEMENTED		
 		// this is probably a texture pack icon added from TMS
 
 		DWORD dwBytes=0,dwFileBytes=0;
-		PBYTE pbData=NULL,pbFileData=NULL;
+		PBYTE pbData=nullptr,pbFileData=nullptr;
 
 		CXuiCtrl4JList::LIST_ITEM_INFO ListItem;
 		// get the current index of the list, and then get the data
@@ -171,7 +171,7 @@ void IUIScene_StartGame::UpdateTexturePackDescription(int index)
 		}
 		else
 		{
-			m_texturePackComparison->UseBrush(NULL);
+			m_texturePackComparison->UseBrush(nullptr);
 		}
 #endif
 	}
@@ -214,7 +214,7 @@ void IUIScene_StartGame::UpdateCurrentTexturePack(int iSlot)
 	TexturePack *tp = Minecraft::GetInstance()->skins->getTexturePackByIndex(m_currentTexturePackIndex);
 
 	// if the texture pack is null, you don't have it yet
-	if(tp==NULL)
+	if(tp==nullptr)
 	{
 #if TO_BE_IMPLEMENTED
 		// Upsell
@@ -254,7 +254,7 @@ void IUIScene_StartGame::UpdateCurrentTexturePack(int iSlot)
 
 int IUIScene_StartGame::TrialTexturePackWarningReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	IUIScene_StartGame* pScene = (IUIScene_StartGame*)pParam;
+	IUIScene_StartGame* pScene = static_cast<IUIScene_StartGame *>(pParam);
 
 	if(result==C4JStorage::EMessage_ResultAccept)
 	{
@@ -269,7 +269,7 @@ int IUIScene_StartGame::TrialTexturePackWarningReturned(void *pParam,int iPad,C4
 
 int IUIScene_StartGame::UnlockTexturePackReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	IUIScene_StartGame* pScene = (IUIScene_StartGame*)pParam;
+	IUIScene_StartGame* pScene = static_cast<IUIScene_StartGame *>(pParam);
 
 	if(result==C4JStorage::EMessage_ResultAccept)
 	{
@@ -279,7 +279,7 @@ int IUIScene_StartGame::UnlockTexturePackReturned(void *pParam,int iPad,C4JStora
 			ULONGLONG ullIndexA[1];
 			DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(pScene->m_pDLCPack->getPurchaseOfferId());
 
-			if(pDLCInfo!=NULL)
+			if(pDLCInfo!=nullptr)
 			{
 				ullIndexA[0]=pDLCInfo->ullOfferID_Full;
 			}
@@ -289,9 +289,9 @@ int IUIScene_StartGame::UnlockTexturePackReturned(void *pParam,int iPad,C4JStora
 			}
 
 
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 #elif defined _XBOX_ONE
-			//StorageManager.InstallOffer(1,StorageManager.GetOffer(iIndex).wszProductID,NULL,NULL);
+			//StorageManager.InstallOffer(1,StorageManager.GetOffer(iIndex).wszProductID,nullptr,nullptr);
 #endif
 
 			// the license change coming in when the offer has been installed will cause this scene to refresh	
@@ -311,7 +311,7 @@ int IUIScene_StartGame::UnlockTexturePackReturned(void *pParam,int iPad,C4JStora
 
 int IUIScene_StartGame::TexturePackDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	IUIScene_StartGame *pClass = (IUIScene_StartGame *)pParam;
+	IUIScene_StartGame *pClass = static_cast<IUIScene_StartGame *>(pParam);
 
 
 #ifdef _XBOX
@@ -332,7 +332,7 @@ int IUIScene_StartGame::TexturePackDialogReturned(void *pParam,int iPad,C4JStora
 		if( result==C4JStorage::EMessage_ResultAccept ) // Full version
 		{
 			ullIndexA[0]=ullOfferID_Full;
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 
 		}
 		else // trial version
@@ -343,7 +343,7 @@ int IUIScene_StartGame::TexturePackDialogReturned(void *pParam,int iPad,C4JStora
 			{
 
 				ullIndexA[0]=pDLCInfo->ullOfferID_Trial;
-				StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+				StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 			}
 		}		
 	}
@@ -360,7 +360,7 @@ int IUIScene_StartGame::TexturePackDialogReturned(void *pParam,int iPad,C4JStora
 				app.GetDLCFullOfferIDForPackID(pClass->m_MoreOptionsParams.dwTexturePack,ProductId);
 
 
-				StorageManager.InstallOffer(1,(WCHAR *)ProductId.c_str(),NULL,NULL);
+				StorageManager.InstallOffer(1,(WCHAR *)ProductId.c_str(),nullptr,nullptr);
 
 				// the license change coming in when the offer has been installed will cause this scene to refresh	
 			}
diff --git a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
index 059f9b75..0b1e0df2 100644
--- a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
@@ -8,12 +8,14 @@
 #include "..\..\ClientConnection.h"
 #include "IUIScene_TradingMenu.h"
 
+#include "UI.h"
+
 IUIScene_TradingMenu::IUIScene_TradingMenu()
 {
 	m_validOffersCount = 0;
 	m_selectedSlot = 0;
 	m_offersStartIndex = 0;
-	m_menu = NULL;
+	m_menu = nullptr;
 	m_bHasUpdatedOnce = false;
 }
 
@@ -31,10 +33,10 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if( pMinecraft->localgameModes[getPad()] != NULL )
+	if( pMinecraft->localgameModes[getPad()] != nullptr )
 	{
 		Tutorial *tutorial = pMinecraft->localgameModes[getPad()]->getTutorial();
-		if(tutorial != NULL)
+		if(tutorial != nullptr)
 		{
 			tutorial->handleUIInput(iAction);
 			if(ui.IsTutorialVisible(getPad()) && !tutorial->isInputAllowed(iAction))
@@ -76,7 +78,7 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 					shared_ptr<MultiplayerLocalPlayer> player = Minecraft::GetInstance()->localplayers[getPad()];
 					int buyAMatches = player->inventory->countMatches(buyAItem);
 					int buyBMatches = player->inventory->countMatches(buyBItem);
-					if( (buyAItem != NULL && buyAMatches >= buyAItem->count) && (buyBItem == NULL || buyBMatches >= buyBItem->count) )
+					if( (buyAItem != nullptr && buyAMatches >= buyAItem->count) && (buyBItem == nullptr || buyBMatches >= buyBItem->count) )
 					{
 						// 4J-JEV: Fix for PS4 #7111: [PATCH 1.12] Trading Librarian villagers for multiple �Enchanted Books� will cause the title to crash.
 						int actualShopItem = m_activeOffers.at(selectedShopItem).second;
@@ -95,7 +97,7 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 						}
 
 						// Send a packet to the server
-						player->connection->send( shared_ptr<TradeItemPacket>( new TradeItemPacket(m_menu->containerId, actualShopItem) ) );
+						player->connection->send(std::make_shared<TradeItemPacket>(m_menu->containerId, actualShopItem));
 
 						updateDisplay();
 					}
@@ -152,7 +154,7 @@ bool IUIScene_TradingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 			ByteArrayOutputStream rawOutput;
 			DataOutputStream output(&rawOutput);
 			output.writeInt(actualShopItem);
-			Minecraft::GetInstance()->getConnection(getPad())->send(shared_ptr<CustomPayloadPacket>( new CustomPayloadPacket(CustomPayloadPacket::TRADER_SELECTION_PACKET, rawOutput.toByteArray())));
+			Minecraft::GetInstance()->getConnection(getPad())->send(std::make_shared<CustomPayloadPacket>(CustomPayloadPacket::TRADER_SELECTION_PACKET, rawOutput.toByteArray()));
 		}
 	}
 	return handled;
@@ -162,7 +164,7 @@ void IUIScene_TradingMenu::handleTick()
 {
 	int offerCount = 0;
 	MerchantRecipeList *offers = m_merchant->getOffers(Minecraft::GetInstance()->localplayers[getPad()]);
-	if (offers != NULL)
+	if (offers != nullptr)
 	{
 		offerCount = offers->size();
 
@@ -181,7 +183,7 @@ void IUIScene_TradingMenu::updateDisplay()
 	int iA = -1;
 
 	MerchantRecipeList *unfilteredOffers = m_merchant->getOffers(Minecraft::GetInstance()->localplayers[getPad()]);
-	if (unfilteredOffers != NULL)
+	if (unfilteredOffers != nullptr)
 	{
 		m_activeOffers.clear();
 		int unfilteredIndex = 0;
@@ -205,7 +207,7 @@ void IUIScene_TradingMenu::updateDisplay()
 				ByteArrayOutputStream rawOutput;
 				DataOutputStream output(&rawOutput);
 				output.writeInt(firstValidTrade);
-				Minecraft::GetInstance()->getConnection(getPad())->send(shared_ptr<CustomPayloadPacket>( new CustomPayloadPacket(CustomPayloadPacket::TRADER_SELECTION_PACKET, rawOutput.toByteArray())));
+				Minecraft::GetInstance()->getConnection(getPad())->send(std::make_shared<CustomPayloadPacket>(CustomPayloadPacket::TRADER_SELECTION_PACKET, rawOutput.toByteArray()));
 			}
 		}
 
@@ -241,7 +243,7 @@ void IUIScene_TradingMenu::updateDisplay()
 			// 4J-PB - need to get the villager type here
 			wsTemp = app.GetString(IDS_VILLAGER_OFFERS_ITEM);
 			wsTemp = replaceAll(wsTemp,L"{*VILLAGER_TYPE*}",m_merchant->getDisplayName());
-			int iPos=wsTemp.find(L"%s");
+			size_t iPos=wsTemp.find(L"%s");
 			wsTemp.replace(iPos,2,activeRecipe->getSellItem()->getHoverName());
 
 			setTitle(wsTemp.c_str());
@@ -255,10 +257,10 @@ void IUIScene_TradingMenu::updateDisplay()
 			setRequest1Item(buyAItem);
 			setRequest2Item(buyBItem);
 
-			if(buyAItem != NULL) setRequest1Name(buyAItem->getHoverName());
+			if(buyAItem != nullptr) setRequest1Name(buyAItem->getHoverName());
 			else setRequest1Name(L"");
 
-			if(buyBItem != NULL) setRequest2Name(buyBItem->getHoverName());
+			if(buyBItem != nullptr) setRequest2Name(buyBItem->getHoverName());
 			else setRequest2Name(L"");
 
 			bool canMake = true;
@@ -284,15 +286,15 @@ void IUIScene_TradingMenu::updateDisplay()
 			}
 			else
 			{
-				if(buyBItem!=NULL)
+				if(buyBItem!=nullptr)
 				{
 					setRequest2RedBox(true);
 					canMake = false;
 				}
 				else
 				{
-					setRequest2RedBox(buyBItem != NULL);
-					canMake = canMake && buyBItem == NULL;
+					setRequest2RedBox(buyBItem != nullptr);
+					canMake = canMake && buyBItem == nullptr;
 				}
 			}
 
@@ -320,7 +322,7 @@ void IUIScene_TradingMenu::updateDisplay()
 bool IUIScene_TradingMenu::canMake(MerchantRecipe *recipe)
 {
 	bool canMake = false;
-	if (recipe != NULL)
+	if (recipe != nullptr)
 	{
 		if(recipe->isDeprecated()) return false;
 
@@ -335,7 +337,7 @@ bool IUIScene_TradingMenu::canMake(MerchantRecipe *recipe)
 		}
 		else
 		{
-			canMake = buyAItem == NULL;
+			canMake = buyAItem == nullptr;
 		}
 
 		int buyBMatches = player->inventory->countMatches(buyBItem);
@@ -345,7 +347,7 @@ bool IUIScene_TradingMenu::canMake(MerchantRecipe *recipe)
 		}
 		else
 		{
-			canMake = canMake && buyBItem == NULL;
+			canMake = canMake && buyBItem == nullptr;
 		}
 	}
 	return canMake;
diff --git a/Minecraft.Client/Common/UI/UI.h b/Minecraft.Client/Common/UI/UI.h
index 428b3b90..a7c416f8 100644
--- a/Minecraft.Client/Common/UI/UI.h
+++ b/Minecraft.Client/Common/UI/UI.h
@@ -123,4 +123,6 @@
 #include "UIScene_TeleportMenu.h"
 #include "UIScene_EndPoem.h"
 #include "UIScene_EULA.h"
-#include "UIScene_NewUpdateMessage.h"
\ No newline at end of file
+#include "UIScene_NewUpdateMessage.h"
+
+extern ConsoleUIController ui;
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIBitmapFont.cpp b/Minecraft.Client/Common/UI/UIBitmapFont.cpp
index afc2b139..2b1518c4 100644
--- a/Minecraft.Client/Common/UI/UIBitmapFont.cpp
+++ b/Minecraft.Client/Common/UI/UIBitmapFont.cpp
@@ -53,42 +53,42 @@ void UIAbstractBitmapFont::registerFont()
 
 IggyFontMetrics * RADLINK UIAbstractBitmapFont::GetFontMetrics_Callback(void *user_context,IggyFontMetrics *metrics)
 {
-	return ((UIAbstractBitmapFont *) user_context)->GetFontMetrics(metrics);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->GetFontMetrics(metrics);
 }
 
 S32 RADLINK UIAbstractBitmapFont::GetCodepointGlyph_Callback(void *user_context,U32 codepoint)
 {
-	return ((UIAbstractBitmapFont *) user_context)->GetCodepointGlyph(codepoint);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->GetCodepointGlyph(codepoint);
 }
 
 IggyGlyphMetrics * RADLINK UIAbstractBitmapFont::GetGlyphMetrics_Callback(void *user_context,S32 glyph,IggyGlyphMetrics *metrics)
 {
-	return ((UIAbstractBitmapFont *) user_context)->GetGlyphMetrics(glyph,metrics);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->GetGlyphMetrics(glyph,metrics);
 }
 
 rrbool RADLINK UIAbstractBitmapFont::IsGlyphEmpty_Callback(void *user_context,S32 glyph)
 {
-	return ((UIAbstractBitmapFont *) user_context)->IsGlyphEmpty(glyph);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->IsGlyphEmpty(glyph);
 }
 
 F32 RADLINK UIAbstractBitmapFont::GetKerningForGlyphPair_Callback(void *user_context,S32 first_glyph,S32 second_glyph)
 {
-	return ((UIAbstractBitmapFont *) user_context)->GetKerningForGlyphPair(first_glyph,second_glyph);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->GetKerningForGlyphPair(first_glyph,second_glyph);
 }
 
 rrbool RADLINK UIAbstractBitmapFont::CanProvideBitmap_Callback(void *user_context,S32 glyph,F32 pixel_scale)
 {
-	return ((UIAbstractBitmapFont *) user_context)->CanProvideBitmap(glyph,pixel_scale);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->CanProvideBitmap(glyph,pixel_scale);
 }
 
 rrbool RADLINK UIAbstractBitmapFont::GetGlyphBitmap_Callback(void *user_context,S32 glyph,F32 pixel_scale,IggyBitmapCharacter *bitmap)
 {
-	return ((UIAbstractBitmapFont *) user_context)->GetGlyphBitmap(glyph,pixel_scale,bitmap);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->GetGlyphBitmap(glyph,pixel_scale,bitmap);
 }
 
 void RADLINK UIAbstractBitmapFont::FreeGlyphBitmap_Callback(void *user_context,S32 glyph,F32 pixel_scale,IggyBitmapCharacter *bitmap)
 {
-	return ((UIAbstractBitmapFont *) user_context)->FreeGlyphBitmap(glyph,pixel_scale,bitmap);
+	return static_cast<UIAbstractBitmapFont *>(user_context)->FreeGlyphBitmap(glyph,pixel_scale,bitmap);
 }
 
 UIBitmapFont::UIBitmapFont(	SFontData &sfontdata )
@@ -250,15 +250,22 @@ rrbool UIBitmapFont::GetGlyphBitmap(S32 glyph,F32 pixel_scale,IggyBitmapCharacte
 
 	// Choose a reasonable glyph scale.
 	float glyphScale = 1.0f, truePixelScale = 1.0f / m_cFontData->getFontData()->m_fAdvPerPixel;
-	F32 targetPixelScale = pixel_scale;
-	//if(!RenderManager.IsWidescreen())
-	//{
-	//	// Fix for different scales in 480
-	//	targetPixelScale = pixel_scale*2/3;
-	//}
-	while ( (0.5f + glyphScale) * truePixelScale <  targetPixelScale)
+	while ( (0.5f + glyphScale) * truePixelScale < pixel_scale)
 		glyphScale++;
 
+	// Debug: log each unique (font, pixel_scale) pair
+	{
+		static std::unordered_set<int> s_loggedScaleKeys;
+		// Encode font pointer + quantized scale into a key to log each combo once
+		int scaleKey = (int)(pixel_scale * 100.0f) ^ (int)(uintptr_t)m_cFontData;
+		if (s_loggedScaleKeys.find(scaleKey) == s_loggedScaleKeys.end() && s_loggedScaleKeys.size() < 50) {
+			s_loggedScaleKeys.insert(scaleKey);
+			float tps = truePixelScale;
+			app.DebugPrintf("[FONT-DBG] GetGlyphBitmap: font=%s glyph=%d pixel_scale=%.3f truePixelScale=%.1f glyphScale=%.0f\n",
+				m_cFontData->getFontName().c_str(), glyph, pixel_scale, tps, glyphScale);
+		}
+	}
+
 	// 4J-JEV: Debug code to check which font sizes are being used.
 #if (!defined _CONTENT_PACKAGE) && (VERBOSE_FONT_OUTPUT > 0)
 
@@ -303,9 +310,6 @@ rrbool UIBitmapFont::GetGlyphBitmap(S32 glyph,F32 pixel_scale,IggyBitmapCharacte
 	}
 #endif
 
-	//app.DebugPrintf("Request glyph_%d (U+%.4X) at %f, converted to %f (%f)\n",
-	//				glyph, GetUnicode(glyph), pixel_scale, targetPixelScale, glyphScale);
-
 	// It is not necessary to shrink the glyph width here
 	// as its already been done in 'GetGlyphMetrics' by:
 	// > metrics->x1 = m_kerningTable[glyph] * ratio;
@@ -321,37 +325,67 @@ rrbool UIBitmapFont::GetGlyphBitmap(S32 glyph,F32 pixel_scale,IggyBitmapCharacte
 
 	// 4J-PB - this was chopping off the top of the characters, so accented ones were losing a couple of pixels at the top
 	// DaveK has reduced the height of the accented capitalised characters, and we've dropped this from 0.65 to 0.64 
-	bitmap->top_left_y = -((S32) m_cFontData->getFontData()->m_uiGlyphHeight) * m_cFontData->getFontData()->m_fAscent;
+	bitmap->top_left_y = -static_cast<S32>(m_cFontData->getFontData()->m_uiGlyphHeight) * m_cFontData->getFontData()->m_fAscent;
 
 	bitmap->oversample = 0;
-	bitmap->point_sample = true;
-
-	// 4J-JEV:
-	// pixel_scale == font size chosen in flash.
-	// bitmap->pixel_scale_correct = (float) m_glyphHeight;	// Scales the glyph to desired size.
-	// bitmap->pixel_scale_correct = pixel_scale;			// Always the same size (not desired size).
-	// bitmap->pixel_scale_correct = pixel_scale * 0.5;		// Doubles original size.
-	// bitmap->pixel_scale_correct = pixel_scale * 2;		// Halves original size.
-	
-	// Actual scale, and possible range of scales.
-	bitmap->pixel_scale_correct = pixel_scale / glyphScale;
-	bitmap->pixel_scale_max = 99.0f;
-	bitmap->pixel_scale_min = 0.0f;
-
-	/* 4J-JEV: Some of Sean's code.
-	int glyphScaleMin = 1;
-    int glyphScaleMax = 3;
-    float actualScale = pixel_scale / glyphScale;
-    bitmap->pixel_scale_correct = actualScale;
-    bitmap->pixel_scale_min = actualScale * glyphScaleMin * 0.999f;
-    bitmap->pixel_scale_max = actualScale * glyphScaleMax * 1.001f; */
+
+#ifdef _WINDOWS64
+	// On Windows64 the window can be any size, producing fractional
+	// pixel_scale values that don't align to integer multiples of
+	// truePixelScale.  The original console code cached glyphs with a
+	// broad [truePixelScale, 99] range in the "normal" branch, which
+	// works on consoles (fixed 1080p — font sizes are exact multiples)
+	// but causes cache pollution on Windows: the first glyph cached in
+	// that range sets pixel_scale_correct for ALL subsequent requests,
+	// so different font sizes get scaled by wrong ratios, producing
+	// mixed letter sizes on screen.
+	//
+	// Fix: always use pixel_scale_correct = truePixelScale so every
+	// cache entry is consistent.  Two ranges: downscale (bilinear for
+	// smooth reduction) and upscale (point_sample for crisp pixel-art).
+	bitmap->pixel_scale_correct = truePixelScale;
+	if (pixel_scale < truePixelScale)
+	{
+		bitmap->pixel_scale_min = 0.0f;
+		bitmap->pixel_scale_max = truePixelScale;
+		bitmap->point_sample = false;
+	}
+	else
+	{
+		bitmap->pixel_scale_min = truePixelScale;
+		bitmap->pixel_scale_max = 99.0f;
+		bitmap->point_sample = true;
+	}
+#else
+	if (glyphScale <= 1 && pixel_scale < truePixelScale)
+	{
+		// Small display: pixel_scale is less than the native glyph size.
+		// Report the bitmap at its true native scale so Iggy downscales it
+		// to match the layout metrics (bilinear for smooth downscaling).
+		bitmap->pixel_scale_correct = truePixelScale;
+		bitmap->pixel_scale_min = 0.0f;
+		bitmap->pixel_scale_max = truePixelScale * 1.001f;
+		bitmap->point_sample = false;
+	}
+	else
+	{
+		// Normal/upscale case: integer-multiple scaling for pixel-art look.
+		// Console-only — fixed resolution means pixel_scale values are exact
+		// integer multiples of truePixelScale, so cache sharing is safe.
+		float actualScale = pixel_scale / glyphScale;
+		bitmap->pixel_scale_correct = actualScale;
+		bitmap->pixel_scale_min = truePixelScale;
+		bitmap->pixel_scale_max = 99.0f;
+		bitmap->point_sample = true;
+	}
+#endif
 
 	// 4J-JEV: Nothing to do with glyph placement,
 	// entirely to do with cropping your glyph out of an archive.
 	bitmap->stride_in_bytes = m_cFontData->getFontData()->m_uiGlyphMapX;
 
 	// 4J-JEV: Additional information needed to release memory afterwards.
-	bitmap->user_context_for_free = NULL;
+	bitmap->user_context_for_free = nullptr;
 
 	return true;
 }
diff --git a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
index 98b4f165..49c5d5d2 100644
--- a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIComponent_Chat.h"
+#include "UISplitScreenHelpers.h"
 #include "..\..\Minecraft.h"
 #include "..\..\Gui.h"
 
@@ -46,7 +47,7 @@ void UIComponent_Chat::handleTimerComplete(int id)
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	
 	bool anyVisible = false;
-	if(pMinecraft->localplayers[m_iPad]!= NULL)
+	if(pMinecraft->localplayers[m_iPad]!= nullptr)
 	{
 		Gui *pGui = pMinecraft->gui;
 		//DWORD messagesToDisplay = min( CHAT_LINES_COUNT, pGui->getMessagesCount(m_iPad) );
@@ -55,10 +56,16 @@ void UIComponent_Chat::handleTimerComplete(int id)
 			float opacity = pGui->getOpacity(m_iPad, i);
 			if( opacity > 0 )
 			{
+#ifdef _WINDOWS64
+				// Chat drawn by Gui::render with color codes. Hides Iggy chat to avoid double chats.
+				m_controlLabelBackground[i].setOpacity(0);
+				m_labelChatText[i].setOpacity(0);
+				m_labelChatText[i].setLabel(L"");
+#else
 				m_controlLabelBackground[i].setOpacity(opacity);
 				m_labelChatText[i].setOpacity(opacity);
 				m_labelChatText[i].setLabel( pGui->getMessage(m_iPad,i) );
-
+#endif
 				anyVisible = true;
 			}
 			else
@@ -96,15 +103,15 @@ void UIComponent_Chat::render(S32 width, S32 height, C4JRender::eViewportType vi
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		}
 		ui.setupRenderPosition(xPos, yPos);
@@ -114,32 +121,42 @@ void UIComponent_Chat::render(S32 width, S32 height, C4JRender::eViewportType vi
 		S32 tileWidth = width;
 		S32 tileHeight = height;
 
+		bool needsYTile = false;
 		switch( viewport )
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-			tileHeight = (S32)(ui.getScreenHeight());
+			tileHeight = static_cast<S32>(ui.getScreenHeight());
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
-			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
+			tileWidth = static_cast<S32>(ui.getScreenWidth());
+			needsYTile = true;
 			break;
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			tileYStart = (S32)(m_movieHeight / 2);
+			needsYTile = true;
 			break;
 		}
 
-		IggyPlayerSetDisplaySize( getMovie(), m_movieWidth, m_movieHeight );
+		F32 scale;
+		ComputeTileScale(tileWidth, tileHeight, m_movieWidth, m_movieHeight, needsYTile, scale, tileYStart);
+
+		// For vertical split, scale down to fit the full SWF height when the
+		// window is shorter than the movie (same fix as HUD).
+		if(!needsYTile && m_movieHeight > 0)
+		{
+			F32 scaleH = (F32)tileHeight / (F32)m_movieHeight;
+			if(scaleH < scale)
+				scale = scaleH;
+		}
+
+		IggyPlayerSetDisplaySize( getMovie(), (S32)(m_movieWidth * scale), (S32)(m_movieHeight * scale) );
 
 		IggyPlayerDrawTilesStart ( getMovie() );
-		
+
 		m_renderWidth = tileWidth;
 		m_renderHeight = tileHeight;
 		IggyPlayerDrawTile ( getMovie() ,
@@ -147,7 +164,7 @@ void UIComponent_Chat::render(S32 width, S32 height, C4JRender::eViewportType vi
 			tileYStart ,
 			tileXStart + tileWidth ,
 			tileYStart + tileHeight ,
-			0 ); 
+			0 );
 		IggyPlayerDrawTilesEnd ( getMovie() );
 	}
 	else
diff --git a/Minecraft.Client/Common/UI/UIComponent_DebugUIMarketingGuide.cpp b/Minecraft.Client/Common/UI/UIComponent_DebugUIMarketingGuide.cpp
index 240429bc..3aab5b98 100644
--- a/Minecraft.Client/Common/UI/UIComponent_DebugUIMarketingGuide.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_DebugUIMarketingGuide.cpp
@@ -10,7 +10,7 @@ UIComponent_DebugUIMarketingGuide::UIComponent_DebugUIMarketingGuide(int iPad, v
 	IggyDataValue result;
 	IggyDataValue value[1];
 	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = (F64)0;	// WIN64
+	value[0].number = static_cast<F64>(0);	// WIN64
 #if defined _XBOX
 	value[0].number = (F64)1;
 #elif defined _DURANGO
@@ -22,7 +22,7 @@ UIComponent_DebugUIMarketingGuide::UIComponent_DebugUIMarketingGuide(int iPad, v
 #elif defined __PSVITA__
 	value[0].number = (F64)5;
 #elif defined _WINDOWS64
-	value[0].number = (F64)0;
+	value[0].number = static_cast<F64>(0);
 #endif
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetPlatform , 1 , value );
 }
diff --git a/Minecraft.Client/Common/UI/UIComponent_MenuBackground.cpp b/Minecraft.Client/Common/UI/UIComponent_MenuBackground.cpp
index d3a4c4c0..b7c4ebbd 100644
--- a/Minecraft.Client/Common/UI/UIComponent_MenuBackground.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_MenuBackground.cpp
@@ -2,6 +2,8 @@
 #include "UI.h"
 #include "UIComponent_MenuBackground.h"
 
+#include <algorithm>
+
 UIComponent_MenuBackground::UIComponent_MenuBackground(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
 	m_bSplitscreen = false; 
@@ -42,15 +44,15 @@ void UIComponent_MenuBackground::render(S32 width, S32 height, C4JRender::eViewp
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		}
 		ui.setupRenderPosition(xPos, yPos);
@@ -64,28 +66,33 @@ void UIComponent_MenuBackground::render(S32 width, S32 height, C4JRender::eViewp
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-			tileHeight = (S32)(ui.getScreenHeight());
+			tileHeight = static_cast<S32>(ui.getScreenHeight());
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
+			tileWidth = static_cast<S32>(ui.getScreenWidth());
+			tileYStart = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
+			tileWidth = static_cast<S32>(ui.getScreenWidth());
+			tileYStart = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			tileYStart = (S32)(m_movieHeight / 2);
+			tileYStart = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		}
 
-		IggyPlayerSetDisplaySize( getMovie(), m_movieWidth, m_movieHeight );
+		F32 scaleW = static_cast<F32>(tileXStart + tileWidth) / static_cast<F32>(m_movieWidth);
+		F32 scaleH = static_cast<F32>(tileYStart + tileHeight) / static_cast<F32>(m_movieHeight);
+		F32 scale = (scaleW > scaleH) ? scaleW : scaleH;
+		scale = max(scale, 1.0f);
+
+		IggyPlayerSetDisplaySize( getMovie(), static_cast<S32>(m_movieWidth * scale), static_cast<S32>(m_movieHeight * scale) );
 
 		IggyPlayerDrawTilesStart ( getMovie() );
-		
+
 		m_renderWidth = tileWidth;
 		m_renderHeight = tileHeight;
 		IggyPlayerDrawTile ( getMovie() ,
@@ -93,11 +100,15 @@ void UIComponent_MenuBackground::render(S32 width, S32 height, C4JRender::eViewp
 			tileYStart ,
 			tileXStart + tileWidth ,
 			tileYStart + tileHeight ,
-			0 ); 
+			0 );
 		IggyPlayerDrawTilesEnd ( getMovie() );
 	}
 	else
 	{
-		UIScene::render(width, height, viewport);
+		if(m_bIsReloading) return;
+		if(!m_hasTickedOnce || !getMovie()) return;
+		ui.setupRenderPosition(0, 0);
+		IggyPlayerSetDisplaySize( getMovie(), static_cast<S32>(ui.getScreenWidth()), static_cast<S32>(ui.getScreenHeight()) );
+		IggyPlayerDraw( getMovie() );
 	}
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
index cb6443a1..3da8174c 100644
--- a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
@@ -45,9 +45,9 @@ void UIComponent_Panorama::tick()
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	EnterCriticalSection(&pMinecraft->m_setLevelCS);
-	if(pMinecraft->level!=NULL)
+	if(pMinecraft->level!=nullptr)
 	{
-		__int64 i64TimeOfDay =0;
+		int64_t i64TimeOfDay =0;
 		// are we in the Nether? - Leave the time as 0 if we are, so we show daylight
 		if(pMinecraft->level->dimension->id==0)
 		{
@@ -85,46 +85,55 @@ void UIComponent_Panorama::render(S32 width, S32 height, C4JRender::eViewportTyp
 		switch( viewport )
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
 			break;
 		}
 		ui.setupRenderPosition(xPos, yPos);
 
-		if((viewport == C4JRender::VIEWPORT_TYPE_SPLIT_LEFT) ||	(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT))
+		S32 tileXStart = 0;
+		S32 tileYStart = 0;
+		S32 tileWidth = width;
+		S32 tileHeight = height;
+
+		if((viewport == C4JRender::VIEWPORT_TYPE_SPLIT_LEFT) || (viewport == C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT))
 		{
-			// Need to render at full height, but only the left side of the scene
-			S32 tileXStart = 0;
-			S32 tileYStart = 0;
-			S32 tileWidth = width;
-			S32 tileHeight = (S32)(ui.getScreenHeight());
-
-			IggyPlayerSetDisplaySize( getMovie(), m_movieWidth, m_movieHeight );
-
-			IggyPlayerDrawTilesStart ( getMovie() );
-		
-			m_renderWidth = tileWidth;
-			m_renderHeight = tileHeight;
-			IggyPlayerDrawTile ( getMovie() ,
-				tileXStart ,
-				tileYStart ,
-				tileXStart + tileWidth ,
-				tileYStart + tileHeight ,
-				0 ); 
-			IggyPlayerDrawTilesEnd ( getMovie() );
+			tileHeight = static_cast<S32>(ui.getScreenHeight());
 		}
 		else
 		{
-			// Need to render at full height, and full width. But compressed into the viewport
-			IggyPlayerSetDisplaySize( getMovie(), ui.getScreenWidth(), ui.getScreenHeight()/2 );
-			IggyPlayerDraw( getMovie() );
+			tileWidth = static_cast<S32>(ui.getScreenWidth());
+			tileYStart = static_cast<S32>(ui.getScreenHeight() / 2);
 		}
+
+		F32 scaleW = static_cast<F32>(tileXStart + tileWidth) / static_cast<F32>(m_movieWidth);
+		F32 scaleH = static_cast<F32>(tileYStart + tileHeight) / static_cast<F32>(m_movieHeight);
+		F32 scale = (scaleW > scaleH) ? scaleW : scaleH;
+		if(scale < 1.0f) scale = 1.0f;
+
+		IggyPlayerSetDisplaySize( getMovie(), static_cast<S32>(m_movieWidth * scale), static_cast<S32>(m_movieHeight * scale) );
+
+		IggyPlayerDrawTilesStart ( getMovie() );
+
+		m_renderWidth = tileWidth;
+		m_renderHeight = tileHeight;
+		IggyPlayerDrawTile ( getMovie() ,
+			tileXStart ,
+			tileYStart ,
+			tileXStart + tileWidth ,
+			tileYStart + tileHeight ,
+			0 );
+		IggyPlayerDrawTilesEnd ( getMovie() );
 	}
 	else
 	{
-		UIScene::render(width, height, viewport);
+		if(m_bIsReloading) return;
+		if(!m_hasTickedOnce || !getMovie()) return;
+		ui.setupRenderPosition(0, 0);
+		IggyPlayerSetDisplaySize( getMovie(), static_cast<S32>(ui.getScreenWidth()), static_cast<S32>(ui.getScreenHeight()) );
+		IggyPlayerDraw( getMovie() );
 	}
 }
 
diff --git a/Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp b/Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp
index 255740c9..4f60de5f 100644
--- a/Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIComponent_Tooltips.h"
+#include "UISplitScreenHelpers.h"
 
 UIComponent_Tooltips::UIComponent_Tooltips(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
@@ -92,18 +93,22 @@ void UIComponent_Tooltips::updateSafeZone()
 	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
 		safeTop = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-		safeBottom = getSafeZoneHalfHeight();
+		safeTop = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-		safeLeft = getSafeZoneHalfWidth();
+		safeTop = getSafeZoneHalfHeight();
 		safeBottom = getSafeZoneHalfHeight();
+		safeLeft = getSafeZoneHalfWidth();
 		break;
 	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		safeRight = getSafeZoneHalfWidth();
+		safeTop = getSafeZoneHalfHeight();
 		safeBottom = getSafeZoneHalfHeight();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
 		safeTop = getSafeZoneHalfHeight();
@@ -111,22 +116,22 @@ void UIComponent_Tooltips::updateSafeZone()
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
 		safeTop = getSafeZoneHalfHeight();
-		safeRight = getSafeZoneHalfWidth();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-		safeBottom = getSafeZoneHalfHeight();
+		safeTop = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-		safeBottom = getSafeZoneHalfHeight();
-		safeRight = getSafeZoneHalfWidth();
+		safeTop = getSafeZoneHalfHeight();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
 	default:
 		safeTop = getSafeZoneHalfHeight();
 		safeBottom = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
-		safeRight = getSafeZoneHalfWidth();
+
 		break;
 	}
 	setSafeZone(safeTop, safeBottom, safeLeft, safeRight);
@@ -154,8 +159,8 @@ void UIComponent_Tooltips::tick()
 		{
 			if(uiOpacityTimer<10)
 			{
-				float fStep=(80.0f-(float)ucAlpha)/10.0f;
-				fVal=0.01f*(80.0f-((10.0f-(float)uiOpacityTimer)*fStep));
+				float fStep=(80.0f-static_cast<float>(ucAlpha))/10.0f;
+				fVal=0.01f*(80.0f-((10.0f-static_cast<float>(uiOpacityTimer))*fStep));
 			}
 			else
 			{
@@ -164,7 +169,7 @@ void UIComponent_Tooltips::tick()
 		}
 		else
 		{
-			fVal=0.01f*(float)ucAlpha;
+			fVal=0.01f*static_cast<float>(ucAlpha);
 		}
 	}
 	else
@@ -174,7 +179,7 @@ void UIComponent_Tooltips::tick()
 		{
 			ucAlpha=15;
 		}
-		fVal=0.01f*(float)ucAlpha;
+		fVal=0.01f*static_cast<float>(ucAlpha);
 	}
 	setOpacity(fVal);
 
@@ -206,15 +211,15 @@ void UIComponent_Tooltips::render(S32 width, S32 height, C4JRender::eViewportTyp
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
 			break;
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			yPos = (S32)(ui.getScreenHeight() / 2);
+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);
+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);
 			break;
 		}
 		ui.setupRenderPosition(xPos, yPos);
@@ -224,32 +229,42 @@ void UIComponent_Tooltips::render(S32 width, S32 height, C4JRender::eViewportTyp
 		S32 tileWidth = width;
 		S32 tileHeight = height;
 
+		bool needsYTile = false;
 		switch( viewport )
 		{
 		case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
 		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-			tileHeight = (S32)(ui.getScreenHeight());
+			tileHeight = static_cast<S32>(ui.getScreenHeight());
 			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
-			break;
 		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
+			tileWidth = static_cast<S32>(ui.getScreenWidth());
+			needsYTile = true;
 			break;
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
 		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			tileYStart = (S32)(m_movieHeight / 2);
+			needsYTile = true;
 			break;
 		}
 
-		IggyPlayerSetDisplaySize( getMovie(), m_movieWidth, m_movieHeight );
+		F32 scale;
+		ComputeTileScale(tileWidth, tileHeight, m_movieWidth, m_movieHeight, needsYTile, scale, tileYStart);
+
+		// For vertical split, scale down to fit the full SWF height when the
+		// window is shorter than the movie (same fix as HUD).
+		if(!needsYTile && m_movieHeight > 0)
+		{
+			F32 scaleH = (F32)tileHeight / (F32)m_movieHeight;
+			if(scaleH < scale)
+				scale = scaleH;
+		}
+
+		IggyPlayerSetDisplaySize( getMovie(), (S32)(m_movieWidth * scale), (S32)(m_movieHeight * scale) );
 
 		IggyPlayerDrawTilesStart ( getMovie() );
-		
+
 		m_renderWidth = tileWidth;
 		m_renderHeight = tileHeight;
 		IggyPlayerDrawTile ( getMovie() ,
@@ -257,7 +272,7 @@ void UIComponent_Tooltips::render(S32 width, S32 height, C4JRender::eViewportTyp
 			tileYStart ,
 			tileXStart + tileWidth ,
 			tileYStart + tileHeight ,
-			0 ); 
+			0 );
 		IggyPlayerDrawTilesEnd ( getMovie() );
 	}
 	else
@@ -351,7 +366,7 @@ void UIComponent_Tooltips::_SetTooltip(unsigned int iToolTipId, UIString label,
 void UIComponent_Tooltips::_Relayout()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcUpdateLayout, 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcUpdateLayout, 0 , nullptr );
 
 #ifdef __PSVITA__
 	// rebuild touchboxes
diff --git a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
index 3b4eb097..76d3babf 100644
--- a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIComponent_TutorialPopup.h"
+#include "UISplitScreenHelpers.h"
 #include "..\..\Common\Tutorial\Tutorial.h"
 #include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "..\..\MultiplayerLocalPlayer.h"
@@ -12,8 +13,8 @@ UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void *initData, U
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	m_interactScene = NULL;
-	m_lastInteractSceneMoved = NULL;
+	m_interactScene = nullptr;
+	m_lastInteractSceneMoved = nullptr;
 	m_lastSceneMovedLeft = false;
 	m_bAllowFade = false;
 	m_iconItem = nullptr;
@@ -90,7 +91,7 @@ void UIComponent_TutorialPopup::RemoveInteractSceneReference(UIScene *scene)
 {
 	if( m_interactScene == scene )
 	{
-		m_interactScene = NULL;
+		m_interactScene = nullptr;
 	}
 }
 
@@ -132,7 +133,7 @@ void UIComponent_TutorialPopup::_SetDescription(UIScene *interactScene, const ws
 {	
 	m_interactScene = interactScene;
 	app.DebugPrintf("Setting m_interactScene to %08x\n", m_interactScene);
-	if( interactScene != m_lastInteractSceneMoved ) m_lastInteractSceneMoved = NULL;
+	if( interactScene != m_lastInteractSceneMoved ) m_lastInteractSceneMoved = nullptr;
 	if(desc.empty())
 	{
 		SetVisible( false );
@@ -212,20 +213,20 @@ wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil,
 	if( icon != TUTORIAL_NO_ICON )
 	{
 		m_iconIsFoil = false;
-		m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(icon,1,iAuxVal));
+		m_iconItem = std::make_shared<ItemInstance>(icon, 1, iAuxVal);
 	}
 	else
 	{
 		m_iconItem = nullptr;
 		wstring openTag(L"{*ICON*}");
 		wstring closeTag(L"{*/ICON*}");
-		int iconTagStartPos = (int)temp.find(openTag);
-		int iconStartPos = iconTagStartPos + (int)openTag.length();
-		if( iconTagStartPos > 0 && iconStartPos < (int)temp.length() )
+		size_t iconTagStartPos = temp.find(openTag);
+		size_t iconStartPos = iconTagStartPos + openTag.length();
+		if( iconTagStartPos > 0 && iconStartPos < temp.length() )
 		{
-			int iconEndPos = (int)temp.find( closeTag, iconStartPos );
+			size_t iconEndPos = temp.find(closeTag, iconStartPos);
 
-			if(iconEndPos > iconStartPos && iconEndPos < (int)temp.length() )
+			if(iconEndPos > iconStartPos && iconEndPos < temp.length() )
 			{
 				wstring id = temp.substr(iconStartPos, iconEndPos - iconStartPos);
 
@@ -241,7 +242,7 @@ wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil,
 				{
 					iAuxVal = 0;
 				}
-				m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(iconId,1,iAuxVal));
+				m_iconItem = std::make_shared<ItemInstance>(iconId, 1, iAuxVal);
 
 				temp.replace(iconTagStartPos, iconEndPos - iconTagStartPos + closeTag.length(), L"");
 			}
@@ -250,63 +251,63 @@ wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil,
 		// remove any icon text
 		else if(temp.find(L"{*CraftingTableIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::workBench_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::workBench_Id, 1, 0);
 		}
 		else if(temp.find(L"{*SticksIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::stick_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::stick_Id, 1, 0);
 		}
 		else if(temp.find(L"{*PlanksIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::wood_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::wood_Id, 1, 0);
 		}
 		else if(temp.find(L"{*WoodenShovelIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::shovel_wood_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::shovel_wood_Id, 1, 0);
 		}
 		else if(temp.find(L"{*WoodenHatchetIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::hatchet_wood_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::hatchet_wood_Id, 1, 0);
 		}
 		else if(temp.find(L"{*WoodenPickaxeIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::pickAxe_wood_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::pickAxe_wood_Id, 1, 0);
 		}
 		else if(temp.find(L"{*FurnaceIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::furnace_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::furnace_Id, 1, 0);
 		}
 		else if(temp.find(L"{*WoodenDoorIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::door_wood,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::door_wood, 1, 0);
 		}
 		else if(temp.find(L"{*TorchIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::torch_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::torch_Id, 1, 0);
 		}
 		else if(temp.find(L"{*BoatIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::boat_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::boat_Id, 1, 0);
 		}
 		else if(temp.find(L"{*FishingRodIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::fishingRod_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::fishingRod_Id, 1, 0);
 		}
 		else if(temp.find(L"{*FishIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::fish_raw_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::fish_raw_Id, 1, 0);
 		}
 		else if(temp.find(L"{*MinecartIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Item::minecart_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Item::minecart_Id, 1, 0);
 		}
 		else if(temp.find(L"{*RailIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::rail_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::rail_Id, 1, 0);
 		}
 		else if(temp.find(L"{*PoweredRailIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::goldenRail_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::goldenRail_Id, 1, 0);
 		}
 		else if(temp.find(L"{*StructuresIcon*}")!=wstring::npos)
 		{
@@ -320,15 +321,15 @@ wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil,
 		}
 		else if(temp.find(L"{*StoneIcon*}")!=wstring::npos)
 		{
-			m_iconItem = shared_ptr<ItemInstance>(new ItemInstance(Tile::stone_Id,1,0));
+			m_iconItem = std::make_shared<ItemInstance>(Tile::stone_Id, 1, 0);
 		}
 		else
 		{
 			m_iconItem = nullptr;
 		}
 	}
-	if(!isFixedIcon && m_iconItem != NULL) setupIconHolder(e_ICON_TYPE_IGGY);
-	m_controlIconHolder.setVisible( isFixedIcon || m_iconItem != NULL);
+	if(!isFixedIcon && m_iconItem != nullptr) setupIconHolder(e_ICON_TYPE_IGGY);
+	m_controlIconHolder.setVisible( isFixedIcon || m_iconItem != nullptr);
 
 	return temp;
 }
@@ -341,13 +342,13 @@ wstring UIComponent_TutorialPopup::_SetImage(wstring &desc)
 
 	wstring openTag(L"{*IMAGE*}");
 	wstring closeTag(L"{*/IMAGE*}");
-	int imageTagStartPos = (int)desc.find(openTag);
-	int imageStartPos = imageTagStartPos + (int)openTag.length();
-	if( imageTagStartPos > 0 && imageStartPos < (int)desc.length() )
+	size_t imageTagStartPos = desc.find(openTag);
+	size_t imageStartPos = imageTagStartPos + openTag.length();
+	if( imageTagStartPos > 0 && imageStartPos < desc.length() )
 	{
-		int imageEndPos = (int)desc.find( closeTag, imageStartPos );
+		size_t imageEndPos = desc.find( closeTag, imageStartPos );
 
-		if(imageEndPos > imageStartPos && imageEndPos < (int)desc.length() )
+		if(imageEndPos > imageStartPos && imageEndPos < desc.length() )
 		{
 			wstring id = desc.substr(imageStartPos, imageEndPos - imageStartPos);
 			m_image.SetImagePath( id.c_str() );
@@ -425,7 +426,7 @@ wstring UIComponent_TutorialPopup::ParseDescription(int iPad, wstring &text)
 
 void UIComponent_TutorialPopup::UpdateInteractScenePosition(bool visible)
 {
-	if( m_interactScene == NULL ) return;
+	if( m_interactScene == nullptr ) return;
 
 	// 4J-PB - check this players screen section to see if we should allow the animation
 	bool bAllowAnim=false;
@@ -474,27 +475,17 @@ void UIComponent_TutorialPopup::render(S32 width, S32 height, C4JRender::eViewpo
 {
 	if(viewport != C4JRender::VIEWPORT_TYPE_FULLSCREEN)
 	{
-		S32 xPos = 0;
-		S32 yPos = 0;
-		switch( viewport )
-		{
-		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			yPos = (S32)(ui.getScreenHeight() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-			yPos = (S32)(ui.getScreenHeight() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			yPos = (S32)(ui.getScreenHeight() / 2);
-			break;
-		}
+		// Derive the viewport origin and fit a 16:9 box inside it (same as UIScene::render),
+		// then apply safezone nudges so the popup stays clear of screen edges.
+		F32 originX, originY, viewW, viewH;
+		GetViewportRect(ui.getScreenWidth(), ui.getScreenHeight(), viewport, originX, originY, viewW, viewH);
+
+		S32 fitW, fitH, offsetX, offsetY;
+		Fit16x9(viewW, viewH, fitW, fitH, offsetX, offsetY);
+
+		S32 xPos = static_cast<S32>(originX) + offsetX;
+		S32 yPos = static_cast<S32>(originY) + offsetY;
+
 		//Adjust for safezone
 		switch( viewport )
 		{
@@ -505,6 +496,7 @@ void UIComponent_TutorialPopup::render(S32 width, S32 height, C4JRender::eViewpo
 			case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
 				yPos += getSafeZoneHalfHeight();
 				break;
+			default: break;
 		}
 		switch( viewport )
 		{
@@ -515,10 +507,11 @@ void UIComponent_TutorialPopup::render(S32 width, S32 height, C4JRender::eViewpo
 			case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
 				xPos -= getSafeZoneHalfWidth();
 				break;
+			default: break;
 		}
 		ui.setupRenderPosition(xPos, yPos);
 
-		IggyPlayerSetDisplaySize( getMovie(), width, height );
+		IggyPlayerSetDisplaySize( getMovie(), fitW, fitH );
 		IggyPlayerDraw( getMovie() );
 	}
 	else
@@ -529,7 +522,7 @@ void UIComponent_TutorialPopup::render(S32 width, S32 height, C4JRender::eViewpo
 
 void UIComponent_TutorialPopup::customDraw(IggyCustomDrawCallbackRegion *region)
 {
-	if(m_iconItem != NULL) customDrawSlotControl(region,m_iPad,m_iconItem,1.0f,m_iconItem->isFoil() || m_iconIsFoil,false);
+	if(m_iconItem != nullptr) customDrawSlotControl(region,m_iPad,m_iconItem,1.0f,m_iconItem->isFoil() || m_iconIsFoil,false);
 }
 
 void UIComponent_TutorialPopup::setupIconHolder(EIcons icon)
@@ -538,7 +531,7 @@ void UIComponent_TutorialPopup::setupIconHolder(EIcons icon)
 	IggyDataValue result;
 	IggyDataValue value[1];
 	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = (F64)icon;
+	value[0].number = static_cast<F64>(icon);
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetupIconHolder , 1 , value );
 
 	m_iconType = icon;
diff --git a/Minecraft.Client/Common/UI/UIControl.cpp b/Minecraft.Client/Common/UI/UIControl.cpp
index be267ada..7582e82f 100644
--- a/Minecraft.Client/Common/UI/UIControl.cpp
+++ b/Minecraft.Client/Common/UI/UIControl.cpp
@@ -6,12 +6,14 @@
 
 UIControl::UIControl()
 {
-	m_parentScene = NULL;
+	m_parentScene = nullptr;
 	m_lastOpacity = 1.0f;
 	m_controlName = "";
 	m_isVisible = true;
 	m_bHidden = false;
 	m_eControlType = eNoControl;
+	m_id = -1;
+	m_pParentPanel = NULL;
 }
 
 bool UIControl::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName)
@@ -29,15 +31,15 @@ bool UIControl::setupControl(UIScene *scene, IggyValuePath *parent, const string
 	m_nameVisible = registerFastName(L"visible");
 
 	F64 fx, fy, fwidth, fheight;
-	IggyValueGetF64RS( getIggyValuePath() , m_nameXPos , NULL , &fx ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameYPos , NULL , &fy ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameWidth , NULL , &fwidth ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameHeight , NULL , &fheight );
+	IggyValueGetF64RS( getIggyValuePath() , m_nameXPos , nullptr , &fx ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameYPos , nullptr , &fy ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameWidth , nullptr , &fwidth ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameHeight , nullptr , &fheight );
 
-	m_x = (S32)fx;
-	m_y = (S32)fy;
-	m_width = (S32)Math::round(fwidth);
-	m_height = (S32)Math::round(fheight);
+	m_x = static_cast<S32>(fx);
+	m_y = static_cast<S32>(fy);
+	m_width = static_cast<S32>(Math::round(fwidth));
+	m_height = static_cast<S32>(Math::round(fheight));
 
 	return res;
 }
@@ -45,14 +47,14 @@ bool UIControl::setupControl(UIScene *scene, IggyValuePath *parent, const string
 void UIControl::UpdateControl()
 {
 	F64 fx, fy, fwidth, fheight;
-	IggyValueGetF64RS( getIggyValuePath() , m_nameXPos , NULL , &fx ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameYPos , NULL , &fy ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameWidth , NULL , &fwidth ); 
-	IggyValueGetF64RS( getIggyValuePath() , m_nameHeight , NULL , &fheight );
-	m_x = (S32)fx;
-	m_y = (S32)fy;
-	m_width = (S32)Math::round(fwidth);
-	m_height = (S32)Math::round(fheight);
+	IggyValueGetF64RS( getIggyValuePath() , m_nameXPos , nullptr , &fx ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameYPos , nullptr , &fy ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameWidth , nullptr , &fwidth ); 
+	IggyValueGetF64RS( getIggyValuePath() , m_nameHeight , nullptr , &fheight );
+	m_x = static_cast<S32>(fx);
+	m_y = static_cast<S32>(fy);
+	m_width = static_cast<S32>(Math::round(fwidth));
+	m_height = static_cast<S32>(Math::round(fheight));
 }
 
 void UIControl::ReInit()
@@ -74,7 +76,7 @@ void UIControl::ReInit()
 		IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, m_parentScene->m_rootPath , m_funcSetAlpha , 2 , value );
 	}
 
-	IggyValueSetBooleanRS( getIggyValuePath(), m_nameVisible, NULL, m_isVisible );
+	IggyValueSetBooleanRS( getIggyValuePath(), m_nameVisible, nullptr, m_isVisible );
 }
 
 IggyValuePath *UIControl::getIggyValuePath()
@@ -128,7 +130,7 @@ void UIControl::setVisible(bool visible)
 {
 	if(visible != m_isVisible)
 	{
-		rrbool succ = IggyValueSetBooleanRS( getIggyValuePath(), m_nameVisible, NULL, visible );
+		rrbool succ = IggyValueSetBooleanRS( getIggyValuePath(), m_nameVisible, nullptr, visible );
 		if(succ) m_isVisible = visible;
 		else app.DebugPrintf("Failed to set visibility for control\n");
 	}
@@ -138,7 +140,7 @@ bool UIControl::getVisible()
 {
 	rrbool bVisible = false;
 	
-	IggyResult result = IggyValueGetBooleanRS ( getIggyValuePath() , m_nameVisible, NULL, &bVisible );
+	IggyResult result = IggyValueGetBooleanRS ( getIggyValuePath() , m_nameVisible, nullptr, &bVisible );
 	
 	m_isVisible = bVisible;
 	
diff --git a/Minecraft.Client/Common/UI/UIControl.h b/Minecraft.Client/Common/UI/UIControl.h
index 29770df2..8445af0f 100644
--- a/Minecraft.Client/Common/UI/UIControl.h
+++ b/Minecraft.Client/Common/UI/UIControl.h
@@ -38,12 +38,14 @@ protected:
 	bool m_bHidden; // set by the Remove call
 
 public:
+	UIControl *m_pParentPanel; // set by UI_MAP_ELEMENT macro during mapElementsAndNames
 
 	void setControlType(eUIControlType eType) {m_eControlType=eType;}
 	eUIControlType getControlType() {return m_eControlType;}
 	void setId(int iID) { m_id=iID; }
 	int getId() { return m_id; }
 	UIScene * getParentScene() {return m_parentScene;}
+	UIControl* getParentPanel() { return m_pParentPanel; }
 
 protected:
 	IggyValuePath m_iggyPath;
@@ -62,10 +64,8 @@ public:
 
 	virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName);
 	void UpdateControl();
-#ifdef __PSVITA__
 	void setHidden(bool bHidden) {m_bHidden=bHidden;}
 	bool getHidden(void) {return m_bHidden;}
-#endif
 
 	IggyValuePath *getIggyValuePath();
 
diff --git a/Minecraft.Client/Common/UI/UIControl_Base.cpp b/Minecraft.Client/Common/UI/UIControl_Base.cpp
index 7a4a24e5..87c2862f 100644
--- a/Minecraft.Client/Common/UI/UIControl_Base.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_Base.cpp
@@ -72,7 +72,7 @@ void UIControl_Base::setLabel(UIString label, bool instant, bool force)
 const wchar_t* UIControl_Base::getLabel()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_funcGetLabel, 0, NULL);
+	IggyResult out = IggyPlayerCallMethodRS(m_parentScene->getMovie(), &result, getIggyValuePath(), m_funcGetLabel, 0, nullptr);
 
 	if(result.type == IGGY_DATATYPE_string_UTF16)
 	{
@@ -90,7 +90,7 @@ void UIControl_Base::setAllPossibleLabels(int labelCount, wchar_t labels[][256])
 
 	for(unsigned int i = 0; i < labelCount; ++i)
 	{
-		stringVal[i].string = (IggyUTF16 *)labels[i];
+		stringVal[i].string = static_cast<IggyUTF16 *>(labels[i]);
 		stringVal[i].length = wcslen(labels[i]);
 		value[i].type = IGGY_DATATYPE_string_UTF16;
 		value[i].string16 = stringVal[i];
diff --git a/Minecraft.Client/Common/UI/UIControl_ButtonList.cpp b/Minecraft.Client/Common/UI/UIControl_ButtonList.cpp
index 68a3d655..4f0e5ca0 100644
--- a/Minecraft.Client/Common/UI/UIControl_ButtonList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_ButtonList.cpp
@@ -60,7 +60,7 @@ void UIControl_ButtonList::ReInit()
 void UIControl_ButtonList::clearList()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_removeAllItemsFunc , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_removeAllItemsFunc , 0 , nullptr );
 
 	m_itemCount = 0;
 }
@@ -82,7 +82,7 @@ void UIControl_ButtonList::addItem(const string &label, int data)
 
 	IggyStringUTF8 stringVal;
 	stringVal.string = (char*)label.c_str();
-	stringVal.length = (S32)label.length();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF8;
 	value[0].string8 = stringVal;
 
@@ -159,7 +159,7 @@ void UIControl_ButtonList::setButtonLabel(int iButtonId, const wstring &label)
 	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie(), &result, getIggyValuePath(), m_funcSetButtonLabel, 2 , value );
 }
 
-#ifdef __PSVITA__
+#if defined(__PSVITA__) || defined(_WINDOWS64)
 void UIControl_ButtonList::SetTouchFocus(S32 iX, S32 iY, bool bRepeat)
 {
 	IggyDataValue result;
diff --git a/Minecraft.Client/Common/UI/UIControl_ButtonList.h b/Minecraft.Client/Common/UI/UIControl_ButtonList.h
index 44484ac3..666b1f0a 100644
--- a/Minecraft.Client/Common/UI/UIControl_ButtonList.h
+++ b/Minecraft.Client/Common/UI/UIControl_ButtonList.h
@@ -37,7 +37,7 @@ public:
 
 	void setButtonLabel(int iButtonId, const wstring &label);
 
-#ifdef __PSVITA__
+#if defined(__PSVITA__) || defined(_WINDOWS64)
 	void SetTouchFocus(S32 iX, S32 iY, bool bRepeat);
 	bool CanTouchTrigger(S32 iX, S32 iY);
 #endif
diff --git a/Minecraft.Client/Common/UI/UIControl_CheckBox.cpp b/Minecraft.Client/Common/UI/UIControl_CheckBox.cpp
index 1c3e8afe..e5f4da7a 100644
--- a/Minecraft.Client/Common/UI/UIControl_CheckBox.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_CheckBox.cpp
@@ -60,7 +60,7 @@ void UIControl_CheckBox::init(UIString label, int id, bool checked)
 bool UIControl_CheckBox::IsChecked()
 {
 	rrbool checked = false;
-	IggyResult result = IggyValueGetBooleanRS ( &m_iggyPath , m_checkedProp, NULL, &checked );
+	IggyResult result = IggyValueGetBooleanRS ( &m_iggyPath , m_checkedProp, nullptr, &checked );
 	m_bChecked = checked;
 	return checked;
 }
diff --git a/Minecraft.Client/Common/UI/UIControl_DLCList.cpp b/Minecraft.Client/Common/UI/UIControl_DLCList.cpp
index 35e6b08a..39f8ff39 100644
--- a/Minecraft.Client/Common/UI/UIControl_DLCList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_DLCList.cpp
@@ -20,7 +20,7 @@ void UIControl_DLCList::addItem(const string &label, bool showTick, int iId)
 
 	IggyStringUTF8 stringVal;
 	stringVal.string = (char*)label.c_str();
-	stringVal.length = (S32)label.length();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF8;
 	value[0].string8 = stringVal;
 
@@ -41,7 +41,7 @@ void UIControl_DLCList::addItem(const wstring &label, bool showTick, int iId)
 
 	IggyStringUTF16 stringVal;
 	stringVal.string = (IggyUTF16 *)label.c_str();
-	stringVal.length = (S32)label.length();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF16;
 	value[0].string16 = stringVal;
 
diff --git a/Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp b/Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp
index fa29a137..8c275893 100644
--- a/Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_DynamicLabel.cpp
@@ -74,12 +74,12 @@ void UIControl_DynamicLabel::TouchScroll(S32 iY, bool bActive)
 S32 UIControl_DynamicLabel::GetRealWidth()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth, 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth, 0 , nullptr );
 
 	S32 iRealWidth = m_width;
 	if(result.type == IGGY_DATATYPE_number)
 	{
-		iRealWidth = (S32)result.number;
+		iRealWidth = static_cast<S32>(result.number);
 	}
 	return iRealWidth;
 }
@@ -87,12 +87,12 @@ S32 UIControl_DynamicLabel::GetRealWidth()
 S32 UIControl_DynamicLabel::GetRealHeight()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , nullptr );
 
 	S32 iRealHeight = m_height;
 	if(result.type == IGGY_DATATYPE_number)
 	{
-		iRealHeight = (S32)result.number;
+		iRealHeight = static_cast<S32>(result.number);
 	}
 	return iRealHeight;
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
index 9664dbf4..f091b0fc 100644
--- a/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
@@ -12,7 +12,7 @@
 UIControl_EnchantmentBook::UIControl_EnchantmentBook()
 {
 	UIControl::setControlType(UIControl::eEnchantmentBook);
-	model = NULL;
+	model = nullptr;
 	last = nullptr;
 
 	time = 0;
@@ -69,12 +69,12 @@ void UIControl_EnchantmentBook::render(IggyCustomDrawCallbackRegion *region)
 
 	glEnable(GL_CULL_FACE);
 
-	if(model == NULL)
+	if(model == nullptr)
 	{
 		// Share the model the the EnchantTableRenderer
 
-		EnchantTableRenderer *etr = (EnchantTableRenderer*)TileEntityRenderDispatcher::instance->getRenderer(eTYPE_ENCHANTMENTTABLEENTITY);
-		if(etr != NULL)
+		EnchantTableRenderer *etr = static_cast<EnchantTableRenderer *>(TileEntityRenderDispatcher::instance->getRenderer(eTYPE_ENCHANTMENTTABLEENTITY));
+		if(etr != nullptr)
 		{
 			model = etr->bookModel;
 		}
@@ -96,7 +96,7 @@ void UIControl_EnchantmentBook::render(IggyCustomDrawCallbackRegion *region)
 
 void UIControl_EnchantmentBook::tickBook()
 {
-	UIScene_EnchantingMenu *m_containerScene = (UIScene_EnchantingMenu *)m_parentScene;
+	UIScene_EnchantingMenu *m_containerScene = static_cast<UIScene_EnchantingMenu *>(m_parentScene);
 	EnchantmentMenu *menu = m_containerScene->getMenu();
 	shared_ptr<ItemInstance> current = menu->getSlot(0)->getItem();
 	if (!ItemInstance::matches(current, last))
diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
index f1e2735a..156f9815 100644
--- a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
@@ -55,7 +55,7 @@ void UIControl_EnchantmentButton::tick()
 
 void UIControl_EnchantmentButton::render(IggyCustomDrawCallbackRegion *region)
 {
-	UIScene_EnchantingMenu *enchantingScene = (UIScene_EnchantingMenu *)m_parentScene;
+	UIScene_EnchantingMenu *enchantingScene = static_cast<UIScene_EnchantingMenu *>(m_parentScene);
 	EnchantmentMenu *menu = enchantingScene->getMenu();
 
 	float width = region->x1 - region->x0;
@@ -108,7 +108,7 @@ void UIControl_EnchantmentButton::render(IggyCustomDrawCallbackRegion *region)
 		if (pMinecraft->localplayers[enchantingScene->getPad()]->experienceLevel < cost && !pMinecraft->localplayers[enchantingScene->getPad()]->abilities.instabuild)
 		{
 			col = m_textDisabledColour;
-			font->drawWordWrap(m_enchantmentString, 0, 0, (float)m_width/ss, col, (float)m_height/ss);
+			font->drawWordWrap(m_enchantmentString, 0, 0, static_cast<float>(m_width)/ss, col, static_cast<float>(m_height)/ss);
 			font = pMinecraft->font;
 			//col = (0x80ff20 & 0xfefefe) >> 1;
 			//font->drawShadow(line, (bwidth - font->width(line))/ss, 7, col);
@@ -120,7 +120,7 @@ void UIControl_EnchantmentButton::render(IggyCustomDrawCallbackRegion *region)
 				//col = 0xffff80;
 				col = m_textFocusColour;
 			}
-			font->drawWordWrap(m_enchantmentString, 0, 0, (float)m_width/ss, col, (float)m_height/ss);
+			font->drawWordWrap(m_enchantmentString, 0, 0, static_cast<float>(m_width)/ss, col, static_cast<float>(m_height)/ss);
 			font = pMinecraft->font;
 			//col = 0x80ff20;
 			//font->drawShadow(line, (bwidth - font->width(line))/ss, 7, col);
@@ -137,7 +137,7 @@ void UIControl_EnchantmentButton::render(IggyCustomDrawCallbackRegion *region)
 
 void UIControl_EnchantmentButton::updateState()
 {
-	UIScene_EnchantingMenu *enchantingScene = (UIScene_EnchantingMenu *)m_parentScene;
+	UIScene_EnchantingMenu *enchantingScene = static_cast<UIScene_EnchantingMenu *>(m_parentScene);
 	EnchantmentMenu *menu = enchantingScene->getMenu();
 
 	EState state = eState_Inactive;
@@ -182,7 +182,7 @@ void UIControl_EnchantmentButton::updateState()
 		IggyDataValue value[1];
 
 		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = (int)state;
+		value[0].number = static_cast<int>(state);
 		IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcChangeState , 1 , value );
 
 		if(out == IGGY_RESULT_SUCCESS) m_lastState = state;
diff --git a/Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp b/Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp
index 8b7eb9a1..b6bd3e47 100644
--- a/Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_HTMLLabel.cpp
@@ -23,7 +23,7 @@ bool UIControl_HTMLLabel::setupControl(UIScene *scene, IggyValuePath *parent, co
 void UIControl_HTMLLabel::startAutoScroll()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcStartAutoScroll , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcStartAutoScroll , 0 , nullptr );
 }
 
 void UIControl_HTMLLabel::ReInit()
@@ -79,12 +79,12 @@ void UIControl_HTMLLabel::TouchScroll(S32 iY, bool bActive)
 S32 UIControl_HTMLLabel::GetRealWidth()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth, 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth, 0 , nullptr );
 
 	S32 iRealWidth = m_width;
 	if(result.type == IGGY_DATATYPE_number)
 	{
-		iRealWidth = (S32)result.number;
+		iRealWidth = static_cast<S32>(result.number);
 	}
 	return iRealWidth;
 }
@@ -92,12 +92,12 @@ S32 UIControl_HTMLLabel::GetRealWidth()
 S32 UIControl_HTMLLabel::GetRealHeight()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , nullptr );
 
 	S32 iRealHeight = m_height;
 	if(result.type == IGGY_DATATYPE_number)
 	{
-		iRealHeight = (S32)result.number;
+		iRealHeight = static_cast<S32>(result.number);
 	}
 	return iRealHeight;
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIControl_LeaderboardList.cpp b/Minecraft.Client/Common/UI/UIControl_LeaderboardList.cpp
index c34b5e87..3920e004 100644
--- a/Minecraft.Client/Common/UI/UIControl_LeaderboardList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_LeaderboardList.cpp
@@ -45,7 +45,7 @@ void UIControl_LeaderboardList::ReInit()
 void UIControl_LeaderboardList::clearList()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_funcResetLeaderboard , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_funcResetLeaderboard , 0 , nullptr );
 }
 
 void UIControl_LeaderboardList::setupTitles(const wstring &rank, const wstring &gamertag)
diff --git a/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp b/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp
index 457e2028..25fc0316 100644
--- a/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_MinecraftHorse.cpp
@@ -27,10 +27,10 @@ UIControl_MinecraftHorse::UIControl_MinecraftHorse()
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 }
 
 void UIControl_MinecraftHorse::render(IggyCustomDrawCallbackRegion *region)
@@ -49,7 +49,7 @@ void UIControl_MinecraftHorse::render(IggyCustomDrawCallbackRegion *region)
 	glTranslatef(xo, yo - (height / 7.5f), 50.0f);
 
 	//UIScene_InventoryMenu *containerMenu = (UIScene_InventoryMenu *)m_parentScene;
-	UIScene_HorseInventoryMenu *containerMenu = (UIScene_HorseInventoryMenu *)m_parentScene;
+	UIScene_HorseInventoryMenu *containerMenu = static_cast<UIScene_HorseInventoryMenu *>(m_parentScene);
 
 	shared_ptr<LivingEntity> entityHorse = containerMenu->m_horse;
 
diff --git a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
index d0625bce..ae65ac2b 100644
--- a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
@@ -19,10 +19,10 @@ UIControl_MinecraftPlayer::UIControl_MinecraftPlayer()
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 }
 
 void UIControl_MinecraftPlayer::render(IggyCustomDrawCallbackRegion *region)
@@ -49,7 +49,7 @@ void UIControl_MinecraftPlayer::render(IggyCustomDrawCallbackRegion *region)
 	glScalef(-ss, ss, ss);
 	glRotatef(180, 0, 0, 1);
 
-	UIScene_InventoryMenu *containerMenu = (UIScene_InventoryMenu *)m_parentScene;
+	UIScene_InventoryMenu *containerMenu = static_cast<UIScene_InventoryMenu *>(m_parentScene);
 
 	float oybr = pMinecraft->localplayers[containerMenu->getPad()]->yBodyRot;
 	float oyr = pMinecraft->localplayers[containerMenu->getPad()]->yRot;
diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerList.cpp b/Minecraft.Client/Common/UI/UIControl_PlayerList.cpp
index 41534dc2..0703919f 100644
--- a/Minecraft.Client/Common/UI/UIControl_PlayerList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_PlayerList.cpp
@@ -21,7 +21,7 @@ void UIControl_PlayerList::addItem(const wstring &label, int iPlayerIcon, int iV
 
 	IggyStringUTF16 stringVal;
 	stringVal.string = (IggyUTF16*)label.c_str();
-	stringVal.length = (S32)label.length();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF16;
 	value[0].string16 = stringVal;
 
diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
index d74bd185..b8c439b1 100644
--- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
@@ -23,10 +23,10 @@ UIControl_PlayerSkinPreview::UIControl_PlayerSkinPreview()
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 
 	m_customTextureUrl = L"default";
 	m_backupTexture = TN_MOB_CHAR;
@@ -55,7 +55,7 @@ UIControl_PlayerSkinPreview::UIControl_PlayerSkinPreview()
 	m_fOriginalRotation = 0.0f;
 	m_framesAnimatingRotation = 0;
 	m_bAnimatingToFacing = false;
-	m_pvAdditionalModelParts=NULL;
+	m_pvAdditionalModelParts=nullptr;
 	m_uiAnimOverrideBitmask=0L;
 }
 
@@ -167,7 +167,7 @@ void UIControl_PlayerSkinPreview::SetFacing(ESkinPreviewFacing facing, bool bAni
 
 void UIControl_PlayerSkinPreview::CycleNextAnimation()
 {
-	m_currentAnimation = (ESkinPreviewAnimations)(m_currentAnimation + 1);
+	m_currentAnimation = static_cast<ESkinPreviewAnimations>(m_currentAnimation + 1);
 	if(m_currentAnimation >= e_SkinPreviewAnimation_Count) m_currentAnimation = e_SkinPreviewAnimation_Walking;
 
 	m_swingTime = 0.0f;
@@ -175,8 +175,8 @@ void UIControl_PlayerSkinPreview::CycleNextAnimation()
 
 void UIControl_PlayerSkinPreview::CyclePreviousAnimation()
 {
-	m_currentAnimation = (ESkinPreviewAnimations)(m_currentAnimation - 1);
-	if(m_currentAnimation < e_SkinPreviewAnimation_Walking) m_currentAnimation = (ESkinPreviewAnimations)(e_SkinPreviewAnimation_Count - 1);
+	m_currentAnimation = static_cast<ESkinPreviewAnimations>(m_currentAnimation - 1);
+	if(m_currentAnimation < e_SkinPreviewAnimation_Walking) m_currentAnimation = static_cast<ESkinPreviewAnimations>(e_SkinPreviewAnimation_Count - 1);
 
 	m_swingTime = 0.0f;
 }
@@ -210,7 +210,7 @@ void UIControl_PlayerSkinPreview::render(IggyCustomDrawCallbackRegion *region)
 	Lighting::turnOn();
 	//glRotatef(-45 - 90, 0, 1, 0);
 
-	glRotatef(-(float)m_xRot, 1, 0, 0);
+	glRotatef(-static_cast<float>(m_xRot), 1, 0, 0);
 
 	// 4J Stu - Turning on hideGui while we do this stops the name rendering in split-screen
 	bool wasHidingGui = pMinecraft->options->hideGui;
@@ -218,7 +218,7 @@ void UIControl_PlayerSkinPreview::render(IggyCustomDrawCallbackRegion *region)
 
 	//EntityRenderDispatcher::instance->render(pMinecraft->localplayers[0], 0, 0, 0, 0, 1);
 	EntityRenderer *renderer = EntityRenderDispatcher::instance->getRenderer(eTYPE_LOCALPLAYER);
-	if (renderer != NULL)
+	if (renderer != nullptr)
 	{
 		// 4J-PB - any additional parts to turn on for this player (skin dependent)
 		//vector<ModelPart *> *pAdditionalModelParts=mob->GetAdditionalModelParts();
@@ -257,12 +257,12 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer *renderer, double x, dou
 	glPushMatrix();
 	glDisable(GL_CULL_FACE);
 
-	HumanoidModel *model = (HumanoidModel *)renderer->getModel();
+	HumanoidModel *model = static_cast<HumanoidModel *>(renderer->getModel());
 
 	//getAttackAnim(mob, a);
-	//if (armor != NULL) armor->attackTime = model->attackTime;
+	//if (armor != nullptr) armor->attackTime = model->attackTime;
 	//model->riding = mob->isRiding();
-	//if (armor != NULL) armor->riding = model->riding;
+	//if (armor != nullptr) armor->riding = model->riding;
 
 	// 4J Stu - Remember to reset these values once the rendering is done if you add another one
 	model->attackTime = 0;
@@ -292,7 +292,7 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer *renderer, double x, dou
 			{
 				m_swingTime = 0;
 			}
-			model->attackTime = m_swingTime / (float) (Player::SWING_DURATION * 3);
+			model->attackTime = m_swingTime / static_cast<float>(Player::SWING_DURATION * 3);
 			break;
 		default:
 			break;
@@ -306,7 +306,7 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer *renderer, double x, dou
 
 	//setupPosition(mob, x, y, z);
 	// is equivalent to
-	glTranslatef((float) x, (float) y, (float) z);
+	glTranslatef(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z));
 
 	//float bob = getBob(mob, a);
 #ifdef SKIN_PREVIEW_BOB_ANIM
@@ -383,11 +383,11 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer *renderer, double x, dou
 		double xa = sin(yr * PI / 180);
 		double za = -cos(yr * PI / 180);
 
-		float flap = (float) yd * 10;
+		float flap = static_cast<float>(yd) * 10;
 		if (flap < -6) flap = -6;
 		if (flap > 32) flap = 32;
-		float lean = (float) (xd * xa + zd * za) * 100;
-		float lean2 = (float) (xd * za - zd * xa) * 100;
+		float lean = static_cast<float>(xd * xa + zd * za) * 100;
+		float lean2 = static_cast<float>(xd * za - zd * xa) * 100;
 		if (lean < 0) lean = 0;
 
 		//float pow = 1;//mob->oBob + (bob - mob->oBob) * a;
diff --git a/Minecraft.Client/Common/UI/UIControl_Progress.cpp b/Minecraft.Client/Common/UI/UIControl_Progress.cpp
index 78e7c1d0..20dc1ff7 100644
--- a/Minecraft.Client/Common/UI/UIControl_Progress.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_Progress.cpp
@@ -53,7 +53,7 @@ void UIControl_Progress::setProgress(int current)
 {
 	m_current = current;
 
-	float percent = (float)((m_current-m_min))/(m_max-m_min);
+	float percent = static_cast<float>((m_current - m_min))/(m_max-m_min);
 
 	if(percent != m_lastPercent)
 	{
diff --git a/Minecraft.Client/Common/UI/UIControl_SaveList.cpp b/Minecraft.Client/Common/UI/UIControl_SaveList.cpp
index f83454d7..5ae9c8f0 100644
--- a/Minecraft.Client/Common/UI/UIControl_SaveList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_SaveList.cpp
@@ -52,7 +52,7 @@ void UIControl_SaveList::addItem(const string &label, const wstring &iconName, i
 
 	IggyStringUTF8 stringVal;
 	stringVal.string = (char*)label.c_str();
-	stringVal.length = (S32)label.length();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF8;
 	value[0].string8 = stringVal;
 
@@ -74,7 +74,7 @@ void UIControl_SaveList::addItem(const wstring &label, const wstring &iconName,
 
 	IggyStringUTF16 stringVal;
 	stringVal.string = (IggyUTF16*)label.c_str();
-	stringVal.length = (S32)label.length();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF16;
 	value[0].string16 = stringVal;
 
diff --git a/Minecraft.Client/Common/UI/UIControl_Slider.cpp b/Minecraft.Client/Common/UI/UIControl_Slider.cpp
index c2168002..2d56a29c 100644
--- a/Minecraft.Client/Common/UI/UIControl_Slider.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_Slider.cpp
@@ -92,12 +92,12 @@ void UIControl_Slider::SetSliderTouchPos(float fTouchPos)
 S32 UIControl_Slider::GetRealWidth()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealWidth , 0 , nullptr );
 
 	S32 iRealWidth = m_width;
 	if(result.type == IGGY_DATATYPE_number)
 	{
-		iRealWidth = (S32)result.number;
+		iRealWidth = static_cast<S32>(result.number);
 	}
 	return iRealWidth;
 }
diff --git a/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.cpp b/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.cpp
index 74683a62..75bbac29 100644
--- a/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.cpp
@@ -24,7 +24,7 @@ bool UIControl_SpaceIndicatorBar::setupControl(UIScene *scene, IggyValuePath *pa
 	return success;
 }
 
-void UIControl_SpaceIndicatorBar::init(UIString label, int id, __int64 min, __int64 max)
+void UIControl_SpaceIndicatorBar::init(UIString label, int id, int64_t min, int64_t max)
 {
 	m_label = label;
 	m_id = id;
@@ -61,11 +61,11 @@ void UIControl_SpaceIndicatorBar::reset()
 	setSaveGameOffset(0.0f);
 }
 
-void UIControl_SpaceIndicatorBar::addSave(__int64 size)
+void UIControl_SpaceIndicatorBar::addSave(int64_t size)
 {
-	float startPercent = (float)((m_currentTotal-m_min))/(m_max-m_min);
+	float startPercent = static_cast<float>((m_currentTotal - m_min))/(m_max-m_min);
 
-	m_sizeAndOffsets.push_back( pair<__int64, float>(size, startPercent) );
+	m_sizeAndOffsets.push_back( pair<int64_t, float>(size, startPercent) );
 
 	m_currentTotal += size;
 	setTotalSize(m_currentTotal);
@@ -75,7 +75,7 @@ void UIControl_SpaceIndicatorBar::selectSave(int index)
 {
 	if(index >= 0 && index < m_sizeAndOffsets.size())
 	{
-		pair<__int64,float> values = m_sizeAndOffsets[index];
+		pair<int64_t,float> values = m_sizeAndOffsets[index];
 		setSaveSize(values.first);
 		setSaveGameOffset(values.second);
 	}
@@ -86,11 +86,11 @@ void UIControl_SpaceIndicatorBar::selectSave(int index)
 	}
 }
 
-void UIControl_SpaceIndicatorBar::setSaveSize(__int64 size)
+void UIControl_SpaceIndicatorBar::setSaveSize(int64_t size)
 {
 	m_currentSave = size;
 
-	float percent = (float)((m_currentSave-m_min))/(m_max-m_min);
+	float percent = static_cast<float>((m_currentSave - m_min))/(m_max-m_min);
 
 	IggyDataValue result;
 	IggyDataValue value[1];
@@ -99,9 +99,9 @@ void UIControl_SpaceIndicatorBar::setSaveSize(__int64 size)
 	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_setSaveSizeFunc , 1 , value );
 }
 
-void UIControl_SpaceIndicatorBar::setTotalSize(__int64 size)
+void UIControl_SpaceIndicatorBar::setTotalSize(int64_t size)
 {
-	float percent = (float)((m_currentTotal-m_min))/(m_max-m_min);
+	float percent = static_cast<float>((m_currentTotal - m_min))/(m_max-m_min);
 
 	IggyDataValue result;
 	IggyDataValue value[1];
diff --git a/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.h b/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.h
index 8eed3944..52eb3f6d 100644
--- a/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.h
+++ b/Minecraft.Client/Common/UI/UIControl_SpaceIndicatorBar.h
@@ -6,28 +6,28 @@ class UIControl_SpaceIndicatorBar : public UIControl_Base
 {
 private:
 	IggyName m_setSaveSizeFunc, m_setTotalSizeFunc, m_setSaveGameOffsetFunc;
-	__int64 m_min;
-	__int64 m_max;
-	__int64 m_currentSave, m_currentTotal;
+	int64_t m_min;
+	int64_t m_max;
+	int64_t m_currentSave, m_currentTotal;
 	float m_currentOffset;
 
-	vector<pair<__int64,float> > m_sizeAndOffsets;
+	vector<pair<int64_t,float> > m_sizeAndOffsets;
 
 public:
 	UIControl_SpaceIndicatorBar();
 
 	virtual bool setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName);
 
-	void init(UIString label, int id, __int64 min, __int64 max);
+	void init(UIString label, int id, int64_t min, int64_t max);
 	virtual void ReInit();
 	void reset();
 
-	void addSave(__int64 size);
+	void addSave(int64_t size);
 	void selectSave(int index);
 
 
 private:
-	void setSaveSize(__int64 size);
-	void setTotalSize(__int64 totalSize);
+	void setSaveSize(int64_t size);
+	void setTotalSize(int64_t totalSize);
 	void setSaveGameOffset(float offset);
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIControl_TextInput.cpp b/Minecraft.Client/Common/UI/UIControl_TextInput.cpp
index dc7bc532..8e679b7c 100644
--- a/Minecraft.Client/Common/UI/UIControl_TextInput.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_TextInput.cpp
@@ -5,6 +5,15 @@
 UIControl_TextInput::UIControl_TextInput()
 {
 	m_bHasFocus = false;
+	m_bHasCaret = false;
+	m_bCaretChecked = false;
+#ifdef _WINDOWS64
+	m_bDirectEditing = false;
+	m_iCursorPos = 0;
+	m_iCharLimit = 0;
+	m_iDirectEditCooldown = 0;
+	m_iCaretBlinkTimer = 0;
+#endif
 }
 
 bool UIControl_TextInput::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName)
@@ -16,6 +25,7 @@ bool UIControl_TextInput::setupControl(UIScene *scene, IggyValuePath *parent, co
 	m_textName = registerFastName(L"text");
 	m_funcChangeState = registerFastName(L"ChangeState");
 	m_funcSetCharLimit = registerFastName(L"SetCharLimit");
+	m_funcSetCaretIndex = registerFastName(L"SetCaretIndex");
 
 	return success;
 }
@@ -81,3 +91,197 @@ void UIControl_TextInput::SetCharLimit(int iLimit)
 	value[0].number = iLimit;
 	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcSetCharLimit , 1 , value );
 }
+
+void UIControl_TextInput::setCaretVisible(bool visible)
+{
+	if (!m_parentScene || !m_parentScene->getMovie())
+		return;
+
+	// Check once whether this SWF's FJ_TextInput actually has a m_mcCaret child.
+	// IggyValuePathMakeNameRef always succeeds (creates a ref to undefined),
+	// so we validate by trying to read a property from the resolved path.
+	if (!m_bCaretChecked)
+	{
+		IggyValuePath caretPath;
+		if (IggyValuePathMakeNameRef(&caretPath, getIggyValuePath(), "m_mcCaret"))
+		{
+			rrbool test = false;
+			IggyResult res = IggyValueGetBooleanRS(&caretPath, m_nameVisible, NULL, &test);
+			m_bHasCaret = (res == 0);
+		}
+		else
+		{
+			m_bHasCaret = false;
+		}
+		m_bCaretChecked = true;
+	}
+	if (!m_bHasCaret)
+		return;
+
+	IggyValuePath caretPath;
+	if (IggyValuePathMakeNameRef(&caretPath, getIggyValuePath(), "m_mcCaret"))
+	{
+		IggyValueSetBooleanRS(&caretPath, m_nameVisible, NULL, visible);
+	}
+}
+
+void UIControl_TextInput::setCaretIndex(int index)
+{
+	if (!m_parentScene || !m_parentScene->getMovie())
+		return;
+
+	IggyDataValue result;
+	IggyDataValue value[1];
+	value[0].type = IGGY_DATATYPE_number;
+	value[0].number = index;
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcSetCaretIndex , 1 , value );
+}
+
+#ifdef _WINDOWS64
+
+void UIControl_TextInput::beginDirectEdit(int charLimit)
+{
+	const wchar_t* current = getLabel();
+	m_editBuffer = current ? current : L"";
+	m_textBeforeEdit = m_editBuffer;
+	m_iCursorPos = (int)m_editBuffer.length();
+	m_iCharLimit = charLimit;
+	m_bDirectEditing = true;
+	m_iDirectEditCooldown = 0;
+	m_iCaretBlinkTimer = 0;
+	g_KBMInput.ClearCharBuffer();
+	setCaretVisible(true);
+	setCaretIndex(m_iCursorPos);
+}
+
+UIControl_TextInput::EDirectEditResult UIControl_TextInput::tickDirectEdit()
+{
+	if (m_iDirectEditCooldown > 0)
+		m_iDirectEditCooldown--;
+
+	if (!m_bDirectEditing)
+	{
+		setCaretVisible(false);
+		return eDirectEdit_Continue;
+	}
+
+	// Enforce caret visibility and position every tick — setLabel() and Flash
+	// focus changes can reset both at any time.
+	setCaretVisible(true);
+	setCaretIndex(m_iCursorPos);
+
+	// For SWFs without m_mcCaret, insert '_' at the cursor position.
+	// All characters remain visible — '_' sits between them like a cursor.
+	if (!m_bHasCaret)
+	{
+		wstring display = m_editBuffer;
+		display.insert(m_iCursorPos, 1, L'_');
+		setLabel(display.c_str());
+	}
+
+	EDirectEditResult result = eDirectEdit_Continue;
+	bool changed = false;
+
+	// Consume typed characters from the KBM buffer
+	wchar_t ch;
+	while (g_KBMInput.ConsumeChar(ch))
+	{
+		if (ch == 0x08) // Backspace
+		{
+			if (m_iCursorPos > 0)
+			{
+				m_editBuffer.erase(m_iCursorPos - 1, 1);
+				m_iCursorPos--;
+				changed = true;
+			}
+		}
+		else if (ch == 0x0D) // Enter — confirm edit
+		{
+			m_bDirectEditing = false;
+			m_iDirectEditCooldown = 4;
+			setLabel(m_editBuffer.c_str(), true);
+			setCaretVisible(false);
+			return eDirectEdit_Confirmed;
+		}
+		else if (m_iCharLimit <= 0 || (int)m_editBuffer.length() < m_iCharLimit)
+		{
+			m_editBuffer.insert(m_iCursorPos, 1, ch);
+			m_iCursorPos++;
+			changed = true;
+		}
+	}
+
+	// Arrow keys, Home, End, Delete for cursor movement
+	if (g_KBMInput.IsKeyPressed(VK_LEFT) && m_iCursorPos > 0)
+	{
+		m_iCursorPos--;
+		setCaretIndex(m_iCursorPos);
+	}
+	if (g_KBMInput.IsKeyPressed(VK_RIGHT) && m_iCursorPos < (int)m_editBuffer.length())
+	{
+		m_iCursorPos++;
+		setCaretIndex(m_iCursorPos);
+	}
+	if (g_KBMInput.IsKeyPressed(VK_HOME))
+	{
+		m_iCursorPos = 0;
+		setCaretIndex(m_iCursorPos);
+	}
+	if (g_KBMInput.IsKeyPressed(VK_END))
+	{
+		m_iCursorPos = (int)m_editBuffer.length();
+		setCaretIndex(m_iCursorPos);
+	}
+	if (g_KBMInput.IsKeyPressed(VK_DELETE) && m_iCursorPos < (int)m_editBuffer.length())
+	{
+		m_editBuffer.erase(m_iCursorPos, 1);
+		changed = true;
+	}
+
+	// Escape — cancel edit and restore original text
+	if (g_KBMInput.IsKeyPressed(VK_ESCAPE))
+	{
+		m_editBuffer = m_textBeforeEdit;
+		m_bDirectEditing = false;
+		m_iDirectEditCooldown = 4;
+		setLabel(m_editBuffer.c_str());
+		setCaretVisible(false);
+		return eDirectEdit_Cancelled;
+	}
+
+	if (changed)
+	{
+		if (m_bHasCaret)
+		{
+			setLabel(m_editBuffer.c_str());
+			setCaretIndex(m_iCursorPos);
+		}
+		// SWFs without caret: the cursor block above already updates the label every tick
+	}
+
+	return eDirectEdit_Continue;
+}
+
+void UIControl_TextInput::cancelDirectEdit()
+{
+	if (m_bDirectEditing)
+	{
+		m_editBuffer = m_textBeforeEdit;
+		m_bDirectEditing = false;
+		m_iDirectEditCooldown = 4;
+		setLabel(m_editBuffer.c_str(), true);
+		setCaretVisible(false);
+	}
+}
+
+void UIControl_TextInput::confirmDirectEdit()
+{
+	if (m_bDirectEditing)
+	{
+		m_bDirectEditing = false;
+		setLabel(m_editBuffer.c_str(), true);
+		setCaretVisible(false);
+	}
+}
+
+#endif
diff --git a/Minecraft.Client/Common/UI/UIControl_TextInput.h b/Minecraft.Client/Common/UI/UIControl_TextInput.h
index 98032d85..3ff28930 100644
--- a/Minecraft.Client/Common/UI/UIControl_TextInput.h
+++ b/Minecraft.Client/Common/UI/UIControl_TextInput.h
@@ -6,7 +6,20 @@ class UIControl_TextInput : public UIControl_Base
 {
 private:
 	IggyName m_textName, m_funcChangeState, m_funcSetCharLimit;
+	IggyName m_funcSetCaretIndex;
 	bool m_bHasFocus;
+	bool m_bHasCaret;
+	bool m_bCaretChecked;
+
+#ifdef _WINDOWS64
+	bool m_bDirectEditing;
+	wstring m_textBeforeEdit;
+	wstring m_editBuffer;
+	int m_iCursorPos;
+	int m_iCharLimit;
+	int m_iDirectEditCooldown;
+	int m_iCaretBlinkTimer;
+#endif
 
 public:
 	UIControl_TextInput();
@@ -19,4 +32,24 @@ public:
 	virtual void setFocus(bool focus);
 
 	void SetCharLimit(int iLimit);
+
+	void setCaretVisible(bool visible);
+	void setCaretIndex(int index);
+
+#ifdef _WINDOWS64
+	enum EDirectEditResult
+	{
+		eDirectEdit_Continue,
+		eDirectEdit_Confirmed,
+		eDirectEdit_Cancelled,
+	};
+
+	void beginDirectEdit(int charLimit = 0);
+	EDirectEditResult tickDirectEdit();
+	void cancelDirectEdit();
+	void confirmDirectEdit();
+	bool isDirectEditing() const { return m_bDirectEditing; }
+	int getDirectEditCooldown() const { return m_iDirectEditCooldown; }
+	const wstring& getEditBuffer() const { return m_editBuffer; }
+#endif
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIControl_TexturePackList.cpp b/Minecraft.Client/Common/UI/UIControl_TexturePackList.cpp
index 02336e00..7f721493 100644
--- a/Minecraft.Client/Common/UI/UIControl_TexturePackList.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_TexturePackList.cpp
@@ -83,7 +83,7 @@ void UIControl_TexturePackList::selectSlot(int id)
 void UIControl_TexturePackList::clearSlots()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_clearSlotsFunc ,0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath(), m_clearSlotsFunc ,0 , nullptr );
 }
 
 void UIControl_TexturePackList::setEnabled(bool enable)
@@ -125,7 +125,7 @@ bool UIControl_TexturePackList::CanTouchTrigger(S32 iX, S32 iY)
 	S32 bCanTouchTrigger = false;
 	if(result.type == IGGY_DATATYPE_boolean)
 	{
-		bCanTouchTrigger = (bool)result.boolval;
+		bCanTouchTrigger = static_cast<bool>(result.boolval);
 	}
 	return bCanTouchTrigger;
 }
@@ -133,12 +133,12 @@ bool UIControl_TexturePackList::CanTouchTrigger(S32 iX, S32 iY)
 S32 UIControl_TexturePackList::GetRealHeight()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_funcGetRealHeight, 0 , nullptr );
 
 	S32 iRealHeight = m_height;
 	if(result.type == IGGY_DATATYPE_number)
 	{
-		iRealHeight = (S32)result.number;
+		iRealHeight = static_cast<S32>(result.number);
 	}
 	return iRealHeight;
 }
diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp
index 5375b784..b12ea5e7 100644
--- a/Minecraft.Client/Common/UI/UIController.cpp
+++ b/Minecraft.Client/Common/UI/UIController.cpp
@@ -3,6 +3,7 @@
 #include "UI.h"
 #include "UIScene.h"
 #include "UIControl_Slider.h"
+#include "UIControl_TexturePackList.h"
 #include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "..\..\LocalPlayer.h"
 #include "..\..\DLCTexturePack.h"
@@ -12,6 +13,7 @@
 #include "..\..\EnderDragonRenderer.h"
 #include "..\..\MultiPlayerLocalPlayer.h"
 #include "UIFontData.h"
+#include "UISplitScreenHelpers.h"
 #ifdef _WINDOWS64
 #include "..\..\Windows64\KeyboardMouseInput.h"
 #endif
@@ -56,18 +58,20 @@ bool UIController::ms_bReloadSkinCSInitialised = false;
 
 DWORD UIController::m_dwTrialTimerLimitSecs=DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME;
 
+// GetViewportRect and Fit16x9 are now in UISplitScreenHelpers.h
+
 #ifdef _WINDOWS64
 static UIControl_Slider *FindSliderById(UIScene *pScene, int sliderId)
 {
 	vector<UIControl *> *controls = pScene->GetControls();
-	if (!controls) return NULL;
+	if (!controls) return nullptr;
 	for (size_t i = 0; i < controls->size(); ++i)
 	{
 		UIControl *ctrl = (*controls)[i];
 		if (ctrl && ctrl->getControlType() == UIControl::eSlider && ctrl->getId() == sliderId)
-			return (UIControl_Slider *)ctrl;
+			return static_cast<UIControl_Slider *>(ctrl);
 	}
-	return NULL;
+	return nullptr;
 }
 #endif
 
@@ -143,11 +147,11 @@ extern "C" void *__real_malloc(size_t t);
 extern "C" void __real_free(void *t);
 #endif
 
-__int64 UIController::iggyAllocCount = 0;
+int64_t UIController::iggyAllocCount = 0;
 static unordered_map<void *,size_t> allocations;
 static void * RADLINK AllocateFunction ( void * alloc_callback_user_data , size_t size_requested , size_t * size_returned )
 {
-	UIController *controller = (UIController *)alloc_callback_user_data;
+	UIController *controller = static_cast<UIController *>(alloc_callback_user_data);
 	EnterCriticalSection(&controller->m_Allocatorlock);
 #ifdef EXCLUDE_IGGY_ALLOCATIONS_FROM_HEAP_INSPECTOR
 	void *alloc = __real_malloc(size_requested);
@@ -164,7 +168,7 @@ static void * RADLINK AllocateFunction ( void * alloc_callback_user_data , size_
 
 static void RADLINK DeallocateFunction ( void * alloc_callback_user_data , void * ptr )
 {
-	UIController *controller = (UIController *)alloc_callback_user_data;
+	UIController *controller = static_cast<UIController *>(alloc_callback_user_data);
 	EnterCriticalSection(&controller->m_Allocatorlock);
 	size_t size = allocations[ptr];
 	UIController::iggyAllocCount -= size;
@@ -180,15 +184,15 @@ static void RADLINK DeallocateFunction ( void * alloc_callback_user_data , void
 
 UIController::UIController()
 {
-	m_uiDebugConsole = NULL;
-	m_reloadSkinThread = NULL;
+	m_uiDebugConsole = nullptr;
+	m_reloadSkinThread = nullptr;
 
 	m_navigateToHomeOnReload = false;
 
 	m_bCleanupOnReload = false;
-	m_mcTTFFont = NULL;
-	m_moj7 = NULL;
-	m_moj11 = NULL;
+	m_mcTTFFont = nullptr;
+	m_moj7 = nullptr;
+	m_moj11 = nullptr;
 
 	// 4J-JEV: It's important that these remain the same, unless updateCurrentLanguage is going to be called.
 	m_eCurrentFont = m_eTargetFont = eFont_NotLoaded;
@@ -237,6 +241,8 @@ UIController::UIController()
 	m_winUserIndex = 0;
 	m_mouseDraggingSliderScene = eUIScene_COUNT;
 	m_mouseDraggingSliderId = -1;
+	m_mouseClickConsumedByScene = false;
+	m_bMouseHoverHorizontalList = false;
 	m_lastHoverMouseX = -1;
 	m_lastHoverMouseY = -1;
 	m_accumulatedTicks = 0;
@@ -267,7 +273,7 @@ void UIController::SetSysUIShowing(bool bVal)
 
 void UIController::SetSystemUIShowing(LPVOID lpParam,bool bVal)
 {
-	UIController *pClass=(UIController *)lpParam;
+	UIController *pClass=static_cast<UIController *>(lpParam);
 	pClass->SetSysUIShowing(bVal);
 }
 
@@ -307,13 +313,13 @@ void UIController::postInit()
 
 	for(unsigned int i = 0; i < eUIGroup_COUNT; ++i)
 	{
-		m_groups[i] = new UIGroup((EUIGroup)i,i-1);
+		m_groups[i] = new UIGroup(static_cast<EUIGroup>(i),i-1);
 	}
 
 
 #ifdef ENABLE_IGGY_EXPLORER
 	iggy_explorer = IggyExpCreate("127.0.0.1", 9190, malloc(IGGYEXP_MIN_STORAGE), IGGYEXP_MIN_STORAGE);
-	if ( iggy_explorer == NULL )
+	if ( iggy_explorer == nullptr )
 	{
 		// not normally an error, just an error for this demo!
 		app.DebugPrintf( "Couldn't connect to Iggy Explorer, did you run it first?" );
@@ -326,7 +332,7 @@ void UIController::postInit()
 
 #ifdef ENABLE_IGGY_PERFMON
 	m_iggyPerfmonEnabled = false;
-	iggy_perfmon = IggyPerfmonCreate(perf_malloc, perf_free, NULL);
+	iggy_perfmon = IggyPerfmonCreate(perf_malloc, perf_free, nullptr);
 	IggyInstallPerfmon(iggy_perfmon);
 #endif
 
@@ -367,7 +373,7 @@ UITTFFont *UIController::createFont(EFont fontLanguage)
 #endif
 	// 4J-JEV, Cyrillic characters have been added to this font now, (4/July/14)
 	// XC_LANGUAGE_RUSSIAN and XC_LANGUAGE_GREEK:
-	default:					return NULL;
+	default:					return nullptr;
 	}
 }
 
@@ -394,17 +400,17 @@ void UIController::SetupFont()
 	if (m_eCurrentFont != eFont_NotLoaded)	app.DebugPrintf("[UIController] Font switch required for language transition to %i.\n", nextLanguage);
 	else									app.DebugPrintf("[UIController] Initialising font for language %i.\n", nextLanguage);
 
-	if (m_mcTTFFont != NULL)
+	if (m_mcTTFFont != nullptr)
 	{
 		delete m_mcTTFFont;
-		m_mcTTFFont = NULL;
+		m_mcTTFFont = nullptr;
 	}
 
 	if(m_eTargetFont == eFont_Bitmap)
 	{
 		// these may have been set up by a previous language being chosen
-		if (m_moj7 == NULL)		m_moj7  = new UIBitmapFont(SFontData::Mojangles_7);
-		if (m_moj11 == NULL)	m_moj11 = new UIBitmapFont(SFontData::Mojangles_11);
+		if (m_moj7 == nullptr)		m_moj7  = new UIBitmapFont(SFontData::Mojangles_7);
+		if (m_moj11 == nullptr)	m_moj11 = new UIBitmapFont(SFontData::Mojangles_11);
 
 		// 4J-JEV: Ensure we redirect to them correctly, even if the objects were previously initialised.
 		m_moj7->registerFont();
@@ -499,7 +505,7 @@ void UIController::tick()
 	}
 
 	// Clear out the cached movie file data
-	__int64 currentTime = System::currentTimeMillis();
+	int64_t currentTime = System::currentTimeMillis();
     for (auto it = m_cachedMovieData.begin(); it != m_cachedMovieData.end();)
     {
 		if(it->second.m_expiry < currentTime)
@@ -516,52 +522,23 @@ void UIController::tick()
 
 void UIController::loadSkins()
 {
-	wstring platformSkinPath = L"";
-
 #ifdef __PS3__
-	platformSkinPath = L"skinPS3.swf";
-#elif defined __PSVITA__
-	platformSkinPath = L"skinVita.swf";
-#elif defined _WINDOWS64
-	if(m_fScreenHeight>720.0f)
-	{
-		platformSkinPath = L"skinHDWin.swf";
-	}
-	else
-	{
-		platformSkinPath = L"skinWin.swf";
-	}
-#elif defined _DURANGO
-	if(m_fScreenHeight>720.0f)
-	{
-		platformSkinPath = L"skinHDDurango.swf";
-	}
-	else
-	{
-		platformSkinPath = L"skinDurango.swf";
-	}
-#elif defined __ORBIS__
-	if(m_fScreenHeight>720.0f)
-	{
-		platformSkinPath = L"skinHDOrbis.swf";
-	}
-	else
-	{
-		platformSkinPath = L"skinOrbis.swf";
-	}
+	m_iggyLibraries[eLibrary_Platform] = loadSkin(L"skinPS3.swf", L"platformskin.swf");
 
-#endif
-	// Every platform has one of these, so nothing shared
-	if(m_fScreenHeight>720.0f)
-	{
-		m_iggyLibraries[eLibrary_Platform] = loadSkin(platformSkinPath, L"platformskinHD.swf");
-	}
-	else
-	{
-		m_iggyLibraries[eLibrary_Platform] = loadSkin(platformSkinPath, L"platformskin.swf");
-	}
+	m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf");
+	m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf");
+	m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf");
+	m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinGraphicsTooltips.swf", L"skinGraphicsTooltips.swf");
+	m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinGraphicsLabels.swf", L"skinGraphicsLabels.swf");
+	m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinLabels.swf", L"skinLabels.swf");
+	m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinInGame.swf", L"skinInGame.swf");
+	m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf");
+	m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf");
+	m_iggyLibraries[eLibrary_Default] = loadSkin(L"skin.swf", L"skin.swf");
+
+#elif defined __PSVITA__
+	m_iggyLibraries[eLibrary_Platform] = loadSkin(L"skinVita.swf", L"platformskin.swf");
 
-#if defined(__PS3__) || defined(__PSVITA__)
 	m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf");
 	m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf");
 	m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf");
@@ -572,13 +549,14 @@ void UIController::loadSkins()
 	m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf");
 	m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf");
 	m_iggyLibraries[eLibrary_Default] = loadSkin(L"skin.swf", L"skin.swf");
-#endif
 
-#if ( defined(_WINDOWS64) || defined(_DURANGO) || defined(__ORBIS__) )
+#elif defined _WINDOWS64
+	// HD platform skin — required by skinHD*.swf (1080p scene SWFs)
+	m_iggyLibraries[eLibrary_Platform] = loadSkin(L"skinHDWin.swf", L"platformskinHD.swf");
+	// Non-HD platform skin — required by skin*.swf (720p/480p scene SWFs)
+	m_iggyLibraries[eLibraryFallback_Platform] = loadSkin(L"skinWin.swf", L"platformskin.swf");
 
-#if defined(_WINDOWS64)
-	// 4J Stu - Load the 720/480 skins so that we have something to fallback on during development
-#ifndef _FINAL_BUILD
+	// Non-HD skin set (720p/480p scenes import these)
 	m_iggyLibraries[eLibraryFallback_GraphicsDefault] = loadSkin(L"skinGraphics.swf", L"skinGraphics.swf");
 	m_iggyLibraries[eLibraryFallback_GraphicsHUD] = loadSkin(L"skinGraphicsHud.swf", L"skinGraphicsHud.swf");
 	m_iggyLibraries[eLibraryFallback_GraphicsInGame] = loadSkin(L"skinGraphicsInGame.swf", L"skinGraphicsInGame.swf");
@@ -589,9 +567,8 @@ void UIController::loadSkins()
 	m_iggyLibraries[eLibraryFallback_HUD] = loadSkin(L"skinHud.swf", L"skinHud.swf");
 	m_iggyLibraries[eLibraryFallback_Tooltips] = loadSkin(L"skinTooltips.swf", L"skinTooltips.swf");
 	m_iggyLibraries[eLibraryFallback_Default] = loadSkin(L"skin.swf", L"skin.swf");
-#endif
-#endif
 
+	// HD skin set (1080p scenes import these)
 	m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf");
 	m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinHDGraphicsHud.swf", L"skinHDGraphicsHud.swf");
 	m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinHDGraphicsInGame.swf", L"skinHDGraphicsInGame.swf");
@@ -602,7 +579,35 @@ void UIController::loadSkins()
 	m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHDHud.swf", L"skinHDHud.swf");
 	m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinHDTooltips.swf", L"skinHDTooltips.swf");
 	m_iggyLibraries[eLibrary_Default] = loadSkin(L"skinHD.swf", L"skinHD.swf");
-#endif // HD platforms
+
+#elif defined _DURANGO
+	m_iggyLibraries[eLibrary_Platform] = loadSkin(L"skinHDDurango.swf", L"platformskinHD.swf");
+
+	m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf");
+	m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinHDGraphicsHud.swf", L"skinHDGraphicsHud.swf");
+	m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinHDGraphicsInGame.swf", L"skinHDGraphicsInGame.swf");
+	m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinHDGraphicsTooltips.swf", L"skinHDGraphicsTooltips.swf");
+	m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinHDGraphicsLabels.swf", L"skinHDGraphicsLabels.swf");
+	m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinHDLabels.swf", L"skinHDLabels.swf");
+	m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinHDInGame.swf", L"skinHDInGame.swf");
+	m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHDHud.swf", L"skinHDHud.swf");
+	m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinHDTooltips.swf", L"skinHDTooltips.swf");
+	m_iggyLibraries[eLibrary_Default] = loadSkin(L"skinHD.swf", L"skinHD.swf");
+
+#elif defined __ORBIS__
+	m_iggyLibraries[eLibrary_Platform] = loadSkin(L"skinHDOrbis.swf", L"platformskinHD.swf");
+
+	m_iggyLibraries[eLibrary_GraphicsDefault] = loadSkin(L"skinHDGraphics.swf", L"skinHDGraphics.swf");
+	m_iggyLibraries[eLibrary_GraphicsHUD] = loadSkin(L"skinHDGraphicsHud.swf", L"skinHDGraphicsHud.swf");
+	m_iggyLibraries[eLibrary_GraphicsInGame] = loadSkin(L"skinHDGraphicsInGame.swf", L"skinHDGraphicsInGame.swf");
+	m_iggyLibraries[eLibrary_GraphicsTooltips] = loadSkin(L"skinHDGraphicsTooltips.swf", L"skinHDGraphicsTooltips.swf");
+	m_iggyLibraries[eLibrary_GraphicsLabels] = loadSkin(L"skinHDGraphicsLabels.swf", L"skinHDGraphicsLabels.swf");
+	m_iggyLibraries[eLibrary_Labels] = loadSkin(L"skinHDLabels.swf", L"skinHDLabels.swf");
+	m_iggyLibraries[eLibrary_InGame] = loadSkin(L"skinHDInGame.swf", L"skinHDInGame.swf");
+	m_iggyLibraries[eLibrary_HUD] = loadSkin(L"skinHDHud.swf", L"skinHDHud.swf");
+	m_iggyLibraries[eLibrary_Tooltips] = loadSkin(L"skinHDTooltips.swf", L"skinHDTooltips.swf");
+	m_iggyLibraries[eLibrary_Default] = loadSkin(L"skinHD.swf", L"skinHD.swf");
+#endif
 }
 
 IggyLibrary UIController::loadSkin(const wstring &skinPath, const wstring &skinName)
@@ -612,20 +617,20 @@ IggyLibrary UIController::loadSkin(const wstring &skinPath, const wstring &skinN
 	if(!skinPath.empty() && app.hasArchiveFile(skinPath))
 	{
 		byteArray baFile = app.getArchiveFile(skinPath);
-		lib = IggyLibraryCreateFromMemoryUTF16( (IggyUTF16 *)skinName.c_str() , (void *)baFile.data, baFile.length, NULL );
+		lib = IggyLibraryCreateFromMemoryUTF16( (IggyUTF16 *)skinName.c_str() , (void *)baFile.data, baFile.length, nullptr );
 
 		delete[] baFile.data;
 #ifdef _DEBUG
 		IggyMemoryUseInfo memoryInfo;
 		rrbool res;
 		int iteration = 0;
-		__int64 totalStatic = 0;
-		while(res = IggyDebugGetMemoryUseInfo ( NULL ,
-			lib ,
-			"" ,
-			0 ,
-			iteration ,
-			&memoryInfo ))
+		int64_t totalStatic = 0;
+		while(res = IggyDebugGetMemoryUseInfo (nullptr,
+                                               lib ,
+                                               "" ,
+                                               0 ,
+                                               iteration ,
+                                               &memoryInfo ))
 		{
 			totalStatic += memoryInfo.static_allocation_bytes;
 			app.DebugPrintf(app.USER_SR, "%ls - %.*s, static: %dB, dynamic: %dB\n", skinPath.c_str(), memoryInfo.subcategory_stringlen, memoryInfo.subcategory, memoryInfo.static_allocation_bytes, memoryInfo.dynamic_allocation_bytes);
@@ -689,7 +694,7 @@ void UIController::StartReloadSkinThread()
 int UIController::reloadSkinThreadProc(void* lpParam)
 {
 	EnterCriticalSection(&ms_reloadSkinCS);		// MGH - added to prevent crash loading Iggy movies while the skins were being reloaded
-	UIController *controller = (UIController *)lpParam;
+	UIController *controller = static_cast<UIController *>(lpParam);
 	// Load new skin
 	controller->loadSkins();
 
@@ -724,7 +729,7 @@ bool UIController::IsExpectingOrReloadingSkin()
 void UIController::CleanUpSkinReload()
 {
 	delete m_reloadSkinThread;
-	m_reloadSkinThread = NULL;
+	m_reloadSkinThread = nullptr;
 
 	if(!Minecraft::GetInstance()->skins->isUsingDefaultSkin())
 	{
@@ -750,7 +755,7 @@ void UIController::CleanUpSkinReload()
 byteArray UIController::getMovieData(const wstring &filename)
 {
 	// Cache everything we load in the current tick
-	__int64 targetTime = System::currentTimeMillis() + (1000LL * 60);
+	int64_t targetTime = System::currentTimeMillis() + (1000LL * 60);
     auto it = m_cachedMovieData.find(filename);
     if(it == m_cachedMovieData.end() )
 	{
@@ -784,40 +789,56 @@ void UIController::tickInput()
 #endif
 		{
 #ifdef _WINDOWS64
-			if (!g_KBMInput.IsMouseGrabbed() && g_KBMInput.IsKBMActive())
+            m_mouseClickConsumedByScene = false;
+            if (!g_KBMInput.IsMouseGrabbed() && g_KBMInput.IsKBMActive())
+            {
+                UIScene *pScene = nullptr;
+
+                // Search by layer priority across all groups (layer-first).
+                // Tooltip layer is skipped because it holds non-interactive
+                // overlays (button hints, timer) that should never capture mouse.
+                // Old group-first order found those tooltips on eUIGroup_Fullscreen
+                // before reaching in-game menus on eUIGroup_Player1.
+                static const EUILayer mouseLayers[] = {
+#ifndef _CONTENT_PACKAGE
+                    eUILayer_Debug,
+#endif
+					eUILayer_Error,
+					eUILayer_Alert,
+					eUILayer_Popup,
+					eUILayer_Fullscreen,
+					eUILayer_Scene,
+				};
+				// Only check the fullscreen group and the primary (KBM) player's group.
+			// Other splitscreen players use controllers — mouse must not affect them.
+			const int mouseGroups[] = { static_cast<int>(eUIGroup_Fullscreen), ProfileManager.GetPrimaryPad() + 1 };
+			for (int l = 0; l < _countof(mouseLayers) && !pScene; ++l)
 			{
-				UIScene *pScene = NULL;
-				for (int grp = 0; grp < eUIGroup_COUNT && !pScene; ++grp)
+				for (int g = 0; g < _countof(mouseGroups) && !pScene; ++g)
 				{
-					pScene = m_groups[grp]->GetTopScene(eUILayer_Debug);
-					if (!pScene) pScene = m_groups[grp]->GetTopScene(eUILayer_Tooltips);
-					if (!pScene) pScene = m_groups[grp]->GetTopScene(eUILayer_Error);
-					if (!pScene) pScene = m_groups[grp]->GetTopScene(eUILayer_Alert);
-					if (!pScene) pScene = m_groups[grp]->GetTopScene(eUILayer_Popup);
-					if (!pScene) pScene = m_groups[grp]->GetTopScene(eUILayer_Fullscreen);
-					if (!pScene) pScene = m_groups[grp]->GetTopScene(eUILayer_Scene);
+					pScene = m_groups[mouseGroups[g]]->GetTopScene(mouseLayers[l]);
 				}
+			}
 				if (pScene && pScene->getMovie())
-				{
-					Iggy *movie = pScene->getMovie();
-					int rawMouseX = g_KBMInput.GetMouseX();
-					int rawMouseY = g_KBMInput.GetMouseY();
-					F32 mouseX = (F32)rawMouseX;
-					F32 mouseY = (F32)rawMouseY;
-
-					extern HWND g_hWnd;
-					if (g_hWnd)
-					{
-						RECT rc;
-						GetClientRect(g_hWnd, &rc);
-						int winW = rc.right - rc.left;
-						int winH = rc.bottom - rc.top;
-						if (winW > 0 && winH > 0)
-						{
-							mouseX = mouseX * (m_fScreenWidth / (F32)winW);
-							mouseY = mouseY * (m_fScreenHeight / (F32)winH);
-						}
-					}
+                {
+                    int rawMouseX = g_KBMInput.GetMouseX();
+                    int rawMouseY = g_KBMInput.GetMouseY();
+                    F32 mouseX = static_cast<F32>(rawMouseX);
+                    F32 mouseY = static_cast<F32>(rawMouseY);
+
+                    extern HWND g_hWnd;
+                    if (g_hWnd)
+                    {
+                        RECT rc;
+                        GetClientRect(g_hWnd, &rc);
+                        int winW = rc.right - rc.left;
+                        int winH = rc.bottom - rc.top;
+                        if (winW > 0 && winH > 0)
+                        {
+                            mouseX = mouseX * (m_fScreenWidth / static_cast<F32>(winW));
+                            mouseY = mouseY * (m_fScreenHeight / static_cast<F32>(winH));
+                        }
+                    }
 
 					// Only update hover focus when the mouse has actually moved,
 					// so that mouse-wheel scrolling can change list selection
@@ -826,43 +847,48 @@ void UIController::tickInput()
 					m_lastHoverMouseX = rawMouseX;
 					m_lastHoverMouseY = rawMouseY;
 
-					if (mouseMoved)
+					// Convert mouse window-pixel coords to Flash/SWF authoring coords.
+					// In split-screen the scene is rendered at a tile-origin offset
+					// and at a smaller display size, so we must:
+					//   1. Map window pixels -> UIController screen space
+					//   2. Subtract the viewport tile origin
+					//   3. Scale from display dimensions to SWF authoring dimensions
+					F32 sceneMouseX = static_cast<F32>(rawMouseX);
+					F32 sceneMouseY = static_cast<F32>(rawMouseY);
 					{
-						IggyFocusHandle currentFocus = IGGY_FOCUS_NULL;
-						IggyFocusableObject focusables[64];
-						S32 numFocusables = 0;
-						IggyPlayerGetFocusableObjects(movie, &currentFocus, focusables, 64, &numFocusables);
-
-						if (numFocusables > 0 && numFocusables <= 64)
+						extern HWND g_hWnd;
+						RECT rc;
+						if (g_hWnd && GetClientRect(g_hWnd, &rc))
 						{
-							IggyFocusHandle hitObject = IGGY_FOCUS_NULL;
-							for (S32 i = 0; i < numFocusables; ++i)
+							int winW = rc.right - rc.left;
+							int winH = rc.bottom - rc.top;
+							if (winW > 0 && winH > 0)
 							{
-								if (mouseX >= focusables[i].x0 && mouseX <= focusables[i].x1 &&
-									mouseY >= focusables[i].y0 && mouseY <= focusables[i].y1)
+								// Step 1: window pixels -> screen space
+								F32 screenX = sceneMouseX * (getScreenWidth() / static_cast<F32>(winW));
+								F32 screenY = sceneMouseY * (getScreenHeight() / static_cast<F32>(winH));
+
+								// Step 2 & 3: account for split-screen viewport
+								C4JRender::eViewportType vp = pScene->GetParentLayer()->getViewport();
+								S32 displayW = 0, displayH = 0;
+								getRenderDimensions(vp, displayW, displayH);
+
+								F32 vpOriginX, vpOriginY, vpW, vpH;
+								GetViewportRect(getScreenWidth(), getScreenHeight(), vp, vpOriginX, vpOriginY, vpW, vpH);
+								// All viewports use Fit16x9 for menu scenes
+								S32 fitW, fitH, fitOffsetX, fitOffsetY;
+								Fit16x9(vpW, vpH, fitW, fitH, fitOffsetX, fitOffsetY);
+								S32 originX = static_cast<S32>(vpOriginX) + fitOffsetX;
+								S32 originY = static_cast<S32>(vpOriginY) + fitOffsetY;
+								displayW = fitW;
+								displayH = fitH;
+
+								if (displayW > 0 && displayH > 0)
 								{
-									hitObject = focusables[i].object;
-									break;
+									sceneMouseX = (screenX - originX) * (static_cast<F32>(pScene->getRenderWidth()) / static_cast<F32>(displayW));
+									sceneMouseY = (screenY - originY) * (static_cast<F32>(pScene->getRenderHeight()) / static_cast<F32>(displayH));
 								}
 							}
-
-							if (hitObject != currentFocus)
-							{
-								IggyPlayerSetFocusRS(movie, hitObject, 0);
-							}
-						}
-					}
-
-					// Convert mouse to scene/movie coordinates for slider hit testing
-					F32 sceneMouseX = mouseX;
-					F32 sceneMouseY = mouseY;
-					{
-						S32 displayWidth = 0, displayHeight = 0;
-						pScene->GetParentLayer()->getRenderDimensions(displayWidth, displayHeight);
-						if (displayWidth > 0 && displayHeight > 0)
-						{
-							sceneMouseX = mouseX * ((F32)pScene->getRenderWidth() / (F32)displayWidth);
-							sceneMouseY = mouseY * ((F32)pScene->getRenderHeight() / (F32)displayHeight);
 						}
 					}
 
@@ -876,6 +902,110 @@ void UIController::tickInput()
 						panelOffsetY = pMainPanel->getYPos();
 					}
 
+					// Mouse hover — hit test against C++ control bounds.
+					// Simple controls use SetFocusToElement; list controls
+					// use their own SetTouchFocus for Flash-side hit testing.
+					if (mouseMoved)
+					{
+						m_bMouseHoverHorizontalList = false;
+						vector<UIControl *> *controls = pScene->GetControls();
+						if (controls)
+						{
+							int hitControlId = -1;
+							S32 hitArea = INT_MAX;
+							UIControl *hitCtrl = NULL;
+							for (size_t i = 0; i < controls->size(); ++i)
+							{
+								UIControl *ctrl = (*controls)[i];
+								if (!ctrl || ctrl->getHidden() || !ctrl->getVisible() || ctrl->getId() < 0)
+									continue;
+
+								UIControl::eUIControlType type = ctrl->getControlType();
+								if (type != UIControl::eButton && type != UIControl::eTextInput &&
+									type != UIControl::eCheckBox && type != UIControl::eSlider &&
+									type != UIControl::eButtonList && type != UIControl::eTexturePackList)
+									continue;
+
+								// If the scene has an active panel (e.g. tab menus),
+								// skip controls that aren't children of that panel.
+								if (pMainPanel && ctrl->getParentPanel() != pMainPanel)
+									continue;
+
+								ctrl->UpdateControl();
+								S32 cx = ctrl->getXPos() + panelOffsetX;
+								S32 cy = ctrl->getYPos() + panelOffsetY;
+								S32 cw = ctrl->getWidth();
+								S32 ch = ctrl->getHeight();
+								// TexturePackList origin is where the slot area starts,
+								// not the top-left of the whole control — use GetRealHeight.
+								if (type == UIControl::eTexturePackList)
+									ch = static_cast<UIControl_TexturePackList*>(ctrl)->GetRealHeight();
+								if (cw <= 0 || ch <= 0)
+									continue;
+
+								if (sceneMouseX >= cx && sceneMouseX <= cx + cw &&
+									sceneMouseY >= cy && sceneMouseY <= cy + ch)
+								{
+									if (type == UIControl::eButtonList)
+									{
+										// ButtonList manages focus internally via Flash —
+										// pass mouse coords so it can highlight the right item.
+										static_cast<UIControl_ButtonList*>(ctrl)->SetTouchFocus(
+											static_cast<S32>(sceneMouseX), static_cast<S32>(sceneMouseY), false);
+										hitControlId = -1;
+										hitArea = INT_MAX;
+										hitCtrl = NULL;
+										break; // ButtonList takes priority
+									}
+									if (type == UIControl::eTexturePackList)
+									{
+										// TexturePackList expects coords relative to its origin.
+										UIControl_TexturePackList *pList = static_cast<UIControl_TexturePackList*>(ctrl);
+										pScene->SetFocusToElement(ctrl->getId());
+										pList->SetTouchFocus(
+											static_cast<S32>(sceneMouseX - cx), static_cast<S32>(sceneMouseY - cy), false);
+										m_bMouseHoverHorizontalList = true;
+										hitControlId = -1;
+										hitArea = INT_MAX;
+										hitCtrl = NULL;
+										break;
+									}
+									S32 area = cw * ch;
+									if (area < hitArea)
+									{
+										hitControlId = ctrl->getId();
+										hitArea = area;
+										hitCtrl = ctrl;
+										if (type == UIControl::eSlider)
+											m_bMouseHoverHorizontalList = true;
+									}
+								}
+							}
+
+							if (hitControlId >= 0 && pScene->getControlFocus() != hitControlId)
+							{
+								// During direct editing, don't let hover move focus
+								// away to other TextInputs (e.g. sign lines).
+								if (hitCtrl && hitCtrl->getControlType() == UIControl::eTextInput
+									&& pScene->isDirectEditBlocking())
+								{
+									// Skip — keep focus on the actively-edited input
+								}
+								else
+								{
+									pScene->SetFocusToElement(hitControlId);
+									// TextInput: SetFocusToElement triggers ChangeState which
+									// shows the caret. Hide it immediately — the render pass
+									// happens after both tickInput and scene tick, so no flicker.
+									if (hitCtrl && hitCtrl->getControlType() == UIControl::eTextInput)
+									{
+										static_cast<UIControl_TextInput*>(hitCtrl)->setCaretVisible(false);
+									}
+								}
+							}
+						}
+					}
+
 					bool leftPressed = g_KBMInput.IsMouseButtonPressed(KeyboardMouseInput::MOUSE_LEFT);
 					bool leftDown = leftPressed || g_KBMInput.IsMouseButtonDown(KeyboardMouseInput::MOUSE_LEFT);
 
@@ -890,13 +1020,52 @@ void UIController::tickInput()
 						vector<UIControl *> *controls = pScene->GetControls();
 						if (controls)
 						{
+							// Set Iggy dispatch focus for TextInput on click (not hover)
+							// so ACTION_MENU_OK targets the correct text field.
+							for (size_t i = 0; i < controls->size(); ++i)
+							{
+								UIControl *ctrl = (*controls)[i];
+								if (!ctrl || ctrl->getControlType() != UIControl::eTextInput || !ctrl->getVisible())
+									continue;
+								if (pMainPanel && ctrl->getParentPanel() != pMainPanel)
+									continue;
+								ctrl->UpdateControl();
+								S32 cx = ctrl->getXPos() + panelOffsetX;
+								S32 cy = ctrl->getYPos() + panelOffsetY;
+								S32 cw = ctrl->getWidth();
+								S32 ch = ctrl->getHeight();
+								if (cw > 0 && ch > 0 &&
+									sceneMouseX >= cx && sceneMouseX <= cx + cw &&
+									sceneMouseY >= cy && sceneMouseY <= cy + ch)
+								{
+									Iggy *movie = pScene->getMovie();
+									IggyFocusHandle currentFocus = IGGY_FOCUS_NULL;
+									IggyFocusableObject focusables[64];
+									S32 numFocusables = 0;
+									IggyPlayerGetFocusableObjects(movie, &currentFocus, focusables, 64, &numFocusables);
+									for (S32 fi = 0; fi < numFocusables && fi < 64; ++fi)
+									{
+										if (sceneMouseX >= focusables[fi].x0 && sceneMouseX <= focusables[fi].x1 &&
+											sceneMouseY >= focusables[fi].y0 && sceneMouseY <= focusables[fi].y1)
+										{
+											IggyPlayerSetFocusRS(movie, focusables[fi].object, 0);
+											break;
+										}
+									}
+									break;
+								}
+							}
+
 							for (size_t i = 0; i < controls->size(); ++i)
 							{
 								UIControl *ctrl = (*controls)[i];
 								if (!ctrl || ctrl->getControlType() != UIControl::eSlider || !ctrl->getVisible())
 									continue;
 
-								UIControl_Slider *pSlider = (UIControl_Slider *)ctrl;
+								if (pMainPanel && ctrl->getParentPanel() != pMainPanel)
+									continue;
+
+								UIControl_Slider *pSlider = static_cast<UIControl_Slider *>(ctrl);
 								pSlider->UpdateControl();
 								S32 cx = pSlider->getXPos() + panelOffsetX;
 								S32 cy = pSlider->getYPos() + panelOffsetY;
@@ -925,7 +1094,7 @@ void UIController::tickInput()
 							S32 sliderWidth = pSlider->GetRealWidth();
 							if (sliderWidth > 0)
 							{
-								float fNewSliderPos = (sceneMouseX - (float)sliderX) / (float)sliderWidth;
+								float fNewSliderPos = (sceneMouseX - static_cast<float>(sliderX)) / static_cast<float>(sliderWidth);
 								if (fNewSliderPos < 0.0f) fNewSliderPos = 0.0f;
 								if (fNewSliderPos > 1.0f) fNewSliderPos = 1.0f;
 								pSlider->SetSliderTouchPos(fNewSliderPos);
@@ -942,6 +1111,12 @@ void UIController::tickInput()
 						m_mouseDraggingSliderScene = eUIScene_COUNT;
 						m_mouseDraggingSliderId = -1;
 					}
+
+					// Let the scene handle mouse clicks for custom navigation (e.g. crafting slots)
+					if (leftPressed && m_mouseDraggingSliderId < 0)
+					{
+						m_mouseClickConsumedByScene = pScene->handleMouseClick(sceneMouseX, sceneMouseY);
+					}
 				}
 			}
 #endif
@@ -1006,7 +1181,7 @@ void UIController::handleInput()
 
 		if(ProfileManager.GetLockedProfile() >= 0 && !InputManager.IsPadLocked( ProfileManager.GetLockedProfile() ) && firstUnfocussedUnhandledPad >= 0)
 		{
-			ProfileManager.RequestSignInUI(false, false, false, false, true, NULL, NULL, firstUnfocussedUnhandledPad );
+			ProfileManager.RequestSignInUI(false, false, false, false, true, nullptr, nullptr, firstUnfocussedUnhandledPad );
 		}
 	}
 #endif
@@ -1033,8 +1208,8 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 		if((m_bTouchscreenPressed==false) && pTouchData->reportNum==1)
 		{
 			// no active touch? clear active and highlighted touch UI elements
-			m_ActiveUIElement = NULL;
-			m_HighlightedUIElement = NULL;
+			m_ActiveUIElement = nullptr;
+			m_HighlightedUIElement = nullptr;
 
 			// fullscreen first
 			UIScene *pScene=m_groups[(int)eUIGroup_Fullscreen]->getCurrentScene();
@@ -1206,7 +1381,7 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 
 		if ((key == ACTION_MENU_OK || key == ACTION_MENU_A) && !g_KBMInput.IsMouseGrabbed())
 		{
-			if (m_mouseDraggingSliderId < 0)
+			if (m_mouseDraggingSliderId < 0 && !m_mouseClickConsumedByScene)
 			{
 				if (g_KBMInput.IsMouseButtonPressed(KeyboardMouseInput::MOUSE_LEFT))  { pressed = true; down = true; }
 				if (g_KBMInput.IsMouseButtonReleased(KeyboardMouseInput::MOUSE_LEFT)) { released = true; down = false; }
@@ -1214,6 +1389,14 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 			}
 		}
 
+		// Right click → ACTION_MENU_X (pick up half stack in inventory)
+		if (key == ACTION_MENU_X && !g_KBMInput.IsMouseGrabbed())
+		{
+			if (g_KBMInput.IsMouseButtonPressed(KeyboardMouseInput::MOUSE_RIGHT))  { pressed = true; down = true; }
+			if (g_KBMInput.IsMouseButtonReleased(KeyboardMouseInput::MOUSE_RIGHT)) { released = true; down = false; }
+			if (!pressed && !released && g_KBMInput.IsMouseButtonDown(KeyboardMouseInput::MOUSE_RIGHT)) { down = true; }
+		}
+
 		// Scroll wheel for list scrolling — only consume the wheel value when the
 		// action key actually matches, so the other direction isn't lost.
 		if (!g_KBMInput.IsMouseGrabbed() && (key == ACTION_MENU_OTHER_STICK_UP || key == ACTION_MENU_OTHER_STICK_DOWN))
@@ -1231,6 +1414,16 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 				pressed = true;
 				down = true;
 			}
+
+			// Remap scroll wheel to navigation actions. Use LEFT/RIGHT when
+			// hovering a horizontal list (e.g. TexturePackList), UP/DOWN otherwise.
+			if (pressed && g_KBMInput.IsKBMActive())
+			{
+				if (m_bMouseHoverHorizontalList)
+					key = (key == ACTION_MENU_OTHER_STICK_UP) ? ACTION_MENU_LEFT : ACTION_MENU_RIGHT;
+				else
+					key = (key == ACTION_MENU_OTHER_STICK_UP) ? ACTION_MENU_UP : ACTION_MENU_DOWN;
+			}
 		}
 	}
 #endif
@@ -1297,8 +1490,8 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 		//!(app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_ToggleFont)) &&
 		key == ACTION_MENU_STICK_PRESS)
 	{
-		__int64 totalStatic = 0;
-		__int64 totalDynamic = 0;
+		int64_t totalStatic = 0;
+		int64_t totalDynamic = 0;
 		app.DebugPrintf(app.USER_SR, "********************************\n");
 		app.DebugPrintf(app.USER_SR, "BEGIN TOTAL SWF MEMORY USAGE\n\n");
 		for(unsigned int i = 0; i < eUIGroup_COUNT; ++i)
@@ -1307,8 +1500,8 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 		}
 		for(unsigned int i = 0; i < eLibrary_Count; ++i)
 		{
-			__int64 libraryStatic = 0;
-			__int64 libraryDynamic = 0;
+			int64_t libraryStatic = 0;
+			int64_t libraryDynamic = 0;
 
 			if(m_iggyLibraries[i] != IGGY_INVALID_LIBRARY)
 			{
@@ -1316,7 +1509,7 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 				IggyMemoryUseInfo memoryInfo;
 				rrbool res;
 				int iteration = 0;
-				while(res = IggyDebugGetMemoryUseInfo ( NULL ,
+				while(res = IggyDebugGetMemoryUseInfo ( nullptr ,
 					m_iggyLibraries[i] ,
 					"" ,
 					0 ,
@@ -1347,7 +1540,7 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 			bool handled = false;
 
 			// Send the key to the fullscreen group first
-			m_groups[(int)eUIGroup_Fullscreen]->handleInput(iPad, key, repeat, pressed, released, handled);
+			m_groups[static_cast<int>(eUIGroup_Fullscreen)]->handleInput(iPad, key, repeat, pressed, released, handled);
 			if(!handled)
 			{
 				// If it's not been handled yet, then pass the event onto the players specific group
@@ -1358,9 +1551,9 @@ void UIController::handleKeyPress(unsigned int iPad, unsigned int key)
 
 rrbool RADLINK UIController::ExternalFunctionCallback( void * user_callback_data , Iggy * player , IggyExternalFunctionCallUTF16 * call)
 {
-	UIScene *scene = (UIScene *)IggyPlayerGetUserdata(player);
+	UIScene *scene = static_cast<UIScene *>(IggyPlayerGetUserdata(player));
 
-	if(scene != NULL)
+	if(scene != nullptr)
 	{
 		scene->externalCallback(call);
 	}
@@ -1422,73 +1615,48 @@ void UIController::renderScenes()
 
 void UIController::getRenderDimensions(C4JRender::eViewportType viewport, S32 &width, S32 &height)
 {
-	switch( viewport )
+	F32 originX, originY, viewW, viewH;
+	GetViewportRect(getScreenWidth(), getScreenHeight(), viewport, originX, originY, viewW, viewH);
+
+	if(viewport == C4JRender::VIEWPORT_TYPE_FULLSCREEN)
 	{
-	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
-		width = (S32)(getScreenWidth());
-		height = (S32)(getScreenHeight());
-		break;
-	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-		width = (S32)(getScreenWidth() / 2);
-		height = (S32)(getScreenHeight() / 2);
-		break;
-	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		width = (S32)(getScreenWidth() / 2);
-		height = (S32)(getScreenHeight() / 2);
-		break;
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-		width = (S32)(getScreenWidth() / 2);
-		height = (S32)(getScreenHeight() / 2);
-		break;
+		S32 offsetX, offsetY;
+		Fit16x9(viewW, viewH, width, height, offsetX, offsetY);
+	}
+	else
+	{
+		// Split-screen: use raw viewport dims — the SWF tiling code handles non-16:9
+		width = static_cast<S32>(viewW);
+		height = static_cast<S32>(viewH);
 	}
 }
 
 void UIController::setupRenderPosition(C4JRender::eViewportType viewport)
 {
-	if(m_bCustomRenderPosition || m_currentRenderViewport != viewport)
+	m_currentRenderViewport = viewport;
+	m_bCustomRenderPosition = false;
+
+	F32 vpOriginX, vpOriginY, vpW, vpH;
+	GetViewportRect(getScreenWidth(), getScreenHeight(), viewport, vpOriginX, vpOriginY, vpW, vpH);
+
+	S32 xPos, yPos;
+	if(viewport == C4JRender::VIEWPORT_TYPE_FULLSCREEN)
 	{
-		m_currentRenderViewport = viewport;
-		m_bCustomRenderPosition = false;
-		S32 xPos = 0;
-		S32 yPos = 0;
-		switch( viewport )
-		{
-		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-			xPos = (S32)(getScreenWidth() / 4);
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			xPos = (S32)(getScreenWidth() / 4);
-			yPos = (S32)(getScreenHeight() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-			yPos = (S32)(getScreenHeight() / 4);
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-			xPos = (S32)(getScreenWidth() / 2);
-			yPos = (S32)(getScreenHeight() / 4);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-			xPos = (S32)(getScreenWidth() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-			yPos = (S32)(getScreenHeight() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			xPos = (S32)(getScreenWidth() / 2);
-			yPos = (S32)(getScreenHeight() / 2);
-			break;
-		}
-		m_tileOriginX = xPos;
-		m_tileOriginY = yPos;
-		setTileOrigin(xPos, yPos);
+		S32 fitW, fitH, fitOffsetX, fitOffsetY;
+		Fit16x9(vpW, vpH, fitW, fitH, fitOffsetX, fitOffsetY);
+		xPos = static_cast<S32>(vpOriginX) + fitOffsetX;
+		yPos = static_cast<S32>(vpOriginY) + fitOffsetY;
+	}
+	else
+	{
+		// Split-screen: position at viewport origin, no 16:9 fitting
+		xPos = static_cast<S32>(vpOriginX);
+		yPos = static_cast<S32>(vpOriginY);
 	}
+
+	m_tileOriginX = xPos;
+	m_tileOriginY = yPos;
+	setTileOrigin(xPos, yPos);
 }
 
 void UIController::setupRenderPosition(S32 xOrigin, S32 yOrigin)
@@ -1547,8 +1715,8 @@ void UIController::setupCustomDrawMatrices(UIScene *scene, CustomDrawData *custo
 	Minecraft *pMinecraft=Minecraft::GetInstance();
 
 	// Clear just the region required for this control.
-	float sceneWidth = (float)scene->getRenderWidth();
-	float sceneHeight = (float)scene->getRenderHeight();
+	float sceneWidth = static_cast<float>(scene->getRenderWidth());
+	float sceneHeight = static_cast<float>(scene->getRenderHeight());
 
 	LONG left, right, top, bottom;
 #ifdef __PS3__
@@ -1576,10 +1744,10 @@ void UIController::setupCustomDrawMatrices(UIScene *scene, CustomDrawData *custo
 	if(!m_bScreenWidthSetup)
 	{
 		Minecraft *pMinecraft=Minecraft::GetInstance();
-		if(pMinecraft != NULL)
+		if(pMinecraft != nullptr)
 		{
-			m_fScreenWidth=(float)pMinecraft->width_phys;
-			m_fScreenHeight=(float)pMinecraft->height_phys;
+			m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+			m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
 			m_bScreenWidthSetup = true;
 		}
 	}
@@ -1623,9 +1791,9 @@ void UIController::endCustomDrawGameStateAndMatrices()
 
 void RADLINK UIController::CustomDrawCallback(void *user_callback_data, Iggy *player, IggyCustomDrawCallbackRegion *region)
 {
-	UIScene *scene = (UIScene *)IggyPlayerGetUserdata(player);
+	UIScene *scene = static_cast<UIScene *>(IggyPlayerGetUserdata(player));
 
-	if(scene != NULL)
+	if(scene != nullptr)
 	{
 		scene->customDraw(region);
 	}
@@ -1637,7 +1805,7 @@ void RADLINK UIController::CustomDrawCallback(void *user_callback_data, Iggy *pl
 //width - Input value: optional number of pixels wide specified from AS3, or -1 if not defined. Output value: the number of pixels wide to pretend to Iggy that the bitmap is. SWF and AS3 scales bitmaps based on their pixel dimensions, so you can use this to substitute a texture that is higher or lower resolution that ActionScript thinks it is.
 //height - Input value: optional number of pixels high specified from AS3, or -1 if not defined. Output value: the number of pixels high to pretend to Iggy that the bitmap is. SWF and AS3 scales bitmaps based on their pixel dimensions, so you can use this to substitute a texture that is higher or lower resolution that ActionScript thinks it is.
 //destroy_callback_data - Optional additional output value you can set; the value will be passed along to the corresponding Iggy_TextureSubstitutionDestroyCallback (e.g. you can store the pointer to your own internal structure here).
-//return - A platform-independent wrapped texture handle provided by GDraw, or NULL (NULL with throw an ActionScript 3 ArgumentError that the Flash developer can catch) Use by calling IggySetTextureSubstitutionCallbacks.
+//return - A platform-independent wrapped texture handle provided by GDraw, or nullptr (nullptr with throw an ActionScript 3 ArgumentError that the Flash developer can catch) Use by calling IggySetTextureSubstitutionCallbacks.
 //
 //Discussion
 //
@@ -1652,7 +1820,7 @@ GDrawTexture * RADLINK UIController::TextureSubstitutionCreateCallback ( void *
 		app.DebugPrintf("Found substitution texture %ls, with %d bytes\n", texture_name,it->second.length);
 
 		BufferedImage image(it->second.data, it->second.length);
-		if( image.getData() != NULL )
+		if( image.getData() != nullptr )
 		{
 			image.preMultiplyAlpha();
 			Textures *t = Minecraft::GetInstance()->textures;
@@ -1660,28 +1828,38 @@ GDrawTexture * RADLINK UIController::TextureSubstitutionCreateCallback ( void *
 
 			// 4J Stu - All our flash controls that allow replacing textures use a special 64x64 symbol
 			// Force this size here so that our images don't get scaled wildly
-	#if (defined __ORBIS__ || defined _DURANGO || defined _WINDOWS64 )
+	#if (defined __ORBIS__ || defined _DURANGO )
 			*width = 96;
 			*height = 96;
 	#else
 			*width = 64;
 			*height = 64;
+	#endif
 
+	#if defined _WINDOWS64
+            // Only set the size to 96x96 for 1080p on Windows
+            UIScene *scene = uiController->GetTopScene(0);
+            if (scene->getSceneResolution() == UIScene::eSceneResolution_1080)
+            {
+                *width = 96;
+                *height = 96;
+			}
 	#endif
+
 			*destroy_callback_data = (void *)id;
 
-			app.DebugPrintf("Found substitution texture %ls (%d) - %dx%d\n", (wchar_t *)texture_name, id, image.getWidth(), image.getHeight());
+			app.DebugPrintf("Found substitution texture %ls (%d) - %dx%d\n", static_cast<wchar_t *>(texture_name), id, image.getWidth(), image.getHeight());
 			return ui.getSubstitutionTexture(id);
 		}
 		else
 		{
-			return NULL;
+			return nullptr;
 		}
 	}
 	else
 	{
-		app.DebugPrintf("Could not find substitution texture %ls\n", (wchar_t *)texture_name);
-		return NULL;
+		app.DebugPrintf("Could not find substitution texture %ls\n", static_cast<wchar_t *>(texture_name));
+		return nullptr;
 	}
 }
 
@@ -1691,13 +1869,16 @@ void RADLINK UIController::TextureSubstitutionDestroyCallback ( void * user_call
 {
 	// Orbis complains about casting a pointer to an int
 	LONGLONG llVal=(LONGLONG)destroy_callback_data;
-	int id=(int)llVal;
+	int id=static_cast<int>(llVal);
 	app.DebugPrintf("Destroying iggy texture %d\n", id);
 
 	ui.destroySubstitutionTexture(user_callback_data, handle);
 
-	Textures *t = Minecraft::GetInstance()->textures;
-	t->releaseTexture( id );
+	Minecraft* mc = Minecraft::GetInstance();
+	if (mc && mc->textures)
+	{
+		mc->textures->releaseTexture( id );
+	}
 }
 
 void UIController::registerSubstitutionTexture(const wstring &textureName, PBYTE pbData, DWORD dwLength)
@@ -1723,6 +1904,7 @@ void UIController::unregisterSubstitutionTexture(const wstring &textureName, boo
 bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUILayer layer, EUIGroup group)
 {
 	static bool bSeenUpdateTextThisSession = false;
+	#if 0 // Disable since we don't use this
 	// If you're navigating to the multigamejoinload, and the player hasn't seen the updates message yet, display it now
 	// display this message the first 3 times
 	if((scene==eUIScene_LoadOrJoinMenu) && (bSeenUpdateTextThisSession==false) && ( app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplayUpdateMessage)!=0))
@@ -1730,6 +1912,7 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUI
 		scene=eUIScene_NewUpdateMessage;
 		bSeenUpdateTextThisSession=true;
 	}
+	#endif
 
 	// if you're trying to navigate to the inventory,the crafting, pause or game info or any of the trigger scenes and there's already a menu up (because you were pressing a few buttons at the same time) then ignore the navigate
 	if(GetMenuDisplayed(iPad))
@@ -1791,7 +1974,7 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUI
 			if( ( iPad != 255 ) && ( iPad >= 0 ) )
 			{
 				menuDisplayedPad = iPad;
-				group = (EUIGroup)(iPad+1);
+				group = static_cast<EUIGroup>(iPad + 1);
 			}
 			else group = eUIGroup_Fullscreen;
 		}
@@ -1806,7 +1989,7 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUI
 
 	EnterCriticalSection(&m_navigationLock);
 	SetMenuDisplayed(menuDisplayedPad,true);
-	bool success = m_groups[(int)group]->NavigateToScene(iPad, scene, initData, layer);
+	bool success = m_groups[static_cast<int>(group)]->NavigateToScene(iPad, scene, initData, layer);
 	if(success && group == eUIGroup_Fullscreen) setFullscreenMenuDisplayed(true);
 	LeaveCriticalSection(&m_navigationLock);
 
@@ -1821,18 +2004,18 @@ bool UIController::NavigateBack(int iPad, bool forceUsePad, EUIScene eScene, EUI
 	bool navComplete = false;
 	if( app.GetGameStarted() )
 	{
-		bool navComplete = m_groups[(int)eUIGroup_Fullscreen]->NavigateBack(iPad, eScene, eLayer);
+		bool navComplete = m_groups[static_cast<int>(eUIGroup_Fullscreen)]->NavigateBack(iPad, eScene, eLayer);
 
 		if(!navComplete && ( iPad != 255 ) && ( iPad >= 0 ) )
 		{
-			EUIGroup group = (EUIGroup)(iPad+1);
-			navComplete = m_groups[(int)group]->NavigateBack(iPad, eScene, eLayer);
-			if(!m_groups[(int)group]->GetMenuDisplayed())SetMenuDisplayed(iPad,false);
+			EUIGroup group = static_cast<EUIGroup>(iPad + 1);
+			navComplete = m_groups[static_cast<int>(group)]->NavigateBack(iPad, eScene, eLayer);
+			if(!m_groups[static_cast<int>(group)]->GetMenuDisplayed())SetMenuDisplayed(iPad,false);
 		}
 		// 4J-PB - autosave in fullscreen doesn't clear the menuDisplayed flag
 		else
 		{
-			if(!m_groups[(int)eUIGroup_Fullscreen]->GetMenuDisplayed())
+			if(!m_groups[static_cast<int>(eUIGroup_Fullscreen)]->GetMenuDisplayed())
 			{
 				setFullscreenMenuDisplayed(false);
 				for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
@@ -1844,8 +2027,8 @@ bool UIController::NavigateBack(int iPad, bool forceUsePad, EUIScene eScene, EUI
 	}
 	else
 	{
-		navComplete = m_groups[(int)eUIGroup_Fullscreen]->NavigateBack(iPad, eScene, eLayer);
-		if(!m_groups[(int)eUIGroup_Fullscreen]->GetMenuDisplayed()) SetMenuDisplayed(XUSER_INDEX_ANY,false);
+		navComplete = m_groups[static_cast<int>(eUIGroup_Fullscreen)]->NavigateBack(iPad, eScene, eLayer);
+		if(!m_groups[static_cast<int>(eUIGroup_Fullscreen)]->GetMenuDisplayed()) SetMenuDisplayed(XUSER_INDEX_ANY,false);
 	}
 	return navComplete;
 }
@@ -1866,11 +2049,11 @@ void UIController::NavigateToHomeMenu()
 	TexturePack *pTexPack=Minecraft::GetInstance()->skins->getSelected();
 
 
-	DLCTexturePack *pDLCTexPack=NULL;
+	DLCTexturePack *pDLCTexPack=nullptr;
 	if(pTexPack->hasAudio())
 	{
 		// get the dlc texture pack, and store it
-		pDLCTexPack=(DLCTexturePack *)pTexPack;
+		pDLCTexPack=static_cast<DLCTexturePack *>(pTexPack);
 	}
 
 	// change to the default texture pack
@@ -1887,11 +2070,11 @@ void UIController::NavigateToHomeMenu()
 			eStream_CD_1);
 		pMinecraft->soundEngine->playStreaming(L"", 0, 0, 0, 1, 1);
 
-		// 		if(pDLCTexPack->m_pStreamedWaveBank!=NULL)
+		// 		if(pDLCTexPack->m_pStreamedWaveBank!=nullptr)
 		// 		{
 		// 			pDLCTexPack->m_pStreamedWaveBank->Destroy();
 		// 		}
-		// 		if(pDLCTexPack->m_pSoundBank!=NULL)
+		// 		if(pDLCTexPack->m_pSoundBank!=nullptr)
 		// 		{
 		// 			pDLCTexPack->m_pSoundBank->Destroy();
 		// 		}
@@ -1925,7 +2108,7 @@ UIScene *UIController::GetTopScene(int iPad, EUILayer layer, EUIGroup group)
 			// If the game isn't running treat as user 0, otherwise map index directly from pad
 			if( ( iPad != 255 ) && ( iPad >= 0 ) )
 			{
-				group = (EUIGroup)(iPad+1);
+				group = static_cast<EUIGroup>(iPad + 1);
 			}
 			else group = eUIGroup_Fullscreen;
 		}
@@ -1935,7 +2118,7 @@ UIScene *UIController::GetTopScene(int iPad, EUILayer layer, EUIGroup group)
 			group = eUIGroup_Fullscreen;
 		}
 	}
-	return m_groups[(int)group]->GetTopScene(layer);
+	return m_groups[static_cast<int>(group)]->GetTopScene(layer);
 }
 
 size_t UIController::RegisterForCallbackId(UIScene *scene)
@@ -1962,7 +2145,7 @@ void UIController::UnregisterCallbackId(size_t id)
 
 UIScene *UIController::GetSceneFromCallbackId(size_t id)
 {
-	UIScene *scene = NULL;
+	UIScene *scene = nullptr;
     auto it = m_registeredCallbackScenes.find(id);
     if(it != m_registeredCallbackScenes.end() )
 	{
@@ -1983,7 +2166,7 @@ void UIController::LeaveCallbackIdCriticalSection()
 
 void UIController::CloseAllPlayersScenes()
 {
-	m_groups[(int)eUIGroup_Fullscreen]->getTooltips()->SetTooltips(-1);
+	m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getTooltips()->SetTooltips(-1);
 	for(unsigned int i = 0; i < eUIGroup_COUNT; ++i)
 	{
 		//m_bCloseAllScenes[i] = true;
@@ -2006,7 +2189,7 @@ void UIController::CloseUIScenes(int iPad, bool forceIPad)
 	if( app.GetGameStarted() || forceIPad )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
@@ -2014,22 +2197,22 @@ void UIController::CloseUIScenes(int iPad, bool forceIPad)
 		group = eUIGroup_Fullscreen;
 	}
 
-	m_groups[(int)group]->closeAllScenes();
-	m_groups[(int)group]->getTooltips()->SetTooltips(-1);
+	m_groups[static_cast<int>(group)]->closeAllScenes();
+	m_groups[static_cast<int>(group)]->getTooltips()->SetTooltips(-1);
 
 	// This should cause the popup to dissappear
 	TutorialPopupInfo popupInfo;
-	if(m_groups[(int)group]->getTutorialPopup()) m_groups[(int)group]->getTutorialPopup()->SetTutorialDescription(&popupInfo);
+	if(m_groups[static_cast<int>(group)]->getTutorialPopup()) m_groups[static_cast<int>(group)]->getTutorialPopup()->SetTutorialDescription(&popupInfo);
 
 	if(group==eUIGroup_Fullscreen) setFullscreenMenuDisplayed(false);
 
-	SetMenuDisplayed((group == eUIGroup_Fullscreen ? XUSER_INDEX_ANY : iPad), m_groups[(int)group]->GetMenuDisplayed());
+	SetMenuDisplayed((group == eUIGroup_Fullscreen ? XUSER_INDEX_ANY : iPad), m_groups[static_cast<int>(group)]->GetMenuDisplayed());
 }
 
 void UIController::setFullscreenMenuDisplayed(bool displayed)
 {
 	// Show/hide the tooltips for the fullscreen group
-	m_groups[(int)eUIGroup_Fullscreen]->showComponent(ProfileManager.GetPrimaryPad(),eUIComponent_Tooltips,eUILayer_Tooltips,displayed);
+	m_groups[static_cast<int>(eUIGroup_Fullscreen)]->showComponent(ProfileManager.GetPrimaryPad(),eUIComponent_Tooltips,eUILayer_Tooltips,displayed);
 
 	// Show/hide tooltips for the other layers
 	for(unsigned int i = (eUIGroup_Fullscreen+1); i < eUIGroup_COUNT; ++i)
@@ -2044,14 +2227,14 @@ bool UIController::IsPauseMenuDisplayed(int iPad)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	return m_groups[(int)group]->IsPauseMenuDisplayed();
+	return m_groups[static_cast<int>(group)]->IsPauseMenuDisplayed();
 }
 
 bool UIController::IsContainerMenuDisplayed(int iPad)
@@ -2060,14 +2243,14 @@ bool UIController::IsContainerMenuDisplayed(int iPad)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	return m_groups[(int)group]->IsContainerMenuDisplayed();
+	return m_groups[static_cast<int>(group)]->IsContainerMenuDisplayed();
 }
 
 bool UIController::IsIgnorePlayerJoinMenuDisplayed(int iPad)
@@ -2076,14 +2259,14 @@ bool UIController::IsIgnorePlayerJoinMenuDisplayed(int iPad)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	return m_groups[(int)group]->IsIgnorePlayerJoinMenuDisplayed();
+	return m_groups[static_cast<int>(group)]->IsIgnorePlayerJoinMenuDisplayed();
 }
 
 bool UIController::IsIgnoreAutosaveMenuDisplayed(int iPad)
@@ -2092,14 +2275,14 @@ bool UIController::IsIgnoreAutosaveMenuDisplayed(int iPad)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	return m_groups[(int)eUIGroup_Fullscreen]->IsIgnoreAutosaveMenuDisplayed() || (group != eUIGroup_Fullscreen && m_groups[(int)group]->IsIgnoreAutosaveMenuDisplayed());
+	return m_groups[static_cast<int>(eUIGroup_Fullscreen)]->IsIgnoreAutosaveMenuDisplayed() || (group != eUIGroup_Fullscreen && m_groups[static_cast<int>(group)]->IsIgnoreAutosaveMenuDisplayed());
 }
 
 void UIController::SetIgnoreAutosaveMenuDisplayed(int iPad, bool displayed)
@@ -2113,14 +2296,14 @@ bool UIController::IsSceneInStack(int iPad, EUIScene eScene)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	return m_groups[(int)group]->IsSceneInStack(eScene);
+	return m_groups[static_cast<int>(group)]->IsSceneInStack(eScene);
 }
 
 bool UIController::GetMenuDisplayed(int iPad)
@@ -2201,14 +2384,14 @@ void UIController::SetTooltipText( unsigned int iPad, unsigned int tooltip, int
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->SetTooltipText(tooltip, iTextID);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->SetTooltipText(tooltip, iTextID);
 }
 
 void UIController::SetEnableTooltips( unsigned int iPad, BOOL bVal )
@@ -2217,14 +2400,14 @@ void UIController::SetEnableTooltips( unsigned int iPad, BOOL bVal )
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->SetEnableTooltips(bVal);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->SetEnableTooltips(bVal);
 }
 
 void UIController::ShowTooltip( unsigned int iPad, unsigned int tooltip, bool show )
@@ -2233,14 +2416,14 @@ void UIController::ShowTooltip( unsigned int iPad, unsigned int tooltip, bool sh
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->ShowTooltip(tooltip,show);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->ShowTooltip(tooltip,show);
 }
 
 void UIController::SetTooltips( unsigned int iPad, int iA, int iB, int iX, int iY, int iLT, int iRT, int iLB, int iRB, int iLS, int iRS, int iBack, bool forceUpdate)
@@ -2262,14 +2445,14 @@ void UIController::SetTooltips( unsigned int iPad, int iA, int iB, int iX, int i
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->SetTooltips(iA, iB, iX, iY, iLT, iRT, iLB, iRB, iLS, iRS, iBack, forceUpdate);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->SetTooltips(iA, iB, iX, iY, iLT, iRT, iLB, iRB, iLS, iRS, iBack, forceUpdate);
 }
 
 void UIController::EnableTooltip( unsigned int iPad, unsigned int tooltip, bool enable )
@@ -2278,14 +2461,14 @@ void UIController::EnableTooltip( unsigned int iPad, unsigned int tooltip, bool
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->EnableTooltip(tooltip,enable);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->EnableTooltip(tooltip,enable);
 }
 
 void UIController::RefreshTooltips(unsigned int iPad)
@@ -2304,7 +2487,7 @@ void UIController::AnimateKeyPress(int iPad, int iAction, bool bRepeat, bool bPr
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
@@ -2312,7 +2495,7 @@ void UIController::AnimateKeyPress(int iPad, int iAction, bool bRepeat, bool bPr
 		group = eUIGroup_Fullscreen;
 	}
 	bool handled = false;
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->handleInput(iPad, iAction, bRepeat, bPressed, bReleased, handled);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->handleInput(iPad, iAction, bRepeat, bPressed, bReleased, handled);
 }
 
 void UIController::OverrideSFX(int iPad, int iAction,bool bVal)
@@ -2322,7 +2505,7 @@ void UIController::OverrideSFX(int iPad, int iAction,bool bVal)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
@@ -2330,19 +2513,25 @@ void UIController::OverrideSFX(int iPad, int iAction,bool bVal)
 		group = eUIGroup_Fullscreen;
 	}
 	bool handled = false;
-	if(m_groups[(int)group]->getTooltips()) m_groups[(int)group]->getTooltips()->overrideSFX(iPad, iAction,bVal);
+	if(m_groups[static_cast<int>(group)]->getTooltips()) m_groups[static_cast<int>(group)]->getTooltips()->overrideSFX(iPad, iAction,bVal);
 }
 
 void UIController::PlayUISFX(ESoundEffect eSound)
 {
-	__uint64 time = System::currentTimeMillis();
+	uint64_t time = System::currentTimeMillis();
 
 	// Don't play multiple SFX on the same tick
 	// (prevents horrible sounds when programmatically setting multiple checkboxes)
 	if (time - m_lastUiSfx < 10) { return; }
 	m_lastUiSfx = time;
 
-	Minecraft::GetInstance()->soundEngine->playUI(eSound,1.0f,1.0f);
+	float pitch = 1.0f;
+	if (eSound == eSFX_Focus)
+	{
+		pitch += (m_randomDistribution(m_randomGenerator) - 0.5f) / 10;
+	}
+
+	Minecraft::GetInstance()->soundEngine->playUI(eSound,1.0f,pitch);
 }
 
 void UIController::DisplayGamertag(unsigned int iPad, bool show)
@@ -2352,13 +2541,13 @@ void UIController::DisplayGamertag(unsigned int iPad, bool show)
 	{
 		show = false;
 	}
-	EUIGroup group = (EUIGroup)(iPad+1);
-	if(m_groups[(int)group]->getHUD()) m_groups[(int)group]->getHUD()->ShowDisplayName(show);
+	EUIGroup group = static_cast<EUIGroup>(iPad + 1);
+	if(m_groups[static_cast<int>(group)]->getHUD()) m_groups[static_cast<int>(group)]->getHUD()->ShowDisplayName(show);
 
 	// Update TutorialPopup in Splitscreen if no container is displayed (to make sure the Popup does not overlap with the Gamertag!)
-	if(app.GetLocalPlayerCount() > 1 && m_groups[(int)group]->getTutorialPopup() && !m_groups[(int)group]->IsContainerMenuDisplayed())
+	if(app.GetLocalPlayerCount() > 1 && m_groups[static_cast<int>(group)]->getTutorialPopup() && !m_groups[static_cast<int>(group)]->IsContainerMenuDisplayed())
 	{
-		m_groups[(int)group]->getTutorialPopup()->UpdateTutorialPopup();
+		m_groups[static_cast<int>(group)]->getTutorialPopup()->UpdateTutorialPopup();
 	}
 }
 
@@ -2369,7 +2558,7 @@ void UIController::SetSelectedItem(unsigned int iPad, const wstring &name)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
@@ -2377,7 +2566,7 @@ void UIController::SetSelectedItem(unsigned int iPad, const wstring &name)
 		group = eUIGroup_Fullscreen;
 	}
 	bool handled = false;
-	if(m_groups[(int)group]->getHUD()) m_groups[(int)group]->getHUD()->SetSelectedLabel(name);
+	if(m_groups[static_cast<int>(group)]->getHUD()) m_groups[static_cast<int>(group)]->getHUD()->SetSelectedLabel(name);
 }
 
 void UIController::UpdateSelectedItemPos(unsigned int iPad)
@@ -2430,10 +2619,10 @@ void UIController::HandleInventoryUpdated(int iPad)
 	EUIGroup group = eUIGroup_Fullscreen;
 	if( app.GetGameStarted() && ( iPad != 255 ) && ( iPad >= 0 ) )
 	{
-		group = (EUIGroup)(iPad+1);
+		group = static_cast<EUIGroup>(iPad + 1);
 	}
 
-	m_groups[group]->HandleMessage(eUIMessage_InventoryUpdated, NULL);
+	m_groups[group]->HandleMessage(eUIMessage_InventoryUpdated, nullptr);
 }
 
 void UIController::HandleGameTick()
@@ -2452,14 +2641,14 @@ void UIController::SetTutorial(int iPad, Tutorial *tutorial)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTutorialPopup()) m_groups[(int)group]->getTutorialPopup()->SetTutorial(tutorial);
+	if(m_groups[static_cast<int>(group)]->getTutorialPopup()) m_groups[static_cast<int>(group)]->getTutorialPopup()->SetTutorial(tutorial);
 }
 
 void UIController::SetTutorialDescription(int iPad, TutorialPopupInfo *info)
@@ -2468,7 +2657,7 @@ void UIController::SetTutorialDescription(int iPad, TutorialPopupInfo *info)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
@@ -2476,11 +2665,11 @@ void UIController::SetTutorialDescription(int iPad, TutorialPopupInfo *info)
 		group = eUIGroup_Fullscreen;
 	}
 
-	if(m_groups[(int)group]->getTutorialPopup())
+	if(m_groups[static_cast<int>(group)]->getTutorialPopup())
 	{
 		// tutorial popup needs to know if a container menu is being displayed
-		m_groups[(int)group]->getTutorialPopup()->SetContainerMenuVisible(m_groups[(int)group]->IsContainerMenuDisplayed());
-		m_groups[(int)group]->getTutorialPopup()->SetTutorialDescription(info);
+		m_groups[static_cast<int>(group)]->getTutorialPopup()->SetContainerMenuVisible(m_groups[static_cast<int>(group)]->IsContainerMenuDisplayed());
+		m_groups[static_cast<int>(group)]->getTutorialPopup()->SetTutorialDescription(info);
 	}
 }
 
@@ -2488,9 +2677,9 @@ void UIController::SetTutorialDescription(int iPad, TutorialPopupInfo *info)
 void UIController::RemoveInteractSceneReference(int iPad, UIScene *scene)
 {
 	EUIGroup group;
-	if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+	if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 	else group = eUIGroup_Fullscreen;
-	if(m_groups[(int)group]->getTutorialPopup()) m_groups[(int)group]->getTutorialPopup()->RemoveInteractSceneReference(scene);
+	if(m_groups[static_cast<int>(group)]->getTutorialPopup()) m_groups[static_cast<int>(group)]->getTutorialPopup()->RemoveInteractSceneReference(scene);
 }
 #endif
 
@@ -2500,14 +2689,14 @@ void UIController::SetTutorialVisible(int iPad, bool visible)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
 	{
 		group = eUIGroup_Fullscreen;
 	}
-	if(m_groups[(int)group]->getTutorialPopup()) m_groups[(int)group]->getTutorialPopup()->SetVisible(visible);
+	if(m_groups[static_cast<int>(group)]->getTutorialPopup()) m_groups[static_cast<int>(group)]->getTutorialPopup()->SetVisible(visible);
 }
 
 bool UIController::IsTutorialVisible(int iPad)
@@ -2516,7 +2705,7 @@ bool UIController::IsTutorialVisible(int iPad)
 	if( app.GetGameStarted() )
 	{
 		// If the game isn't running treat as user 0, otherwise map index directly from pad
-		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = (EUIGroup)(iPad+1);
+		if( ( iPad != 255 ) && ( iPad >= 0 ) ) group = static_cast<EUIGroup>(iPad + 1);
 		else group = eUIGroup_Fullscreen;
 	}
 	else
@@ -2524,7 +2713,7 @@ bool UIController::IsTutorialVisible(int iPad)
 		group = eUIGroup_Fullscreen;
 	}
 	bool visible = false;
-	if(m_groups[(int)group]->getTutorialPopup()) visible = m_groups[(int)group]->getTutorialPopup()->IsVisible();
+	if(m_groups[static_cast<int>(group)]->getTutorialPopup()) visible = m_groups[static_cast<int>(group)]->getTutorialPopup()->IsVisible();
 	return visible;
 }
 
@@ -2534,7 +2723,7 @@ void UIController::UpdatePlayerBasePositions()
 
 	for( BYTE idx = 0; idx < XUSER_MAX_COUNT; ++idx)
 	{
-		if(pMinecraft->localplayers[idx] != NULL)
+		if(pMinecraft->localplayers[idx] != nullptr)
 		{
 			if(pMinecraft->localplayers[idx]->m_iScreenSection==C4JRender::VIEWPORT_TYPE_FULLSCREEN)
 			{
@@ -2544,7 +2733,7 @@ void UIController::UpdatePlayerBasePositions()
 			{
 				DisplayGamertag(idx,true);
 			}
-			m_groups[idx+1]->SetViewportType((C4JRender::eViewportType)pMinecraft->localplayers[idx]->m_iScreenSection);
+			m_groups[idx+1]->SetViewportType(static_cast<C4JRender::eViewportType>(pMinecraft->localplayers[idx]->m_iScreenSection));
 		}
 		else
 		{
@@ -2577,7 +2766,7 @@ void UIController::ShowOtherPlayersBaseScene(unsigned int iPad, bool show)
 
 void UIController::ShowTrialTimer(bool show)
 {
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->showTrialTimer(show);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->showTrialTimer(show);
 }
 
 void UIController::SetTrialTimerLimitSecs(unsigned int uiSeconds)
@@ -2589,7 +2778,7 @@ void UIController::UpdateTrialTimer(unsigned int iPad)
 {
 	WCHAR wcTime[20];
 
-	DWORD dwTimeTicks=(DWORD)app.getTrialTimer();
+	DWORD dwTimeTicks=static_cast<DWORD>(app.getTrialTimer());
 
 	if(dwTimeTicks>m_dwTrialTimerLimitSecs)
 	{
@@ -2608,11 +2797,11 @@ void UIController::UpdateTrialTimer(unsigned int iPad)
 		int iMins=dwTimeTicks/60;
 		int iSeconds=dwTimeTicks%60;
 		swprintf( wcTime, 20, L"%d:%02d",iMins,iSeconds);
-		if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->setTrialTimer(wcTime);
+		if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->setTrialTimer(wcTime);
 	}
 	else
 	{
-		if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->setTrialTimer(L"");
+		if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->setTrialTimer(L"");
 	}
 
 	// are we out of time?
@@ -2622,7 +2811,7 @@ void UIController::UpdateTrialTimer(unsigned int iPad)
 		// bring up the pause menu to stop the trial over message box being called again?
 		if(!ui.GetMenuDisplayed( iPad ) )
 		{
-			ui.NavigateToScene(iPad, eUIScene_PauseMenu, NULL, eUILayer_Scene);
+			ui.NavigateToScene(iPad, eUIScene_PauseMenu, nullptr, eUILayer_Scene);
 
 			app.SetAction(iPad,eAppAction_TrialOver);
 		}
@@ -2631,7 +2820,7 @@ void UIController::UpdateTrialTimer(unsigned int iPad)
 
 void UIController::ReduceTrialTimerValue()
 {
-	DWORD dwTimeTicks=(int)app.getTrialTimer();
+	DWORD dwTimeTicks=static_cast<int>(app.getTrialTimer());
 
 	if(dwTimeTicks>m_dwTrialTimerLimitSecs)
 	{
@@ -2643,7 +2832,7 @@ void UIController::ReduceTrialTimerValue()
 
 void UIController::ShowAutosaveCountdownTimer(bool show)
 {
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->showTrialTimer(show);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->showTrialTimer(show);
 }
 
 void UIController::UpdateAutosaveCountdownTimer(unsigned int uiSeconds)
@@ -2651,7 +2840,7 @@ void UIController::UpdateAutosaveCountdownTimer(unsigned int uiSeconds)
 #if !(defined(_XBOX_ONE) || defined(__ORBIS__))
 	WCHAR wcAutosaveCountdown[100];
 	swprintf( wcAutosaveCountdown, 100, app.GetString(IDS_AUTOSAVE_COUNTDOWN),uiSeconds);
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->setTrialTimer(wcAutosaveCountdown);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->setTrialTimer(wcAutosaveCountdown);
 #endif
 }
 
@@ -2668,12 +2857,12 @@ void UIController::ShowSavingMessage(unsigned int iPad, C4JStorage::ESavingMessa
 		show = true;
 		break;
 	}
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->showSaveIcon(show);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->showSaveIcon(show);
 }
 
 void UIController::ShowPlayerDisplayname(bool show)
 {
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->showPlayerDisplayName(show);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->showPlayerDisplayName(show);
 }
 
 void UIController::SetWinUserIndex(unsigned int iPad)
@@ -2692,12 +2881,12 @@ void UIController::ShowUIDebugConsole(bool show)
 
 	if(show)
 	{
-		m_uiDebugConsole = (UIComponent_DebugUIConsole *)m_groups[eUIGroup_Fullscreen]->addComponent(0, eUIComponent_DebugUIConsole, eUILayer_Debug);
+		m_uiDebugConsole = static_cast<UIComponent_DebugUIConsole *>(m_groups[eUIGroup_Fullscreen]->addComponent(0, eUIComponent_DebugUIConsole, eUILayer_Debug));
 	}
 	else
 	{
 		m_groups[eUIGroup_Fullscreen]->removeComponent(eUIComponent_DebugUIConsole, eUILayer_Debug);
-		m_uiDebugConsole = NULL;
+		m_uiDebugConsole = nullptr;
 	}
 #endif
 }
@@ -2708,12 +2897,12 @@ void UIController::ShowUIDebugMarketingGuide(bool show)
 
 	if(show)
 	{
-		m_uiDebugMarketingGuide = (UIComponent_DebugUIMarketingGuide *)m_groups[eUIGroup_Fullscreen]->addComponent(0, eUIComponent_DebugUIMarketingGuide, eUILayer_Debug);
+		m_uiDebugMarketingGuide = static_cast<UIComponent_DebugUIMarketingGuide *>(m_groups[eUIGroup_Fullscreen]->addComponent(0, eUIComponent_DebugUIMarketingGuide, eUILayer_Debug));
 	}
 	else
 	{
 		m_groups[eUIGroup_Fullscreen]->removeComponent(eUIComponent_DebugUIMarketingGuide, eUILayer_Debug);
-		m_uiDebugMarketingGuide = NULL;
+		m_uiDebugMarketingGuide = nullptr;
 	}
 #endif
 }
@@ -2731,13 +2920,13 @@ bool UIController::PressStartPlaying(unsigned int iPad)
 void UIController::ShowPressStart(unsigned int iPad)
 {
 	m_iPressStartQuadrantsMask|=1<<iPad;
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->showPressStart(iPad, true);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->showPressStart(iPad, true);
 }
 
 void UIController::HidePressStart()
 {
 	ClearPressStart();
-	if(m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()) m_groups[(int)eUIGroup_Fullscreen]->getPressStartToPlay()->showPressStart(0, false);
+	if(m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()) m_groups[static_cast<int>(eUIGroup_Fullscreen)]->getPressStartToPlay()->showPressStart(0, false);
 }
 
 void UIController::ClearPressStart()
@@ -2800,7 +2989,7 @@ C4JStorage::EMessageResult UIController::RequestMessageBox(UINT uiTitle, UINT ui
 	}
 }
 
-C4JStorage::EMessageResult UIController::RequestUGCMessageBox(UINT title/* = -1 */, UINT message/* = -1 */, int iPad/* = -1*/, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)/* = NULL*/, LPVOID lpParam/* = NULL*/)
+C4JStorage::EMessageResult UIController::RequestUGCMessageBox(UINT title/* = -1 */, UINT message/* = -1 */, int iPad/* = -1*/, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)/* = nullptr*/, LPVOID lpParam/* = nullptr*/)
 {
 	// Default title / messages
 	if (title == -1)
@@ -2832,7 +3021,7 @@ C4JStorage::EMessageResult UIController::RequestUGCMessageBox(UINT title/* = -1
 #endif
 }
 
-C4JStorage::EMessageResult UIController::RequestContentRestrictedMessageBox(UINT title/* = -1 */, UINT message/* = -1 */, int iPad/* = -1*/, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)/* = NULL*/, LPVOID lpParam/* = NULL*/)
+C4JStorage::EMessageResult UIController::RequestContentRestrictedMessageBox(UINT title/* = -1 */, UINT message/* = -1 */, int iPad/* = -1*/, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)/* = nullptr*/, LPVOID lpParam/* = nullptr*/)
 {
 	// Default title / messages
 	if (title == -1)
@@ -2870,7 +3059,7 @@ C4JStorage::EMessageResult UIController::RequestContentRestrictedMessageBox(UINT
 void UIController::setFontCachingCalculationBuffer(int length)
 {
 	/* 4J-JEV: As described in an email from Sean.
-	If your `optional_temp_buffer` is NULL, Iggy will allocate the temp
+	If your `optional_temp_buffer` is nullptr, Iggy will allocate the temp
 	buffer on the stack during Iggy draw calls. The size of the buffer it
 	will allocate is 16 bytes times `max_chars` in 32-bit, and 24 bytes
 	times `max_chars` in 64-bit. If the stack of the thread making the
@@ -2883,10 +3072,10 @@ void UIController::setFontCachingCalculationBuffer(int length)
 	static const int CHAR_SIZE = 16;
 #endif
 
-	if (m_tempBuffer != NULL) delete [] m_tempBuffer;
+	if (m_tempBuffer != nullptr) delete [] m_tempBuffer;
 	if (length<0)
 	{
-		if (m_defaultBuffer == NULL) m_defaultBuffer = new char[CHAR_SIZE*5000];
+		if (m_defaultBuffer == nullptr) m_defaultBuffer = new char[CHAR_SIZE*5000];
 		IggySetFontCachingCalculationBuffer(5000, m_defaultBuffer, CHAR_SIZE*5000);
 	}
 	else
@@ -2896,16 +3085,16 @@ void UIController::setFontCachingCalculationBuffer(int length)
 	}
 }
 
-// Returns the first scene of given type if it exists, NULL otherwise
+// Returns the first scene of given type if it exists, nullptr otherwise
 UIScene *UIController::FindScene(EUIScene sceneType)
 {
-	UIScene *pScene = NULL;
+	UIScene *pScene = nullptr;
 
 	for (int i = 0; i < eUIGroup_COUNT; i++)
 	{
 		pScene = m_groups[i]->FindScene(sceneType);
 #ifdef __PS3__
-		if (pScene != NULL) return pScene;
+		if (pScene != nullptr) return pScene;
 #else
 		if (pScene != nullptr) return pScene;
 #endif
@@ -3071,7 +3260,7 @@ bool UIController::TouchBoxHit(UIScene *pUIScene,S32 x, S32 y)
 	}
 
 	//app.DebugPrintf("MISS at x = %i y = %i\n", (int)x, (int)y);
-	m_HighlightedUIElement = NULL;
+	m_HighlightedUIElement = nullptr;
 	return false;
 }
 
diff --git a/Minecraft.Client/Common/UI/UIController.h b/Minecraft.Client/Common/UI/UIController.h
index 373d67b2..08a5ba08 100644
--- a/Minecraft.Client/Common/UI/UIController.h
+++ b/Minecraft.Client/Common/UI/UIController.h
@@ -3,6 +3,7 @@ using namespace std;
 #include "IUIController.h"
 #include "UIEnums.h"
 #include "UIGroup.h"
+#include <random>
 
 class UIAbstractBitmapFont;
 class UIBitmapFont;
@@ -15,7 +16,7 @@ class UIControl;
 class UIController : public IUIController
 {
 public:
-	static __int64 iggyAllocCount;
+	static int64_t iggyAllocCount;
 
 	// MGH - added to prevent crash loading Iggy movies while the skins were being reloaded
 	static CRITICAL_SECTION ms_reloadSkinCS;
@@ -29,7 +30,7 @@ private:
 	CRITICAL_SECTION m_navigationLock;
 
 	static const int UI_REPEAT_KEY_DELAY_MS = 300; // How long from press until the first repeat
-	static const int UI_REPEAT_KEY_REPEAT_RATE_MS = 100; // How long in between repeats	
+	static const int UI_REPEAT_KEY_REPEAT_RATE_MS = 100; // How long in between repeats
 	DWORD m_actionRepeatTimer[XUSER_MAX_COUNT][ACTION_MAX_MENU+1];
 
 	float m_fScreenWidth;
@@ -49,7 +50,7 @@ private:
 		eFont_Korean,
 
 	};
-	
+
 	// 4J-JEV: It's important that currentFont == targetFont, unless updateCurrentLanguage is going to be called.
 	EFont m_eCurrentFont, m_eTargetFont;
 
@@ -63,6 +64,9 @@ private:
 	UITTFFont *m_mcTTFFont;
 	UIBitmapFont *m_moj7, *m_moj11;
 
+	std::mt19937 m_randomGenerator;
+	std::uniform_real_distribution<float> m_randomDistribution;
+
 public:
 	void setCleanupOnReload();
 	void updateCurrentFont();
@@ -72,7 +76,7 @@ private:
 	// 4J-PB - ui element type for PSVita touch control
 #ifdef __PSVITA__
 
-	typedef struct  
+	typedef struct
 	{
 		UIControl *pControl;
 		S32 x1,y1,x2,y2;
@@ -97,9 +101,8 @@ private:
 		eLibrary_Tooltips,
 		eLibrary_Default,
 
-#if ( defined(_WINDOWS64) )
-	// 4J Stu - Load the 720/480 skins so that we have something to fallback on during development
-#ifndef _FINAL_BUILD
+#if defined(_WINDOWS64)
+		// Non-HD skin libraries needed by 720p/480p scene SWFs.
 		eLibraryFallback_Platform,
 		eLibraryFallback_GraphicsDefault,
 		eLibraryFallback_GraphicsHUD,
@@ -112,7 +115,6 @@ private:
 		eLibraryFallback_Tooltips,
 		eLibraryFallback_Default,
 #endif
-#endif
 
 		eLibrary_Count,
 	};
@@ -137,7 +139,7 @@ private:
 
 	C4JRender::eViewportType m_currentRenderViewport;
 	bool m_bCustomRenderPosition;
-	
+
 	static DWORD				m_dwTrialTimerLimitSecs;
 
 	unordered_map<wstring, byteArray> m_substitutionTextures;
@@ -145,7 +147,7 @@ private:
 	typedef struct _CachedMovieData
 	{
 		byteArray m_ba;
-		__int64 m_expiry;
+		int64_t m_expiry;
 	} CachedMovieData;
 	unordered_map<wstring, CachedMovieData> m_cachedMovieData;
 
@@ -160,6 +162,8 @@ private:
 	unsigned int m_winUserIndex;
 	EUIScene m_mouseDraggingSliderScene;
 	int m_mouseDraggingSliderId;
+	bool m_mouseClickConsumedByScene;
+	bool m_bMouseHoverHorizontalList;
 	int m_lastHoverMouseX;
 	int m_lastHoverMouseY;
 	//bool m_bSysUIShowing;
@@ -167,7 +171,7 @@ private:
 	C4JThread *m_reloadSkinThread;
 	bool m_navigateToHomeOnReload;
 	int m_accumulatedTicks;
-	__uint64 m_lastUiSfx; // Tracks time (ms) of last UI sound effect
+	uint64_t m_lastUiSfx; // Tracks time (ms) of last UI sound effect
 
 	D3D11_RECT m_customRenderingClearRect;
 
@@ -211,7 +215,7 @@ protected:
 	void postInit();
 
 
-public:	
+public:
 	CRITICAL_SECTION m_Allocatorlock;
 	void SetupFont();
 	bool PendingFontChange();
@@ -243,7 +247,7 @@ private:
 	void tickInput();
 	void handleInput();
 	void handleKeyPress(unsigned int iPad, unsigned int key);
-	
+
 protected:
 	static rrbool RADLINK ExternalFunctionCallback( void * user_callback_data , Iggy * player , IggyExternalFunctionCallUTF16 * call );
 
@@ -251,6 +255,7 @@ public:
 	// RENDERING
 	float getScreenWidth() { return m_fScreenWidth; }
 	float getScreenHeight() { return m_fScreenHeight; }
+	void updateScreenSize(S32 w, S32 h) { m_fScreenWidth = (float)w; m_fScreenHeight = (float)h; app.DebugPrintf("[UI-INIT] updateScreenSize: %d x %d\n", w, h); }
 
 	virtual void render() = 0;
 	void getRenderDimensions(C4JRender::eViewportType viewport, S32 &width, S32 &height);
@@ -287,7 +292,7 @@ protected:
 	static GDrawTexture * RADLINK TextureSubstitutionCreateCallback( void * user_callback_data , IggyUTF16 * texture_name , S32 * width , S32 * height , void **destroy_callback_data );
 	static void RADLINK TextureSubstitutionDestroyCallback( void * user_callback_data , void * destroy_callback_data , GDrawTexture * handle );
 
-	virtual GDrawTexture *getSubstitutionTexture(int textureId) { return NULL; }
+	virtual GDrawTexture *getSubstitutionTexture(int textureId) { return nullptr; }
 	virtual void destroySubstitutionTexture(void *destroyCallBackData, GDrawTexture *handle) {}
 
 public:
@@ -296,7 +301,7 @@ public:
 
 public:
 	// NAVIGATION
-	bool NavigateToScene(int iPad, EUIScene scene, void *initData = NULL, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD);
+	bool NavigateToScene(int iPad, EUIScene scene, void *initData = nullptr, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD);
 	bool NavigateBack(int iPad, bool forceUsePad = false, EUIScene eScene = eUIScene_COUNT, EUILayer eLayer = eUILayer_COUNT);
 	void NavigateToHomeMenu();
 	UIScene *GetTopScene(int iPad, EUILayer layer = eUILayer_Scene, EUIGroup group = eUIGroup_PAD);
@@ -313,7 +318,7 @@ private:
 public:
 	void CloseAllPlayersScenes();
 	void CloseUIScenes(int iPad, bool forceIPad = false);
-	
+
 	virtual bool IsPauseMenuDisplayed(int iPad);
 	virtual bool IsContainerMenuDisplayed(int iPad);
 	virtual bool IsIgnorePlayerJoinMenuDisplayed(int iPad);
@@ -376,14 +381,14 @@ public:
 	virtual void HidePressStart();
 	void ClearPressStart();
 
-	virtual C4JStorage::EMessageResult RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, WCHAR *pwchFormatString=NULL);
-	virtual C4JStorage::EMessageResult RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=NULL,LPVOID lpParam=NULL, WCHAR *pwchFormatString=NULL);
+	virtual C4JStorage::EMessageResult RequestAlertMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=nullptr,LPVOID lpParam=nullptr, WCHAR *pwchFormatString=nullptr);
+	virtual C4JStorage::EMessageResult RequestErrorMessage(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad=XUSER_INDEX_ANY, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)=nullptr,LPVOID lpParam=nullptr, WCHAR *pwchFormatString=nullptr);
 private:
 	virtual C4JStorage::EMessageResult RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad,int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, WCHAR *pwchFormatString,DWORD dwFocusButton, bool bIsError);
 
 public:
-	C4JStorage::EMessageResult RequestUGCMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = NULL, LPVOID lpParam = NULL);
-	C4JStorage::EMessageResult RequestContentRestrictedMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = NULL, LPVOID lpParam = NULL);
+	C4JStorage::EMessageResult RequestUGCMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = nullptr, LPVOID lpParam = nullptr);
+	C4JStorage::EMessageResult RequestContentRestrictedMessageBox(UINT title = -1, UINT message = -1, int iPad = -1, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult) = nullptr, LPVOID lpParam = nullptr);
 
 	virtual void SetWinUserIndex(unsigned int iPad);
 	unsigned int GetWinUserIndex();
diff --git a/Minecraft.Client/Common/UI/UIFontData.cpp b/Minecraft.Client/Common/UI/UIFontData.cpp
index c5ad46ef..715d08dd 100644
--- a/Minecraft.Client/Common/UI/UIFontData.cpp
+++ b/Minecraft.Client/Common/UI/UIFontData.cpp
@@ -145,9 +145,9 @@ CFontData::CFontData()
 {
 	m_unicodeMap = unordered_map<unsigned int, unsigned short>();
 
-	m_sFontData = NULL;
-	m_kerningTable = NULL;
-	m_pbRawImage = NULL;
+	m_sFontData = nullptr;
+	m_kerningTable = nullptr;
+	m_pbRawImage = nullptr;
 }
 
 CFontData::CFontData(SFontData &sFontData, int *pbRawImage)
diff --git a/Minecraft.Client/Common/UI/UIGroup.cpp b/Minecraft.Client/Common/UI/UIGroup.cpp
index e8bb9fe6..baccc17f 100644
--- a/Minecraft.Client/Common/UI/UIGroup.cpp
+++ b/Minecraft.Client/Common/UI/UIGroup.cpp
@@ -1,6 +1,8 @@
 #include "stdafx.h"
 #include "UIGroup.h"
 
+#include "UI.h"
+
 UIGroup::UIGroup(EUIGroup group, int iPad)
 {
 	m_group = group;
@@ -23,22 +25,22 @@ UIGroup::UIGroup(EUIGroup group, int iPad)
 #endif
 	}
 
-	m_tooltips = (UIComponent_Tooltips *)m_layers[(int)eUILayer_Tooltips]->addComponent(0, eUIComponent_Tooltips);
+	m_tooltips = (UIComponent_Tooltips *)m_layers[static_cast<int>(eUILayer_Tooltips)]->addComponent(0, eUIComponent_Tooltips);
 
-	m_tutorialPopup = NULL;
-	m_hud = NULL;
-	m_pressStartToPlay = NULL;
+	m_tutorialPopup = nullptr;
+	m_hud = nullptr;
+	m_pressStartToPlay = nullptr;
 	if(m_group != eUIGroup_Fullscreen)
 	{
-		m_tutorialPopup = (UIComponent_TutorialPopup *)m_layers[(int)eUILayer_Popup]->addComponent(m_iPad, eUIComponent_TutorialPopup);
+		m_tutorialPopup = (UIComponent_TutorialPopup *)m_layers[static_cast<int>(eUILayer_Popup)]->addComponent(m_iPad, eUIComponent_TutorialPopup);
 
-		m_hud = (UIScene_HUD *)m_layers[(int)eUILayer_HUD]->addComponent(m_iPad, eUIScene_HUD);
+		m_hud = (UIScene_HUD *)m_layers[static_cast<int>(eUILayer_HUD)]->addComponent(m_iPad, eUIScene_HUD);
 
 		//m_layers[(int)eUILayer_Chat]->addComponent(m_iPad, eUIComponent_Chat);
 	}
 	else
 	{
-		m_pressStartToPlay = (UIComponent_PressStartToPlay *)m_layers[(int)eUILayer_Tooltips]->addComponent(0, eUIComponent_PressStartToPlay);
+		m_pressStartToPlay = (UIComponent_PressStartToPlay *)m_layers[static_cast<int>(eUILayer_Tooltips)]->addComponent(0, eUIComponent_PressStartToPlay);
 	}
 
 	// 4J Stu - Pre-allocate this for cached rendering in scenes. It's horribly slow to do dynamically, but we should only need one
@@ -65,7 +67,7 @@ void UIGroup::ReloadAll()
 	if(highestRenderable < eUILayer_Fullscreen) highestRenderable = eUILayer_Fullscreen;
 	for(; highestRenderable >= 0; --highestRenderable)
 	{
-		if(highestRenderable < eUILayer_COUNT) m_layers[highestRenderable]->ReloadAll(highestRenderable != (int)eUILayer_Fullscreen);
+		if(highestRenderable < eUILayer_COUNT) m_layers[highestRenderable]->ReloadAll(highestRenderable != static_cast<int>(eUILayer_Fullscreen));
 	}
 }
 
@@ -81,7 +83,7 @@ void UIGroup::tick()
 	}
 
 	// Handle deferred update focus
-	if (m_updateFocusStateCountdown > 0) 
+	if (m_updateFocusStateCountdown > 0)
 	{
 		m_updateFocusStateCountdown--;
 		if (m_updateFocusStateCountdown == 0)_UpdateFocusState();
@@ -127,7 +129,7 @@ void UIGroup::getRenderDimensions(S32 &width, S32 &height)
 // NAVIGATION
 bool UIGroup::NavigateToScene(int iPad, EUIScene scene, void *initData, EUILayer layer)
 {
-	bool succeeded = m_layers[(int)layer]->NavigateToScene(iPad, scene, initData);
+	bool succeeded = m_layers[static_cast<int>(layer)]->NavigateToScene(iPad, scene, initData);
 	updateStackStates();
 	return succeeded;
 }
@@ -151,9 +153,9 @@ void UIGroup::closeAllScenes()
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	if( m_iPad >= 0 )
 	{
-		if(pMinecraft != NULL && pMinecraft->localgameModes[m_iPad] != NULL )
+		if(pMinecraft != nullptr && pMinecraft->localgameModes[m_iPad] != nullptr )
 		{
-			TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
+			TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
 
 			// This just allows it to be shown
 			gameMode->getTutorial()->showTutorialPopup(true);
@@ -163,14 +165,14 @@ void UIGroup::closeAllScenes()
 	for(unsigned int i = 0; i < eUILayer_COUNT; ++i)
 	{
 		// Ignore the error layer
-		if(i != (int)eUILayer_Error) m_layers[i]->closeAllScenes();
+		if(i != static_cast<int>(eUILayer_Error)) m_layers[i]->closeAllScenes();
 	}
 	updateStackStates();
 }
 
 UIScene *UIGroup::GetTopScene(EUILayer layer)
 {
-	return m_layers[(int)layer]->GetTopScene();
+	return m_layers[static_cast<int>(layer)]->GetTopScene();
 }
 
 bool UIGroup::GetMenuDisplayed()
@@ -214,10 +216,10 @@ UIScene *UIGroup::getCurrentScene()
 	{
 		pScene=m_layers[i]->getCurrentScene();
 
-		if(pScene!=NULL) return pScene;
+		if(pScene!=nullptr) return pScene;
 	}
 
-	return NULL;
+	return nullptr;
 }
 #endif
 
@@ -233,7 +235,7 @@ void UIGroup::handleInput(int iPad, int key, bool repeat, bool pressed, bool rel
 	}
 }
 
-// FOCUS 
+// FOCUS
 
 // Check that a layer may recieve focus, specifically that there is no infocus layer above
 bool UIGroup::RequestFocus(UILayer* layerPtr)
@@ -389,16 +391,16 @@ unsigned int UIGroup::GetLayerIndex(UILayer* layerPtr)
 	// can't get here...
 	return 0;
 }
-	
-void UIGroup::PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic)
+
+void UIGroup::PrintTotalMemoryUsage(int64_t &totalStatic, int64_t &totalDynamic)
 {
-	__int64 groupStatic = 0;
-	__int64 groupDynamic = 0;
+	int64_t groupStatic = 0;
+	int64_t groupDynamic = 0;
 	app.DebugPrintf(app.USER_SR, "-- BEGIN GROUP %d\n",m_group);
 	for(unsigned int i = 0; i < eUILayer_COUNT; ++i)
 	{
 		app.DebugPrintf(app.USER_SR, "  \\- BEGIN LAYER %d\n",i);
-		m_layers[i]->PrintTotalMemoryUsage(groupStatic, groupDynamic);		
+		m_layers[i]->PrintTotalMemoryUsage(groupStatic, groupDynamic);
 		app.DebugPrintf(app.USER_SR, "  \\- END LAYER %d\n",i);
 	}
 	app.DebugPrintf(app.USER_SR, "-- Group static: %d, Group dynamic: %d\n", groupStatic, groupDynamic);
@@ -412,16 +414,16 @@ int UIGroup::getCommandBufferList()
 	return m_commandBufferList;
 }
 
-// Returns the first scene of given type if it exists, NULL otherwise 
+// Returns the first scene of given type if it exists, nullptr otherwise 
 UIScene *UIGroup::FindScene(EUIScene sceneType)
 {
-	UIScene *pScene = NULL;
+	UIScene *pScene = nullptr;
 
 	for (int i = 0; i < eUILayer_COUNT; i++)
 	{
 		pScene = m_layers[i]->FindScene(sceneType);
 #ifdef __PS3__
-		if (pScene != NULL) return pScene;
+		if (pScene != nullptr) return pScene;
 #else
 		if (pScene != nullptr) return pScene;
 #endif
diff --git a/Minecraft.Client/Common/UI/UIGroup.h b/Minecraft.Client/Common/UI/UIGroup.h
index 28369f27..403a32ae 100644
--- a/Minecraft.Client/Common/UI/UIGroup.h
+++ b/Minecraft.Client/Common/UI/UIGroup.h
@@ -19,10 +19,10 @@ private:
 	UIScene_HUD *m_hud;
 
 	C4JRender::eViewportType m_viewportType;
-	
+
 	EUIGroup m_group;
 	int m_iPad;
-	
+
 	bool m_bMenuDisplayed;
 	bool m_bPauseMenuDisplayed;
 	bool m_bContainerMenuDisplayed;
@@ -88,7 +88,7 @@ public:
 
 	void SetViewportType(C4JRender::eViewportType type);
 	C4JRender::eViewportType GetViewportType();
-	
+
 	virtual void HandleDLCMountingComplete();
 	virtual void HandleDLCInstalled();
 #ifdef _XBOX_ONE
@@ -99,15 +99,15 @@ public:
 	bool IsFullscreenGroup();
 
 	void handleUnlockFullVersion();
-	
-	void PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic);
+
+	void PrintTotalMemoryUsage(int64_t &totalStatic, int64_t &totalDynamic);
 
 	unsigned int GetLayerIndex(UILayer* layerPtr);
 
 	int getCommandBufferList();
 	UIScene *FindScene(EUIScene sceneType);
 
-private:	
+private:
 	void _UpdateFocusState();
 	void updateStackStates();
 };
diff --git a/Minecraft.Client/Common/UI/UILayer.cpp b/Minecraft.Client/Common/UI/UILayer.cpp
index b3cf72a0..e1c388f5 100644
--- a/Minecraft.Client/Common/UI/UILayer.cpp
+++ b/Minecraft.Client/Common/UI/UILayer.cpp
@@ -102,7 +102,7 @@ void UILayer::render(S32 width, S32 height, C4JRender::eViewportType viewport)
 bool UILayer::IsSceneInStack(EUIScene scene)
 {
 	bool inStack = false;
-	for(int i = m_sceneStack.size() - 1;i >= 0; --i)
+	for(int i = static_cast<int>(m_sceneStack.size()) - 1; i >= 0; --i)
 	{
 		if(m_sceneStack[i]->getSceneType() == scene)
 		{
@@ -118,7 +118,7 @@ bool UILayer::HasFocus(int iPad)
 	bool hasFocus = false;
 	if(m_hasFocus)
 	{
-		for(int i = m_sceneStack.size() - 1;i >= 0; --i)
+		for(int i = (int)m_sceneStack.size() - 1; i >= 0; --i)
 		{
 			if(m_sceneStack[i]->stealsFocus() )
 			{
@@ -146,7 +146,7 @@ bool UILayer::hidesLowerScenes()
 	}
 	if(!hidesScenes && !m_sceneStack.empty())
 	{
-		for(int i = m_sceneStack.size() - 1;i >= 0; --i)
+		for(int i = static_cast<int>(m_sceneStack.size()) - 1; i >= 0; --i)
 		{
 			if(m_sceneStack[i]->hidesLowerScenes())
 			{
@@ -197,7 +197,7 @@ bool UILayer::GetMenuDisplayed()
 
 bool UILayer::NavigateToScene(int iPad, EUIScene scene, void *initData)
 {
-	UIScene *newScene = NULL;
+	UIScene *newScene = nullptr;
 	switch(scene)
 	{
 		// Debug
@@ -424,7 +424,7 @@ bool UILayer::NavigateToScene(int iPad, EUIScene scene, void *initData)
 		break;
 	};
 
-	if(newScene == NULL)
+	if(newScene == nullptr)
 	{
 		app.DebugPrintf("WARNING: Scene %d was not created. Add it to UILayer::NavigateToScene\n", scene);
 		return false;
@@ -451,7 +451,7 @@ bool UILayer::NavigateBack(int iPad, EUIScene eScene)
 	bool navigated = false;
 	if(eScene < eUIScene_COUNT)
 	{
-		UIScene *scene = NULL;
+		UIScene *scene = nullptr;
 		do
 		{
 			scene = m_sceneStack.back();
@@ -523,9 +523,9 @@ UIScene *UILayer::addComponent(int iPad, EUIScene scene, void *initData)
 				return itComp;
 			}
 		}
-		return NULL;
+		return nullptr;
 	}
-	UIScene *newScene = NULL;
+	UIScene *newScene = nullptr;
 
 	switch(scene)
 	{
@@ -573,7 +573,7 @@ UIScene *UILayer::addComponent(int iPad, EUIScene scene, void *initData)
 		break;
 	};
 
-	if(newScene == NULL) return NULL;
+	if(newScene == nullptr) return nullptr;
 
 	m_components.push_back(newScene);
 
@@ -661,12 +661,12 @@ void UILayer::closeAllScenes()
 	}
 }
 
-// Get top scene on stack (or NULL if stack is empty)
+// Get top scene on stack (or nullptr if stack is empty)
 UIScene *UILayer::GetTopScene()
 {
 	if(m_sceneStack.size() == 0)
 	{
-		return NULL;
+		return nullptr;
 	}
 	else
 	{
@@ -789,7 +789,7 @@ UIScene *UILayer::getCurrentScene()
 		}
 }
 
-	return NULL;
+	return nullptr;
 }
 #endif
 
@@ -877,10 +877,10 @@ void UILayer::handleUnlockFullVersion()
 	}
 }
 
-void UILayer::PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic)
+void UILayer::PrintTotalMemoryUsage(int64_t &totalStatic, int64_t &totalDynamic)
 {
-	__int64 layerStatic = 0;
-	__int64 layerDynamic = 0;
+	int64_t layerStatic = 0;
+	int64_t layerDynamic = 0;
 	for(auto& it : m_components)
 	{
 		it->PrintTotalMemoryUsage(layerStatic, layerDynamic);
@@ -894,10 +894,10 @@ void UILayer::PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic)
 	totalDynamic += layerDynamic;
 }
 
-// Returns the first scene of given type if it exists, NULL otherwise
+// Returns the first scene of given type if it exists, nullptr otherwise
 UIScene *UILayer::FindScene(EUIScene sceneType)
 {
-	for (int i = 0; i < m_sceneStack.size(); i++)
+	for (size_t i = 0; i < m_sceneStack.size(); i++)
 	{
 		if (m_sceneStack[i]->getSceneType() == sceneType)
 		{
@@ -905,5 +905,5 @@ UIScene *UILayer::FindScene(EUIScene sceneType)
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UILayer.h b/Minecraft.Client/Common/UI/UILayer.h
index 47c776ab..7f1a0bf5 100644
--- a/Minecraft.Client/Common/UI/UILayer.h
+++ b/Minecraft.Client/Common/UI/UILayer.h
@@ -61,17 +61,17 @@ public:
 	// E.g. you can keep a component active while performing navigation with other scenes on this layer
 	void showComponent(int iPad, EUIScene scene, bool show);
 	bool isComponentVisible(EUIScene scene);
-	UIScene *addComponent(int iPad, EUIScene scene, void *initData = NULL);
+	UIScene *addComponent(int iPad, EUIScene scene, void *initData = nullptr);
 	void removeComponent(EUIScene scene);
 
 	// INPUT
 	void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
-#ifdef __PSVITA__	
+#ifdef __PSVITA__
 	// Current active scene
 	UIScene *getCurrentScene();
 #endif
 	// FOCUS
-	
+
 	bool updateFocusState(bool allowedFocus = false);
 
 public:
@@ -87,7 +87,7 @@ public:
 
 	void handleUnlockFullVersion();
 	UIScene *FindScene(EUIScene sceneType);
-	
-	void PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic);
+
+	void PrintTotalMemoryUsage(int64_t &totalStatic, int64_t &totalDynamic);
 
 };
diff --git a/Minecraft.Client/Common/UI/UIScene.cpp b/Minecraft.Client/Common/UI/UIScene.cpp
index 6ef6d0e8..303897a7 100644
--- a/Minecraft.Client/Common/UI/UIScene.cpp
+++ b/Minecraft.Client/Common/UI/UIScene.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene.h"
+#include "UISplitScreenHelpers.h"
 
 #include "..\..\Lighting.h"
 #include "..\..\LocalPlayer.h"
@@ -11,8 +12,8 @@ UIScene::UIScene(int iPad, UILayer *parentLayer)
 {
 	m_parentLayer = parentLayer;
 	m_iPad = iPad;
-	swf = NULL;
-	m_pItemRenderer = NULL;
+	swf = nullptr;
+	m_pItemRenderer = nullptr;
 
 	bHasFocus = false;
 	m_hasTickedOnce = false;
@@ -26,7 +27,7 @@ UIScene::UIScene(int iPad, UILayer *parentLayer)
 	m_lastOpacity = 1.0f;
 	m_bUpdateOpacity = false;
 
-	m_backScene = NULL;
+	m_backScene = nullptr;
 
 	m_cacheSlotRenders = false;
 	m_needsCacheRendered = true;
@@ -49,14 +50,14 @@ UIScene::~UIScene()
 		ui.UnregisterCallbackId(m_callbackUniqueId);
 	}
 
-	if(m_pItemRenderer != NULL) delete m_pItemRenderer;
+	if(m_pItemRenderer != nullptr) delete m_pItemRenderer;
 }
 
 void UIScene::destroyMovie()
 {
 	/* Destroy the Iggy player. */
 	IggyPlayerDestroy( swf );
-	swf = NULL;
+	swf = nullptr;
 
 	// Clear out the controls collection (doesn't delete the controls, and they get re-setup later)
 	m_controls.clear();
@@ -115,7 +116,7 @@ bool UIScene::needsReloaded()
 
 bool UIScene::hasMovie()
 {
-	return swf != NULL;
+	return swf != nullptr;
 }
 
 F64 UIScene::getSafeZoneHalfHeight()
@@ -171,15 +172,22 @@ void UIScene::updateSafeZone()
 	{
 	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
 		safeTop = getSafeZoneHalfHeight();
+		safeLeft = getSafeZoneHalfWidth();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-		safeBottom = getSafeZoneHalfHeight();
+		// safeTop mirrors SPLIT_TOP for visual symmetry. safeBottom omitted.
+		safeTop = getSafeZoneHalfHeight();
+		safeLeft = getSafeZoneHalfWidth();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
+		safeTop = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
 		break;
 	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		safeRight = getSafeZoneHalfWidth();
+		safeTop = getSafeZoneHalfHeight();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
 		safeTop = getSafeZoneHalfHeight();
@@ -187,22 +195,22 @@ void UIScene::updateSafeZone()
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
 		safeTop = getSafeZoneHalfHeight();
-		safeRight = getSafeZoneHalfWidth();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-		safeBottom = getSafeZoneHalfHeight();
+		safeTop = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
 		break;
 	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-		safeBottom = getSafeZoneHalfHeight();
-		safeRight = getSafeZoneHalfWidth();
+		safeTop = getSafeZoneHalfHeight();
+
 		break;
 	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
 	default:
 		safeTop = getSafeZoneHalfHeight();
 		safeBottom = getSafeZoneHalfHeight();
 		safeLeft = getSafeZoneHalfWidth();
-		safeRight = getSafeZoneHalfWidth();
+
 		break;
 	}
 	setSafeZone(safeTop, safeBottom, safeLeft, safeRight);
@@ -234,7 +242,7 @@ void UIScene::initialiseMovie()
 	m_bUpdateOpacity = true;
 }
 
-#ifdef __PSVITA__
+#if defined(__PSVITA__) || defined(_WINDOWS64)
 void UIScene::SetFocusToElement(int iID)
 {
 	IggyDataValue result;
@@ -285,25 +293,15 @@ void UIScene::loadMovie()
 	moviePath.append(L"Vita.swf");
 	m_loadedResolution = eSceneResolution_Vita;
 #elif defined _WINDOWS64
-	if(ui.getScreenHeight() == 720)
-	{
-		moviePath.append(L"720.swf");
-		m_loadedResolution = eSceneResolution_720;
-	}
-	else if(ui.getScreenHeight() == 480)
+	if(ui.getScreenHeight() > 720.0f)
 	{
-		moviePath.append(L"480.swf");
-		m_loadedResolution = eSceneResolution_480;
-	}
-	else if(ui.getScreenHeight() < 720)
-	{
-		moviePath.append(L"Vita.swf");
-		m_loadedResolution = eSceneResolution_Vita;
+		moviePath.append(L"1080.swf");
+		m_loadedResolution = eSceneResolution_1080;
 	}
 	else
 	{
-		moviePath.append(L"1080.swf");
-		m_loadedResolution = eSceneResolution_1080;
+		moviePath.append(L"720.swf");
+		m_loadedResolution = eSceneResolution_720;
 	}
 #else
 	moviePath.append(L"1080.swf");
@@ -329,11 +327,9 @@ void UIScene::loadMovie()
 	}
 
 	byteArray baFile = ui.getMovieData(moviePath.c_str());
-	__int64 beforeLoad = ui.iggyAllocCount;
-	swf = IggyPlayerCreateFromMemory ( baFile.data , baFile.length, NULL);
-	__int64 afterLoad = ui.iggyAllocCount;
-	IggyPlayerInitializeAndTickRS ( swf );
-	__int64 afterTick = ui.iggyAllocCount;
+	int64_t beforeLoad = ui.iggyAllocCount;
+	swf = IggyPlayerCreateFromMemory ( baFile.data , baFile.length, nullptr);
+	int64_t afterLoad = ui.iggyAllocCount;
 
 	if(!swf)
 	{
@@ -343,17 +339,44 @@ void UIScene::loadMovie()
 #endif
 		app.FatalLoadError();
 	}
-	app.DebugPrintf( app.USER_SR, "Loaded iggy movie %ls\n", moviePath.c_str() );
+
+	// Read movie dimensions from the SWF header (available immediately after
+	// CreateFromMemory, no init tick needed).
 	IggyProperties *properties = IggyPlayerProperties ( swf );
 	m_movieHeight = properties->movie_height_in_pixels;
 	m_movieWidth = properties->movie_width_in_pixels;
-
 	m_renderWidth = m_movieWidth;
 	m_renderHeight = m_movieHeight;
 
-	S32 width, height;
-	m_parentLayer->getRenderDimensions(width, height);
-	IggyPlayerSetDisplaySize( swf, width, height );
+	// Set display size BEFORE the init tick to match what render() will use.
+	// InitializeAndTickRS runs ActionScript that creates text fields. If the
+	// display size here differs from what render() passes to SetDisplaySize,
+	// Iggy can cache glyph rasterizations at one scale during init and then
+	// reuse them at a different scale during draw, producing mixed glyph sizes.
+#ifdef _WINDOWS64
+	{
+		S32 fitW, fitH, fitOffX, fitOffY;
+		Fit16x9(ui.getScreenWidth(), ui.getScreenHeight(), fitW, fitH, fitOffX, fitOffY);
+		IggyPlayerSetDisplaySize( swf, fitW, fitH );
+	}
+#else
+	IggyPlayerSetDisplaySize( swf, m_movieWidth, m_movieHeight );
+#endif
+
+	IggyPlayerInitializeAndTickRS ( swf );
+	int64_t afterTick = ui.iggyAllocCount;
+
+#ifdef _WINDOWS64
+	// Flush Iggy's internal font caches so all glyphs get rasterized fresh
+	// at the current display scale on the first Draw. Without this, stale
+	// cache entries from a previous scene (loaded at a different display size)
+	// cause mixed glyph sizes. ResizeD3D already calls this, which is why
+	// fonts look correct after a resize but break when a scene reloads
+	// without one.
+	IggyFlushInstalledFonts();
+#endif
+
+	app.DebugPrintf( app.USER_SR, "Loaded iggy movie %ls\n", moviePath.c_str() );
 
 	IggyPlayerSetUserdata(swf,this);
 
@@ -362,10 +385,10 @@ void UIScene::loadMovie()
 	IggyMemoryUseInfo memoryInfo;
 	rrbool res;
 	int iteration = 0;
-	__int64 totalStatic = 0;
-	__int64 totalDynamic = 0;
+	int64_t totalStatic = 0;
+	int64_t totalDynamic = 0;
 	while(res = IggyDebugGetMemoryUseInfo ( swf ,
-		NULL ,
+		nullptr ,
 		0 ,
 		0 ,
 		iteration ,
@@ -389,34 +412,35 @@ void UIScene::loadMovie()
 
 void UIScene::getDebugMemoryUseRecursive(const wstring &moviePath, IggyMemoryUseInfo &memoryInfo)
 {
-	rrbool res;
-	IggyMemoryUseInfo internalMemoryInfo;
-	int internalIteration = 0;
-	while(res = IggyDebugGetMemoryUseInfo ( swf ,
-		NULL ,
-		memoryInfo.subcategory ,
-		memoryInfo.subcategory_stringlen ,
-		internalIteration ,
-		&internalMemoryInfo ))
-	{
-		app.DebugPrintf(app.USER_SR, "%ls - %.*s static: %d ( %d ) dynamic: %d ( %d )\n", moviePath.c_str(), internalMemoryInfo.subcategory_stringlen, internalMemoryInfo.subcategory,
-			internalMemoryInfo.static_allocation_bytes, internalMemoryInfo.static_allocation_count, internalMemoryInfo.dynamic_allocation_bytes, internalMemoryInfo.dynamic_allocation_count);
-		++internalIteration;
-		if(internalMemoryInfo.subcategory_stringlen > memoryInfo.subcategory_stringlen) getDebugMemoryUseRecursive(moviePath, internalMemoryInfo);
-	}
+    rrbool res;
+    IggyMemoryUseInfo internalMemoryInfo;
+    int internalIteration = 0;
+    while (res = IggyDebugGetMemoryUseInfo(swf,
+                                           0,
+                                           memoryInfo.subcategory,
+                                           memoryInfo.subcategory_stringlen,
+                                           internalIteration,
+                                           &internalMemoryInfo))
+    {
+        app.DebugPrintf(app.USER_SR, "%ls - %.*s static: %d ( %d ) dynamic: %d ( %d )\n", moviePath.c_str(), internalMemoryInfo.subcategory_stringlen, internalMemoryInfo.subcategory,
+                        internalMemoryInfo.static_allocation_bytes, internalMemoryInfo.static_allocation_count, internalMemoryInfo.dynamic_allocation_bytes, internalMemoryInfo.dynamic_allocation_count);
+        ++internalIteration;
+        if (internalMemoryInfo.subcategory_stringlen > memoryInfo.subcategory_stringlen)
+            getDebugMemoryUseRecursive(moviePath, internalMemoryInfo);
+    }
 }
 
-void UIScene::PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic)
+void UIScene::PrintTotalMemoryUsage(int64_t &totalStatic, int64_t &totalDynamic)
 {
 	if(!swf) return;
 
 	IggyMemoryUseInfo memoryInfo;
 	rrbool res;
 	int iteration = 0;
-	__int64 sceneStatic = 0;
-	__int64 sceneDynamic = 0;
+	int64_t sceneStatic = 0;
+	int64_t sceneDynamic = 0;
 	while(res = IggyDebugGetMemoryUseInfo ( swf ,
-		NULL ,
+		0 ,
 		"" ,
 		0 ,
 		iteration ,
@@ -447,13 +471,136 @@ void UIScene::tick()
 		IggyPlayerTickRS( swf );
 		m_hasTickedOnce = true;
 	}
+
+#ifdef _WINDOWS64
+	{
+		vector<UIControl_TextInput*> inputs;
+		getDirectEditInputs(inputs);
+		for (size_t i = 0; i < inputs.size(); i++)
+		{
+			UIControl_TextInput::EDirectEditResult result = inputs[i]->tickDirectEdit();
+			if (result != UIControl_TextInput::eDirectEdit_Continue)
+				onDirectEditFinished(inputs[i], result);
+		}
+	}
+#endif
 }
 
 UIControl* UIScene::GetMainPanel()
 {
-	return NULL;
+	return nullptr;
 }
 
+#ifdef _WINDOWS64
+bool UIScene::isDirectEditBlocking()
+{
+	vector<UIControl_TextInput*> inputs;
+	getDirectEditInputs(inputs);
+	for (size_t i = 0; i < inputs.size(); i++)
+	{
+		if (inputs[i]->isDirectEditing() || inputs[i]->getDirectEditCooldown() > 0)
+			return true;
+	}
+	return false;
+}
+
+bool UIScene::handleMouseClick(F32 x, F32 y)
+{
+	S32 panelOffsetX = 0, panelOffsetY = 0;
+	UIControl *pMainPanel = GetMainPanel();
+	if (pMainPanel)
+	{
+		pMainPanel->UpdateControl();
+		panelOffsetX = pMainPanel->getXPos();
+		panelOffsetY = pMainPanel->getYPos();
+	}
+
+	// Click-outside-to-deselect: confirm any active direct edit if
+	// the click landed outside the editing text input.
+	{
+		vector<UIControl_TextInput*> deInputs;
+		getDirectEditInputs(deInputs);
+		for (size_t i = 0; i < deInputs.size(); i++)
+		{
+			if (!deInputs[i]->isDirectEditing())
+				continue;
+			deInputs[i]->UpdateControl();
+			S32 cx = deInputs[i]->getXPos() + panelOffsetX;
+			S32 cy = deInputs[i]->getYPos() + panelOffsetY;
+			S32 cw = deInputs[i]->getWidth();
+			S32 ch = deInputs[i]->getHeight();
+			if (!(cw > 0 && ch > 0 && x >= cx && x <= cx + cw && y >= cy && y <= cy + ch))
+			{
+				deInputs[i]->confirmDirectEdit();
+				onDirectEditFinished(deInputs[i], UIControl_TextInput::eDirectEdit_Confirmed);
+			}
+		}
+	}
+
+	vector<UIControl *> *controls = GetControls();
+	if (!controls) return false;
+
+	// Hit-test controls and pick the smallest-area match to handle
+	// overlapping Flash bounds correctly without sacrificing precision.
+	int bestId = -1;
+	S32 bestArea = INT_MAX;
+	UIControl *bestCtrl = NULL;
+
+	for (size_t i = 0; i < controls->size(); ++i)
+	{
+		UIControl *ctrl = (*controls)[i];
+		if (!ctrl || ctrl->getHidden() || !ctrl->getVisible() || ctrl->getId() < 0)
+			continue;
+
+		UIControl::eUIControlType type = ctrl->getControlType();
+		if (type != UIControl::eButton && type != UIControl::eTextInput &&
+			type != UIControl::eCheckBox)
+			continue;
+
+		if (pMainPanel && ctrl->getParentPanel() != pMainPanel)
+			continue;
+
+		ctrl->UpdateControl();
+		S32 cx = ctrl->getXPos() + panelOffsetX;
+		S32 cy = ctrl->getYPos() + panelOffsetY;
+		S32 cw = ctrl->getWidth();
+		S32 ch = ctrl->getHeight();
+		if (cw <= 0 || ch <= 0)
+			continue;
+
+		if (x >= cx && x <= cx + cw && y >= cy && y <= cy + ch)
+		{
+			S32 area = cw * ch;
+			if (area < bestArea)
+			{
+				bestArea = area;
+				bestId = ctrl->getId();
+				bestCtrl = ctrl;
+			}
+		}
+	}
+
+	if (bestId >= 0 && bestCtrl)
+	{
+		if (bestCtrl->getControlType() == UIControl::eCheckBox)
+		{
+			UIControl_CheckBox *cb = static_cast<UIControl_CheckBox*>(bestCtrl);
+			if (cb->IsEnabled())
+			{
+				bool newState = !cb->IsChecked();
+				cb->setChecked(newState);
+				handleCheckboxToggled((F64)bestId, newState);
+			}
+		}
+		else
+		{
+			handlePress((F64)bestId, 0);
+		}
+		return true;
+	}
+	return false;
+}
+#endif
 
 void UIScene::addTimer(int id, int ms)
 {
@@ -534,39 +681,54 @@ void UIScene::removeControl( UIControl_Base *control, bool centreScene)
 	// update the button positions since they may have changed
 	UpdateSceneControls();
 
-	// mark the button as removed
-	control->setHidden(true);
 	// remove it from the touchboxes
 	ui.TouchBoxRebuild(control->getParentScene());
 #endif
 
+	// mark the button as removed so hover/touch hit-tests skip it
+	control->setHidden(true);
+
 }
 
 void UIScene::slideLeft()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSlideLeft , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSlideLeft , 0 , nullptr );
 }
 
 void UIScene::slideRight()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSlideRight , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSlideRight , 0 , nullptr );
 }
 
 void UIScene::doHorizontalResizeCheck()
 {
 	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcHorizontalResizeCheck , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcHorizontalResizeCheck , 0 , nullptr );
 }
 
 void UIScene::render(S32 width, S32 height, C4JRender::eViewportType viewport)
 {
 	if(m_bIsReloading) return;
 	if(!m_hasTickedOnce || !swf) return;
-	ui.setupRenderPosition(viewport);
-	IggyPlayerSetDisplaySize( swf, width, height );
-	IggyPlayerDraw( swf );
+
+	if(viewport != C4JRender::VIEWPORT_TYPE_FULLSCREEN)
+	{
+		F32 originX, originY, viewW, viewH;
+		GetViewportRect(ui.getScreenWidth(), ui.getScreenHeight(), viewport, originX, originY, viewW, viewH);
+		S32 fitW, fitH, offsetX, offsetY;
+		Fit16x9(viewW, viewH, fitW, fitH, offsetX, offsetY);
+		ui.setupRenderPosition(static_cast<S32>(originX) + offsetX, static_cast<S32>(originY) + offsetY);
+		IggyPlayerSetDisplaySize( swf, fitW, fitH );
+		IggyPlayerDraw( swf );
+	}
+	else
+	{
+		ui.setupRenderPosition(viewport);
+		IggyPlayerSetDisplaySize( swf, width, height );
+		IggyPlayerDraw( swf );
+	}
 }
 
 void UIScene::setOpacity(float percent)
@@ -600,7 +762,7 @@ void UIScene::customDraw(IggyCustomDrawCallbackRegion *region)
 
 void UIScene::customDrawSlotControl(IggyCustomDrawCallbackRegion *region, int iPad, shared_ptr<ItemInstance> item, float fAlpha, bool isFoil, bool bDecorations)
 {
-	if (item!= NULL)
+	if (item!= nullptr)
 	{
 		if(m_cacheSlotRenders)
 		{
@@ -728,7 +890,7 @@ void UIScene::_customDrawSlotControl(CustomDrawData *region, int iPad, shared_pt
 	if (pop > 0)
 	{
 		glPushMatrix();
-		float squeeze = 1 + pop / (float) Inventory::POP_TIME_DURATION;
+		float squeeze = 1 + pop / static_cast<float>(Inventory::POP_TIME_DURATION);
 		float sx = x;
 		float sy = y;
 		float sxoffs = 8 * scaleX;
@@ -739,7 +901,7 @@ void UIScene::_customDrawSlotControl(CustomDrawData *region, int iPad, shared_pt
 	}
 
 	PIXBeginNamedEvent(0,"Render and decorate");
-	if(m_pItemRenderer == NULL) m_pItemRenderer = new ItemRenderer();
+	if(m_pItemRenderer == nullptr) m_pItemRenderer = new ItemRenderer();
 	RenderManager.StateSetBlendEnable(true);
 	RenderManager.StateSetBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	RenderManager.StateSetBlendFactor(0xffffffff);
@@ -757,15 +919,15 @@ void UIScene::_customDrawSlotControl(CustomDrawData *region, int iPad, shared_pt
 		{
 			glPushMatrix();
 			glScalef(scaleX, scaleY, 1.0f);
-			int iX= (int)(0.5f+((float)x)/scaleX);
-			int iY= (int)(0.5f+((float)y)/scaleY);
+			int iX= static_cast<int>(0.5f + ((float)x) / scaleX);
+			int iY= static_cast<int>(0.5f + ((float)y) / scaleY);
 
 			m_pItemRenderer->renderGuiItemDecorations(pMinecraft->font, pMinecraft->textures, item, iX, iY, fAlpha);
 			glPopMatrix();
 		}
 		else
 		{
-			m_pItemRenderer->renderGuiItemDecorations(pMinecraft->font, pMinecraft->textures, item, (int)x, (int)y, fAlpha);
+			m_pItemRenderer->renderGuiItemDecorations(pMinecraft->font, pMinecraft->textures, item, static_cast<int>(x), static_cast<int>(y), fAlpha);
 		}
 	}
 
@@ -776,9 +938,9 @@ void UIScene::_customDrawSlotControl(CustomDrawData *region, int iPad, shared_pt
 // 4J Stu - Not threadsafe
 //void UIScene::navigateForward(int iPad, EUIScene scene, void *initData)
 //{
-//	if(m_parentLayer == NULL)
+//	if(m_parentLayer == nullptr)
 //	{
-//		app.DebugPrintf("A scene is trying to navigate forwards, but it's parent layer is NULL!\n");
+//		app.DebugPrintf("A scene is trying to navigate forwards, but it's parent layer is nullptr!\n");
 //#ifndef _CONTENT_PACKAGE
 //		__debugbreak();
 //#endif
@@ -796,9 +958,9 @@ void UIScene::navigateBack()
 
 	ui.NavigateBack(m_iPad);
 
-	if(m_parentLayer == NULL)
+	if(m_parentLayer == nullptr)
 	{
-//		app.DebugPrintf("A scene is trying to navigate back, but it's parent layer is NULL!\n");
+//		app.DebugPrintf("A scene is trying to navigate back, but it's parent layer is nullptr!\n");
 #ifndef _CONTENT_PACKAGE
 //		__debugbreak();
 #endif
@@ -900,9 +1062,28 @@ void UIScene::sendInputToMovie(int key, bool repeat, bool pressed, bool released
 		app.DebugPrintf("UI WARNING: Ignoring input as game action does not translate to an Iggy keycode\n");
 		return;
 	}
+
+#ifdef _WINDOWS64
+	// If a navigation key is pressed with no focused element, focus the first
+	// available one so arrow keys work even when the mouse is over empty space.
+	if(pressed && (iggyKeyCode == IGGY_KEYCODE_UP || iggyKeyCode == IGGY_KEYCODE_DOWN ||
+	               iggyKeyCode == IGGY_KEYCODE_LEFT || iggyKeyCode == IGGY_KEYCODE_RIGHT))
+	{
+		IggyFocusHandle currentFocus = IGGY_FOCUS_NULL;
+		IggyFocusableObject focusables[64];
+		S32 numFocusables = 0;
+		IggyPlayerGetFocusableObjects(swf, &currentFocus, focusables, 64, &numFocusables);
+		if(currentFocus == IGGY_FOCUS_NULL && numFocusables > 0)
+		{
+			IggyPlayerSetFocusRS(swf, focusables[0].object, 0);
+			return;
+		}
+	}
+#endif
+
 	IggyEvent keyEvent;
 	// 4J Stu - Keyloc is always standard as we don't care about shift/alt
-	IggyMakeEventKey( &keyEvent, pressed?IGGY_KEYEVENT_Down:IGGY_KEYEVENT_Up, (IggyKeycode)iggyKeyCode, IGGY_KEYLOC_Standard );
+	IggyMakeEventKey( &keyEvent, pressed?IGGY_KEYEVENT_Down:IGGY_KEYEVENT_Up, static_cast<IggyKeycode>(iggyKeyCode), IGGY_KEYLOC_Standard );
 
 	IggyEventResult result;
 	IggyPlayerDispatchEventRS ( swf , &keyEvent , &result );
@@ -1191,17 +1372,22 @@ bool UIScene::hasRegisteredSubstitutionTexture(const wstring &textureName)
 
 void UIScene::_handleFocusChange(F64 controlId, F64 childId)
 {
-	m_iFocusControl = (int)controlId;
-	m_iFocusChild = (int)childId;
+	int newControl = static_cast<int>(controlId);
+	int newChild = static_cast<int>(childId);
+	if (newControl != m_iFocusControl || newChild != m_iFocusChild)
+	{
+		m_iFocusControl = newControl;
+		m_iFocusChild = newChild;
 
-	handleFocusChange(controlId, childId);
-	ui.PlayUISFX(eSFX_Focus);
+		handleFocusChange(controlId, childId);
+		ui.PlayUISFX(eSFX_Focus);
+	}
 }
 
 void UIScene::_handleInitFocus(F64 controlId, F64 childId)
 {
-	m_iFocusControl = (int)controlId;
-	m_iFocusChild = (int)childId;
+	m_iFocusControl = static_cast<int>(controlId);
+	m_iFocusChild = static_cast<int>(childId);
 
 	//handleInitFocus(controlId, childId);
 	handleFocusChange(controlId, childId);
diff --git a/Minecraft.Client/Common/UI/UIScene.h b/Minecraft.Client/Common/UI/UIScene.h
index b4008fa0..ca089d39 100644
--- a/Minecraft.Client/Common/UI/UIScene.h
+++ b/Minecraft.Client/Common/UI/UIScene.h
@@ -6,6 +6,7 @@ using namespace std;
 
 #include "UIEnums.h"
 #include "UIControl_Base.h"
+#include "UIControl_TextInput.h"
 
 class ItemRenderer;
 class UILayer;
@@ -16,22 +17,26 @@ class UILayer;
 	virtual bool mapElementsAndNames() \
 	{ \
 		parentClass::mapElementsAndNames(); \
-		IggyValuePath *currentRoot = IggyPlayerRootPath ( getMovie() );
+		IggyValuePath *currentRoot = IggyPlayerRootPath ( getMovie() ); \
+		UIControl *_mapPanel = NULL;
 
 #define UI_END_MAP_ELEMENTS_AND_NAMES() \
 		return true; \
 	}
 
 #define UI_MAP_ELEMENT( var, name) \
-	{ var.setupControl(this, currentRoot , name ); m_controls.push_back(&var); }
+	{ var.setupControl(this, currentRoot , name ); var.m_pParentPanel = _mapPanel; m_controls.push_back(&var); }
 
 #define UI_BEGIN_MAP_CHILD_ELEMENTS( parent ) \
 	{ \
 		IggyValuePath *lastRoot = currentRoot; \
-		currentRoot = parent.getIggyValuePath();
+		UIControl *_lastPanel = _mapPanel; \
+		currentRoot = parent.getIggyValuePath(); \
+		_mapPanel = &parent;
 
 #define UI_END_MAP_CHILD_ELEMENTS() \
 		currentRoot = lastRoot; \
+		_mapPanel = _lastPanel; \
 	}
 
 #define UI_MAP_NAME( var, name ) \
@@ -40,7 +45,7 @@ class UILayer;
 class UIScene
 {
 	friend class UILayer;
-public:	
+public:
 	IggyValuePath *m_rootPath;
 
 private:
@@ -80,7 +85,7 @@ public:
 
 protected:
 	ESceneResolution m_loadedResolution;
-	
+
 	bool m_bIsReloading;
 	bool m_bFocussedOnce;
 
@@ -96,7 +101,7 @@ protected:
 
 public:
 	virtual Iggy *getMovie() { return swf; }
-	
+
 	void destroyMovie();
 	virtual void reloadMovie(bool force = false);
 	virtual bool needsReloaded();
@@ -129,7 +134,7 @@ private:
 	void getDebugMemoryUseRecursive(const wstring &moviePath, IggyMemoryUseInfo &memoryInfo);
 
 public:
-	void PrintTotalMemoryUsage(__int64 &totalStatic, __int64 &totalDynamic);
+	void PrintTotalMemoryUsage(int64_t &totalStatic, int64_t &totalDynamic);
 
 public:
 	UIScene(int iPad, UILayer *parentLayer);
@@ -141,8 +146,10 @@ public:
 	virtual void tick();
 
 	IggyName registerFastName(const wstring &name);
+#if defined(__PSVITA__) || defined(_WINDOWS64)
+	void SetFocusToElement(int iID);
+#endif
 #ifdef __PSVITA__
-	void SetFocusToElement(int iID); 
 	void UpdateSceneControls();
 #endif
 protected:
@@ -162,7 +169,7 @@ public:
 
 	void gainFocus();
 	void loseFocus();
-	
+
 	virtual void updateTooltips();
 	virtual void updateComponents() {}
 	virtual void handleGainFocus(bool navBack);
@@ -177,6 +184,19 @@ public:
 	// returns main panel if controls are not living in the root
 	virtual UIControl* GetMainPanel();
 
+#ifdef _WINDOWS64
+	// Direct edit support: scenes override to register their text inputs.
+	// Base class handles tickDirectEdit in tick(), click-outside-to-deselect
+	// in handleMouseClick(), and provides isDirectEditBlocking() for guards.
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs) {}
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result) {}
+	bool isDirectEditBlocking();
+
+	// Mouse click dispatch. Hit-tests C++ controls and picks the smallest-area
+	// match, then calls handlePress. Override for custom behaviour (e.g. crafting).
+	virtual bool handleMouseClick(F32 x, F32 y);
+#endif
+
 	void removeControl( UIControl_Base *control, bool centreScene);
 	void slideLeft();
 	void slideRight();
@@ -193,7 +213,7 @@ public:
 protected:
 	//void customDrawSlotControl(IggyCustomDrawCallbackRegion *region, int iPad, int iID, int iCount, int iAuxVal, float fAlpha, bool isFoil, bool bDecorations);
 	void customDrawSlotControl(IggyCustomDrawCallbackRegion *region, int iPad, shared_ptr<ItemInstance> item, float fAlpha, bool isFoil, bool bDecorations);
-	
+
 	bool m_cacheSlotRenders;
 	bool m_needsCacheRendered;
 	int m_expectedCachedSlotCount;
@@ -245,7 +265,7 @@ public:
 
 	// NAVIGATION
 protected:
-	//void navigateForward(int iPad, EUIScene scene, void *initData = NULL);
+	//void navigateForward(int iPad, EUIScene scene, void *initData = nullptr);
 	void navigateBack();
 
 public:
@@ -269,7 +289,7 @@ public:
 
 protected:
 
-#ifdef _DURANGO	
+#ifdef _DURANGO
 	virtual long long getDefaultGtcButtons() { return _360_GTC_BACK; }
 #endif
 
diff --git a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
index 6b196c1b..0c3b6096 100644
--- a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_AbstractContainerMenu.h"
+#include "UISplitScreenHelpers.h"
 
 #include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 #include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
@@ -49,15 +50,15 @@ void UIScene_AbstractContainerMenu::handleDestroy()
 #endif
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(pMinecraft->localplayers[m_iPad] != NULL && pMinecraft->localplayers[m_iPad]->containerMenu->containerId == m_menu->containerId)
+	if(pMinecraft->localplayers[m_iPad] != nullptr && pMinecraft->localplayers[m_iPad]->containerMenu->containerId == m_menu->containerId)
 	{
 		pMinecraft->localplayers[m_iPad]->closeContainer();
 	}
@@ -149,8 +150,8 @@ void UIScene_AbstractContainerMenu::PlatformInitialize(int iPad, int startIndex)
 	m_fPointerMaxX = m_fPanelMaxX + fPointerWidth;
 	m_fPointerMaxY = m_fPanelMaxY + (fPointerHeight/2);
 
-// 	m_hPointerText=NULL;
-// 	m_hPointerTextBkg=NULL;
+// 	m_hPointerText=nullptr;
+// 	m_hPointerTextBkg=nullptr;
 
 	// Put the pointer over first item in use row to start with.
 	UIVec2D itemPos;
@@ -187,14 +188,19 @@ void UIScene_AbstractContainerMenu::PlatformInitialize(int iPad, int startIndex)
 	IggyEvent mouseEvent;
 	S32 width, height;
 	m_parentLayer->getRenderDimensions(width, height);
-	S32 x = m_pointerPos.x*((float)width/m_movieWidth);
-	S32 y = m_pointerPos.y*((float)height/m_movieHeight); 
+
+	C4JRender::eViewportType vp = m_parentLayer->getViewport();
+	if(vp != C4JRender::VIEWPORT_TYPE_FULLSCREEN)
+		Fit16x9(width, height);
+
+	S32 x = m_pointerPos.x*(static_cast<float>(width)/m_movieWidth);
+	S32 y = m_pointerPos.y*(static_cast<float>(height)/m_movieHeight);
 	IggyMakeEventMouseMove( &mouseEvent, x, y);
 
 	IggyEventResult result;
 	IggyPlayerDispatchEventRS ( getMovie() , &mouseEvent , &result );
 
-#ifdef USE_POINTER_ACCEL	
+#ifdef USE_POINTER_ACCEL
 	m_fPointerVelX = 0.0f;
 	m_fPointerVelY = 0.0f;
 	m_fPointerAccelX = 0.0f;
@@ -212,8 +218,12 @@ void UIScene_AbstractContainerMenu::tick()
 	S32 width, height;
 	m_parentLayer->getRenderDimensions(width, height);
 
-	S32 x = (S32)(m_pointerPos.x * ((float)width / m_movieWidth));
-	S32 y = (S32)(m_pointerPos.y * ((float)height / m_movieHeight));
+	C4JRender::eViewportType vp = m_parentLayer->getViewport();
+	if(vp != C4JRender::VIEWPORT_TYPE_FULLSCREEN)
+		Fit16x9(width, height);
+
+	S32 x = static_cast<S32>(m_pointerPos.x * (static_cast<float>(width) / m_movieWidth));
+	S32 y = static_cast<S32>(m_pointerPos.y * (static_cast<float>(height) / m_movieHeight));
 
 	IggyMakeEventMouseMove( &mouseEvent, x, y);
 
@@ -251,10 +261,31 @@ void UIScene_AbstractContainerMenu::render(S32 width, S32 height, C4JRender::eVi
 	m_needsCacheRendered = false;
 }
 
+void UIScene_AbstractContainerMenu::getMouseToSWFScale(float &scaleX, float &scaleY)
+{
+	extern HWND g_hWnd;
+	RECT rc;
+	GetClientRect(g_hWnd, &rc);
+	int winW = rc.right - rc.left;
+	int winH = rc.bottom - rc.top;
+	if(winW <= 0 || winH <= 0) { scaleX = 1.0f; scaleY = 1.0f; return; }
+
+	S32 renderW, renderH;
+	C4JRender::eViewportType vp = GetParentLayer()->getViewport();
+	ui.getRenderDimensions(vp, renderW, renderH);
+	if(vp != C4JRender::VIEWPORT_TYPE_FULLSCREEN)
+		Fit16x9(renderW, renderH);
+
+	float screenW = (float)ui.getScreenWidth();
+	float screenH = (float)ui.getScreenHeight();
+	scaleX = static_cast<float>(m_movieWidth) * screenW / (static_cast<float>(renderW) * static_cast<float>(winW));
+	scaleY = static_cast<float>(m_movieHeight) * screenH / (static_cast<float>(renderH) * static_cast<float>(winH));
+}
+
 void UIScene_AbstractContainerMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	shared_ptr<ItemInstance> item = nullptr;
 	int slotId = -1;
@@ -265,7 +296,7 @@ void UIScene_AbstractContainerMenu::customDraw(IggyCustomDrawCallbackRegion *reg
 	}
 	else
 	{
-		swscanf((wchar_t*)region->name,L"slot_%d",&slotId);
+		swscanf(static_cast<wchar_t *>(region->name),L"slot_%d",&slotId);
 		if (slotId == -1)
 		{
 			app.DebugPrintf("This is not the control we are looking for\n");
@@ -278,7 +309,7 @@ void UIScene_AbstractContainerMenu::customDraw(IggyCustomDrawCallbackRegion *reg
 		}
 	}
 
-	if(item != NULL) customDrawSlotControl(region,m_iPad,item,m_menu->isValidIngredient(item, slotId)?1.0f:0.5f,item->isFoil(),true);
+	if(item != nullptr) customDrawSlotControl(region,m_iPad,item,m_menu->isValidIngredient(item, slotId)?1.0f:0.5f,item->isFoil(),true);
 }
 
 void UIScene_AbstractContainerMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
@@ -337,7 +368,7 @@ Slot *UIScene_AbstractContainerMenu::getSlot(ESceneSection eSection, int iSlot)
 {
 	Slot *slot = m_menu->getSlot( getSectionStartOffset(eSection) + iSlot );
 	if(slot) return slot;
-	else return NULL;
+	else return nullptr;
 }
 
 bool UIScene_AbstractContainerMenu::isSlotEmpty(ESceneSection eSection, int iSlot)
diff --git a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.h b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.h
index 605f5dbd..f28a5830 100644
--- a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.h
@@ -38,6 +38,7 @@ public:
 	int getPad() { return m_iPad; }
 	int getMovieWidth() { return m_movieWidth; }
 	int getMovieHeight() { return m_movieHeight; }
+	void getMouseToSWFScale(float &scaleX, float &scaleY);
 	bool getIgnoreInput() { return m_bIgnoreInput; }
 	void setIgnoreInput(bool bVal) { m_bIgnoreInput=bVal; }
 
@@ -53,7 +54,7 @@ protected:
 	virtual bool isSlotEmpty(ESceneSection eSection, int iSlot);
 	virtual void adjustPointerForSafeZone();
 
-	virtual UIControl *getSection(ESceneSection eSection) { return NULL; }
+	virtual UIControl *getSection(ESceneSection eSection) { return nullptr; }
 	virtual int GetBaseSlotCount() { return 0; }
 
 public:
diff --git a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
index c810ad45..a3fb0d2d 100644
--- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
@@ -16,13 +16,13 @@ UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void *_initData, UILayer *parentL
 
 	m_labelAnvil.init( app.GetString(IDS_REPAIR_AND_NAME) );
 
-	AnvilScreenInput *initData = (AnvilScreenInput *)_initData;
+	AnvilScreenInput *initData = static_cast<AnvilScreenInput *>(_initData);
 	m_inventory = initData->inventory;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[iPad] != NULL )
+	if( pMinecraft->localgameModes[iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Anvil_Menu, this);
 	}
@@ -96,6 +96,19 @@ void UIScene_AnvilMenu::tick()
 {
 	UIScene_AbstractContainerMenu::tick();
 
+#ifdef _WINDOWS64
+	// Live update: sync item name per-keystroke while editing (like Java edition)
+	if (m_textInputAnvil.isDirectEditing())
+	{
+		const wstring& buf = m_textInputAnvil.getEditBuffer();
+		if (buf != m_itemName)
+		{
+			m_itemName = buf;
+			updateItemName();
+		}
+	}
+#endif
+
 	handleTick();
 }
 
@@ -250,7 +263,7 @@ void UIScene_AnvilMenu::setSectionSelectedSlot(ESceneSection eSection, int x, in
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionAnvilItem1:
@@ -278,7 +291,7 @@ void UIScene_AnvilMenu::setSectionSelectedSlot(ESceneSection eSection, int x, in
 
 UIControl *UIScene_AnvilMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionAnvilItem1:
@@ -306,26 +319,67 @@ UIControl *UIScene_AnvilMenu::getSection(ESceneSection eSection)
 	return control;
 }
 
+#ifdef _WINDOWS64
+void UIScene_AnvilMenu::getDirectEditInputs(vector<UIControl_TextInput*> &inputs)
+{
+	inputs.push_back(&m_textInputAnvil);
+}
+
+void UIScene_AnvilMenu::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
+{
+	m_itemName = input->getEditBuffer();
+	updateItemName();
+}
+#endif
+
 int UIScene_AnvilMenu::KeyboardCompleteCallback(LPVOID lpParam,bool bRes)
 {
-	// 4J HEG - No reason to set value if keyboard was cancelled
-	UIScene_AnvilMenu *pClass=(UIScene_AnvilMenu *)lpParam;
+	UIScene_AnvilMenu *pClass=static_cast<UIScene_AnvilMenu *>(lpParam);
 	pClass->setIgnoreInput(false);
 
 	if (bRes)
 	{
+#ifdef _WINDOWS64
+		uint16_t pchText[128];
+		ZeroMemory(pchText, 128 * sizeof(uint16_t));
+		Win64_GetKeyboardText(pchText, 128);
+		pClass->setEditNameValue(reinterpret_cast<wchar_t *>(pchText));
+		pClass->m_itemName = reinterpret_cast<wchar_t *>(pchText);
+		pClass->updateItemName();
+#else
 		uint16_t pchText[128];
 		ZeroMemory(pchText, 128 * sizeof(uint16_t) );
 		InputManager.GetText(pchText);
 		pClass->setEditNameValue((wchar_t *)pchText);
 		pClass->m_itemName = (wchar_t *)pchText;
 		pClass->updateItemName();
+#endif
 	}
 	return 0;
 }
 
 void UIScene_AnvilMenu::handleEditNamePressed()
 {
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking())
+		return;
+
+	if (g_KBMInput.IsKBMActive())
+	{
+		m_textInputAnvil.beginDirectEdit(30);
+	}
+	else
+	{
+		setIgnoreInput(true);
+		UIKeyboardInitData kbData;
+		kbData.title       = app.GetString(IDS_TITLE_RENAME);
+		kbData.defaultText = m_textInputAnvil.getLabel();
+		kbData.maxChars    = 30;
+		kbData.callback    = &UIScene_AnvilMenu::KeyboardCompleteCallback;
+		kbData.lpParam     = this;
+		ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData, eUILayer_Fullscreen, eUIGroup_Fullscreen);
+	}
+#else
 	setIgnoreInput(true);
 #if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__
 	int language = XGetLanguage();
@@ -337,12 +391,12 @@ void UIScene_AnvilMenu::handleEditNamePressed()
 		InputManager.RequestKeyboard(app.GetString(IDS_TITLE_RENAME),m_textInputAnvil.getLabel(),(DWORD)m_iPad,30,&UIScene_AnvilMenu::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Default);
 		break;
 	default:
-		// 4J Stu - Use a different keyboard for non-asian languages so we don't have prediction on
 		InputManager.RequestKeyboard(app.GetString(IDS_TITLE_RENAME),m_textInputAnvil.getLabel(),(DWORD)m_iPad,30,&UIScene_AnvilMenu::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Alphabet_Extended);
 		break;
 	}
 #else
-	InputManager.RequestKeyboard(app.GetString(IDS_TITLE_RENAME),m_textInputAnvil.getLabel(),(DWORD)m_iPad,30,&UIScene_AnvilMenu::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Default);
+	InputManager.RequestKeyboard(app.GetString(IDS_TITLE_RENAME),m_textInputAnvil.getLabel(),static_cast<DWORD>(m_iPad),30,&UIScene_AnvilMenu::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Default);
+#endif
 #endif
 }
 
@@ -357,6 +411,8 @@ void UIScene_AnvilMenu::setEditNameEditable(bool enabled)
 
 void UIScene_AnvilMenu::setCostLabel(const wstring &label, bool canAfford)
 {
+	if (!getMovie()) return;
+
 	IggyDataValue result;
 	IggyDataValue value[2];
 
@@ -375,6 +431,8 @@ void UIScene_AnvilMenu::showCross(bool show)
 {
 	if(m_showingCross != show)
 	{
+		if (!getMovie()) return;
+
 		IggyDataValue result;
 		IggyDataValue value[1];
 
diff --git a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
index 3afc6333..44f75992 100644
--- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
@@ -55,6 +55,10 @@ protected:
 
 	virtual UIControl *getSection(ESceneSection eSection);
 
+#ifdef _WINDOWS64
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs);
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result);
+#endif
 	static int KeyboardCompleteCallback(LPVOID lpParam,bool bRes);
 	virtual void handleEditNamePressed();
 	virtual void setEditNameValue(const wstring &name);
diff --git a/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp b/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp
index e70397d6..64e12373 100644
--- a/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp
@@ -21,12 +21,12 @@ UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void *_initData, UILayer *paren
 	m_buttonsPowers[eControl_Secondary1].setVisible(false);
 	m_buttonsPowers[eControl_Secondary2].setVisible(false);
 
-	BeaconScreenInput *initData = (BeaconScreenInput *)_initData;
+	BeaconScreenInput *initData = static_cast<BeaconScreenInput *>(_initData);
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Beacon_Menu, this);
 	}
@@ -254,7 +254,7 @@ void UIScene_BeaconMenu::setSectionSelectedSlot(ESceneSection eSection, int x, i
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionBeaconItem:
@@ -276,7 +276,7 @@ void UIScene_BeaconMenu::setSectionSelectedSlot(ESceneSection eSection, int x, i
 
 UIControl *UIScene_BeaconMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionBeaconItem:
@@ -324,11 +324,11 @@ UIControl *UIScene_BeaconMenu::getSection(ESceneSection eSection)
 void UIScene_BeaconMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	shared_ptr<ItemInstance> item = nullptr;
 	int slotId = -1;
-	swscanf((wchar_t*)region->name,L"slot_%d",&slotId);
+	swscanf(static_cast<wchar_t *>(region->name),L"slot_%d",&slotId);
 
 	if(slotId >= 0 && slotId >= m_menu->getSize() )
 	{			
@@ -336,22 +336,22 @@ void UIScene_BeaconMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 		switch(icon)
 		{
 		case 0:
-			item = shared_ptr<ItemInstance>(new ItemInstance(Item::emerald) );
+			item = std::make_shared<ItemInstance>(Item::emerald);
 			break;
 		case 1:
-			item = shared_ptr<ItemInstance>(new ItemInstance(Item::diamond) );
+			item = std::make_shared<ItemInstance>(Item::diamond);
 			break;
 		case 2:
-			item = shared_ptr<ItemInstance>(new ItemInstance(Item::goldIngot) );
+			item = std::make_shared<ItemInstance>(Item::goldIngot);
 			break;
 		case 3:
-			item = shared_ptr<ItemInstance>(new ItemInstance(Item::ironIngot) );
+			item = std::make_shared<ItemInstance>(Item::ironIngot);
 			break;
 		default:
 			assert(false);
 			break;
 		};		
-		if(item != NULL) customDrawSlotControl(region,m_iPad,item,1.0f,item->isFoil(),true);
+		if(item != nullptr) customDrawSlotControl(region,m_iPad,item,1.0f,item->isFoil(),true);
 	}
 	else
 	{
diff --git a/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp b/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
index 8563054c..129868fd 100644
--- a/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
@@ -14,15 +14,15 @@ UIScene_BrewingStandMenu::UIScene_BrewingStandMenu(int iPad, void *_initData, UI
 	m_progressBrewingArrow.init(L"",0,0,PotionBrewing::BREWING_TIME_SECONDS * SharedConstants::TICKS_PER_SECOND,0);
 	m_progressBrewingBubbles.init(L"",0,0,30,0);
 
-	BrewingScreenInput *initData = (BrewingScreenInput *)_initData;
+	BrewingScreenInput *initData = static_cast<BrewingScreenInput *>(_initData);
 	m_brewingStand = initData->brewingStand;
 
 	m_labelBrewingStand.init( m_brewingStand->getName() );
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Brewing_Menu, this);
 	}
@@ -249,7 +249,7 @@ void UIScene_BrewingStandMenu::setSectionSelectedSlot(ESceneSection eSection, in
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionBrewingBottle1:
@@ -280,7 +280,7 @@ void UIScene_BrewingStandMenu::setSectionSelectedSlot(ESceneSection eSection, in
 
 UIControl *UIScene_BrewingStandMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionBrewingBottle1:
diff --git a/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp b/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
index 968072a8..e10a5a62 100644
--- a/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
@@ -15,7 +15,7 @@ UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void *_initData
 	m_progressBar.setVisible( false );
 	m_labelTip.setVisible( false );
 
-	ConnectionProgressParams *param = (ConnectionProgressParams *)_initData;
+	ConnectionProgressParams *param = static_cast<ConnectionProgressParams *>(_initData);
 
 	if( param->stringId >= 0 )
 	{
@@ -210,7 +210,7 @@ void UIScene_ConnectingProgress::handleInput(int iPad, int key, bool repeat, boo
 // 4J-PB - Removed the option to cancel join - it didn't work anyway
 // 		case ACTION_MENU_CANCEL:
 // 			{
-// 				if(m_cancelFunc != NULL)
+// 				if(m_cancelFunc != nullptr)
 // 				{
 // 					m_cancelFunc(m_cancelFuncParam);
 // 				}
@@ -245,7 +245,7 @@ void UIScene_ConnectingProgress::handleInput(int iPad, int key, bool repeat, boo
 
 void UIScene_ConnectingProgress::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Confirm:
 		if(m_showingButton)
diff --git a/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
index 9e48a57b..b26ae48e 100644
--- a/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
@@ -13,7 +13,7 @@
 
 UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
 {
-	ContainerScreenInput *initData = (ContainerScreenInput *)_initData;
+	ContainerScreenInput *initData = static_cast<ContainerScreenInput *>(_initData);
 	m_bLargeChest = (initData->container->getContainerSize() > 3*9)?true:false;
 
 	// Setup all the Iggy references we need for this scene
@@ -24,9 +24,9 @@ UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void *_initData, UILayer
 	ContainerMenu* menu = new ContainerMenu( initData->inventory, initData->container );
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[iPad] != NULL )
+	if( pMinecraft->localgameModes[iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Container_Menu, this);
 	}
@@ -181,7 +181,7 @@ void UIScene_ContainerMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionContainerChest:
@@ -203,7 +203,7 @@ void UIScene_ContainerMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 UIControl *UIScene_ContainerMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionContainerChest:
diff --git a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
index 57567248..939efde1 100644
--- a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
@@ -13,7 +13,7 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *pa
 	IggyDataValue value[1];
 	value[0].type = IGGY_DATATYPE_number;
 #if defined(_XBOX) || defined(_WIN64)
-	value[0].number = (F64)0;
+	value[0].number = static_cast<F64>(0);
 #elif defined(_DURANGO)
 	value[0].number = (F64)1;
 #elif defined(__PS3__)
@@ -25,7 +25,7 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *pa
 #endif
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetPlatform , 1 , value );
 
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	if(bNotInGame)
 	{
@@ -84,7 +84,7 @@ UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *pa
 		IggyDataValue result;
 		IggyDataValue value[1];
 		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = (F64)m_iCurrentNavigatedControlsLayout;
+		value[0].number = static_cast<F64>(m_iCurrentNavigatedControlsLayout);
 		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetControllerLayout , 1 , value );
 	}
 
@@ -180,7 +180,7 @@ void UIScene_ControlsMenu::handleInput(int iPad, int key, bool repeat, bool pres
 
 void UIScene_ControlsMenu::handleCheckboxToggled(F64 controlId, bool selected)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_InvertLook:
 		app.SetGameSettings(m_iPad,eGameSetting_ControlInvertLook,(unsigned char)( selected ) );
@@ -194,13 +194,13 @@ void UIScene_ControlsMenu::handleCheckboxToggled(F64 controlId, bool selected)
 
 void UIScene_ControlsMenu::handlePress(F64 controlId, F64 childId)
 {
-	int control = (int)controlId;
+	int control = static_cast<int>(controlId);
 	switch(control)
 	{
 	case eControl_Button0:
 	case eControl_Button1:
 	case eControl_Button2:
-		app.SetGameSettings(m_iPad,eGameSetting_ControlScheme,(unsigned char)control);
+		app.SetGameSettings(m_iPad,eGameSetting_ControlScheme,static_cast<unsigned char>(control));
 		LPWSTR layoutString = new wchar_t[ 128 ];
 		swprintf( layoutString, 128, L"%ls : %ls", app.GetString( IDS_CURRENT_LAYOUT ),app.GetString(m_iSchemeTextA[control]));	
 #ifdef __ORBIS__
@@ -216,7 +216,7 @@ void UIScene_ControlsMenu::handlePress(F64 controlId, F64 childId)
 
 void UIScene_ControlsMenu::handleFocusChange(F64 controlId, F64 childId)
 {
-	int control = (int)controlId;
+	int control = static_cast<int>(controlId);
 	switch(control)
 	{
 	case eControl_Button0:
diff --git a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
index 66d8c41e..16b63c4c 100644
--- a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
@@ -4,6 +4,9 @@
 #include "..\..\MultiplayerLocalPlayer.h"
 #include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
 #include "UIScene_CraftingMenu.h"
+#ifdef _WINDOWS64
+#include "..\..\Windows64\Iggy\gdraw\gdraw_d3d11.h"
+#endif
 
 #ifdef __PSVITA__
 #define GAME_CRAFTING_TOUCHUPDATE_TIMER_ID 0
@@ -12,9 +15,14 @@
 
 UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
+#ifdef _WINDOWS64
+	m_hSlotBoundsValid = false;
+	m_hSlotX0 = m_hSlotY0 = m_hSlotY1 = 0;
+	m_hSlotSpacing = 0;
+#endif
 	m_bIgnoreKeyPresses = false;
 
-	CraftingPanelScreenInput* initData = (CraftingPanelScreenInput*)_initData;
+	CraftingPanelScreenInput* initData = static_cast<CraftingPanelScreenInput *>(_initData);
 	m_iContainerType=initData->iContainerType;
 	m_pPlayer=initData->player;
 	m_bSplitscreen=initData->bSplitscreen;
@@ -109,9 +117,9 @@ UIScene_CraftingMenu::UIScene_CraftingMenu(int iPad, void *_initData, UILayer *p
 	// Update the tutorial state
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		if(m_iContainerType==RECIPE_TYPE_2x2)
 		{
@@ -190,14 +198,14 @@ void UIScene_CraftingMenu::handleDestroy()
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL && Minecraft::GetInstance()->localplayers[m_iPad]->containerMenu->containerId == m_menu->containerId)
+	if(Minecraft::GetInstance()->localplayers[m_iPad] != nullptr && Minecraft::GetInstance()->localplayers[m_iPad]->containerMenu->containerId == m_menu->containerId)
 	{
 		Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
 	}
@@ -254,12 +262,14 @@ wstring UIScene_CraftingMenu::getMoviePath()
 	}
 }
 
-#ifdef __PSVITA__
+#if defined(__PSVITA__) || defined(_WINDOWS64)
 UIControl* UIScene_CraftingMenu::GetMainPanel()
 {
 	return &m_controlMainPanel;
 }
+#endif
 
+#ifdef __PSVITA__
 void UIScene_CraftingMenu::handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased)
 {
 	// perform action on release
@@ -383,6 +393,85 @@ void UIScene_CraftingMenu::handleTimerComplete(int id)
 }
 #endif
 
+#ifdef _WINDOWS64
+bool UIScene_CraftingMenu::handleMouseClick(F32 x, F32 y)
+{
+	if (!m_hSlotBoundsValid || m_hSlotSpacing <= 0)
+		return false;
+
+	// Tab click — tabs sit directly above the H slot row. We derive their
+	// bounds from the H slot positions cached in customDraw, since the Vita
+	// TouchPanel controls are full-screen overlays with unusable bounds.
+	int maxTabs = (m_iContainerType == RECIPE_TYPE_3x3) ? m_iMaxGroup3x3 : m_iMaxGroup2x2;
+	F32 slotHeight = m_hSlotY1 - m_hSlotY0;
+	F32 tabRowY0 = (m_hSlotY0 * 0.75f) - slotHeight * 1.55f;
+	F32 tabRowY1 = tabRowY0 + (slotHeight * 1.7f);
+	F32 tabRowWidth = m_hSlotSpacing * m_iCraftablesMaxHSlotC;
+	F32 tabWidth = tabRowWidth / maxTabs;
+
+	if (tabWidth > 0 && x >= m_hSlotX0 && x < m_hSlotX0 + tabRowWidth &&
+		y >= tabRowY0 && y < tabRowY1)
+	{
+		int iTab = (int)((x - m_hSlotX0) / tabWidth);
+		if (iTab >= 0 && iTab < maxTabs && iTab != m_iGroupIndex)
+		{
+			showTabHighlight(m_iGroupIndex, false);
+			m_iGroupIndex = iTab;
+			showTabHighlight(m_iGroupIndex, true);
+			m_iCurrentSlotHIndex = 0;
+			m_iCurrentSlotVIndex = 1;
+			CheckRecipesAvailable();
+			iVSlotIndexA[0] = CanBeMadeA[m_iCurrentSlotHIndex].iCount - 1;
+			iVSlotIndexA[1] = 0;
+			iVSlotIndexA[2] = 1;
+			ui.PlayUISFX(eSFX_Focus);
+			UpdateVerticalSlots();
+			UpdateHighlight();
+			setGroupText(GetGroupNameText(m_pGroupA[m_iGroupIndex]));
+		}
+		return true;
+	}
+
+	// H slot click — select or craft
+	F32 rowWidth = m_hSlotSpacing * m_iCraftablesMaxHSlotC;
+	if (x >= m_hSlotX0 && x < m_hSlotX0 + rowWidth &&
+		y >= m_hSlotY0 && y < m_hSlotY1)
+	{
+		int iNewSlot = (int)((x - m_hSlotX0) / m_hSlotSpacing);
+		if (iNewSlot >= 0 && iNewSlot < m_iCraftablesMaxHSlotC)
+		{
+			// Only interact with populated slots
+			if (CanBeMadeA[iNewSlot].iCount == 0)
+				return true;
+
+			if (iNewSlot == m_iCurrentSlotHIndex)
+			{
+				// Click on already-selected slot — craft the item
+				handleKeyDown(m_iPad, ACTION_MENU_A, false);
+			}
+			else
+			{
+				int iOldHSlot = m_iCurrentSlotHIndex;
+				m_iCurrentSlotHIndex = iNewSlot;
+				m_iCurrentSlotVIndex = 1;
+				iVSlotIndexA[0] = CanBeMadeA[m_iCurrentSlotHIndex].iCount - 1;
+				iVSlotIndexA[1] = 0;
+				iVSlotIndexA[2] = 1;
+				UpdateVerticalSlots();
+				UpdateHighlight();
+				if (CanBeMadeA[iOldHSlot].iCount > 0)
+					setShowCraftHSlot(iOldHSlot, true);
+				ui.PlayUISFX(eSFX_Focus);
+			}
+			return true;
+		}
+	}
+	// Consume all mouse clicks so misses don't generate ACTION_MENU_A
+	// and accidentally craft. Only blocks mouse-originated presses.
+	return true;
+}
+#endif
+
 void UIScene_CraftingMenu::handleReload()
 {
 	m_slotListInventory.addSlots(CRAFTING_INVENTORY_SLOT_START,CRAFTING_INVENTORY_SLOT_END - CRAFTING_INVENTORY_SLOT_START);
@@ -436,14 +525,14 @@ void UIScene_CraftingMenu::handleReload()
 void UIScene_CraftingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	shared_ptr<ItemInstance> item = nullptr;
 	int slotId = -1;
 	float alpha = 1.0f;
 	bool decorations = true;
 	bool inventoryItem = false;
-	swscanf((wchar_t*)region->name,L"slot_%d",&slotId);
+	swscanf(static_cast<wchar_t *>(region->name),L"slot_%d",&slotId);
 	if (slotId == -1)
 	{
 		app.DebugPrintf("This is not the control we are looking for\n");
@@ -471,17 +560,43 @@ void UIScene_CraftingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 		if(m_vSlotsInfo[iIndex].show)
 		{
 			item = m_vSlotsInfo[iIndex].item;
-			alpha = ((float)m_vSlotsInfo[iIndex].alpha)/31.0f;
+			alpha = static_cast<float>(m_vSlotsInfo[iIndex].alpha)/31.0f;
 		}
 	}
 	else if(slotId >= CRAFTING_H_SLOT_START && slotId < (CRAFTING_H_SLOT_START + m_iCraftablesMaxHSlotC) )
 	{
 		decorations = false;
 		int iIndex = slotId - CRAFTING_H_SLOT_START;
+#ifdef _WINDOWS64
+		// Cache H slot SWF-space positions from the custom draw transform matrix
+		if (iIndex == 0 || iIndex == 1)
+		{
+			F32 mat[16];
+			gdraw_D3D11_CalculateCustomDraw_4J(region, mat);
+			// Matrix to SWF coords (same formula as setupCustomDrawMatrices)
+			F32 sw = (F32)getRenderWidth();
+			F32 sh = (F32)getRenderHeight();
+			F32 swfX = sw * (1.0f + mat[3]) / 2.0f;
+			F32 swfY = sh * (1.0f - mat[7]) / 2.0f;
+			if (iIndex == 0)
+			{
+				m_hSlotX0 = swfX;
+				m_hSlotY0 = swfY;
+				// Slot visual height from matrix scale and region height
+				F32 slotH = sh * (-mat[5]) / 2.0f * region->y1;
+				m_hSlotY1 = swfY + slotH;
+			}
+			else
+			{
+				m_hSlotSpacing = swfX - m_hSlotX0;
+				m_hSlotBoundsValid = (m_hSlotSpacing > 0);
+			}
+		}
+#endif
 		if(m_hSlotsInfo[iIndex].show)
 		{
 			item = m_hSlotsInfo[iIndex].item;
-			alpha = ((float)m_hSlotsInfo[iIndex].alpha)/31.0f;
+			alpha = static_cast<float>(m_hSlotsInfo[iIndex].alpha)/31.0f;
 		}
 	}
 	else if(slotId >= CRAFTING_INGREDIENTS_LAYOUT_START && slotId < (CRAFTING_INGREDIENTS_LAYOUT_START + m_iIngredientsMaxSlotC) )
@@ -490,7 +605,7 @@ void UIScene_CraftingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 		if(m_ingredientsSlotsInfo[iIndex].show)
 		{
 			item = m_ingredientsSlotsInfo[iIndex].item;
-			alpha = ((float)m_ingredientsSlotsInfo[iIndex].alpha)/31.0f;
+			alpha = static_cast<float>(m_ingredientsSlotsInfo[iIndex].alpha)/31.0f;
 		}
 	}
 	else if(slotId >= CRAFTING_INGREDIENTS_DESCRIPTION_START && slotId < (CRAFTING_INGREDIENTS_DESCRIPTION_START + 4) )
@@ -499,7 +614,7 @@ void UIScene_CraftingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 		if(m_ingredientsInfo[iIndex].show)
 		{
 			item = m_ingredientsInfo[iIndex].item;
-			alpha = ((float)m_ingredientsInfo[iIndex].alpha)/31.0f;
+			alpha = static_cast<float>(m_ingredientsInfo[iIndex].alpha)/31.0f;
 		}
 	}
 	else if(slotId == CRAFTING_OUTPUT_SLOT_START )
@@ -507,11 +622,11 @@ void UIScene_CraftingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 		if(m_craftingOutputSlotInfo.show)
 		{
 			item = m_craftingOutputSlotInfo.item;
-			alpha = ((float)m_craftingOutputSlotInfo.alpha)/31.0f;
+			alpha = static_cast<float>(m_craftingOutputSlotInfo.alpha)/31.0f;
 		}
 	}
 
-	if(item != NULL)
+	if(item != nullptr)
 	{
 		if(!inventoryItem)
 		{
@@ -627,7 +742,7 @@ void UIScene_CraftingMenu::setCraftingOutputSlotItem(int iPad, shared_ptr<ItemIn
 {
 	m_craftingOutputSlotInfo.item = item;
 	m_craftingOutputSlotInfo.alpha = 31;
-	m_craftingOutputSlotInfo.show = item != NULL;
+	m_craftingOutputSlotInfo.show = item != nullptr;
 }
 
 void UIScene_CraftingMenu::setCraftingOutputSlotRedBox(bool show)
@@ -639,7 +754,7 @@ void UIScene_CraftingMenu::setIngredientSlotItem(int iPad, int index, shared_ptr
 {
 	m_ingredientsSlotsInfo[index].item = item;
 	m_ingredientsSlotsInfo[index].alpha = 31;
-	m_ingredientsSlotsInfo[index].show = item != NULL;
+	m_ingredientsSlotsInfo[index].show = item != nullptr;
 }
 
 void UIScene_CraftingMenu::setIngredientSlotRedBox(int index, bool show)
@@ -651,7 +766,7 @@ void UIScene_CraftingMenu::setIngredientDescriptionItem(int iPad, int index, sha
 {
 	m_ingredientsInfo[index].item = item;
 	m_ingredientsInfo[index].alpha = 31;
-	m_ingredientsInfo[index].show = item != NULL;
+	m_ingredientsInfo[index].show = item != nullptr;
 
 	IggyDataValue result;
 	IggyDataValue value[2];
diff --git a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.h b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.h
index 84c9ba65..2f52b8ba 100644
--- a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.h
@@ -66,10 +66,19 @@ public:
 
 #ifdef __PSVITA__
 	virtual void handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased);
-	virtual UIControl* GetMainPanel();
 	virtual void handleTouchBoxRebuild();
 	virtual void handleTimerComplete(int id);
 #endif
+#if defined(__PSVITA__) || defined(_WINDOWS64)
+	virtual UIControl* GetMainPanel();
+#endif
+#ifdef _WINDOWS64
+	virtual bool handleMouseClick(F32 x, F32 y);
+	// Cached from customDraw — H slot bounding boxes in SWF space
+	F32 m_hSlotX0, m_hSlotY0, m_hSlotY1;
+	F32 m_hSlotSpacing; // x distance between slot 0 and slot 1
+	bool m_hSlotBoundsValid;
+#endif
 
 protected:
 	UIControl m_controlMainPanel;
@@ -97,7 +106,7 @@ protected:
 		ETouchInput_TouchPanel_5,
 		ETouchInput_TouchPanel_6,
 		ETouchInput_CraftingHSlots,
-		
+
 		ETouchInput_Count,
 	};
 	UIControl_Touch m_TouchInput[ETouchInput_Count];
diff --git a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
index 2bd06bc6..ef72ec16 100644
--- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
@@ -58,11 +58,11 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
 	m_labelTexturePackDescription.init(L"");
 
 	WCHAR TempString[256];
-	swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)]));	
+	swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)]));
 	m_sliderDifficulty.init(TempString,eControl_Difficulty,0,3,app.GetGameSettings(m_iPad,eGameSetting_Difficulty));
 
 	m_MoreOptionsParams.bGenerateOptions=TRUE;
-	m_MoreOptionsParams.bStructures=TRUE;	
+	m_MoreOptionsParams.bStructures=TRUE;
 	m_MoreOptionsParams.bFlatWorld=FALSE;
 	m_MoreOptionsParams.bBonusChest=FALSE;
 	m_MoreOptionsParams.bPVP = TRUE;
@@ -82,12 +82,8 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
 
 	m_bGameModeCreative = false;
 	m_iGameModeId = GameType::SURVIVAL->getId();
-	m_pDLCPack = NULL;
+	m_pDLCPack = nullptr;
 	m_bRebuildTouchBoxes = false;
-#ifdef _WINDOWS64
-	m_bDirectEditing = false;
-	m_iDirectEditCooldown = 0;
-#endif
 
 	m_bMultiplayerAllowed = ProfileManager.IsSignedInLive( m_iPad ) && ProfileManager.AllowedToPlayMultiplayer(m_iPad);
 	// 4J-PB - read the settings for the online flag. We'll only save this setting if the user changed it.
@@ -95,12 +91,12 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
 	m_MoreOptionsParams.bOnlineSettingChangedBySystem=false;
 
 	// 4J-PB - Removing this so that we can attempt to create an online game on PS3 when we are a restricted child account
-	// It'll fail when we choose create, but this matches the behaviour of load game, and lets the player know why they can't play online, 
+	// It'll fail when we choose create, but this matches the behaviour of load game, and lets the player know why they can't play online,
 	// instead of just greying out the online setting in the More Options
 	// #ifdef __PS3__
 	// 	if(ProfileManager.IsSignedInLive( m_iPad ))
 	// 	{
-	// 		ProfileManager.GetChatAndContentRestrictions(m_iPad,true,&bChatRestricted,&bContentRestricted,NULL);
+	// 		ProfileManager.GetChatAndContentRestrictions(m_iPad,true,&bChatRestricted,&bContentRestricted,nullptr);
 	// 	}
 	// #endif
 
@@ -128,9 +124,9 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
 		{
 			// The profile settings say Online, but either the player is offline, or they are not allowed to play online
 			m_MoreOptionsParams.bOnlineSettingChangedBySystem=true;
-		}	
+		}
 	}
-	
+
 	// Set up online game checkbox
 	bool bOnlineGame = m_MoreOptionsParams.bOnlineGame;
 	m_checkboxOnline.SetEnable(true);
@@ -188,7 +184,7 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
 #if TO_BE_IMPLEMENTED
 		// 4J-PB - there may be texture packs we don't have, so use the info from TMS for this
 
-		DLC_INFO *pDLCInfo=NULL;
+		DLC_INFO *pDLCInfo=nullptr;
 
 		// first pass - look to see if there are any that are not in the list
 		bool bTexturePackAlreadyListed;
@@ -293,54 +289,6 @@ void UIScene_CreateWorldMenu::tick()
 {
 	UIScene::tick();
 
-#ifdef _WINDOWS64
-	if (m_iDirectEditCooldown > 0)
-		m_iDirectEditCooldown--;
-
-	if (m_bDirectEditing)
-	{
-		wchar_t ch;
-		bool changed = false;
-		while (g_KBMInput.ConsumeChar(ch))
-		{
-			if (ch == 0x08) // backspace
-			{
-				if (!m_worldName.empty())
-				{
-					m_worldName.pop_back();
-					changed = true;
-				}
-			}
-			else if (ch == 0x0D) // enter - confirm
-			{
-				m_bDirectEditing = false;
-				m_iDirectEditCooldown = 4; // absorb the matching ACTION_MENU_OK that follows
-				m_editWorldName.setLabel(m_worldName.c_str());
-			}
-			else if ((int)m_worldName.length() < 25)
-			{
-				m_worldName += ch;
-				changed = true;
-			}
-		}
-
-		// Escape cancels and restores the original name
-		if (m_bDirectEditing && g_KBMInput.IsKeyPressed(VK_ESCAPE))
-		{
-			m_worldName = m_worldNameBeforeEdit;
-			m_bDirectEditing = false;
-			m_iDirectEditCooldown = 4;
-			m_editWorldName.setLabel(m_worldName.c_str());
-			m_buttonCreateWorld.setEnable(!m_worldName.empty());
-		}
-		else if (changed)
-		{
-			m_editWorldName.setLabel(m_worldName.c_str());
-			m_buttonCreateWorld.setEnable(!m_worldName.empty());
-		}
-	}
-#endif
-
 	if(m_iSetTexturePackDescription >= 0 )
 	{
 		UpdateTexturePackDescription( m_iSetTexturePackDescription );
@@ -393,7 +341,7 @@ int UIScene_CreateWorldMenu::ContinueOffline(void *pParam,int iPad,C4JStorage::E
 	UIScene_CreateWorldMenu* pClass = (UIScene_CreateWorldMenu*)pParam;
 
 	// results switched for this dialog
-	if(result==C4JStorage::EMessage_ResultAccept) 
+	if(result==C4JStorage::EMessage_ResultAccept)
 	{
 		pClass->m_MoreOptionsParams.bOnlineGame=false;
 		pClass->checkStateAndStartGame();
@@ -403,11 +351,24 @@ int UIScene_CreateWorldMenu::ContinueOffline(void *pParam,int iPad,C4JStorage::E
 
 #endif
 
+#ifdef _WINDOWS64
+void UIScene_CreateWorldMenu::getDirectEditInputs(vector<UIControl_TextInput*> &inputs)
+{
+	inputs.push_back(&m_editWorldName);
+}
+
+void UIScene_CreateWorldMenu::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
+{
+	m_worldName = input->getEditBuffer();
+	m_buttonCreateWorld.setEnable(!m_worldName.empty());
+}
+#endif
+
 void UIScene_CreateWorldMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
 	if(m_bIgnoreInput) return;
 #ifdef _WINDOWS64
-	if (m_bDirectEditing || m_iDirectEditCooldown > 0) { handled = true; return; }
+	if (isDirectEditBlocking()) { handled = true; return; }
 #endif
 
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
@@ -431,7 +392,7 @@ void UIScene_CreateWorldMenu::handleInput(int iPad, int key, bool repeat, bool p
 		if ( pressed && controlHasFocus(m_checkboxOnline.getId()) && !m_checkboxOnline.IsEnabled() )
 		{
 			UINT uiIDA[1] = { IDS_CONFIRM_OK };
-			ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, iPad); 
+			ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, iPad);
 		}
 #endif
 
@@ -442,7 +403,7 @@ void UIScene_CreateWorldMenu::handleInput(int iPad, int key, bool repeat, bool p
 	case ACTION_MENU_OTHER_STICK_UP:
 	case ACTION_MENU_OTHER_STICK_DOWN:
 		sendInputToMovie(key, repeat, pressed, released);
-		
+
 		bool bOnlineGame = m_checkboxOnline.IsChecked();
 		if (m_MoreOptionsParams.bOnlineGame != bOnlineGame)
 		{
@@ -464,19 +425,19 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId)
 {
 	if(m_bIgnoreInput) return;
 #ifdef _WINDOWS64
-	if (m_bDirectEditing || m_iDirectEditCooldown > 0) return;
+	if (isDirectEditBlocking()) return;
 #endif
 
 	//CD - Added for audio
 	ui.PlayUISFX(eSFX_Press);
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_EditWorldName:
 		{
 			m_bIgnoreInput=true;
 #ifdef _WINDOWS64
-			if (Win64_IsControllerConnected())
+			if (!g_KBMInput.IsKBMActive())
 			{
 				UIKeyboardInitData kbData;
 				kbData.title       = app.GetString(IDS_CREATE_NEW_WORLD);
@@ -488,11 +449,8 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId)
 			}
 			else
 			{
-				// PC without controller: edit the name field directly in-place.
-				m_bIgnoreInput = false; // Don't block input - m_bDirectEditing is the guard
-				m_worldNameBeforeEdit = m_worldName;
-				m_bDirectEditing = true;
-				g_KBMInput.ClearCharBuffer();
+				m_bIgnoreInput = false;
+				m_editWorldName.beginDirectEdit(25);
 			}
 #else
 			InputManager.RequestKeyboard(app.GetString(IDS_CREATE_NEW_WORLD),m_editWorldName.getLabel(),(DWORD)0,25,&UIScene_CreateWorldMenu::KeyboardCompleteWorldNameCallback,this,C_4JInput::EKeyboardMode_Default);
@@ -502,16 +460,20 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId)
 	case eControl_GameModeToggle:
 		switch(m_iGameModeId)
 		{
-		case 0: // Survival
+		case 0: // Creative
 			m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE));
 			m_iGameModeId = GameType::CREATIVE->getId();
 			m_bGameModeCreative = true;
 			break;
-		case 1: // Creative
+		case 1: // Adventure
+			m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE));
+			m_iGameModeId = GameType::ADVENTURE->getId();
+			m_bGameModeCreative = false;
+			break;
+		case 2: // Survival 
 			m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
 			m_iGameModeId = GameType::SURVIVAL->getId();
 			m_bGameModeCreative = false;
-			break;
 		};
 		break;
 	case eControl_MoreOptions:
@@ -519,7 +481,7 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId)
 		break;
 	case eControl_TexturePackList:
 		{
-			UpdateCurrentTexturePack((int)childId);
+			UpdateCurrentTexturePack(static_cast<int>(childId));
 		}
 		break;
 	case eControl_NewWorld:
@@ -565,7 +527,7 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow()
 		// texture pack hasn't been set yet, so check what it will be
 		TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);
 
-		if(pTexturePack==NULL)
+		if(pTexturePack==nullptr)
 		{
 #if TO_BE_IMPLEMENTED
 			// They've selected a texture pack they don't have yet
@@ -614,8 +576,8 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow()
 	if(m_MoreOptionsParams.dwTexturePack!=0)
 	{
 		// texture pack hasn't been set yet, so check what it will be
-		TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);		
-		DLCTexturePack *pDLCTexPack=(DLCTexturePack *)pTexturePack;
+		TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);
+		DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(pTexturePack);
 		m_pDLCPack=pDLCTexPack->getDLCInfoParentPack();
 
 		// do we have a license?
@@ -643,7 +605,7 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow()
 				DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(m_pDLCPack->getPurchaseOfferId());
 				ULONGLONG ullOfferID_Full;
 
-				if(pDLCInfo!=NULL)
+				if(pDLCInfo!=nullptr)
 				{
 					ullOfferID_Full=pDLCInfo->ullOfferID_Full;
 				}
@@ -666,7 +628,7 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow()
 				UINT uiIDA[2];
 				uiIDA[0]=IDS_CONFIRM_OK;
 				uiIDA[1]=IDS_CONFIRM_CANCEL;
-				ui.RequestAlertMessage(IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, IDS_USING_TRIAL_TEXUREPACK_WARNING, uiIDA, 2, m_iPad,&TrialTexturePackWarningReturned,this);	
+				ui.RequestAlertMessage(IDS_WARNING_DLC_TRIALTEXTUREPACK_TITLE, IDS_USING_TRIAL_TEXUREPACK_WARNING, uiIDA, 2, m_iPad,&TrialTexturePackWarningReturned,this);
 #endif
 
 #if defined _XBOX_ONE || defined __ORBIS__
@@ -686,14 +648,14 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow()
 void UIScene_CreateWorldMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
 	WCHAR TempString[256];
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_Difficulty:
 		m_sliderDifficulty.handleSliderMove(value);
 
 		app.SetGameSettings(m_iPad,eGameSetting_Difficulty,value);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[value]));		
+		swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[value]));
 		m_sliderDifficulty.setLabel(TempString);
 		break;
 	}
@@ -740,7 +702,7 @@ void UIScene_CreateWorldMenu::handleTimerComplete(int id)
 					m_MoreOptionsParams.bInviteOnly = FALSE;
 					m_MoreOptionsParams.bAllowFriendsOfFriends = FALSE;
 				}
-				
+
 				m_checkboxOnline.SetEnable(bMultiplayerAllowed);
 				m_checkboxOnline.setChecked(m_MoreOptionsParams.bOnlineGame);
 
@@ -762,7 +724,7 @@ void UIScene_CreateWorldMenu::handleTimerComplete(int id)
 				if(m_iConfigA[i]!=-1)
 				{
 					DWORD dwBytes=0;
-					PBYTE pbData=NULL;
+					PBYTE pbData=nullptr;
 					//app.DebugPrintf("Retrieving iConfig %d from TPD\n",m_iConfigA[i]);
 
 					app.GetTPD(m_iConfigA[i],&pbData,&dwBytes);
@@ -771,10 +733,10 @@ void UIScene_CreateWorldMenu::handleTimerComplete(int id)
 					if(dwBytes > 0 && pbData)
 					{
 						DWORD dwImageBytes=0;
-						PBYTE pbImageData=NULL;
+						PBYTE pbImageData=nullptr;
 
 						app.GetFileFromTPD(eTPDFileType_Icon,pbData,dwBytes,&pbImageData,&dwImageBytes );
-						ListInfo.fEnabled = TRUE;	
+						ListInfo.fEnabled = TRUE;
 						ListInfo.iData = m_iConfigA[i];
 						HRESULT hr=XuiCreateTextureBrushFromMemory(pbImageData,dwImageBytes,&ListInfo.hXuiBrush);
 						app.DebugPrintf("Adding texturepack  %d from TPD\n",m_iConfigA[i]);
@@ -801,7 +763,7 @@ void UIScene_CreateWorldMenu::handleGainFocus(bool navBack)
 
 int UIScene_CreateWorldMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,bool bRes)
 {
-	UIScene_CreateWorldMenu *pClass=(UIScene_CreateWorldMenu *)lpParam;
+	UIScene_CreateWorldMenu *pClass=static_cast<UIScene_CreateWorldMenu *>(lpParam);
 	pClass->m_bIgnoreInput=false;
 	// 4J HEG - No reason to set value if keyboard was cancelled
 	if (bRes)
@@ -832,7 +794,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 	bool isOnlineGame = m_MoreOptionsParams.bOnlineGame;
 	int iPadNotSignedInLive = -1;
 	bool isLocalMultiplayerAvailable = app.IsLocalMultiplayerAvailable();
-		
+
 	for(unsigned int i = 0; i < XUSER_MAX_COUNT; i++)
 	{
 		if (ProfileManager.IsSignedIn(i) && (i == primaryPad || isLocalMultiplayerAvailable))
@@ -884,7 +846,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 			ui.RequestErrorMessage(IDS_PRO_CURRENTLY_NOT_ONLINE_TITLE, IDS_PRO_PSNOFFLINE_TEXT, uiIDA, 1, ProfileManager.GetPrimaryPad());
 		}
 		else
-		{		
+		{
 			// Not signed in to PSN
 			UINT uiIDA[1];
 			uiIDA[0] = IDS_CONFIRM_OK;
@@ -928,7 +890,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 				// MGH -  added this so we don't try and upsell when we don't know if the player has PS Plus yet (if it can't connect to the PS Plus server).
 				UINT uiIDA[1];
 				uiIDA[0]=IDS_OK;
-				ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), NULL, NULL);
+				ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), nullptr, nullptr);
 				return;
 			}
 
@@ -940,7 +902,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 			SceNpCommerceDialogParam param;
 			sceNpCommerceDialogParamInitialize(&param);
 			param.mode=SCE_NP_COMMERCE_DIALOG_MODE_PLUS;
-			param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY; 
+			param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY;
 			param.userId = ProfileManager.getUserID(iPadWithNoPlaystationPlus);
 
 			iResult=sceNpCommerceDialogOpen(&param);
@@ -948,14 +910,14 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 // 			UINT uiIDA[2];
 // 			uiIDA[0]=IDS_PLAY_OFFLINE;
 // 			uiIDA[1]=IDS_PLAYSTATIONPLUS_SIGNUP;
-// 			ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_CreateWorldMenu::PSPlusReturned,this, app.GetStringTable(),NULL,0,false);
+// 			ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_CreateWorldMenu::PSPlusReturned,this, app.GetStringTable(),nullptr,0,false);
 			return;
 		}
 	}
 #endif
 
 	if(m_bGameModeCreative == true || m_MoreOptionsParams.bHostPrivileges == TRUE)
-	{			
+	{
 		UINT uiIDA[2];
 		uiIDA[0]=IDS_CONFIRM_OK;
 		uiIDA[1]=IDS_CONFIRM_CANCEL;
@@ -988,7 +950,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 #if defined(__PS3__) || defined(__PSVITA__)
 		if(isOnlineGame && isSignedInLive)
 		{
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,nullptr,&bContentRestricted,nullptr);
 		}
 #endif
 
@@ -1017,7 +979,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 					// MGH -  added this so we don't try and upsell when we don't know if the player has PS Plus yet (if it can't connect to the PS Plus server).
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_OK;
-					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), NULL, NULL);
+					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), nullptr, nullptr);
 					return;
 				}
 
@@ -1028,14 +990,14 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 				SceNpCommerceDialogParam param;
 				sceNpCommerceDialogParamInitialize(&param);
 				param.mode=SCE_NP_COMMERCE_DIALOG_MODE_PLUS;
-				param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY; 
+				param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY;
 				param.userId = ProfileManager.getUserID(iPadWithNoPlaystationPlus);
 
 				iResult=sceNpCommerceDialogOpen(&param);
 // 				UINT uiIDA[2];
 // 				uiIDA[0]=IDS_PLAY_OFFLINE;
 // 				uiIDA[1]=IDS_PLAYSTATIONPLUS_SIGNUP;
-// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_CreateWorldMenu::PSPlusReturned,this, app.GetStringTable(),NULL,0,false);
+// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_CreateWorldMenu::PSPlusReturned,this, app.GetStringTable(),nullptr,0,false);
 			}
 
 #endif
@@ -1077,7 +1039,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 					// MGH -  added this so we don't try and upsell when we don't know if the player has PS Plus yet (if it can't connect to the PS Plus server).
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_OK;
-					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), NULL, NULL);
+					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), nullptr, nullptr);
 					return;
 				}
 
@@ -1091,15 +1053,15 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 				SceNpCommerceDialogParam param;
 				sceNpCommerceDialogParamInitialize(&param);
 				param.mode=SCE_NP_COMMERCE_DIALOG_MODE_PLUS;
-				param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY; 
-				param.userId = ProfileManager.getUserID(iPadWithNoPlaystationPlus); 
+				param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY;
+				param.userId = ProfileManager.getUserID(iPadWithNoPlaystationPlus);
 
 				iResult=sceNpCommerceDialogOpen(&param);
 
 // 				UINT uiIDA[2];
 // 				uiIDA[0]=IDS_PLAY_OFFLINE;
 // 				uiIDA[1]=IDS_PLAYSTATIONPLUS_SIGNUP;
-// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_CreateWorldMenu::PSPlusReturned,this, app.GetStringTable(),NULL,0,false);
+// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_CreateWorldMenu::PSPlusReturned,this, app.GetStringTable(),nullptr,0,false);
 			}
 
 #endif
@@ -1109,7 +1071,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 				if(isOnlineGame)
 				{
 					bool chatRestricted = false;
-					ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,NULL,NULL);
+					ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,nullptr,nullptr);
 					if(chatRestricted)
 					{
 						ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, ProfileManager.GetPrimaryPad() );
@@ -1165,15 +1127,15 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 
 	// start the game
 	bool isFlat = (pClass->m_MoreOptionsParams.bFlatWorld==TRUE);
-	__int64 seedValue = 0;
+	int64_t seedValue = 0;
 
 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->levelName = wWorldName;
 
 	if (wSeed.length() != 0)
 	{
-		__int64 value = 0;
-		unsigned int len = (unsigned int)wSeed.length();
+		int64_t value = 0;
+		unsigned int len = static_cast<unsigned int>(wSeed.length());
 
 		//Check if the input string contains a numerical value
 		bool isNumber = true;
@@ -1191,7 +1153,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 
 		//If the input string is a numerical value, convert it to a number
 		if( isNumber )
-			value = _fromString<__int64>(wSeed);
+			value = _fromString<int64_t>(wSeed);
 
 		//If the value is not 0 use it, otherwise use the algorithm from the java String.hashCode() function to hash it
 		if( value != 0 )
@@ -1211,7 +1173,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 
 
 	param->seed = seedValue;
-	param->saveData = NULL;
+	param->saveData = nullptr;
 	param->texturePackId = pClass->m_MoreOptionsParams.dwTexturePack;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
@@ -1235,7 +1197,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 	app.SetGameHostOption(eGameHostOption_HostCanFly,pClass->m_MoreOptionsParams.bHostPrivileges);
 	app.SetGameHostOption(eGameHostOption_HostCanChangeHunger,pClass->m_MoreOptionsParams.bHostPrivileges);
 	app.SetGameHostOption(eGameHostOption_HostCanBeInvisible,pClass->m_MoreOptionsParams.bHostPrivileges );
-	
+
 	app.SetGameHostOption(eGameHostOption_MobGriefing, pClass->m_MoreOptionsParams.bMobGriefing);
 	app.SetGameHostOption(eGameHostOption_KeepInventory, pClass->m_MoreOptionsParams.bKeepInventory);
 	app.SetGameHostOption(eGameHostOption_DoMobSpawning, pClass->m_MoreOptionsParams.bDoMobSpawning);
@@ -1243,12 +1205,12 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 	app.SetGameHostOption(eGameHostOption_DoTileDrops, pClass->m_MoreOptionsParams.bDoTileDrops);
 	app.SetGameHostOption(eGameHostOption_NaturalRegeneration, pClass->m_MoreOptionsParams.bNaturalRegeneration);
 	app.SetGameHostOption(eGameHostOption_DoDaylightCycle, pClass->m_MoreOptionsParams.bDoDaylightCycle);
-	
-	app.SetGameHostOption(eGameHostOption_WasntSaveOwner, false); 
+
+	app.SetGameHostOption(eGameHostOption_WasntSaveOwner, false);
 #ifdef _LARGE_WORLDS
 	app.SetGameHostOption(eGameHostOption_WorldSize, pClass->m_MoreOptionsParams.worldSize+1 );  // 0 is GAME_HOST_OPTION_WORLDSIZE_UNKNOWN
-	pClass->m_MoreOptionsParams.currentWorldSize = (EGameHostOptionWorldSize)(pClass->m_MoreOptionsParams.worldSize+1);
-	pClass->m_MoreOptionsParams.newWorldSize = (EGameHostOptionWorldSize)(pClass->m_MoreOptionsParams.worldSize+1);
+	pClass->m_MoreOptionsParams.currentWorldSize = static_cast<EGameHostOptionWorldSize>(pClass->m_MoreOptionsParams.worldSize + 1);
+	pClass->m_MoreOptionsParams.newWorldSize = static_cast<EGameHostOptionWorldSize>(pClass->m_MoreOptionsParams.worldSize + 1);
 #endif
 
 	g_NetworkManager.HostGame(dwLocalUsersMask,isClientSide,isPrivate,MINECRAFT_NET_MAX_PLAYERS,0);
@@ -1290,7 +1252,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-	loadingParams->lpParam = (LPVOID)param;
+	loadingParams->lpParam = static_cast<LPVOID>(param);
 
 	// Reset the autosave time
 	app.SetAutosaveTimerTime();
@@ -1308,7 +1270,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 
 int UIScene_CreateWorldMenu::StartGame_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	UIScene_CreateWorldMenu* pClass = (UIScene_CreateWorldMenu*)pParam;
+	UIScene_CreateWorldMenu* pClass = static_cast<UIScene_CreateWorldMenu *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -1407,7 +1369,7 @@ int UIScene_CreateWorldMenu::StartGame_SignInReturned(void *pParam,bool bContinu
 		}
 	}
 	else
-	{		
+	{
 		pClass->m_bIgnoreInput = false;
 	}
 	return 0;
@@ -1416,9 +1378,9 @@ int UIScene_CreateWorldMenu::StartGame_SignInReturned(void *pParam,bool bContinu
 
 int UIScene_CreateWorldMenu::ConfirmCreateReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_CreateWorldMenu* pClass = (UIScene_CreateWorldMenu*)pParam;
+	UIScene_CreateWorldMenu* pClass = static_cast<UIScene_CreateWorldMenu *>(pParam);
 
-	if(result==C4JStorage::EMessage_ResultAccept) 
+	if(result==C4JStorage::EMessage_ResultAccept)
 	{
 		bool isClientSide = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && pClass->m_MoreOptionsParams.bOnlineGame;
 
@@ -1463,13 +1425,13 @@ int UIScene_CreateWorldMenu::ConfirmCreateReturned(void *pParam,int iPad,C4JStor
 				ui.RequestAlertMessage( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE, uiIDA,1,ProfileManager.GetPrimaryPad());
 			}
 			else
-			{	
+			{
 #if defined( __ORBIS__) || defined(__PSVITA__)
 				bool isOnlineGame = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad()) && pClass->m_MoreOptionsParams.bOnlineGame;
 				if(isOnlineGame)
 				{
 					bool chatRestricted = false;
-					ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,NULL,NULL);
+					ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,nullptr,nullptr);
 					if(chatRestricted)
 					{
 						ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, ProfileManager.GetPrimaryPad() );
@@ -1493,7 +1455,7 @@ int UIScene_CreateWorldMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStor
     UIScene_CreateWorldMenu* pClass = (UIScene_CreateWorldMenu *)pParam;
 	pClass->m_bIgnoreInput = false;
 
-    if(result==C4JStorage::EMessage_ResultAccept) 
+    if(result==C4JStorage::EMessage_ResultAccept)
     {
         SQRNetworkManager_Orbis::AttemptPSNSignIn(&UIScene_CreateWorldMenu::StartGame_SignInReturned, pClass, false, iPad);
     }
@@ -1505,28 +1467,28 @@ int UIScene_CreateWorldMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStor
 // {
 // 	int32_t iResult;
 // 	UIScene_CreateWorldMenu *pClass = (UIScene_CreateWorldMenu *)pParam;
-// 
+//
 // 	// continue offline, or upsell PS Plus?
-// 	if(result==C4JStorage::EMessage_ResultDecline) 
+// 	if(result==C4JStorage::EMessage_ResultDecline)
 // 	{
 // 		// upsell psplus
 // 		int32_t iResult=sceNpCommerceDialogInitialize();
-// 
+//
 // 		SceNpCommerceDialogParam param;
 // 		sceNpCommerceDialogParamInitialize(&param);
 // 		param.mode=SCE_NP_COMMERCE_DIALOG_MODE_PLUS;
-// 		param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY; 
+// 		param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY;
 // 		param.userId = ProfileManager.getUserID(pClass->m_iPad);
-// 
+//
 // 		iResult=sceNpCommerceDialogOpen(&param);
 // 	}
-// 	else if(result==C4JStorage::EMessage_ResultAccept) 
+// 	else if(result==C4JStorage::EMessage_ResultAccept)
 // 	{
 // 		// continue offline
 // 		pClass->m_MoreOptionsParams.bOnlineGame=false;
 // 		pClass->checkStateAndStartGame();
 // 	}
-// 
+//
 // 	pClass->m_bIgnoreInput=false;
 // 	return 0;
 // }
diff --git a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h
index 13f38a3b..75bfe602 100644
--- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h
@@ -51,11 +51,6 @@ private:
 	DLCPack * m_pDLCPack;
 	bool m_bRebuildTouchBoxes;
 
-#ifdef _WINDOWS64
-	bool m_bDirectEditing;
-	wstring m_worldNameBeforeEdit;
-	int m_iDirectEditCooldown;
-#endif
 
 public:
 	UIScene_CreateWorldMenu(int iPad, void *initData, UILayer *parentLayer);
@@ -83,6 +78,10 @@ protected:
 public:
 	// INPUT
 	virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
+#ifdef _WINDOWS64
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs);
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result);
+#endif
 
 private:
 	void StartSharedLaunchFlow();
diff --git a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
index 0895cdff..ba2cd845 100644
--- a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
@@ -19,9 +19,9 @@ UIScene_CreativeMenu::UIScene_CreativeMenu(int iPad, void *_initData, UILayer *p
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	InventoryScreenInput *initData = (InventoryScreenInput *)_initData;
+	InventoryScreenInput *initData = static_cast<InventoryScreenInput *>(_initData);
 
-	shared_ptr<SimpleContainer> creativeContainer = shared_ptr<SimpleContainer>(new SimpleContainer( 0, L"", false, TabSpec::MAX_SIZE ));
+	shared_ptr<SimpleContainer> creativeContainer = std::make_shared<SimpleContainer>(0, L"", false, TabSpec::MAX_SIZE);
 	itemPickerMenu = new ItemPickerMenu(creativeContainer, initData->player->inventory);
 
 	Initialize( initData->iPad, itemPickerMenu, false, -1, eSectionInventoryCreativeUsing, eSectionInventoryCreativeMax, initData->bNavigateBack);
@@ -42,9 +42,9 @@ UIScene_CreativeMenu::UIScene_CreativeMenu(int iPad, void *_initData, UILayer *p
 	}
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Creative_Inventory_Menu, this);
 	}
@@ -144,7 +144,7 @@ void UIScene_CreativeMenu::handleOtherClicked(int iPad, ESceneSection eSection,
 	case eSectionInventoryCreativeTab_6:
 	case eSectionInventoryCreativeTab_7:
 		{
-			ECreativeInventoryTabs tab = (ECreativeInventoryTabs)((int)eCreativeInventoryTab_BuildingBlocks + (int)eSection - (int)eSectionInventoryCreativeTab_0);
+			ECreativeInventoryTabs tab = static_cast<ECreativeInventoryTabs>((int)eCreativeInventoryTab_BuildingBlocks + (int)eSection - (int)eSectionInventoryCreativeTab_0);
 			if(tab != m_curTab)
 			{
 				switchTab(tab);
@@ -193,8 +193,8 @@ void UIScene_CreativeMenu::handleInput(int iPad, int key, bool repeat, bool pres
 		// Fall through intentional
 	case VK_PAD_RSHOULDER:
 		{		
-			ECreativeInventoryTabs tab = (ECreativeInventoryTabs)(m_curTab + dir);
-			if (tab < 0) tab = (ECreativeInventoryTabs)(eCreativeInventoryTab_COUNT - 1);
+			ECreativeInventoryTabs tab = static_cast<ECreativeInventoryTabs>(m_curTab + dir);
+			if (tab < 0) tab = static_cast<ECreativeInventoryTabs>(eCreativeInventoryTab_COUNT - 1);
 			if (tab >= eCreativeInventoryTab_COUNT) tab = eCreativeInventoryTab_BuildingBlocks;
 			switchTab(tab);
 			ui.PlayUISFX(eSFX_Focus);
@@ -220,7 +220,7 @@ void UIScene_CreativeMenu::updateTabHighlightAndText(ECreativeInventoryTabs tab)
 	IggyDataValue value[1];
 
 	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = (F64)tab;
+	value[0].number = static_cast<F64>(tab);
 
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ) , m_funcSetActiveTab , 1 , value );
 
@@ -400,7 +400,7 @@ void UIScene_CreativeMenu::setSectionSelectedSlot(ESceneSection eSection, int x,
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionInventoryCreativeSelector:
@@ -419,7 +419,7 @@ void UIScene_CreativeMenu::setSectionSelectedSlot(ESceneSection eSection, int x,
 
 UIControl *UIScene_CreativeMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionInventoryCreativeSelector:
@@ -468,10 +468,10 @@ void UIScene_CreativeMenu::updateScrollCurrentPage(int currentPage, int pageCoun
 	IggyDataValue value[2];
 
 	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = (F64)pageCount;
+	value[0].number = static_cast<F64>(pageCount);
 
 	value[1].type = IGGY_DATATYPE_number;
-	value[1].number = (F64)currentPage - 1;
+	value[1].number = static_cast<F64>(currentPage) - 1;
 
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ) , m_funcSetScrollBar , 2 , value );
 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_Credits.cpp b/Minecraft.Client/Common/UI/UIScene_Credits.cpp
index 75ddf92f..9900169c 100644
--- a/Minecraft.Client/Common/UI/UIScene_Credits.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_Credits.cpp
@@ -593,11 +593,11 @@ void UIScene_Credits::tick()
 		}
 
 		// Set up the new text element.
-		if(pDef->m_Text!=NULL) // 4J-PB - think the RAD logo ones aren't set up yet and are coming is as null
+		if(pDef->m_Text!=nullptr) // 4J-PB - think the RAD logo ones aren't set up yet and are coming is as null
 		{
 			if ( pDef->m_iStringID[0] == CREDIT_ICON )
 			{
-				addImage((ECreditIcons)pDef->m_iStringID[1]);
+				addImage(static_cast<ECreditIcons>(pDef->m_iStringID[1]));
 			}			
 			else // using additional translated string.
 			{
@@ -670,7 +670,7 @@ void UIScene_Credits::setNextLabel(const wstring &label, ECreditTextTypes size)
 	value[0].string16 = stringVal;
 
 	value[1].type = IGGY_DATATYPE_number;
-	value[1].number = (int)size;
+	value[1].number = static_cast<int>(size);
 
 	value[2].type = IGGY_DATATYPE_boolean;
 	value[2].boolval = (m_iCurrDefIndex == (m_iNumTextDefs - 1));
@@ -684,7 +684,7 @@ void UIScene_Credits::addImage(ECreditIcons icon)
 	IggyDataValue value[2];
 
 	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = (int)icon;
+	value[0].number = static_cast<int>(icon);
 
 	value[1].type = IGGY_DATATYPE_boolean;
 	value[1].boolval = (m_iCurrDefIndex == (m_iNumTextDefs - 1));
diff --git a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
index 77ffdffd..6d705765 100644
--- a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
@@ -121,11 +121,11 @@ void UIScene_DLCMainMenu::handleInput(int iPad, int key, bool repeat, bool press
 
 void UIScene_DLCMainMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_OffersList:
 		{
-			int iIndex = (int)childId;
+			int iIndex = static_cast<int>(childId);
 			DLCOffersParam *param = new DLCOffersParam();
 			param->iPad = m_iPad;
 
@@ -134,7 +134,7 @@ void UIScene_DLCMainMenu::handlePress(F64 controlId, F64 childId)
 
 			// Xbox One will have requested the marketplace content - there is only that type
 #ifndef _XBOX_ONE
-			app.AddDLCRequest((eDLCMarketplaceType)iIndex, true);
+			app.AddDLCRequest(static_cast<eDLCMarketplaceType>(iIndex), true);
 #endif
 			killTimer(PLAYER_ONLINE_TIMER_ID);
 			ui.NavigateToScene(m_iPad, eUIScene_DLCOffersMenu, param);
@@ -166,7 +166,7 @@ void UIScene_DLCMainMenu::handleTimerComplete(int id)
 
 int UIScene_DLCMainMenu::ExitDLCMainMenu(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_DLCMainMenu* pClass = (UIScene_DLCMainMenu*)pParam;
+	UIScene_DLCMainMenu* pClass = static_cast<UIScene_DLCMainMenu *>(pParam);
 
 #if defined __ORBIS__ || defined __PSVITA__
 	app.GetCommerce()->HidePsStoreIcon();
diff --git a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
index c109ed62..5e644803 100644
--- a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
@@ -16,12 +16,12 @@
 UIScene_DLCOffersMenu::UIScene_DLCOffersMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
 	m_bProductInfoShown=false;
-	DLCOffersParam *param=(DLCOffersParam *)initData;
+	DLCOffersParam *param=static_cast<DLCOffersParam *>(initData);
 	m_iProductInfoIndex=param->iType;
 	m_iCurrentDLC=0;
 	m_iTotalDLC=0;
 #if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
-	m_pvProductInfo=NULL;
+	m_pvProductInfo=nullptr;
 #endif
 	m_bAddAllDLCButtons=true;
 
@@ -51,7 +51,7 @@ UIScene_DLCOffersMenu::UIScene_DLCOffersMenu(int iPad, void *initData, UILayer *
 	}
 
 #ifdef _DURANGO
-	m_pNoImageFor_DLC = NULL;
+	m_pNoImageFor_DLC = nullptr;
 	// If we don't yet have this DLC, we need to display a timer
 	m_bDLCRequiredIsRetrieved=false;
 	m_bIgnorePress=true;
@@ -103,7 +103,7 @@ void UIScene_DLCOffersMenu::handleTimerComplete(int id)
 
 int UIScene_DLCOffersMenu::ExitDLCOffersMenu(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_DLCOffersMenu* pClass = (UIScene_DLCOffersMenu*)pParam;
+	UIScene_DLCOffersMenu* pClass = static_cast<UIScene_DLCOffersMenu *>(pParam);
 
 #if defined __ORBIS__ || defined __PSVITA__
 	app.GetCommerce()->HidePsStoreIcon();
@@ -217,7 +217,7 @@ void UIScene_DLCOffersMenu::handleInput(int iPad, int key, bool repeat, bool pre
 
 void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_OffersList:
 		{
@@ -261,13 +261,13 @@ void UIScene_DLCOffersMenu::handlePress(F64 controlId, F64 childId)
 #endif // __PS3__
 #elif defined _XBOX_ONE
 			int iIndex = (int)childId;
-			StorageManager.InstallOffer(1,StorageManager.GetOffer(iIndex).wszProductID,NULL,NULL);
+			StorageManager.InstallOffer(1,StorageManager.GetOffer(iIndex).wszProductID,nullptr,nullptr);
 #else
-			int iIndex = (int)childId;
+			int iIndex = static_cast<int>(childId);
 
 			ULONGLONG ullIndexA[1];
 			ullIndexA[0]=StorageManager.GetOffer(iIndex).qwOfferID;
-			StorageManager.InstallOffer(1,ullIndexA,NULL,NULL);
+			StorageManager.InstallOffer(1,ullIndexA,nullptr,nullptr);
 #endif
 		}
 		break;
@@ -343,10 +343,10 @@ void UIScene_DLCOffersMenu::tick()
 		{
 			m_bAddAllDLCButtons=false;
 			// add the categories to the list box
-			if(m_pvProductInfo==NULL)
+			if(m_pvProductInfo==nullptr)
 			{
 				m_pvProductInfo=app.GetProductList(m_iProductInfoIndex);
-				if(m_pvProductInfo==NULL)
+				if(m_pvProductInfo==nullptr)
 				{
 					m_iTotalDLC=0;
 					// need to display text to say no downloadable content available yet
@@ -690,7 +690,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 			// Check that this is in the list of known DLC
 			DLC_INFO *pDLC=app.GetDLCInfoForFullOfferID(xOffer.wszProductID);
 
-			if(pDLC!=NULL)
+			if(pDLC!=nullptr)
 			{
 				OrderA[uiDLCCount].uiContentIndex=i;
 				OrderA[uiDLCCount++].uiSortIndex=pDLC->uiSortIndex;
@@ -710,7 +710,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 			// Check that this is in the list of known DLC
 			DLC_INFO *pDLC=app.GetDLCInfoForFullOfferID(xOffer.wszProductID);
 
-			if(pDLC==NULL)
+			if(pDLC==nullptr)
 			{
 				// skip this one
 				app.DebugPrintf("Unknown offer - %ls\n",xOffer.wszOfferName);
@@ -736,7 +736,7 @@ void UIScene_DLCOffersMenu::GetDLCInfo( int iOfferC, bool bUpdateOnly )
 				// find the DLC in the installed packages
 				XCONTENT_DATA *pContentData=StorageManager.GetInstalledDLC(xOffer.wszProductID);
 
-				if(pContentData!=NULL)
+				if(pContentData!=nullptr)
 				{
 					m_buttonListOffers.addItem(wstrTemp,!pContentData->bTrialLicense,OrderA[i].uiContentIndex);
 				}
@@ -809,7 +809,7 @@ bool UIScene_DLCOffersMenu::UpdateDisplay(MARKETPLACE_CONTENTOFFER_INFO& xOffer)
 	DLC_INFO *dlc = app.GetDLCInfoForFullOfferID(xOffer.wszOfferName);
 #endif
 
-	if (dlc != NULL)
+	if (dlc != nullptr)
 	{
 		WCHAR *cString = dlc->wchBanner;
 
@@ -844,7 +844,7 @@ bool UIScene_DLCOffersMenu::UpdateDisplay(MARKETPLACE_CONTENTOFFER_INFO& xOffer)
 			{
 				if(hasRegisteredSubstitutionTexture(cString)==false)
 				{
-					BYTE *pData=NULL;
+					BYTE *pData=nullptr;
 					DWORD dwSize=0;
 					app.GetMemFileDetails(cString,&pData,&dwSize);
 					// set the image
diff --git a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
index 8f0f4c11..a4dbe8a8 100644
--- a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
@@ -18,9 +18,9 @@ UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLa
 	m_bIgnoreInput = false;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft != NULL && pMinecraft->localgameModes[iPad] != NULL )
+	if(pMinecraft != nullptr && pMinecraft->localgameModes[iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[iPad]);
 
 		// This just allows it to be shown
 		gameMode->getTutorial()->showTutorialPopup(false);
@@ -30,9 +30,9 @@ UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLa
 UIScene_DeathMenu::~UIScene_DeathMenu()
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft != NULL && pMinecraft->localgameModes[m_iPad] != NULL )
+	if(pMinecraft != nullptr && pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
 
 		// This just allows it to be shown
 		gameMode->getTutorial()->showTutorialPopup(true);
@@ -81,7 +81,7 @@ void UIScene_DeathMenu::handleInput(int iPad, int key, bool repeat, bool pressed
 
 void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Respawn:
 		m_bIgnoreInput = true;
@@ -104,9 +104,9 @@ void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId)
 				{
 					UINT uiIDA[3];
 					int playTime = -1;
-					if( pMinecraft->localplayers[m_iPad] != NULL )
+					if( pMinecraft->localplayers[m_iPad] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[m_iPad]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[m_iPad]->getSessionTimer());
 					}
 					TelemetryManager->RecordLevelExit(m_iPad, eSen_LevelExitStatus_Failed);
 					
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
index 2a8ac9f8..d698b51f 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
@@ -41,8 +41,72 @@ wstring UIScene_DebugCreateSchematic::getMoviePath()
 	return L"DebugCreateSchematic";
 }
 
+UIControl_TextInput* UIScene_DebugCreateSchematic::getTextInputForControl(eControls ctrl)
+{
+	switch (ctrl)
+	{
+	case eControl_Name:   return &m_textInputName;
+	case eControl_StartX: return &m_textInputStartX;
+	case eControl_StartY: return &m_textInputStartY;
+	case eControl_StartZ: return &m_textInputStartZ;
+	case eControl_EndX:   return &m_textInputEndX;
+	case eControl_EndY:   return &m_textInputEndY;
+	case eControl_EndZ:   return &m_textInputEndZ;
+	default: return NULL;
+	}
+}
+
+#ifdef _WINDOWS64
+void UIScene_DebugCreateSchematic::getDirectEditInputs(vector<UIControl_TextInput*> &inputs)
+{
+	inputs.push_back(&m_textInputName);
+	inputs.push_back(&m_textInputStartX);
+	inputs.push_back(&m_textInputStartY);
+	inputs.push_back(&m_textInputStartZ);
+	inputs.push_back(&m_textInputEndX);
+	inputs.push_back(&m_textInputEndY);
+	inputs.push_back(&m_textInputEndZ);
+}
+
+void UIScene_DebugCreateSchematic::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
+{
+	wstring value = input->getEditBuffer();
+	int iVal = 0;
+	if (!value.empty())
+		iVal = _fromString<int>(value);
+
+	if (input == &m_textInputName)
+	{
+		if (!value.empty())
+			swprintf(m_data->name, 64, L"%ls", value.c_str());
+		else
+			swprintf(m_data->name, 64, L"schematic");
+	}
+	else if (input == &m_textInputStartX) m_data->startX = iVal;
+	else if (input == &m_textInputStartY) m_data->startY = iVal;
+	else if (input == &m_textInputStartZ) m_data->startZ = iVal;
+	else if (input == &m_textInputEndX)   m_data->endX = iVal;
+	else if (input == &m_textInputEndY)   m_data->endY = iVal;
+	else if (input == &m_textInputEndZ)   m_data->endZ = iVal;
+}
+
+bool UIScene_DebugCreateSchematic::handleMouseClick(F32 x, F32 y)
+{
+	UIScene::handleMouseClick(x, y);
+	return true; // always consume to prevent Iggy re-entry on empty space
+}
+#endif
+
+void UIScene_DebugCreateSchematic::tick()
+{
+	UIScene::tick();
+}
+
 void UIScene_DebugCreateSchematic::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) return;
+#endif
 	ui.AnimateKeyPress(iPad, key, repeat, pressed, released);
 
 	switch(key)
@@ -67,60 +131,97 @@ void UIScene_DebugCreateSchematic::handleInput(int iPad, int key, bool repeat, b
 
 void UIScene_DebugCreateSchematic::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
-	{
-	case eControl_Create:
-		{
-			// We want the start to be even
-			if(m_data->startX > 0 && m_data->startX%2 != 0)
-				m_data->startX-=1;
-			else if(m_data->startX < 0 && m_data->startX%2 !=0)
-				m_data->startX-=1;
-			if(m_data->startY < 0) m_data->startY = 0;
-			else if(m_data->startY > 0 && m_data->startY%2 != 0)
-				m_data->startY-=1;
-			if(m_data->startZ > 0 && m_data->startZ%2 != 0)
-				m_data->startZ-=1;
-			else if(m_data->startZ < 0 && m_data->startZ%2 !=0)
-				m_data->startZ-=1;
-
-			// We want the end to be odd to have a total size that is even
-			if(m_data->endX > 0 && m_data->endX%2 == 0)
-				m_data->endX+=1;
-			else if(m_data->endX < 0 && m_data->endX%2 ==0)
-				m_data->endX+=1;
-			if(m_data->endY > Level::maxBuildHeight)
-				m_data->endY = Level::maxBuildHeight;
-			else if(m_data->endY > 0 && m_data->endY%2 == 0)
-				m_data->endY+=1;
-			else if(m_data->endY < 0 && m_data->endY%2 ==0)
-				m_data->endY+=1;
-			if(m_data->endZ > 0 && m_data->endZ%2 == 0)
-				m_data->endZ+=1;
-			else if(m_data->endZ < 0 && m_data->endZ%2 ==0)
-				m_data->endZ+=1;
-
-			app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), eXuiServerAction_ExportSchematic, (void *)m_data);
+#ifdef _WINDOWS64
+    if (isDirectEditBlocking())
+        return;
+#endif
 
-			navigateBack();
-		}
-		break;
-	case eControl_Name:
-	case eControl_StartX:
-	case eControl_StartY:
-	case eControl_StartZ:
-	case eControl_EndX:
-	case eControl_EndY:
-	case eControl_EndZ:
-		m_keyboardCallbackControl = (eControls)((int)controlId);	
-		InputManager.RequestKeyboard(L"Enter something",L"",(DWORD)0,25,&UIScene_DebugCreateSchematic::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Default);
-		break;
-	};
+    switch (static_cast<int>(controlId))
+    {
+    case eControl_Create:
+        {
+            // We want the start to be even
+            if (m_data->startX > 0 && m_data->startX % 2 != 0)
+                m_data->startX -= 1;
+            else if (m_data->startX < 0 && m_data->startX % 2 != 0)
+                m_data->startX -= 1;
+
+            if (m_data->startY < 0)
+                m_data->startY = 0;
+            else if (m_data->startY > 0 && m_data->startY % 2 != 0)
+                m_data->startY -= 1;
+
+            if (m_data->startZ > 0 && m_data->startZ % 2 != 0)
+                m_data->startZ -= 1;
+            else if (m_data->startZ < 0 && m_data->startZ % 2 != 0)
+                m_data->startZ -= 1;
+
+            // We want the end to be odd to have a total size that is even
+            if (m_data->endX > 0 && m_data->endX % 2 == 0)
+                m_data->endX += 1;
+            else if (m_data->endX < 0 && m_data->endX % 2 == 0)
+                m_data->endX += 1;
+
+            if (m_data->endY > Level::maxBuildHeight)
+                m_data->endY = Level::maxBuildHeight;
+            else if (m_data->endY > 0 && m_data->endY % 2 == 0)
+                m_data->endY += 1;
+            else if (m_data->endY < 0 && m_data->endY % 2 == 0)
+                m_data->endY += 1;
+
+            if (m_data->endZ > 0 && m_data->endZ % 2 == 0)
+                m_data->endZ += 1;
+            else if (m_data->endZ < 0 && m_data->endZ % 2 == 0)
+                m_data->endZ += 1;
+
+            app.SetXuiServerAction(ProfileManager.GetPrimaryPad(), eXuiServerAction_ExportSchematic, static_cast<void*>(m_data));
+            navigateBack();
+        }
+        break;
+
+    case eControl_Name:
+    case eControl_StartX:
+    case eControl_StartY:
+    case eControl_StartZ:
+    case eControl_EndX:
+    case eControl_EndY:
+    case eControl_EndZ:
+        {
+            m_keyboardCallbackControl = static_cast<eControls>(static_cast<int>(controlId));
+#ifdef _WINDOWS64
+            if (g_KBMInput.IsKBMActive())
+            {
+                UIControl_TextInput* input = getTextInputForControl(m_keyboardCallbackControl);
+                if (input) input->beginDirectEdit(25);
+            }
+            else
+            {
+                UIKeyboardInitData kbData;
+                kbData.title       = L"Enter something";
+                kbData.defaultText = L"";
+                kbData.maxChars    = 25;
+                kbData.callback    = &UIScene_DebugCreateSchematic::KeyboardCompleteCallback;
+                kbData.lpParam     = this;
+                ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData, eUILayer_Fullscreen, eUIGroup_Fullscreen);
+            }
+#else
+            InputManager.RequestKeyboard(
+                L"Enter something",
+                L"",
+                static_cast<DWORD>(0),
+                25,
+                &UIScene_DebugCreateSchematic::KeyboardCompleteCallback,
+                this,
+                C_4JInput::EKeyboardMode_Default);
+#endif
+        }
+        break;
+    }
 }
 
 void UIScene_DebugCreateSchematic::handleCheckboxToggled(F64 controlId, bool selected)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_SaveMobs:
 		m_data->bSaveMobs = selected;
@@ -136,11 +237,17 @@ void UIScene_DebugCreateSchematic::handleCheckboxToggled(F64 controlId, bool sel
 
 int UIScene_DebugCreateSchematic::KeyboardCompleteCallback(LPVOID lpParam,bool bRes)
 {
-	UIScene_DebugCreateSchematic *pClass=(UIScene_DebugCreateSchematic *)lpParam;
+	UIScene_DebugCreateSchematic *pClass=static_cast<UIScene_DebugCreateSchematic *>(lpParam);
 
+#ifdef _WINDOWS64
+	uint16_t pchText[128];
+	ZeroMemory(pchText, 128 * sizeof(uint16_t));
+	Win64_GetKeyboardText(pchText, 128);
+#else
 	uint16_t pchText[128];
 	ZeroMemory(pchText, 128 * sizeof(uint16_t) );
 	InputManager.GetText(pchText);
+#endif
 
 	if(pchText[0]!=0)
 	{
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
index cbfe785d..e18d9f5d 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
+++ b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
@@ -24,6 +24,7 @@ private:
 
 	ConsoleSchematicFile::XboxSchematicInitParam *m_data;
 
+
 public:
 	UIScene_DebugCreateSchematic(int iPad, void *initData, UILayer *parentLayer);
 
@@ -58,8 +59,14 @@ protected:
 	UI_END_MAP_ELEMENTS_AND_NAMES()
 
 	virtual wstring getMoviePath();
+#ifdef _WINDOWS64
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs);
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result);
+	virtual bool handleMouseClick(F32 x, F32 y);
+#endif
 
 public:
+	virtual void tick();
 	// INPUT
 	virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
 
@@ -68,6 +75,7 @@ protected:
 	virtual void handleCheckboxToggled(F64 controlId, bool selected);
 
 private:
+	UIControl_TextInput* getTextInputForControl(eControls ctrl);
 	static int KeyboardCompleteCallback(LPVOID lpParam,const bool bRes);
 };
 #endif
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp b/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
index af86d4b8..c997fb31 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
@@ -21,14 +21,16 @@ UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void *initData, UILayer *pa
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	Minecraft *pMinecraft = Minecraft::GetInstance();
-	WCHAR TempString[256];
-	swprintf( (WCHAR *)TempString, 256, L"Set fov (%d)", (int)pMinecraft->gameRenderer->GetFovVal());
-	m_sliderFov.init(TempString,eControl_FOV,0,100,(int)pMinecraft->gameRenderer->GetFovVal());
+	const Minecraft *pMinecraft = Minecraft::GetInstance();
+	WCHAR tempString[256];
+	const int fovSliderVal = app.GetGameSettings(m_iPad, eGameSetting_FOV);
+	const int fovDeg = 70 + fovSliderVal * 40 / 100;
+	swprintf( tempString, 256, L"Set fov (%d)", fovDeg);
+	m_sliderFov.init(tempString,eControl_FOV,0,100,fovSliderVal);
 
-	float currentTime = pMinecraft->level->getLevelData()->getGameTime() % 24000;
-	swprintf( (WCHAR *)TempString, 256, L"Set time (unsafe) (%d)", (int)currentTime);
-	m_sliderTime.init(TempString,eControl_Time,0,240,currentTime/100);
+	const float currentTime = pMinecraft->level->getLevelData()->getGameTime() % 24000;
+	swprintf( tempString, 256, L"Set time (unsafe) (%d)", static_cast<int>(currentTime));
+	m_sliderTime.init(tempString,eControl_Time,0,240,currentTime/100);
 
 	m_buttonRain.init(L"Toggle Rain",eControl_Rain);
 	m_buttonThunder.init(L"Toggle Thunder",eControl_Thunder);
@@ -44,7 +46,7 @@ UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void *initData, UILayer *pa
     std::vector<std::pair<std::wstring, unsigned int>> sortedItems;
     for (size_t i = 0; i < Item::items.length; ++i)
     {
-        if (Item::items[i] != NULL)
+        if (Item::items[i] != nullptr)
         {
 			sortedItems.emplace_back(std::wstring(app.GetString(Item::items[i]->getDescriptionId())), i);
         }
@@ -136,19 +138,19 @@ wstring UIScene_DebugOverlay::getMoviePath()
 
 void UIScene_DebugOverlay::customDraw(IggyCustomDrawCallbackRegion *region)
 {
-	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	const Minecraft *pMinecraft = Minecraft::GetInstance();
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	int itemId = -1;
-	swscanf((wchar_t*)region->name,L"item_%d",&itemId);
-	if (itemId == -1 || itemId > Item::ITEM_NUM_COUNT || Item::items[itemId] == NULL)
+	swscanf(static_cast<wchar_t *>(region->name),L"item_%d",&itemId);
+	if (itemId == -1 || itemId > Item::ITEM_NUM_COUNT || Item::items[itemId] == nullptr)
 	{
 		app.DebugPrintf("This is not the control we are looking for\n");
 	}
 	else
 	{
-		shared_ptr<ItemInstance> item = shared_ptr<ItemInstance>( new ItemInstance(itemId,1,0) );
-		if(item != NULL) customDrawSlotControl(region,m_iPad,item,1.0f,false,false);
+		const auto item = std::make_shared<ItemInstance>(itemId, 1, 0);
+		if(item != nullptr) customDrawSlotControl(region,m_iPad,item,1.0f,false,false);
 	}
 }
 
@@ -181,7 +183,7 @@ void UIScene_DebugOverlay::handleInput(int iPad, int key, bool repeat, bool pres
 
 void UIScene_DebugOverlay::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Items:
 		{
@@ -211,14 +213,14 @@ void UIScene_DebugOverlay::handlePress(F64 controlId, F64 childId)
 	case eControl_Schematic:
 		{
 #ifndef _CONTENT_PACKAGE
-			ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_DebugCreateSchematic,NULL,eUILayer_Debug);
+			ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_DebugCreateSchematic,nullptr,eUILayer_Debug);
 #endif
 		}
 		break;
 	case eControl_SetCamera:
 		{
 #ifndef _CONTENT_PACKAGE
-			ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_DebugSetCamera,NULL,eUILayer_Debug);
+			ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_DebugSetCamera,nullptr,eUILayer_Debug);
 #endif
 		}
 		break;
@@ -252,7 +254,7 @@ void UIScene_DebugOverlay::handlePress(F64 controlId, F64 childId)
 
 void UIScene_DebugOverlay::handleSliderMove(F64 sliderId, F64 currentValue)
 {
-	switch((int)sliderId)
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_Time:
 		{
@@ -264,20 +266,25 @@ void UIScene_DebugOverlay::handleSliderMove(F64 sliderId, F64 currentValue)
 			MinecraftServer::SetTime(currentValue * 100);
 			pMinecraft->level->getLevelData()->setGameTime(currentValue * 100);
 
-			WCHAR TempString[256];
+			WCHAR tempString[256];
 			float currentTime = currentValue * 100;
-			swprintf( (WCHAR *)TempString, 256, L"Set time (unsafe) (%d)", (int)currentTime);
-			m_sliderTime.setLabel(TempString);
+			swprintf( tempString, 256, L"Set time (unsafe) (%d)", static_cast<int>(currentTime));
+			m_sliderTime.setLabel(tempString);
 		}
 		break;
 	case eControl_FOV:
 		{
 			Minecraft *pMinecraft = Minecraft::GetInstance();
-			pMinecraft->gameRenderer->SetFovVal((float)currentValue);
+			int v = static_cast<int>(currentValue);
+			if (v < 0) v = 0;
+			if (v > 100) v = 100;
+			int fovDeg = 70 + v * 40 / 100;
+			pMinecraft->gameRenderer->SetFovVal(static_cast<float>(fovDeg));
+			app.SetGameSettings(m_iPad, eGameSetting_FOV, v);
 
-			WCHAR TempString[256];
-			swprintf( (WCHAR *)TempString, 256, L"Set fov (%d)", (int)currentValue);
-			m_sliderFov.setLabel(TempString);
+			WCHAR tempString[256];
+			swprintf( tempString, 256, L"Set fov (%d)", fovDeg);
+			m_sliderFov.setLabel(tempString);
 		}
 		break;
 	};
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
index dd5a429f..51eab5aa 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
@@ -17,7 +17,7 @@ UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void *initData, UILayer
 	currentPosition->player = playerNo;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if (pMinecraft != NULL)
+	if (pMinecraft != nullptr)
 	{
 		Vec3 *vec = pMinecraft->localplayers[playerNo]->getPos(1.0);
 
@@ -31,19 +31,19 @@ UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void *initData, UILayer
 
 	WCHAR TempString[256];
 
-	swprintf( (WCHAR *)TempString, 256, L"%f", currentPosition->m_camX);
+	swprintf( (WCHAR *)TempString, 256, L"%.2f", currentPosition->m_camX);
 	m_textInputX.init(TempString, eControl_CamX);
 
-	swprintf( (WCHAR *)TempString, 256, L"%f", currentPosition->m_camY);
+	swprintf( (WCHAR *)TempString, 256, L"%.2f", currentPosition->m_camY);
 	m_textInputY.init(TempString, eControl_CamY);
 
-	swprintf( (WCHAR *)TempString, 256, L"%f", currentPosition->m_camZ);
+	swprintf( (WCHAR *)TempString, 256, L"%.2f", currentPosition->m_camZ);
 	m_textInputZ.init(TempString, eControl_CamZ);
 
-	swprintf( (WCHAR *)TempString, 256, L"%f", currentPosition->m_yRot);
+	swprintf( (WCHAR *)TempString, 256, L"%.2f", currentPosition->m_yRot);
 	m_textInputYRot.init(TempString, eControl_YRot);
 
-	swprintf( (WCHAR *)TempString, 256, L"%f", currentPosition->m_elev);
+	swprintf( (WCHAR *)TempString, 256, L"%.2f", currentPosition->m_elev);
 	m_textInputElevation.init(TempString, eControl_Elevation);
 
 	m_checkboxLockPlayer.init(L"Lock Player", eControl_LockPlayer, app.GetFreezePlayers());
@@ -55,6 +55,7 @@ UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void *initData, UILayer
 	m_labelCamY.init(L"CamY");
 	m_labelCamZ.init(L"CamZ");
 	m_labelYRotElev.init(L"Y-Rot & Elevation (Degs)");
+
 }
 
 wstring UIScene_DebugSetCamera::getMoviePath()
@@ -62,8 +63,59 @@ wstring UIScene_DebugSetCamera::getMoviePath()
 	return L"DebugSetCamera";
 }
 
+#ifdef _WINDOWS64
+UIControl_TextInput* UIScene_DebugSetCamera::getTextInputForControl(eControls ctrl)
+{
+	switch (ctrl)
+	{
+	case eControl_CamX:      return &m_textInputX;
+	case eControl_CamY:      return &m_textInputY;
+	case eControl_CamZ:      return &m_textInputZ;
+	case eControl_YRot:      return &m_textInputYRot;
+	case eControl_Elevation: return &m_textInputElevation;
+	default: return NULL;
+	}
+}
+
+void UIScene_DebugSetCamera::getDirectEditInputs(vector<UIControl_TextInput*> &inputs)
+{
+	inputs.push_back(&m_textInputX);
+	inputs.push_back(&m_textInputY);
+	inputs.push_back(&m_textInputZ);
+	inputs.push_back(&m_textInputYRot);
+	inputs.push_back(&m_textInputElevation);
+}
+
+void UIScene_DebugSetCamera::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
+{
+	wstring value = input->getEditBuffer();
+	double val = 0;
+	if (!value.empty()) val = _fromString<double>(value);
+
+	if (input == &m_textInputX)           currentPosition->m_camX = val;
+	else if (input == &m_textInputY)      currentPosition->m_camY = val;
+	else if (input == &m_textInputZ)      currentPosition->m_camZ = val;
+	else if (input == &m_textInputYRot)   currentPosition->m_yRot = val;
+	else if (input == &m_textInputElevation) currentPosition->m_elev = val;
+}
+
+bool UIScene_DebugSetCamera::handleMouseClick(F32 x, F32 y)
+{
+	UIScene::handleMouseClick(x, y);
+	return true; // always consume to prevent Iggy re-entry on empty space
+}
+#endif
+
+void UIScene_DebugSetCamera::tick()
+{
+	UIScene::tick();
+}
+
 void UIScene_DebugSetCamera::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) { handled = true; return; }
+#endif
 	ui.AnimateKeyPress(iPad, key, repeat, pressed, released);
 
 	switch(key)
@@ -88,11 +140,14 @@ void UIScene_DebugSetCamera::handleInput(int iPad, int key, bool repeat, bool pr
 
 void UIScene_DebugSetCamera::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) return;
+#endif
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Teleport:
 		app.SetXuiServerAction(	ProfileManager.GetPrimaryPad(),
-			eXuiServerAction_SetCameraLocation, 
+			eXuiServerAction_SetCameraLocation,
 			(void *)currentPosition);
 		break;
 	case eControl_CamX:
@@ -100,15 +155,34 @@ void UIScene_DebugSetCamera::handlePress(F64 controlId, F64 childId)
 	case eControl_CamZ:
 	case eControl_YRot:
 	case eControl_Elevation:
-		m_keyboardCallbackControl = (eControls)((int)controlId);	
+		m_keyboardCallbackControl = static_cast<eControls>(static_cast<int>(controlId));
+#ifdef _WINDOWS64
+		if (g_KBMInput.IsKBMActive())
+		{
+			UIControl_TextInput* input = getTextInputForControl(m_keyboardCallbackControl);
+			if (input) input->beginDirectEdit(25);
+		}
+		else
+		{
+			UIKeyboardInitData kbData;
+			kbData.title       = L"Enter value";
+			kbData.defaultText = L"";
+			kbData.maxChars    = 25;
+			kbData.callback    = &UIScene_DebugSetCamera::KeyboardCompleteCallback;
+			kbData.lpParam     = this;
+			ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData, eUILayer_Fullscreen, eUIGroup_Fullscreen);
+		}
+#else
+>>>>>>> origin/main
 		InputManager.RequestKeyboard(L"Enter something",L"",(DWORD)0,25,&UIScene_DebugSetCamera::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Default);
+#endif
 		break;
 	};
 }
 
 void UIScene_DebugSetCamera::handleCheckboxToggled(F64 controlId, bool selected)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_LockPlayer:
 		app.SetFreezePlayers(selected);
@@ -118,14 +192,19 @@ void UIScene_DebugSetCamera::handleCheckboxToggled(F64 controlId, bool selected)
 
 int UIScene_DebugSetCamera::KeyboardCompleteCallback(LPVOID lpParam,bool bRes)
 {
-	UIScene_DebugSetCamera *pClass=(UIScene_DebugSetCamera *)lpParam;
-	uint16_t pchText[2048];//[128];
-	ZeroMemory(pchText, 2048/*128*/ * sizeof(uint16_t) );
+	UIScene_DebugSetCamera *pClass=static_cast<UIScene_DebugSetCamera *>(lpParam);
+	uint16_t pchText[2048];
+	ZeroMemory(pchText, 2048 * sizeof(uint16_t));
+#ifdef _WINDOWS64
+	Win64_GetKeyboardText(pchText, 2048);
+#else
+>>>>>>> origin/main
 	InputManager.GetText(pchText);
+#endif
 
 	if(pchText[0]!=0)
 	{
-		wstring value = (wchar_t *)pchText;
+		wstring value = reinterpret_cast<wchar_t*>(pchText);
 		double val = 0; 
 		if(!value.empty()) val = _fromString<double>( value );
 		switch(pClass->m_keyboardCallbackControl)
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.h b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.h
index 38db1258..d758e049 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.h
+++ b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.h
@@ -26,6 +26,9 @@ private:
 	FreezePlayerParam *fpp;
 
 	eControls m_keyboardCallbackControl;
+#ifdef _WINDOWS64
+	UIControl_TextInput* getTextInputForControl(eControls ctrl);
+#endif
 
 public:
 	UIScene_DebugSetCamera(int iPad, void *initData, UILayer *parentLayer);
@@ -54,6 +57,12 @@ protected:
 	UI_END_MAP_ELEMENTS_AND_NAMES()
 
 	virtual wstring getMoviePath();
+	virtual void tick();
+#ifdef _WINDOWS64
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs);
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result);
+	virtual bool handleMouseClick(F32 x, F32 y);
+#endif
 
 public:
 	// INPUT
diff --git a/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
index 97cf842a..2e47dda4 100644
--- a/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
@@ -10,14 +10,14 @@ UIScene_DispenserMenu::UIScene_DispenserMenu(int iPad, void *_initData, UILayer
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	TrapScreenInput *initData = (TrapScreenInput *)_initData;
+	TrapScreenInput *initData = static_cast<TrapScreenInput *>(_initData);
 
 	m_labelDispenser.init(initData->trap->getName());
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Trap_Menu, this);
 	}
@@ -156,7 +156,7 @@ void UIScene_DispenserMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionTrapTrap:
@@ -177,7 +177,7 @@ void UIScene_DispenserMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 UIControl *UIScene_DispenserMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionTrapTrap:
diff --git a/Minecraft.Client/Common/UI/UIScene_EULA.cpp b/Minecraft.Client/Common/UI/UIScene_EULA.cpp
index 3177344d..41195621 100644
--- a/Minecraft.Client/Common/UI/UIScene_EULA.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EULA.cpp
@@ -48,8 +48,8 @@ UIScene_EULA::UIScene_EULA(int iPad, void *initData, UILayer *parentLayer) : UIS
 #endif
 
 	vector<wstring> paragraphs;
-	int lastIndex = 0;
-	for (	int index = EULA.find(L"\r\n", lastIndex, 2);
+	size_t lastIndex = 0;
+	for (	size_t index = EULA.find(L"\r\n", lastIndex, 2);
 			index != wstring::npos; 
 			index = EULA.find(L"\r\n", lastIndex, 2)
 		)
@@ -132,7 +132,7 @@ void UIScene_EULA::handleInput(int iPad, int key, bool repeat, bool pressed, boo
 
 void UIScene_EULA::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Confirm:
 		//CD - Added for audio
diff --git a/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
index 27459ccc..f90c4b12 100644
--- a/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
@@ -14,14 +14,14 @@ UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void *_initData, UILaye
 	m_enchantButton[1].init(1);
 	m_enchantButton[2].init(2);
 
-	EnchantingScreenInput *initData = (EnchantingScreenInput *)_initData;
+	EnchantingScreenInput *initData = static_cast<EnchantingScreenInput *>(_initData);
 	
 	m_labelEnchant.init( initData->name.empty() ? app.GetString(IDS_ENCHANT) : initData->name );
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Enchanting_Menu, this);
 	}
@@ -194,7 +194,7 @@ void UIScene_EnchantingMenu::setSectionSelectedSlot(ESceneSection eSection, int
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionEnchantSlot:
@@ -216,7 +216,7 @@ void UIScene_EnchantingMenu::setSectionSelectedSlot(ESceneSection eSection, int
 
 UIControl *UIScene_EnchantingMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionEnchantSlot:
@@ -247,7 +247,7 @@ UIControl *UIScene_EnchantingMenu::getSection(ESceneSection eSection)
 void UIScene_EnchantingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 	
 
 	if(wcscmp((wchar_t *)region->name,L"EnchantmentBook")==0)
@@ -264,7 +264,7 @@ void UIScene_EnchantingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 	else
 	{
 		int slotId = -1;
-		swscanf((wchar_t*)region->name,L"slot_Button%d",&slotId);
+		swscanf(static_cast<wchar_t *>(region->name),L"slot_Button%d",&slotId);
 		if(slotId >= 0)
 		{
 			// Setup GDraw, normal game render states and matrices
diff --git a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
index 2f43cada..5b10e8cf 100644
--- a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
@@ -50,7 +50,7 @@ UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer)
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 	wstring playerName = L"";
-	if(pMinecraft->localplayers[ui.GetWinUserIndex()] != NULL)
+	if(pMinecraft->localplayers[ui.GetWinUserIndex()] != nullptr)
 	{
 		playerName = escapeXML( pMinecraft->localplayers[ui.GetWinUserIndex()]->getDisplayName() );
 	}
@@ -159,14 +159,14 @@ void UIScene_EndPoem::handleInput(int iPad, int key, bool repeat, bool pressed,
 			Minecraft *pMinecraft = Minecraft::GetInstance();
 			for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
 			{
-				if(pMinecraft->localplayers[i] != NULL)
+				if(pMinecraft->localplayers[i] != nullptr)
 				{
 					app.SetAction(i,eAppAction_Respawn);
 				}
 			}
 
 			// This just allows it to be shown
-			if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != NULL) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
+			if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != nullptr) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
 
 			updateTooltips();
 			navigateBack();
@@ -191,7 +191,7 @@ void UIScene_EndPoem::handleDestroy()
 
 void UIScene_EndPoem::handleRequestMoreData(F64 startIndex, bool up)
 {
-	m_requestedLabel = (int)startIndex;
+	m_requestedLabel = static_cast<int>(startIndex);
 }
 
 void UIScene_EndPoem::updateNoise()
@@ -221,13 +221,13 @@ void UIScene_EndPoem::updateNoise()
 		{
 			if (ui.UsingBitmapFont())
 			{
-				randomChar = SharedConstants::acceptableLetters[random->nextInt((int)SharedConstants::acceptableLetters.length())];
+				randomChar = SharedConstants::acceptableLetters[random->nextInt(static_cast<int>(SharedConstants::acceptableLetters.length()))];
 			}
 			else
 			{
 				// 4J-JEV: It'd be nice to avoid null characters when using asian languages.
 				static wstring acceptableLetters = L"!\"#$%&'()*+,-./0123456789:;<=>?@[\\]^_'|}~";
-				randomChar = acceptableLetters[ random->nextInt((int)acceptableLetters.length()) ];
+				randomChar = acceptableLetters[ random->nextInt(static_cast<int>(acceptableLetters.length())) ];
 			}
 
 			wstring randomCharStr = L"";
diff --git a/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp b/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp
index 1d24f989..b33e086a 100644
--- a/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FireworksMenu.cpp
@@ -11,14 +11,14 @@ UIScene_FireworksMenu::UIScene_FireworksMenu(int iPad, void *_initData, UILayer
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	FireworksScreenInput *initData = (FireworksScreenInput *)_initData;
+	FireworksScreenInput *initData = static_cast<FireworksScreenInput *>(_initData);
 
 	m_labelFireworks.init(app.GetString(IDS_HOW_TO_PLAY_MENU_FIREWORKS));
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Fireworks_Menu, this);
 	}
@@ -174,7 +174,7 @@ void UIScene_FireworksMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionFireworksIngredients:
@@ -198,7 +198,7 @@ void UIScene_FireworksMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 UIControl *UIScene_FireworksMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionFireworksIngredients:
diff --git a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
index fb17bda4..6a4ea096 100644
--- a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
@@ -4,7 +4,6 @@
 #include "..\..\Minecraft.h"
 #include "..\..\ProgressRenderer.h"
 
-
 UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
 	// Setup all the Iggy references we need for this scene
@@ -27,7 +26,7 @@ UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData,
 	m_buttonConfirm.init( app.GetString( IDS_CONFIRM_OK ), eControl_Confirm );
 	m_buttonConfirm.setVisible(false);
 
-	LoadingInputParams *params = (LoadingInputParams *)initData;
+	LoadingInputParams *params = static_cast<LoadingInputParams *>(initData);
 
 	m_CompletionData = params->completionData;
 	m_iPad=params->completionData->iPad;
@@ -102,7 +101,7 @@ void UIScene_FullscreenProgress::handleDestroy()
 	DWORD exitcode = *((DWORD *)&code);
 
 	// If we're active, have a cancel func, and haven't already cancelled, call cancel func
-	if( exitcode == STILL_ACTIVE && m_cancelFunc != NULL && !m_bWasCancelled)
+	if( exitcode == STILL_ACTIVE && m_cancelFunc != nullptr && !m_bWasCancelled)
 	{
 		m_bWasCancelled = true;
 		m_cancelFunc(m_cancelFuncParam);
@@ -224,7 +223,7 @@ void UIScene_FullscreenProgress::tick()
 
 						// This just allows it to be shown
 						Minecraft *pMinecraft = Minecraft::GetInstance();
-						if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != NULL) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
+						if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != nullptr) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
 						ui.UpdatePlayerBasePositions();
 						navigateBack();
 					}
@@ -279,26 +278,27 @@ void UIScene_FullscreenProgress::handleInput(int iPad, int key, bool repeat, boo
 #ifdef __ORBIS__
 		case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
-			if(pressed)
+			if(pressed && m_threadCompleted)
 			{
 				sendInputToMovie(key, repeat, pressed, released);
 			}
 			break;
 		case ACTION_MENU_B:
 		case ACTION_MENU_CANCEL:
-			if( pressed && m_cancelFunc != NULL && !m_bWasCancelled ) 			
+			if( pressed && m_cancelFunc != nullptr && !m_bWasCancelled ) 			
 			{
 				m_bWasCancelled = true;
 				m_cancelFunc( m_cancelFuncParam );
 			}
 			break;
 		}
+		handled = true;
 	}
 }
 
 void UIScene_FullscreenProgress::handlePress(F64 controlId, F64 childId)
 {
-	if(m_threadCompleted && (int)controlId == eControl_Confirm)
+	if(m_threadCompleted && static_cast<int>(controlId) == eControl_Confirm)
 	{
 		// This assumes all buttons can only be pressed with the A button
 		ui.AnimateKeyPress(m_iPad, ACTION_MENU_A, false, true, false);
diff --git a/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp b/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
index 392221a6..9dcbe45b 100644
--- a/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
@@ -10,7 +10,7 @@ UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void *_initData, UILayer *par
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	FurnaceScreenInput *initData = (FurnaceScreenInput *)_initData;
+	FurnaceScreenInput *initData = static_cast<FurnaceScreenInput *>(_initData);
 	m_furnace = initData->furnace;
 
 	m_labelFurnace.init(m_furnace->getName());
@@ -21,9 +21,9 @@ UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void *_initData, UILayer *par
 	m_progressFurnaceArrow.init(L"",0,0,24,0);
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Furnace_Menu, this);
 	}
@@ -202,7 +202,7 @@ void UIScene_FurnaceMenu::setSectionSelectedSlot(ESceneSection eSection, int x,
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionFurnaceResult:
@@ -230,7 +230,7 @@ void UIScene_FurnaceMenu::setSectionSelectedSlot(ESceneSection eSection, int x,
 
 UIControl *UIScene_FurnaceMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionFurnaceResult:
diff --git a/Minecraft.Client/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Common/UI/UIScene_HUD.cpp
index c3d52cf9..213caa8d 100644
--- a/Minecraft.Client/Common/UI/UIScene_HUD.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HUD.cpp
@@ -1,871 +1,886 @@
-#include "stdafx.h"
-#include "UI.h"
-#include "UIScene_HUD.h"
-#include "BossMobGuiInfo.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
-#include "..\..\EnderDragonRenderer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-
-UIScene_HUD::UIScene_HUD(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
-{
-	m_bSplitscreen = false;
-
-	// Setup all the Iggy references we need for this scene
-	initialiseMovie();
-
-	SetDragonLabel( app.GetString( IDS_BOSS_ENDERDRAGON_HEALTH ) );
-	SetSelectedLabel(L"");
-
-	for(unsigned int i = 0; i < CHAT_LINES_COUNT; ++i)
-	{
-		m_labelChatText[i].init(L"");
-	}
-	m_labelJukebox.init(L"");
-
-	addTimer(0, 100);
-}
-
-wstring UIScene_HUD::getMoviePath()
-{
-	switch( m_parentLayer->getViewport() )
-	{
-	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-		m_bSplitscreen = true;
-		return L"HUDSplit";
-		break;
-	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
-	default:
-		m_bSplitscreen = false;
-		return L"HUD";
-		break;
-	}
-}
-
-void UIScene_HUD::updateSafeZone()
-{
-	// Distance from edge
-	F64 safeTop = 0.0;
-	F64 safeBottom = 0.0;
-	F64 safeLeft = 0.0;
-	F64 safeRight = 0.0;
-
-	switch( m_parentLayer->getViewport() )
-	{
-	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-		safeTop = getSafeZoneHalfHeight();
-		safeLeft = getSafeZoneHalfWidth();
-		safeRight = getSafeZoneHalfWidth();
-		break;
-	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-		safeBottom = getSafeZoneHalfHeight();
-		safeLeft = getSafeZoneHalfWidth();
-		safeRight = getSafeZoneHalfWidth();
-		break;
-	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-		safeLeft = getSafeZoneHalfWidth();
-		safeTop = getSafeZoneHalfHeight();
-		safeBottom = getSafeZoneHalfHeight();
-		break;
-	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		safeRight = getSafeZoneHalfWidth();
-		safeTop = getSafeZoneHalfHeight();
-		safeBottom = getSafeZoneHalfHeight();
-		break;
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
-		safeTop = getSafeZoneHalfHeight();
-		safeLeft = getSafeZoneHalfWidth();
-		break;
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-		safeTop = getSafeZoneHalfHeight();
-		safeRight = getSafeZoneHalfWidth();
-		break;
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-		safeBottom = getSafeZoneHalfHeight();
-		safeLeft = getSafeZoneHalfWidth();
-		break;
-	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-		safeBottom = getSafeZoneHalfHeight();
-		safeRight = getSafeZoneHalfWidth();
-		break;
-	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
-	default:
-		safeTop = getSafeZoneHalfHeight();
-		safeBottom = getSafeZoneHalfHeight();
-		safeLeft = getSafeZoneHalfWidth();
-		safeRight = getSafeZoneHalfWidth();
-		break;
-	}
-	setSafeZone(safeTop, safeBottom, safeLeft, safeRight);
-}
-
-void UIScene_HUD::tick()
-{
-	UIScene::tick();
-	if(getMovie() && app.GetGameStarted())
-	{
-		Minecraft *pMinecraft = Minecraft::GetInstance();
-		if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL)
-		{
-			return;
-		}
-
-		// Is boss present?
-		bool noBoss = BossMobGuiInfo::name.empty() || BossMobGuiInfo::displayTicks <= 0;
-		if (noBoss) 
-		{
-			if (m_showDragonHealth)
-			{
-				// No boss and health is visible
-				if(m_ticksWithNoBoss <= 20)
-				{
-					++m_ticksWithNoBoss;
-				}
-				else
-				{
-					ShowDragonHealth(false);
-				}
-			}
-		}
-		else
-		{
-			BossMobGuiInfo::displayTicks--;
-
-			m_ticksWithNoBoss = 0;			
-			SetDragonHealth(BossMobGuiInfo::healthProgress);
-
-			if (!m_showDragonHealth)
-			{
-				SetDragonLabel(BossMobGuiInfo::name);
-				ShowDragonHealth(true);
-			}
-		}
-	}
-}
-
-void UIScene_HUD::customDraw(IggyCustomDrawCallbackRegion *region)
-{
-	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
-
-	int slot = -1;
-	swscanf((wchar_t*)region->name,L"slot_%d",&slot);
-	if (slot == -1)
-	{
-		app.DebugPrintf("This is not the control we are looking for\n");
-	}
-	else
-	{
-		Slot *invSlot = pMinecraft->localplayers[m_iPad]->inventoryMenu->getSlot(InventoryMenu::USE_ROW_SLOT_START + slot);
-		shared_ptr<ItemInstance> item = invSlot->getItem();
-		if(item != NULL)
-		{
-			unsigned char ucAlpha=app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_InterfaceOpacity);
-			float fVal;
-
-			if(ucAlpha<80)
-			{
-				// check if we have the timer running for the opacity
-				unsigned int uiOpacityTimer=app.GetOpacityTimer(m_iPad);
-				if(uiOpacityTimer!=0)
-				{
-					if(uiOpacityTimer<10)
-					{
-						float fStep=(80.0f-(float)ucAlpha)/10.0f;
-						fVal=0.01f*(80.0f-((10.0f-(float)uiOpacityTimer)*fStep));
-					}
-					else
-					{
-						fVal=0.01f*80.0f;
-					}
-				}
-				else
-				{
-					fVal=0.01f*(float)ucAlpha;
-				}
-			}
-			else
-			{
-				fVal=0.01f*(float)ucAlpha;
-			}
-			customDrawSlotControl(region,m_iPad,item,fVal,item->isFoil(),true);
-		}
-	}
-}
-
-void UIScene_HUD::handleReload()
-{
-	m_lastActiveSlot = -1;
-	m_iGuiScale = -1;
-	m_bToolTipsVisible = true;
-	m_lastExpProgress = 0.0f;
-	m_lastExpLevel = 0;
-	m_iCurrentHealth = 0;
-	m_lastMaxHealth = 20;
-	m_lastHealthBlink = false;
-	m_lastHealthPoison = false;
-	m_iCurrentFood = -1;
-	m_lastFoodPoison = false;
-	m_lastAir = 10;
-	m_currentExtraAir = 0;
-	m_lastArmour = 0;
-	m_showHealth = true;
-	m_showHorseHealth = true;
-	m_showFood = true;
-	m_showAir = false;	// get's initialised invisible anyways, by setting it to false we ensure it will remain visible when switching in and out of split screen!
-	m_showArmour = true;
-	m_showExpBar = true;
-	m_bRegenEffectEnabled = false;
-	m_iFoodSaturation = 0;
-	m_lastDragonHealth = 0.0f;
-	m_showDragonHealth = false;
-	m_ticksWithNoBoss = 0;
-	m_uiSelectedItemOpacityCountDown = 0;
-	m_displayName = L"";
-	m_lastShowDisplayName = true;
-	m_bRidingHorse = true;
-	m_horseHealth = 1;
-	m_lastHealthWither = true;
-	m_iCurrentHealthAbsorb = -1;
-	m_horseJumpProgress = 1.0f;
-	m_iHeartOffsetIndex = -1;
-	m_bHealthAbsorbActive = false;
-	m_iHorseMaxHealth = -1;
-
-	m_labelDisplayName.setVisible(m_lastShowDisplayName);
-
-	SetDragonLabel(BossMobGuiInfo::name);
-	SetSelectedLabel(L"");
-
-	for(unsigned int i = 0; i < CHAT_LINES_COUNT; ++i)
-	{
-		m_labelChatText[i].init(L"");
-	}
-	m_labelJukebox.init(L"");
-
-	int iGuiScale;	
-	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localplayers[m_iPad]->m_iScreenSection == C4JRender::VIEWPORT_TYPE_FULLSCREEN)
-	{
-		iGuiScale=app.GetGameSettings(m_iPad,eGameSetting_UISize);
-	}
-	else
-	{
-		iGuiScale=app.GetGameSettings(m_iPad,eGameSetting_UISizeSplitscreen);
-	}
-	SetHudSize(iGuiScale);
-
-	SetDisplayName(ProfileManager.GetDisplayName(m_iPad));
-
-	repositionHud();
-
-	SetTooltipsEnabled(((ui.GetMenuDisplayed(ProfileManager.GetPrimaryPad())) || (app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_Tooltips) != 0)));
-}
-
-int UIScene_HUD::getPad()
-{
-	return m_iPad;
-}
-
-void UIScene_HUD::SetOpacity(float opacity)
-{
-	setOpacity(opacity);
-}
-
-void UIScene_HUD::SetVisible(bool visible)
-{
-	setVisible(visible);
-}
-
-void UIScene_HUD::SetHudSize(int scale)
-{
-	if(scale != m_iGuiScale)
-	{
-		m_iGuiScale = scale;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = scale;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcLoadHud , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetExpBarProgress(float progress, int xpNeededForNextLevel)
-{
-	if(progress != m_lastExpProgress)
-	{
-		m_lastExpProgress = progress;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = progress;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetExpBarProgress , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetExpLevel(int level)
-{
-	if(level != m_lastExpLevel)
-	{
-		m_lastExpLevel = level;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = level;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetPlayerLevel , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetActiveSlot(int slot)
-{
-	if(slot != m_lastActiveSlot)
-	{
-		m_lastActiveSlot = slot;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = slot;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetActiveSlot , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetHealth(int iHealth, int iLastHealth, bool bBlink, bool bPoison, bool bWither)
-{
-	int maxHealth = max(iHealth, iLastHealth);
-	if(maxHealth != m_lastMaxHealth || bBlink != m_lastHealthBlink || bPoison != m_lastHealthPoison || bWither != m_lastHealthWither)
-	{
-		m_lastMaxHealth = maxHealth;
-		m_lastHealthBlink = bBlink;
-		m_lastHealthPoison = bPoison;
-		m_lastHealthWither = bWither;
-
-		IggyDataValue result;
-		IggyDataValue value[4];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = maxHealth;
-		value[1].type = IGGY_DATATYPE_boolean;
-		value[1].boolval = bBlink;
-		value[2].type = IGGY_DATATYPE_boolean;
-		value[2].boolval = bPoison;
-		value[3].type = IGGY_DATATYPE_boolean;
-		value[3].boolval = bWither;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHealth , 4 , value );
-	}
-}
-
-void UIScene_HUD::SetFood(int iFood, int iLastFood, bool bPoison)
-{
-	// Ignore iLastFood as food doesn't flash
-	int maxFood = iFood; //, iLastFood);
-	if(maxFood != m_iCurrentFood || bPoison != m_lastFoodPoison)
-	{
-		m_iCurrentFood = maxFood;
-		m_lastFoodPoison = bPoison;
-
-		IggyDataValue result;
-		IggyDataValue value[2];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = maxFood;
-		value[1].type = IGGY_DATATYPE_boolean;
-		value[1].boolval = bPoison;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetFood , 2 , value );
-	}
-}
-
-void UIScene_HUD::SetAir(int iAir, int extra)
-{
-	if(iAir != m_lastAir)
-	{
-		app.DebugPrintf("SetAir to %d\n", iAir);
-		m_lastAir = iAir;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = iAir;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetAir , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetArmour(int iArmour)
-{
-	if(iArmour != m_lastArmour)
-	{
-		app.DebugPrintf("SetArmour to %d\n", iArmour);
-		m_lastArmour = iArmour;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = iArmour;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetArmour , 1 , value );
-	}
-}
-
-void UIScene_HUD::ShowHealth(bool show)
-{
-	if(show != m_showHealth)
-	{
-		app.DebugPrintf("ShowHealth to %s\n", show?"TRUE":"FALSE");
-		m_showHealth = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowHealth , 1 , value );
-	}
-}
-
-void UIScene_HUD::ShowHorseHealth(bool show)
-{
-	if(show != m_showHorseHealth)
-	{
-		app.DebugPrintf("ShowHorseHealth to %s\n", show?"TRUE":"FALSE");
-		m_showHorseHealth = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowHorseHealth , 1 , value );
-	}
-}
-
-void UIScene_HUD::ShowFood(bool show)
-{
-	if(show != m_showFood)
-	{
-		app.DebugPrintf("ShowFood to %s\n", show?"TRUE":"FALSE");
-		m_showFood = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowFood , 1 , value );
-	}
-}
-
-void UIScene_HUD::ShowAir(bool show)
-{
-	if(show != m_showAir)
-	{
-		app.DebugPrintf("ShowAir to %s\n", show?"TRUE":"FALSE");
-		m_showAir = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowAir , 1 , value );
-	}
-}
-
-void UIScene_HUD::ShowArmour(bool show)
-{
-	if(show != m_showArmour)
-	{
-		app.DebugPrintf("ShowArmour to %s\n", show?"TRUE":"FALSE");
-		m_showArmour = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowArmour , 1 , value );
-	}
-}
-
-void UIScene_HUD::ShowExpBar(bool show)
-{
-	if(show != m_showExpBar)
-	{
-		app.DebugPrintf("ShowExpBar to %s\n", show?"TRUE":"FALSE");
-		m_showExpBar = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowExpbar , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetRegenerationEffect(bool bEnabled)
-{
-	if(bEnabled != m_bRegenEffectEnabled)
-	{
-		app.DebugPrintf("SetRegenerationEffect to %s\n", bEnabled?"TRUE":"FALSE");
-		m_bRegenEffectEnabled = bEnabled;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = bEnabled;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetRegenerationEffect , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetFoodSaturationLevel(int iSaturation)
-{
-	if(iSaturation != m_iFoodSaturation)
-	{
-		app.DebugPrintf("Set saturation to %d\n", iSaturation);
-		m_iFoodSaturation = iSaturation;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = iSaturation;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetFoodSaturationLevel , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetDragonHealth(float health)
-{
-	if(health != m_lastDragonHealth)
-	{
-		app.DebugPrintf("Set dragon health to %f\n", health);
-		m_lastDragonHealth = health;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = health;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetDragonHealth , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetDragonLabel(const wstring &label)
-{
-	IggyDataValue result;
-	IggyDataValue value[1];
-	IggyStringUTF16 stringVal;
-	stringVal.string = (IggyUTF16*)label.c_str();
-	stringVal.length = label.length();
-	value[0].type = IGGY_DATATYPE_string_UTF16;
-	value[0].string16 = stringVal;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetDragonLabel , 1 , value );
-}
-
-void UIScene_HUD::ShowDragonHealth(bool show)
-{
-	if(show != m_showDragonHealth)
-	{
-		app.DebugPrintf("ShowDragonHealth to %s\n", show?"TRUE":"FALSE");
-		m_showDragonHealth = show;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = show;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowDragonHealth , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetSelectedLabel(const wstring &label)
-{
-	// 4J Stu - Timing here is kept the same as on Xbox360, even though we do it differently now and do the fade out in Flash rather than directly setting opacity
-	if(!label.empty()) m_uiSelectedItemOpacityCountDown = SharedConstants::TICKS_PER_SECOND * 3;
-
-	IggyDataValue result;
-	IggyDataValue value[1];
-	IggyStringUTF16 stringVal;
-	stringVal.string = (IggyUTF16*)label.c_str();
-	stringVal.length = label.length();
-	value[0].type = IGGY_DATATYPE_string_UTF16;
-	value[0].string16 = stringVal;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetSelectedLabel , 1 , value );
-}
-
-void UIScene_HUD::HideSelectedLabel()
-{
-	IggyDataValue result;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcHideSelectedLabel , 0 , NULL );
-}
-
-
-void UIScene_HUD::SetRidingHorse(bool ridingHorse, bool bIsJumpable, int maxHorseHealth)
-{
-	if(m_bRidingHorse != ridingHorse || maxHorseHealth != m_iHorseMaxHealth)
-	{
-		app.DebugPrintf("SetRidingHorse to %s\n", ridingHorse?"TRUE":"FALSE");
-		m_bRidingHorse = ridingHorse;
-		m_bIsJumpable = bIsJumpable;
-		m_iHorseMaxHealth = maxHorseHealth;
-
-		IggyDataValue result;
-		IggyDataValue value[3];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = ridingHorse;
-		value[1].type = IGGY_DATATYPE_boolean;
-		value[1].boolval = bIsJumpable;
-		value[2].type = IGGY_DATATYPE_number;
-		value[2].number = maxHorseHealth;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetRidingHorse , 3 , value );
-	}
-}
-
-void UIScene_HUD::SetHorseHealth(int health, bool blink /*= false*/)
-{
-	if(m_bRidingHorse && m_horseHealth != health)
-	{
-		app.DebugPrintf("SetHorseHealth to %d\n", health);
-		m_horseHealth = health;
-
-		IggyDataValue result;
-		IggyDataValue value[2];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = health;
-		value[1].type = IGGY_DATATYPE_boolean;
-		value[1].boolval = blink;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHorseHealth , 2 , value );
-	}
-}
-
-void UIScene_HUD::SetHorseJumpBarProgress(float progress)
-{
-	if(m_bRidingHorse && m_horseJumpProgress != progress)
-	{
-		app.DebugPrintf("SetHorseJumpBarProgress to %f\n", progress);
-		m_horseJumpProgress = progress;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_number;
-		value[0].number = progress;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHorseJumpBarProgress , 1 , value );
-	}
-}
-
-void UIScene_HUD::SetHealthAbsorb(int healthAbsorb)
-{
-	if(m_iCurrentHealthAbsorb != healthAbsorb)
-	{
-		app.DebugPrintf("SetHealthAbsorb to %d\n", healthAbsorb);
-		m_iCurrentHealthAbsorb = healthAbsorb;
-
-		IggyDataValue result;
-		IggyDataValue value[2];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = healthAbsorb > 0;
-		value[1].type = IGGY_DATATYPE_number;
-		value[1].number = healthAbsorb;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHealthAbsorb , 2 , value );
-	}
-}
-
-void UIScene_HUD::render(S32 width, S32 height, C4JRender::eViewportType viewport)
-{
-	if(m_bSplitscreen)
-	{
-		S32 xPos = 0;
-		S32 yPos = 0;
-		switch( viewport )
-		{
-		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-			yPos = (S32)(ui.getScreenHeight() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			xPos = (S32)(ui.getScreenWidth() / 2);
-			yPos = (S32)(ui.getScreenHeight() / 2);
-			break;
-		}
-		ui.setupRenderPosition(xPos, yPos);
-
-		S32 tileXStart = 0;
-		S32 tileYStart = 0;
-		S32 tileWidth = width;
-		S32 tileHeight = height;
-
-		switch( viewport )
-		{
-		case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-			tileHeight = (S32)(ui.getScreenHeight());
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-			tileWidth = (S32)(ui.getScreenWidth());
-			tileYStart = (S32)(m_movieHeight / 2);
-			break;
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
-		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
-			tileYStart = (S32)(m_movieHeight / 2);
-			break;
-		}
-
-		IggyPlayerSetDisplaySize( getMovie(), m_movieWidth, m_movieHeight );
-		
-		m_renderWidth = tileWidth;
-		m_renderHeight = tileHeight;
-
-		IggyPlayerDrawTilesStart ( getMovie() );
-		IggyPlayerDrawTile ( getMovie() ,
-			tileXStart ,
-			tileYStart ,
-			tileXStart + tileWidth ,
-			tileYStart + tileHeight ,
-			0 ); 
-		IggyPlayerDrawTilesEnd ( getMovie() );
-	}
-	else
-	{
-		UIScene::render(width, height, viewport);
-	}
-}
-
-void UIScene_HUD::handleTimerComplete(int id)
-{
-	Minecraft *pMinecraft = Minecraft::GetInstance();
-	
-	bool anyVisible = false;
-	if(pMinecraft->localplayers[m_iPad]!= NULL)
-	{
-		Gui *pGui = pMinecraft->gui;
-		//DWORD messagesToDisplay = min( CHAT_LINES_COUNT, pGui->getMessagesCount(m_iPad) );
-		for( unsigned int i = 0; i < CHAT_LINES_COUNT; ++i )
-		{
-			float opacity = pGui->getOpacity(m_iPad, i);
-			if( opacity > 0 )
-			{
-				m_controlLabelBackground[i].setOpacity(opacity);
-				m_labelChatText[i].setOpacity(opacity);
-				m_labelChatText[i].setLabel( pGui->getMessagesCount(m_iPad) ? pGui->getMessage(m_iPad,i) : L"" );
-
-				anyVisible = true;
-			}
-			else
-			{
-				m_controlLabelBackground[i].setOpacity(0);
-				m_labelChatText[i].setOpacity(0);
-				m_labelChatText[i].setLabel(L"");
-			}
-		}
-		if(pGui->getJukeboxOpacity(m_iPad) > 0) anyVisible = true;
-		m_labelJukebox.setOpacity( pGui->getJukeboxOpacity(m_iPad) );
-		m_labelJukebox.setLabel( pGui->getJukeboxMessage(m_iPad) );
-	}
-	else
-	{
-		for( unsigned int i = 0; i < CHAT_LINES_COUNT; ++i )
-		{
-			m_controlLabelBackground[i].setOpacity(0);
-			m_labelChatText[i].setOpacity(0);
-			m_labelChatText[i].setLabel(L"");
-		}
-		m_labelJukebox.setOpacity( 0 );
-	}
-
-	//setVisible(anyVisible);
-}
-
-void UIScene_HUD::repositionHud()
-{
-	if(!m_bSplitscreen) return;
-
-	S32 width = 0;
-	S32 height = 0;
-	m_parentLayer->getRenderDimensions( width, height );
-
-	switch( m_parentLayer->getViewport() )
-	{
-	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
-		height = (S32)(ui.getScreenHeight());
-		break;
-	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
-	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
-		width = (S32)(ui.getScreenWidth());
-		break;
-	}
-
-	app.DebugPrintf(app.USER_SR, "Reposition HUD with dims %d, %d\n", width, height );
-
-	IggyDataValue result;
-	IggyDataValue value[2];
-	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = width;
-	value[1].type = IGGY_DATATYPE_number;
-	value[1].number = height;
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcRepositionHud , 2 , value );
-}
-
-void UIScene_HUD::ShowDisplayName(bool show)
-{
-	m_lastShowDisplayName = show;
-	m_labelDisplayName.setVisible(show);
-}
-
-void UIScene_HUD::SetDisplayName(const wstring &displayName)
-{
-	if(displayName.compare(m_displayName) != 0)
-	{
-		m_displayName = displayName;
-		
-		IggyDataValue result;
-		IggyDataValue value[1];
-		IggyStringUTF16 stringVal;
-		stringVal.string = (IggyUTF16*)displayName.c_str();
-		stringVal.length = displayName.length();
-		value[0].type = IGGY_DATATYPE_string_UTF16;
-		value[0].string16 = stringVal;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetDisplayName , 1 , value );
-
-		m_labelDisplayName.setVisible(m_lastShowDisplayName);
-	}
-}
-
-void UIScene_HUD::SetTooltipsEnabled(bool bEnabled)
-{
-	if(m_bToolTipsVisible != bEnabled)
-	{
-		m_bToolTipsVisible = bEnabled;
-
-		IggyDataValue result;
-		IggyDataValue value[1];
-		value[0].type = IGGY_DATATYPE_boolean;
-		value[0].boolval = bEnabled;
-		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetTooltipsEnabled , 1 , value );
-	}
-}
-
-void UIScene_HUD::handleGameTick()
-{
-	if(getMovie() && app.GetGameStarted())
-	{
-		Minecraft *pMinecraft = Minecraft::GetInstance();
-		if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL)
-		{
-			m_parentLayer->showComponent(m_iPad, eUIScene_HUD,false);
-			return;
-		}
-		m_parentLayer->showComponent(m_iPad, eUIScene_HUD,true);
-
-		updateFrameTick();
-	}
+#include "stdafx.h"

+#include "UI.h"

+#include "UIScene_HUD.h"

+#include "UISplitScreenHelpers.h"

+#include "BossMobGuiInfo.h"

+#include "..\..\Minecraft.h"

+#include "..\..\MultiplayerLocalPlayer.h"

+#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"

+#include "..\..\EnderDragonRenderer.h"

+#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"

+#include "..\..\..\Minecraft.World\StringHelpers.h"

+

+UIScene_HUD::UIScene_HUD(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)

+{

+	m_bSplitscreen = false;

+

+	// Setup all the Iggy references we need for this scene

+	initialiseMovie();

+

+	SetDragonLabel( app.GetString( IDS_BOSS_ENDERDRAGON_HEALTH ) );

+	SetSelectedLabel(L"");

+

+	for(unsigned int i = 0; i < CHAT_LINES_COUNT; ++i)

+	{

+		m_labelChatText[i].init(L"");

+	}

+	m_labelJukebox.init(L"");

+

+	addTimer(0, 100);

+}

+

+wstring UIScene_HUD::getMoviePath()

+{

+	switch( m_parentLayer->getViewport() )

+	{

+	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:

+	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:

+	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:

+	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:

+		m_bSplitscreen = true;

+		return L"HUDSplit";

+		break;

+	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:

+	default:

+		m_bSplitscreen = false;

+		return L"HUD";

+		break;

+	}

+}

+

+void UIScene_HUD::updateSafeZone()

+{

+	// Distance from edge

+	F64 safeTop = 0.0;

+	F64 safeBottom = 0.0;

+	F64 safeLeft = 0.0;

+	F64 safeRight = 0.0;

+

+	switch( m_parentLayer->getViewport() )

+	{

+	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:

+		safeTop = getSafeZoneHalfHeight();

+		safeLeft = getSafeZoneHalfWidth();

+

+		break;

+	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:

+		// safeTop mirrors SPLIT_TOP so both players have the same vertical inset

+		// from their viewport's top edge (split divider), keeping GUI symmetrical.

+		// safeBottom is intentionally omitted: it would shift m_Hud.y upward in

+		// ActionScript, placing the hotbar too high relative to SPLIT_TOP.

+		safeTop = getSafeZoneHalfHeight();

+		safeLeft = getSafeZoneHalfWidth();

+

+		break;

+	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:

+		safeTop = getSafeZoneHalfHeight();

+		safeBottom = getSafeZoneHalfHeight();

+		safeLeft = getSafeZoneHalfWidth();

+		break;

+	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:

+		safeTop = getSafeZoneHalfHeight();

+		safeBottom = getSafeZoneHalfHeight();

+

+		break;

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:

+		safeTop = getSafeZoneHalfHeight();

+		safeLeft = getSafeZoneHalfWidth();

+		break;

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:

+		safeTop = getSafeZoneHalfHeight();

+

+		break;

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:

+		safeTop = getSafeZoneHalfHeight();

+		safeLeft = getSafeZoneHalfWidth();

+		break;

+	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:

+		safeTop = getSafeZoneHalfHeight();

+

+		break;

+	case C4JRender::VIEWPORT_TYPE_FULLSCREEN:

+	default:

+		safeTop = getSafeZoneHalfHeight();

+		safeBottom = getSafeZoneHalfHeight();

+		safeLeft = getSafeZoneHalfWidth();

+

+		break;

+	}

+	setSafeZone(safeTop, safeBottom, safeLeft, safeRight);

+}

+

+void UIScene_HUD::tick()

+{

+	UIScene::tick();

+	if(getMovie() && app.GetGameStarted())

+	{

+		Minecraft *pMinecraft = Minecraft::GetInstance();

+		if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr)

+		{

+			return;

+		}

+

+		// Is boss present?

+		bool noBoss = BossMobGuiInfo::name.empty() || BossMobGuiInfo::displayTicks <= 0;

+		if (noBoss) 

+		{

+			if (m_showDragonHealth)

+			{

+				// No boss and health is visible

+				if(m_ticksWithNoBoss <= 20)

+				{

+					++m_ticksWithNoBoss;

+				}

+				else

+				{

+					ShowDragonHealth(false);

+				}

+			}

+		}

+		else

+		{

+			BossMobGuiInfo::displayTicks--;

+

+			m_ticksWithNoBoss = 0;			

+			SetDragonHealth(BossMobGuiInfo::healthProgress);

+

+			if (!m_showDragonHealth)

+			{

+				SetDragonLabel(BossMobGuiInfo::name);

+				ShowDragonHealth(true);

+			}

+		}

+	}

+}

+

+void UIScene_HUD::customDraw(IggyCustomDrawCallbackRegion *region)

+{

+	Minecraft *pMinecraft = Minecraft::GetInstance();

+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;

+

+	int slot = -1;

+	swscanf(static_cast<wchar_t *>(region->name),L"slot_%d",&slot);

+	if (slot == -1)

+	{

+		app.DebugPrintf("This is not the control we are looking for\n");

+	}

+	else

+	{

+		Slot *invSlot = pMinecraft->localplayers[m_iPad]->inventoryMenu->getSlot(InventoryMenu::USE_ROW_SLOT_START + slot);

+		shared_ptr<ItemInstance> item = invSlot->getItem();

+		if(item != nullptr)

+		{

+			unsigned char ucAlpha=app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_InterfaceOpacity);

+			float fVal;

+

+			if(ucAlpha<80)

+			{

+				// check if we have the timer running for the opacity

+				unsigned int uiOpacityTimer=app.GetOpacityTimer(m_iPad);

+				if(uiOpacityTimer!=0)

+				{

+					if(uiOpacityTimer<10)

+					{

+						float fStep=(80.0f-static_cast<float>(ucAlpha))/10.0f;

+						fVal=0.01f*(80.0f-((10.0f-static_cast<float>(uiOpacityTimer))*fStep));

+					}

+					else

+					{

+						fVal=0.01f*80.0f;

+					}

+				}

+				else

+				{

+					fVal=0.01f*static_cast<float>(ucAlpha);

+				}

+			}

+			else

+			{

+				fVal=0.01f*static_cast<float>(ucAlpha);

+			}

+			customDrawSlotControl(region,m_iPad,item,fVal,item->isFoil(),true);

+		}

+	}

+}

+

+void UIScene_HUD::handleReload()

+{

+	m_lastActiveSlot = -1;

+	m_iGuiScale = -1;

+	m_bToolTipsVisible = true;

+	m_lastExpProgress = 0.0f;

+	m_lastExpLevel = 0;

+	m_iCurrentHealth = 0;

+	m_lastMaxHealth = 20;

+	m_lastHealthBlink = false;

+	m_lastHealthPoison = false;

+	m_iCurrentFood = -1;

+	m_lastFoodPoison = false;

+	m_lastAir = 10;

+	m_currentExtraAir = 0;

+	m_lastArmour = 0;

+	m_showHealth = true;

+	m_showHorseHealth = true;

+	m_showFood = true;

+	m_showAir = false;	// get's initialised invisible anyways, by setting it to false we ensure it will remain visible when switching in and out of split screen!

+	m_showArmour = true;

+	m_showExpBar = true;

+	m_bRegenEffectEnabled = false;

+	m_iFoodSaturation = 0;

+	m_lastDragonHealth = 0.0f;

+	m_showDragonHealth = false;

+	m_ticksWithNoBoss = 0;

+	m_uiSelectedItemOpacityCountDown = 0;

+	m_displayName = L"";

+	m_lastShowDisplayName = true;

+	m_bRidingHorse = true;

+	m_horseHealth = 1;

+	m_lastHealthWither = true;

+	m_iCurrentHealthAbsorb = -1;

+	m_horseJumpProgress = 1.0f;

+	m_iHeartOffsetIndex = -1;

+	m_bHealthAbsorbActive = false;

+	m_iHorseMaxHealth = -1;

+

+	m_labelDisplayName.setVisible(m_lastShowDisplayName);

+

+	SetDragonLabel(BossMobGuiInfo::name);

+	SetSelectedLabel(L"");

+

+	for(unsigned int i = 0; i < CHAT_LINES_COUNT; ++i)

+	{

+		m_labelChatText[i].init(L"");

+	}

+	m_labelJukebox.init(L"");

+

+	int iGuiScale;	

+	Minecraft *pMinecraft = Minecraft::GetInstance();

+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localplayers[m_iPad]->m_iScreenSection == C4JRender::VIEWPORT_TYPE_FULLSCREEN)

+	{

+		iGuiScale=app.GetGameSettings(m_iPad,eGameSetting_UISize);

+	}

+	else

+	{

+		iGuiScale=app.GetGameSettings(m_iPad,eGameSetting_UISizeSplitscreen);

+	}

+	SetHudSize(iGuiScale);

+

+	SetDisplayName(ProfileManager.GetDisplayName(m_iPad));

+

+	SetTooltipsEnabled(((ui.GetMenuDisplayed(ProfileManager.GetPrimaryPad())) || (app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_Tooltips) != 0)));

+}

+

+int UIScene_HUD::getPad()

+{

+	return m_iPad;

+}

+

+void UIScene_HUD::SetOpacity(float opacity)

+{

+	setOpacity(opacity);

+}

+

+void UIScene_HUD::SetVisible(bool visible)

+{

+	setVisible(visible);

+}

+

+void UIScene_HUD::SetHudSize(int scale)

+{

+	if(scale != m_iGuiScale)

+	{

+		m_iGuiScale = scale;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = scale;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcLoadHud , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetExpBarProgress(float progress, int xpNeededForNextLevel)

+{

+	if(progress != m_lastExpProgress)

+	{

+		m_lastExpProgress = progress;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = progress;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetExpBarProgress , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetExpLevel(int level)

+{

+	if(level != m_lastExpLevel)

+	{

+		m_lastExpLevel = level;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = level;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetPlayerLevel , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetActiveSlot(int slot)

+{

+	if(slot != m_lastActiveSlot)

+	{

+		m_lastActiveSlot = slot;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = slot;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetActiveSlot , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetHealth(int iHealth, int iLastHealth, bool bBlink, bool bPoison, bool bWither)

+{

+	int maxHealth = max(iHealth, iLastHealth);

+	if(maxHealth != m_lastMaxHealth || bBlink != m_lastHealthBlink || bPoison != m_lastHealthPoison || bWither != m_lastHealthWither)

+	{

+		m_lastMaxHealth = maxHealth;

+		m_lastHealthBlink = bBlink;

+		m_lastHealthPoison = bPoison;

+		m_lastHealthWither = bWither;

+

+		IggyDataValue result;

+		IggyDataValue value[4];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = maxHealth;

+		value[1].type = IGGY_DATATYPE_boolean;

+		value[1].boolval = bBlink;

+		value[2].type = IGGY_DATATYPE_boolean;

+		value[2].boolval = bPoison;

+		value[3].type = IGGY_DATATYPE_boolean;

+		value[3].boolval = bWither;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHealth , 4 , value );

+	}

+}

+

+void UIScene_HUD::SetFood(int iFood, int iLastFood, bool bPoison)

+{

+	// Ignore iLastFood as food doesn't flash

+	int maxFood = iFood; //, iLastFood);

+	if(maxFood != m_iCurrentFood || bPoison != m_lastFoodPoison)

+	{

+		m_iCurrentFood = maxFood;

+		m_lastFoodPoison = bPoison;

+

+		IggyDataValue result;

+		IggyDataValue value[2];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = maxFood;

+		value[1].type = IGGY_DATATYPE_boolean;

+		value[1].boolval = bPoison;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetFood , 2 , value );

+	}

+}

+

+void UIScene_HUD::SetAir(int iAir, int extra)

+{

+	if(iAir != m_lastAir)

+	{

+		app.DebugPrintf("SetAir to %d\n", iAir);

+		m_lastAir = iAir;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = iAir;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetAir , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetArmour(int iArmour)

+{

+	if(iArmour != m_lastArmour)

+	{

+		app.DebugPrintf("SetArmour to %d\n", iArmour);

+		m_lastArmour = iArmour;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = iArmour;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetArmour , 1 , value );

+	}

+}

+

+void UIScene_HUD::ShowHealth(bool show)

+{

+	if(show != m_showHealth)

+	{

+		app.DebugPrintf("ShowHealth to %s\n", show?"TRUE":"FALSE");

+		m_showHealth = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowHealth , 1 , value );

+	}

+}

+

+void UIScene_HUD::ShowHorseHealth(bool show)

+{

+	if(show != m_showHorseHealth)

+	{

+		app.DebugPrintf("ShowHorseHealth to %s\n", show?"TRUE":"FALSE");

+		m_showHorseHealth = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowHorseHealth , 1 , value );

+	}

+}

+

+void UIScene_HUD::ShowFood(bool show)

+{

+	if(show != m_showFood)

+	{

+		app.DebugPrintf("ShowFood to %s\n", show?"TRUE":"FALSE");

+		m_showFood = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowFood , 1 , value );

+	}

+}

+

+void UIScene_HUD::ShowAir(bool show)

+{

+	if(show != m_showAir)

+	{

+		app.DebugPrintf("ShowAir to %s\n", show?"TRUE":"FALSE");

+		m_showAir = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowAir , 1 , value );

+	}

+}

+

+void UIScene_HUD::ShowArmour(bool show)

+{

+	if(show != m_showArmour)

+	{

+		app.DebugPrintf("ShowArmour to %s\n", show?"TRUE":"FALSE");

+		m_showArmour = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowArmour , 1 , value );

+	}

+}

+

+void UIScene_HUD::ShowExpBar(bool show)

+{

+	if(show != m_showExpBar)

+	{

+		app.DebugPrintf("ShowExpBar to %s\n", show?"TRUE":"FALSE");

+		m_showExpBar = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowExpbar , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetRegenerationEffect(bool bEnabled)

+{

+	if(bEnabled != m_bRegenEffectEnabled)

+	{

+		app.DebugPrintf("SetRegenerationEffect to %s\n", bEnabled?"TRUE":"FALSE");

+		m_bRegenEffectEnabled = bEnabled;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = bEnabled;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetRegenerationEffect , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetFoodSaturationLevel(int iSaturation)

+{

+	if(iSaturation != m_iFoodSaturation)

+	{

+		app.DebugPrintf("Set saturation to %d\n", iSaturation);

+		m_iFoodSaturation = iSaturation;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = iSaturation;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetFoodSaturationLevel , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetDragonHealth(float health)

+{

+	if(health != m_lastDragonHealth)

+	{

+		app.DebugPrintf("Set dragon health to %f\n", health);

+		m_lastDragonHealth = health;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = health;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetDragonHealth , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetDragonLabel(const wstring &label)

+{

+	IggyDataValue result;

+	IggyDataValue value[1];

+	IggyStringUTF16 stringVal;

+	stringVal.string = (IggyUTF16*)label.c_str();

+	stringVal.length = label.length();

+	value[0].type = IGGY_DATATYPE_string_UTF16;

+	value[0].string16 = stringVal;

+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetDragonLabel , 1 , value );

+}

+

+void UIScene_HUD::ShowDragonHealth(bool show)

+{

+	if(show != m_showDragonHealth)

+	{

+		app.DebugPrintf("ShowDragonHealth to %s\n", show?"TRUE":"FALSE");

+		m_showDragonHealth = show;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = show;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcShowDragonHealth , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetSelectedLabel(const wstring &label)

+{

+	// 4J Stu - Timing here is kept the same as on Xbox360, even though we do it differently now and do the fade out in Flash rather than directly setting opacity

+	if(!label.empty()) m_uiSelectedItemOpacityCountDown = SharedConstants::TICKS_PER_SECOND * 3;

+

+	IggyDataValue result;

+	IggyDataValue value[1];

+	IggyStringUTF16 stringVal;

+	stringVal.string = (IggyUTF16*)label.c_str();

+	stringVal.length = label.length();

+	value[0].type = IGGY_DATATYPE_string_UTF16;

+	value[0].string16 = stringVal;

+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetSelectedLabel , 1 , value );

+}

+

+void UIScene_HUD::HideSelectedLabel()

+{

+	IggyDataValue result;

+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcHideSelectedLabel , 0 , nullptr );

+}

+

+

+void UIScene_HUD::SetRidingHorse(bool ridingHorse, bool bIsJumpable, int maxHorseHealth)

+{

+	if(m_bRidingHorse != ridingHorse || maxHorseHealth != m_iHorseMaxHealth)

+	{

+		app.DebugPrintf("SetRidingHorse to %s\n", ridingHorse?"TRUE":"FALSE");

+		m_bRidingHorse = ridingHorse;

+		m_bIsJumpable = bIsJumpable;

+		m_iHorseMaxHealth = maxHorseHealth;

+

+		IggyDataValue result;

+		IggyDataValue value[3];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = ridingHorse;

+		value[1].type = IGGY_DATATYPE_boolean;

+		value[1].boolval = bIsJumpable;

+		value[2].type = IGGY_DATATYPE_number;

+		value[2].number = maxHorseHealth;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetRidingHorse , 3 , value );

+	}

+}

+

+void UIScene_HUD::SetHorseHealth(int health, bool blink /*= false*/)

+{

+	if(m_bRidingHorse && m_horseHealth != health)

+	{

+		app.DebugPrintf("SetHorseHealth to %d\n", health);

+		m_horseHealth = health;

+

+		IggyDataValue result;

+		IggyDataValue value[2];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = health;

+		value[1].type = IGGY_DATATYPE_boolean;

+		value[1].boolval = blink;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHorseHealth , 2 , value );

+	}

+}

+

+void UIScene_HUD::SetHorseJumpBarProgress(float progress)

+{

+	if(m_bRidingHorse && m_horseJumpProgress != progress)

+	{

+		app.DebugPrintf("SetHorseJumpBarProgress to %f\n", progress);

+		m_horseJumpProgress = progress;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_number;

+		value[0].number = progress;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHorseJumpBarProgress , 1 , value );

+	}

+}

+

+void UIScene_HUD::SetHealthAbsorb(int healthAbsorb)

+{

+	if(m_iCurrentHealthAbsorb != healthAbsorb)

+	{

+		app.DebugPrintf("SetHealthAbsorb to %d\n", healthAbsorb);

+		m_iCurrentHealthAbsorb = healthAbsorb;

+

+		IggyDataValue result;

+		IggyDataValue value[2];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = healthAbsorb > 0;

+		value[1].type = IGGY_DATATYPE_number;

+		value[1].number = healthAbsorb;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetHealthAbsorb , 2 , value );

+	}

+}

+

+void UIScene_HUD::render(S32 width, S32 height, C4JRender::eViewportType viewport)

+{

+	if(m_bSplitscreen)

+	{

+		S32 xPos = 0;

+		S32 yPos = 0;

+		switch( viewport )

+		{

+		case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:

+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);

+			break;

+		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:

+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);

+			break;

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:

+			xPos = static_cast<S32>(ui.getScreenWidth() / 2);

+			yPos = static_cast<S32>(ui.getScreenHeight() / 2);

+			break;

+		}

+		ui.setupRenderPosition(xPos, yPos);

+

+		S32 tileXStart = 0;

+		S32 tileYStart = 0;

+		S32 tileWidth = width;

+		S32 tileHeight = height;

+

+		bool needsYTile = false;

+		switch( viewport )

+		{

+		case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:

+		case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:

+			tileHeight = static_cast<S32>(ui.getScreenHeight());

+			break;

+		case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:

+			tileWidth = static_cast<S32>(ui.getScreenWidth());

+			needsYTile = true;

+			break;

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:

+		case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:

+			needsYTile = true;

+			break;

+		}

+

+		F32 scale;

+		ComputeTileScale(tileWidth, tileHeight, m_movieWidth, m_movieHeight, needsYTile, scale, tileYStart);

+

+		// For vertical split, if the window is shorter than the SWF movie,

+		// scale the movie down to fit the full height instead of cropping.

+		// ComputeTileScale clamps scale >= 1.0 (needed for quadrant mode),

+		// but in vertical split the tile covers the full screen height and

+		// cropping the bottom pushes RepositionHud's ActionScript to shift

+		// elements down.  Scaling down keeps visibleH == movieHeight in SWF

+		// space, so ActionScript sees the full height and applies no offset.

+		if(!needsYTile && m_movieHeight > 0)

+		{

+			F32 scaleH = (F32)tileHeight / (F32)m_movieHeight;

+			if(scaleH < scale)

+				scale = scaleH;

+		}

+

+		IggyPlayerSetDisplaySize( getMovie(), (S32)(m_movieWidth * scale), (S32)(m_movieHeight * scale) );

+

+		repositionHud(tileWidth, tileHeight, scale, needsYTile);

+

+		m_renderWidth = tileWidth;

+		m_renderHeight = tileHeight;

+

+		IggyPlayerDrawTilesStart ( getMovie() );

+		IggyPlayerDrawTile ( getMovie() ,

+			tileXStart ,

+			tileYStart ,

+			tileXStart + tileWidth ,

+			tileYStart + tileHeight ,

+			0 );

+		IggyPlayerDrawTilesEnd ( getMovie() );

+	}

+	else

+	{

+		UIScene::render(width, height, viewport);

+	}

+}

+

+void UIScene_HUD::handleTimerComplete(int id)

+{

+	Minecraft *pMinecraft = Minecraft::GetInstance();

+	

+	bool anyVisible = false;

+	if(pMinecraft->localplayers[m_iPad]!= nullptr)

+	{

+		Gui *pGui = pMinecraft->gui;

+		//DWORD messagesToDisplay = min( CHAT_LINES_COUNT, pGui->getMessagesCount(m_iPad) );

+		for( unsigned int i = 0; i < CHAT_LINES_COUNT; ++i )

+		{

+			float opacity = pGui->getOpacity(m_iPad, i);

+			if( opacity > 0 )

+			{

+#if 0 // def _WINDOWS64 // Use Iggy chat until Gui::render has visual parity

+				// Chat drawn by Gui::render with color codes. Hides Iggy chat to avoid double chats.

+				m_controlLabelBackground[i].setOpacity(0);

+				m_labelChatText[i].setOpacity(0);

+				m_labelChatText[i].setLabel(L"");

+#else

+				m_controlLabelBackground[i].setOpacity(opacity);

+				m_labelChatText[i].setOpacity(opacity);

+				m_labelChatText[i].setLabel( pGui->getMessagesCount(m_iPad) ? pGui->getMessage(m_iPad,i) : L"" );

+#endif

+				anyVisible = true;

+			}

+			else

+			{

+				m_controlLabelBackground[i].setOpacity(0);

+				m_labelChatText[i].setOpacity(0);

+				m_labelChatText[i].setLabel(L"");

+			}

+		}

+		if(pGui->getJukeboxOpacity(m_iPad) > 0) anyVisible = true;

+		m_labelJukebox.setOpacity( pGui->getJukeboxOpacity(m_iPad) );

+		m_labelJukebox.setLabel( pGui->getJukeboxMessage(m_iPad) );

+	}

+	else

+	{

+		for( unsigned int i = 0; i < CHAT_LINES_COUNT; ++i )

+		{

+			m_controlLabelBackground[i].setOpacity(0);

+			m_labelChatText[i].setOpacity(0);

+			m_labelChatText[i].setLabel(L"");

+		}

+		m_labelJukebox.setOpacity( 0 );

+	}

+

+	//setVisible(anyVisible);

+}

+

+void UIScene_HUD::repositionHud(S32 tileWidth, S32 tileHeight, F32 scale, bool needsYTile)

+{

+	if(!m_bSplitscreen) return;

+

+	// Pass the visible tile area in SWF coordinates so ActionScript

+	// positions elements (crosshair, hotbar, etc.) centered in the

+	// actually visible region, not the raw viewport.

+	S32 visibleW = static_cast<S32>(tileWidth / scale);

+	S32 visibleH = static_cast<S32>(tileHeight / scale);

+

+	app.DebugPrintf(app.USER_SR, "Reposition HUD: tile %dx%d, scale %.3f, visible SWF %dx%d\n", tileWidth, tileHeight, scale, visibleW, visibleH );

+

+	IggyDataValue result;

+	IggyDataValue value[2];

+	value[0].type = IGGY_DATATYPE_number;

+	value[0].number = visibleW;

+	value[1].type = IGGY_DATATYPE_number;

+	value[1].number = visibleH;

+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcRepositionHud , 2 , value );

+}

+

+void UIScene_HUD::ShowDisplayName(bool show)

+{

+	m_lastShowDisplayName = show;

+	m_labelDisplayName.setVisible(show);

+}

+

+void UIScene_HUD::SetDisplayName(const wstring &displayName)

+{

+	if(displayName.compare(m_displayName) != 0)

+	{

+		m_displayName = displayName;

+		

+		IggyDataValue result;

+		IggyDataValue value[1];

+		IggyStringUTF16 stringVal;

+		stringVal.string = (IggyUTF16*)displayName.c_str();

+		stringVal.length = displayName.length();

+		value[0].type = IGGY_DATATYPE_string_UTF16;

+		value[0].string16 = stringVal;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetDisplayName , 1 , value );

+

+		m_labelDisplayName.setVisible(m_lastShowDisplayName);

+	}

+}

+

+void UIScene_HUD::SetTooltipsEnabled(bool bEnabled)

+{

+	if(m_bToolTipsVisible != bEnabled)

+	{

+		m_bToolTipsVisible = bEnabled;

+

+		IggyDataValue result;

+		IggyDataValue value[1];

+		value[0].type = IGGY_DATATYPE_boolean;

+		value[0].boolval = bEnabled;

+		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetTooltipsEnabled , 1 , value );

+	}

+}

+

+void UIScene_HUD::handleGameTick()

+{

+	if(getMovie() && app.GetGameStarted())

+	{

+		Minecraft *pMinecraft = Minecraft::GetInstance();

+		if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr)

+		{

+			m_parentLayer->showComponent(m_iPad, eUIScene_HUD,false);

+			return;

+		}

+		m_parentLayer->showComponent(m_iPad, eUIScene_HUD,true);

+

+		updateFrameTick();

+	}

 }
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_HUD.h b/Minecraft.Client/Common/UI/UIScene_HUD.h
index 9d58ba4b..04468c8e 100644
--- a/Minecraft.Client/Common/UI/UIScene_HUD.h
+++ b/Minecraft.Client/Common/UI/UIScene_HUD.h
@@ -176,5 +176,5 @@ protected:
 #endif
 
 private:
-	void repositionHud();
+	void repositionHud(S32 tileWidth, S32 tileHeight, F32 scale, bool needsYTile);
 };
diff --git a/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
index d442553f..ab79b940 100644
--- a/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
@@ -8,7 +8,7 @@ UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void *initData,
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	m_bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	m_bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	m_buttons[BUTTON_HAO_CHANGESKIN].init(IDS_CHANGE_SKIN,BUTTON_HAO_CHANGESKIN);
 	m_buttons[BUTTON_HAO_HOWTOPLAY].init(IDS_HOW_TO_PLAY,BUTTON_HAO_HOWTOPLAY);
@@ -41,7 +41,7 @@ UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void *initData,
 
 
 	// 4J-PB - do not need a storage device to see this menu - just need one when you choose to re-install them
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	// any content to be re-installed? 
 	if(m_iPad==ProfileManager.GetPrimaryPad() && bNotInGame)
@@ -103,7 +103,7 @@ void UIScene_HelpAndOptionsMenu::updateTooltips()
 
 void UIScene_HelpAndOptionsMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -121,14 +121,14 @@ void UIScene_HelpAndOptionsMenu::updateComponents()
 
 void UIScene_HelpAndOptionsMenu::handleReload()
 {
-#ifdef _FINAL_BUILD
+#ifndef _DEBUG // def _FINAL_BUILD // disable debug settings in release builds
 	removeControl( &m_buttons[BUTTON_HAO_DEBUG], false);
 #else
 	if(!app.DebugSettingsOn()) removeControl( &m_buttons[BUTTON_HAO_DEBUG], false);
 #endif
 
 	// 4J-PB - do not need a storage device to see this menu - just need one when you choose to re-install them
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	// any content to be re-installed? 
 	if(m_iPad==ProfileManager.GetPrimaryPad() && bNotInGame)
@@ -207,7 +207,7 @@ void UIScene_HelpAndOptionsMenu::handleInput(int iPad, int key, bool repeat, boo
 
 void UIScene_HelpAndOptionsMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case BUTTON_HAO_CHANGESKIN:
 		ui.NavigateToScene(m_iPad, eUIScene_SkinSelectMenu);
diff --git a/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp
index f0f6db18..8c657c97 100644
--- a/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HopperMenu.cpp
@@ -10,14 +10,14 @@ UIScene_HopperMenu::UIScene_HopperMenu(int iPad, void *_initData, UILayer *paren
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	HopperScreenInput *initData = (HopperScreenInput *)_initData;
+	HopperScreenInput *initData = static_cast<HopperScreenInput *>(_initData);
 
 	m_labelDispenser.init(initData->hopper->getName());
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Hopper_Menu, this);
 	}
@@ -156,7 +156,7 @@ void UIScene_HopperMenu::setSectionSelectedSlot(ESceneSection eSection, int x, i
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionHopperContents:
@@ -177,7 +177,7 @@ void UIScene_HopperMenu::setSectionSelectedSlot(ESceneSection eSection, int x, i
 
 UIControl *UIScene_HopperMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionHopperContents:
diff --git a/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp
index ab98e30f..c062df4e 100644
--- a/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HorseInventoryMenu.cpp
@@ -11,16 +11,16 @@ UIScene_HorseInventoryMenu::UIScene_HorseInventoryMenu(int iPad, void *_initData
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	HorseScreenInput *initData = (HorseScreenInput *)_initData;
+	HorseScreenInput *initData = static_cast<HorseScreenInput *>(_initData);
 
 	m_labelHorse.init( initData->container->getName() );
 	m_inventory = initData->inventory;
 	m_horse = initData->horse;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[iPad] != NULL )
+	if( pMinecraft->localgameModes[iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Horse_Menu, this);
 	}
@@ -240,7 +240,7 @@ void UIScene_HorseInventoryMenu::setSectionSelectedSlot(ESceneSection eSection,
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionHorseArmor:
@@ -268,7 +268,7 @@ void UIScene_HorseInventoryMenu::setSectionSelectedSlot(ESceneSection eSection,
 
 UIControl *UIScene_HorseInventoryMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionHorseArmor:
@@ -296,7 +296,7 @@ UIControl *UIScene_HorseInventoryMenu::getSection(ESceneSection eSection)
 void UIScene_HorseInventoryMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	if(wcscmp((wchar_t *)region->name,L"horse")==0)
 	{
diff --git a/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp b/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
index e33e24fe..bc721802 100644
--- a/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
@@ -136,7 +136,7 @@ UIScene_HowToPlay::UIScene_HowToPlay(int iPad, void *initData, UILayer *parentLa
 	// Extract pad and required page from init data. We just put the data into the pointer rather than using it as an address.
 	size_t uiInitData = ( size_t )( initData );
 	
-	EHowToPlayPage eStartPage = ( EHowToPlayPage )( ( uiInitData >> 16 ) & 0xFFF );		// Ignores MSB which is set to 1!
+	EHowToPlayPage eStartPage = static_cast<EHowToPlayPage>((uiInitData >> 16) & 0xFFF);		// Ignores MSB which is set to 1!
 
 	TelemetryManager->RecordMenuShown(m_iPad, eUIScene_HowToPlay, (ETelemetry_HowToPlay_SubMenuId)eStartPage);
 
@@ -216,10 +216,10 @@ void UIScene_HowToPlay::handleInput(int iPad, int key, bool repeat, bool pressed
 		if(pressed)
 		{
 			// Next page
-			int iNextPage = ( int )( m_eCurrPage ) + 1;
+			int iNextPage = static_cast<int>(m_eCurrPage) + 1;
 			if ( iNextPage != eHowToPlay_NumPages )
 			{
-				StartPage( ( EHowToPlayPage )( iNextPage ) );
+				StartPage( static_cast<EHowToPlayPage>(iNextPage) );
 				ui.PlayUISFX(eSFX_Press);
 			}
 			handled = true;
@@ -229,7 +229,7 @@ void UIScene_HowToPlay::handleInput(int iPad, int key, bool repeat, bool pressed
 		if(pressed)
 		{
 			// Previous page
-			int iPrevPage = ( int )( m_eCurrPage ) - 1;
+			int iPrevPage = static_cast<int>(m_eCurrPage) - 1;
 
 			// 4J Stu - Add back for future platforms
 #if 0
@@ -247,7 +247,7 @@ void UIScene_HowToPlay::handleInput(int iPad, int key, bool repeat, bool pressed
 			{
 				if ( iPrevPage >= 0 ) 
 				{
-					StartPage( ( EHowToPlayPage )( iPrevPage ) );
+					StartPage( static_cast<EHowToPlayPage>(iPrevPage) );
 					ui.PlayUISFX(eSFX_Press);
 				}
 
@@ -300,8 +300,8 @@ void UIScene_HowToPlay::StartPage( EHowToPlayPage ePage )
 	finalText = startTags + finalText;
 
 	vector<wstring> paragraphs;
-	int lastIndex = 0;
-	for (	int index = finalText.find(L"\r\n", lastIndex, 2);
+	size_t lastIndex = 0;
+	for (	size_t index = finalText.find(L"\r\n", lastIndex, 2);
 		index != wstring::npos; 
 		index = finalText.find(L"\r\n", lastIndex, 2)
 		)
@@ -318,7 +318,7 @@ void UIScene_HowToPlay::StartPage( EHowToPlayPage ePage )
 	IggyStringUTF16 * stringVal = new IggyStringUTF16[paragraphs.size()];
 
 	value[0].type = IGGY_DATATYPE_number;
-	value[0].number = gs_pageToFlashMapping[(int)ePage];
+	value[0].number = gs_pageToFlashMapping[static_cast<int>(ePage)];
 
 	for(unsigned int i = 0; i < paragraphs.size(); ++i)
 	{
diff --git a/Minecraft.Client/Common/UI/UIScene_HowToPlayMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HowToPlayMenu.cpp
index 92e8bdef..728bd4c0 100644
--- a/Minecraft.Client/Common/UI/UIScene_HowToPlayMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HowToPlayMenu.cpp
@@ -122,7 +122,7 @@ void UIScene_HowToPlayMenu::updateTooltips()
 
 void UIScene_HowToPlayMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -191,13 +191,13 @@ void UIScene_HowToPlayMenu::handleInput(int iPad, int key, bool repeat, bool pre
 
 void UIScene_HowToPlayMenu::handlePress(F64 controlId, F64 childId)
 {
-	if( (int)controlId == eControl_Buttons)
+	if( static_cast<int>(controlId) == eControl_Buttons)
 	{
 		//CD - Added for audio
 		ui.PlayUISFX(eSFX_Press);
 
 		unsigned int uiInitData;
-		uiInitData = ( ( 1 <<  31 )  | ( m_uiHTPSceneA[(int)childId]  << 16 ) | ( short )( m_iPad ) );
+		uiInitData = ( ( 1 <<  31 )  | ( m_uiHTPSceneA[static_cast<int>(childId)]  << 16 ) | static_cast<short>(m_iPad) );
 		ui.NavigateToScene(m_iPad, eUIScene_HowToPlay, ( void* )( uiInitData ) );
 	}
 }
diff --git a/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
index 68ac537e..51992e32 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
@@ -126,7 +126,7 @@ void UIScene_InGameHostOptionsMenu::handleInput(int iPad, int key, bool repeat,
 				shared_ptr<MultiplayerLocalPlayer> player = pMinecraft->localplayers[m_iPad];
 				if(player->connection)
 				{
-					player->connection->send( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, hostOptions) ) );
+					player->connection->send(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, hostOptions));
 				}
 			}
 
@@ -153,7 +153,7 @@ void UIScene_InGameHostOptionsMenu::handlePress(F64 controlId, F64 childId)
 	TeleportMenuInitData *initData = new TeleportMenuInitData();
 	initData->iPad = m_iPad;
 	initData->teleportToPlayer = false;
-	if( (int)controlId == eControl_TeleportToPlayer )
+	if( static_cast<int>(controlId) == eControl_TeleportToPlayer )
 	{
 		initData->teleportToPlayer = true;
 	}
diff --git a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
index 57acf345..338d1905 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
@@ -23,7 +23,7 @@ UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i );
 
-		if( player != NULL )
+		if( player != nullptr )
 		{
 			PlayerInfo *info = BuildPlayerInfo(player);
 
@@ -36,7 +36,7 @@ UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer
 
 	INetworkPlayer *thisPlayer = g_NetworkManager.GetLocalPlayerByUserIndex( m_iPad );
 	m_isHostPlayer = false;
-	if(thisPlayer != NULL) m_isHostPlayer = thisPlayer->IsHost() == TRUE;
+	if(thisPlayer != nullptr) m_isHostPlayer = thisPlayer->IsHost() == TRUE;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	shared_ptr<MultiplayerLocalPlayer> localPlayer = pMinecraft->localplayers[m_iPad];
@@ -109,7 +109,7 @@ void UIScene_InGameInfoMenu::updateTooltips()
 		{
 			keyA = IDS_TOOLTIPS_SELECT;
 		}
-		else if( selectedPlayer != NULL)
+		else if( selectedPlayer != nullptr)
 		{
 			bool editingHost = selectedPlayer->IsHost();
 			if( (cheats && (m_isHostPlayer || !editingHost ) ) || (!trust && (m_isHostPlayer || !editingHost))
@@ -134,7 +134,7 @@ void UIScene_InGameInfoMenu::updateTooltips()
 	if(!m_buttonGameOptions.hasFocus())
 	{
 		// if the player is me, then view gamer profile
-		if(selectedPlayer != NULL && selectedPlayer->IsLocal() && selectedPlayer->GetUserIndex()==m_iPad)
+		if(selectedPlayer != nullptr && selectedPlayer->IsLocal() && selectedPlayer->GetUserIndex()==m_iPad)
 		{
 			ikeyY = IDS_TOOLTIPS_VIEW_GAMERPROFILE;
 		}
@@ -150,8 +150,6 @@ void UIScene_InGameInfoMenu::updateTooltips()
 void UIScene_InGameInfoMenu::handleDestroy()
 {
 	g_NetworkManager.UnRegisterPlayerChangedCallback(m_iPad, &UIScene_InGameInfoMenu::OnPlayerChanged, this);
-
-	m_parentLayer->removeComponent(eUIComponent_MenuBackground);
 }
 
 void UIScene_InGameInfoMenu::handleGainFocus(bool navBack)
@@ -172,7 +170,7 @@ void UIScene_InGameInfoMenu::handleReload()
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i );
 
-		if( player != NULL )
+		if( player != nullptr )
 		{
 			PlayerInfo *info = BuildPlayerInfo(player);
 
@@ -183,7 +181,7 @@ void UIScene_InGameInfoMenu::handleReload()
 
 	INetworkPlayer *thisPlayer = g_NetworkManager.GetLocalPlayerByUserIndex( m_iPad );
 	m_isHostPlayer = false;
-	if(thisPlayer != NULL) m_isHostPlayer = thisPlayer->IsHost() == TRUE;
+	if(thisPlayer != nullptr) m_isHostPlayer = thisPlayer->IsHost() == TRUE;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	shared_ptr<MultiplayerLocalPlayer> localPlayer = pMinecraft->localplayers[m_iPad];
@@ -209,7 +207,7 @@ void UIScene_InGameInfoMenu::tick()
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i );
 
-		if(player != NULL)
+		if(player != nullptr)
 		{
 			PlayerInfo *info = BuildPlayerInfo(player);
 
@@ -283,7 +281,7 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, bool pr
 		if(pressed && m_playerList.hasFocus() && (m_playerList.getItemCount() > 0) && (m_playerList.getCurrentSelection() < m_players.size()) )
 		{
 			INetworkPlayer *player = g_NetworkManager.GetPlayerBySmallId(m_players[m_playerList.getCurrentSelection()]->m_smallId);
-			if( player != NULL )
+			if( player != nullptr )
 			{
 				PlayerUID uid = player->GetUID();
 				if( uid != INVALID_XUID )
@@ -327,14 +325,14 @@ void UIScene_InGameInfoMenu::handleInput(int iPad, int key, bool repeat, bool pr
 
 void UIScene_InGameInfoMenu::handlePress(F64 controlId, F64 childId)
 {
-	app.DebugPrintf("Pressed = %d, %d\n", (int)controlId, (int)childId);
-	switch((int)controlId)
+	app.DebugPrintf("Pressed = %d, %d\n", static_cast<int>(controlId), static_cast<int>(childId));
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_GameOptions:
 		ui.NavigateToScene(m_iPad,eUIScene_InGameHostOptionsMenu);
 		break;
 	case eControl_GamePlayers:
-		int currentSelection = (int)childId;
+		int currentSelection = static_cast<int>(childId);
 		INetworkPlayer *selectedPlayer = g_NetworkManager.GetPlayerBySmallId(m_players[currentSelection]->m_smallId);
 
 		Minecraft *pMinecraft = Minecraft::GetInstance();
@@ -344,7 +342,7 @@ void UIScene_InGameInfoMenu::handlePress(F64 controlId, F64 childId)
 		bool cheats = app.GetGameHostOption(eGameHostOption_CheatsEnabled) != 0;
 		bool trust = app.GetGameHostOption(eGameHostOption_TrustPlayers) != 0;
 
-		if( isOp && selectedPlayer != NULL)
+		if( isOp && selectedPlayer != nullptr)
 		{
 			bool editingHost = selectedPlayer->IsHost();
 			if( (cheats && (m_isHostPlayer || !editingHost ) ) || (!trust && (m_isHostPlayer || !editingHost))
@@ -377,10 +375,10 @@ void UIScene_InGameInfoMenu::handlePress(F64 controlId, F64 childId)
 
 void UIScene_InGameInfoMenu::handleFocusChange(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_GamePlayers:
-		m_playerList.updateChildFocus( (int) childId );
+		m_playerList.updateChildFocus( static_cast<int>(childId) );
 	};
 	updateTooltips();
 }
@@ -389,7 +387,7 @@ void UIScene_InGameInfoMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer
 {
 	app.DebugPrintf("<UIScene_InGameInfoMenu::OnPlayerChanged> Player \"%ls\" %s (smallId: %d)\n", pPlayer->GetOnlineName(), leaving ? "leaving" : "joining", pPlayer->GetSmallId());
 
-	UIScene_InGameInfoMenu *scene = (UIScene_InGameInfoMenu *)callbackParam;
+	UIScene_InGameInfoMenu *scene = static_cast<UIScene_InGameInfoMenu *>(callbackParam);
 	bool playerFound = false;
 	int foundIndex = 0;
 	for(int i = 0; i < scene->m_players.size(); ++i)
@@ -439,7 +437,7 @@ void UIScene_InGameInfoMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer
 
 int UIScene_InGameInfoMenu::KickPlayerReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	BYTE smallId = *(BYTE *)pParam;
+	BYTE smallId = *static_cast<BYTE *>(pParam);
 	delete pParam;
 
 	if(result==C4JStorage::EMessage_ResultAccept)
@@ -448,7 +446,7 @@ int UIScene_InGameInfoMenu::KickPlayerReturned(void *pParam,int iPad,C4JStorage:
 		shared_ptr<MultiplayerLocalPlayer> localPlayer = pMinecraft->localplayers[iPad];
 		if(localPlayer->connection)
 		{
-			localPlayer->connection->send( shared_ptr<KickPlayerPacket>( new KickPlayerPacket(smallId) ) );
+			localPlayer->connection->send(std::make_shared<KickPlayerPacket>(smallId));
 		}
 	}
 
@@ -473,7 +471,7 @@ UIScene_InGameInfoMenu::PlayerInfo *UIScene_InGameInfoMenu::BuildPlayerInfo(INet
 	}
 
 	int voiceStatus = 0;
-	if(player != NULL && player->HasVoice() )
+	if(player != nullptr && player->HasVoice() )
 	{
 		if( player->IsMutedByLocalUser(m_iPad) )
 		{
diff --git a/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
index d7196849..57937543 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
@@ -6,7 +6,6 @@
 #include "..\..\ClientConnection.h"
 #include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
 
-
 #define CHECKBOXES_TIMER_ID 0
 #define CHECKBOXES_TIMER_TIME 100
 
@@ -17,21 +16,21 @@ UIScene_InGamePlayerOptionsMenu::UIScene_InGamePlayerOptionsMenu(int iPad, void
 
 	m_bShouldNavBack = false;
 
-	InGamePlayerOptionsInitData *initData = (InGamePlayerOptionsInitData *)_initData;
+	InGamePlayerOptionsInitData *initData = static_cast<InGamePlayerOptionsInitData *>(_initData);
 	m_networkSmallId = initData->networkSmallId;
 	m_playerPrivileges = initData->playerPrivileges;
 
 	INetworkPlayer *localPlayer = g_NetworkManager.GetLocalPlayerByUserIndex( m_iPad );
 	INetworkPlayer *editingPlayer = g_NetworkManager.GetPlayerBySmallId(m_networkSmallId);
 
-	if(editingPlayer != NULL)
+	if(editingPlayer != nullptr)
 	{
 		m_labelGamertag.init(editingPlayer->GetDisplayName());
 	}
 
 	bool trustPlayers = app.GetGameHostOption(eGameHostOption_TrustPlayers) != 0;
 	bool cheats = app.GetGameHostOption(eGameHostOption_CheatsEnabled) != 0;
-	m_editingSelf = (localPlayer != NULL && localPlayer == editingPlayer);
+	m_editingSelf = (localPlayer != nullptr && localPlayer == editingPlayer);
 
 	if( m_editingSelf || trustPlayers || editingPlayer->IsHost())
 	{
@@ -61,7 +60,7 @@ UIScene_InGamePlayerOptionsMenu::UIScene_InGamePlayerOptionsMenu(int iPad, void
 
 	if(m_editingSelf)
 	{
-#if (defined(_CONTENT_PACKAGE) || defined(_FINAL_BUILD) && !defined(_DEBUG_MENUS_ENABLED))
+#ifndef _DEBUG // (defined(_CONTENT_PACKAGE) || defined(_FINAL_BUILD) && !defined(_DEBUG_MENUS_ENABLED))
 		removeControl( &m_checkboxes[eControl_Op], true );
 #else
 		m_checkboxes[eControl_Op].init(L"DEBUG: Creative",eControl_Op,Player::getPlayerGamePrivilege(m_playerPrivileges,Player::ePlayerGamePrivilege_CreativeMode));
@@ -241,7 +240,7 @@ void UIScene_InGamePlayerOptionsMenu::handleReload()
 
 	bool trustPlayers = app.GetGameHostOption(eGameHostOption_TrustPlayers) != 0;
 	bool cheats = app.GetGameHostOption(eGameHostOption_CheatsEnabled) != 0;
-	m_editingSelf = (localPlayer != NULL && localPlayer == editingPlayer);
+	m_editingSelf = (localPlayer != nullptr && localPlayer == editingPlayer);
 
 	if( m_editingSelf || trustPlayers || editingPlayer->IsHost())
 	{
@@ -254,7 +253,7 @@ void UIScene_InGamePlayerOptionsMenu::handleReload()
 
 	if(m_editingSelf)
 	{
-#if (defined(_CONTENT_PACKAGE) || defined(_FINAL_BUILD) && !defined(_DEBUG_MENUS_ENABLED))
+#ifndef _DEBUG //(defined(_CONTENT_PACKAGE) || defined(_FINAL_BUILD) && !defined(_DEBUG_MENUS_ENABLED))
 		removeControl( &m_checkboxes[eControl_Op], true );
 #endif
 		
@@ -348,7 +347,7 @@ void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, bool repeat
 			bool cheats = app.GetGameHostOption(eGameHostOption_CheatsEnabled) != 0;
 			if(m_editingSelf)
 			{
-#if (defined(_CONTENT_PACKAGE) || defined(_FINAL_BUILD) && !defined(_DEBUG_MENUS_ENABLED))
+#ifndef _DEBUG // (defined(_CONTENT_PACKAGE) || defined(_FINAL_BUILD) && !defined(_DEBUG_MENUS_ENABLED))
 #else
 				Player::setPlayerGamePrivilege(m_playerPrivileges,Player::ePlayerGamePrivilege_CreativeMode,m_checkboxes[eControl_Op].IsChecked());
 #endif
@@ -372,7 +371,7 @@ void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, bool repeat
 			else
 			{
 				INetworkPlayer *editingPlayer = g_NetworkManager.GetPlayerBySmallId(m_networkSmallId);
-				if(!trustPlayers && (editingPlayer != NULL && !editingPlayer->IsHost() ) )
+				if(!trustPlayers && (editingPlayer != nullptr && !editingPlayer->IsHost() ) )
 				{
 					Player::setPlayerGamePrivilege(m_playerPrivileges,Player::ePlayerGamePrivilege_CannotMine,!m_checkboxes[eControl_BuildAndMine].IsChecked());
 					Player::setPlayerGamePrivilege(m_playerPrivileges,Player::ePlayerGamePrivilege_CannotBuild,!m_checkboxes[eControl_BuildAndMine].IsChecked());
@@ -405,7 +404,7 @@ void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, bool repeat
 				shared_ptr<MultiplayerLocalPlayer> player = pMinecraft->localplayers[m_iPad];
 				if(player->connection)
 				{
-					player->connection->send( shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( m_networkSmallId, -1, m_playerPrivileges) ) );
+					player->connection->send(std::make_shared<PlayerInfoPacket>(m_networkSmallId, -1, m_playerPrivileges));
 				}
 			}
 			navigateBack();
@@ -428,7 +427,7 @@ void UIScene_InGamePlayerOptionsMenu::handleInput(int iPad, int key, bool repeat
 
 void UIScene_InGamePlayerOptionsMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Kick:
 		{
@@ -446,7 +445,7 @@ void UIScene_InGamePlayerOptionsMenu::handlePress(F64 controlId, F64 childId)
 
 int UIScene_InGamePlayerOptionsMenu::KickPlayerReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	BYTE smallId = *(BYTE *)pParam;
+	BYTE smallId = *static_cast<BYTE *>(pParam);
 	delete pParam;
 
 	if(result==C4JStorage::EMessage_ResultAccept)
@@ -455,7 +454,7 @@ int UIScene_InGamePlayerOptionsMenu::KickPlayerReturned(void *pParam,int iPad,C4
 		shared_ptr<MultiplayerLocalPlayer> localPlayer = pMinecraft->localplayers[iPad];
 		if(localPlayer->connection)
 		{
-			localPlayer->connection->send( shared_ptr<KickPlayerPacket>( new KickPlayerPacket(smallId) ) );
+			localPlayer->connection->send(std::make_shared<KickPlayerPacket>(smallId));
 		}
 
 		// Fix for #61494 - [CRASH]: TU7: Code: Multiplayer: Title may crash while kicking a player from an online game.
@@ -470,12 +469,12 @@ int UIScene_InGamePlayerOptionsMenu::KickPlayerReturned(void *pParam,int iPad,C4
 void UIScene_InGamePlayerOptionsMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer *pPlayer, bool leaving)
 {
 	app.DebugPrintf("UIScene_InGamePlayerOptionsMenu::OnPlayerChanged");
-	UIScene_InGamePlayerOptionsMenu *scene = (UIScene_InGamePlayerOptionsMenu *)callbackParam;
+	UIScene_InGamePlayerOptionsMenu *scene = static_cast<UIScene_InGamePlayerOptionsMenu *>(callbackParam);
 
-	UIScene_InGameInfoMenu *infoScene = (UIScene_InGameInfoMenu *)scene->getBackScene();
-	if(infoScene != NULL) UIScene_InGameInfoMenu::OnPlayerChanged(infoScene,pPlayer,leaving);
+	UIScene_InGameInfoMenu *infoScene = static_cast<UIScene_InGameInfoMenu *>(scene->getBackScene());
+	if(infoScene != nullptr) UIScene_InGameInfoMenu::OnPlayerChanged(infoScene,pPlayer,leaving);
 
-	if(leaving && pPlayer != NULL && pPlayer->GetSmallId() == scene->m_networkSmallId)
+	if(leaving && pPlayer != nullptr && pPlayer->GetSmallId() == scene->m_networkSmallId)
 	{
 		scene->m_bShouldNavBack = true;
 	}
@@ -497,7 +496,7 @@ void UIScene_InGamePlayerOptionsMenu::resetCheatCheckboxes()
 
 void UIScene_InGamePlayerOptionsMenu::handleCheckboxToggled(F64 controlId, bool selected)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Op:
 		// flag that the moderator state has changed
diff --git a/Minecraft.Client/Common/UI/UIScene_InGameSaveManagementMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameSaveManagementMenu.cpp
index fa2c7e61..fb118b15 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGameSaveManagementMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGameSaveManagementMenu.cpp
@@ -8,7 +8,7 @@
 
 int UIScene_InGameSaveManagementMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
 {
-	UIScene_InGameSaveManagementMenu *pClass= (UIScene_InGameSaveManagementMenu *)lpParam;
+	UIScene_InGameSaveManagementMenu *pClass= static_cast<UIScene_InGameSaveManagementMenu *>(lpParam);
 
 	app.DebugPrintf("Received data for save thumbnail\n");
 
@@ -20,9 +20,9 @@ int UIScene_InGameSaveManagementMenu::LoadSaveDataThumbnailReturned(LPVOID lpPar
 	}
 	else
 	{
-		pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].pbThumbnailData = NULL;
+		pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].pbThumbnailData = nullptr;
 		pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].dwThumbnailSize = 0;
-		app.DebugPrintf("Save thumbnail data is NULL, or has size 0\n");
+		app.DebugPrintf("Save thumbnail data is nullptr, or has size 0\n");
 	}
 	pClass->m_bSaveThumbnailReady = true;
 
@@ -55,9 +55,9 @@ UIScene_InGameSaveManagementMenu::UIScene_InGameSaveManagementMenu(int iPad, voi
 	m_bRetrievingSaveThumbnails = false;
 	m_bSaveThumbnailReady = false;
 	m_bExitScene=false;
-	m_pSaveDetails=NULL;
+	m_pSaveDetails=nullptr;
 	m_bSavesDisplayed=false;
-	m_saveDetails = NULL;
+	m_saveDetails = nullptr;
 	m_iSaveDetailsCount = 0;
 
 #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__) || defined(_DURANGO)
@@ -198,17 +198,17 @@ void UIScene_InGameSaveManagementMenu::tick()
 		if(!m_bSavesDisplayed)
 		{
 			m_pSaveDetails=StorageManager.ReturnSavesInfo();
-			if(m_pSaveDetails!=NULL)
+			if(m_pSaveDetails!=nullptr)
 			{
 				m_spaceIndicatorSaves.reset();
 
 				m_bSavesDisplayed=true;
 
-				if(m_saveDetails!=NULL)
+				if(m_saveDetails!=nullptr)
 				{
 					for(unsigned int i = 0; i < m_pSaveDetails->iSaveC; ++i)
 					{
-						if(m_saveDetails[i].pbThumbnailData!=NULL)
+						if(m_saveDetails[i].pbThumbnailData!=nullptr)
 						{
 							delete m_saveDetails[i].pbThumbnailData;
 						}
@@ -371,9 +371,9 @@ void UIScene_InGameSaveManagementMenu::GetSaveInfo(  )
 	m_controlSavesTimer.setVisible(true);
 
 	m_pSaveDetails=StorageManager.ReturnSavesInfo();
-	if(m_pSaveDetails==NULL)
+	if(m_pSaveDetails==nullptr)
 	{
-		C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save"); 
+		C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,nullptr,this,"save"); 
 	}
 
 
@@ -418,12 +418,12 @@ void UIScene_InGameSaveManagementMenu::handleInput(int iPad, int key, bool repea
 
 void UIScene_InGameSaveManagementMenu::handleInitFocus(F64 controlId, F64 childId)
 {
-	app.DebugPrintf(app.USER_SR, "UIScene_InGameSaveManagementMenu::handleInitFocus - %d , %d\n", (int)controlId, (int)childId);
+	app.DebugPrintf(app.USER_SR, "UIScene_InGameSaveManagementMenu::handleInitFocus - %d , %d\n", static_cast<int>(controlId), static_cast<int>(childId));
 }
 
 void UIScene_InGameSaveManagementMenu::handleFocusChange(F64 controlId, F64 childId) 
 {
-	app.DebugPrintf(app.USER_SR, "UIScene_InGameSaveManagementMenu::handleFocusChange - %d , %d\n", (int)controlId, (int)childId);
+	app.DebugPrintf(app.USER_SR, "UIScene_InGameSaveManagementMenu::handleFocusChange - %d , %d\n", static_cast<int>(controlId), static_cast<int>(childId));
 	m_iSaveListIndex = childId;
 	if(m_bSavesDisplayed) m_bUpdateSaveSize = true;
 	updateTooltips();
@@ -431,7 +431,7 @@ void UIScene_InGameSaveManagementMenu::handleFocusChange(F64 controlId, F64 chil
 
 void UIScene_InGameSaveManagementMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_SavesList:
 		{
@@ -452,7 +452,7 @@ void UIScene_InGameSaveManagementMenu::handlePress(F64 controlId, F64 childId)
 
 int UIScene_InGameSaveManagementMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_InGameSaveManagementMenu* pClass = (UIScene_InGameSaveManagementMenu*)pParam;
+	UIScene_InGameSaveManagementMenu* pClass = static_cast<UIScene_InGameSaveManagementMenu *>(pParam);
 	// results switched for this dialog
 
 	if(result==C4JStorage::EMessage_ResultDecline) 
@@ -477,7 +477,7 @@ int UIScene_InGameSaveManagementMenu::DeleteSaveDialogReturned(void *pParam,int
 
 int UIScene_InGameSaveManagementMenu::DeleteSaveDataReturned(LPVOID lpParam,bool bRes)
 {
-	UIScene_InGameSaveManagementMenu* pClass = (UIScene_InGameSaveManagementMenu*)lpParam;
+	UIScene_InGameSaveManagementMenu* pClass = static_cast<UIScene_InGameSaveManagementMenu *>(lpParam);
 
 	if(bRes)
 	{
diff --git a/Minecraft.Client/Common/UI/UIScene_Intro.cpp b/Minecraft.Client/Common/UI/UIScene_Intro.cpp
index 7fc435b2..f4aefc40 100644
--- a/Minecraft.Client/Common/UI/UIScene_Intro.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_Intro.cpp
@@ -83,17 +83,23 @@ void UIScene_Intro::handleInput(int iPad, int key, bool repeat, bool pressed, bo
 			case C4JStorage::eOptions_Callback_Read:
 			case C4JStorage::eOptions_Callback_Read_FileNotFound:
 				// we've either read it, or it wasn't found
+				#if 0
 				if(app.GetGameSettings(0,eGameSetting_PS3_EULA_Read)==0)
 				{
 					ui.NavigateToScene(0,eUIScene_EULA);
 				}
 				else
+				#endif
 				{
 					ui.NavigateToScene(0,eUIScene_SaveMessage);
 				}
 				break;
 			default:
-				ui.NavigateToScene(0,eUIScene_EULA);			
+				#if 0
+				ui.NavigateToScene(0,eUIScene_EULA);		
+				#else
+				ui.NavigateToScene(0,eUIScene_SaveMessage);	
+				#endif
 				break;
 			}
 #elif defined _XBOX_ONE
@@ -131,17 +137,23 @@ void UIScene_Intro::handleAnimationEnd()
 		case C4JStorage::eOptions_Callback_Read:
 		case C4JStorage::eOptions_Callback_Read_FileNotFound:
 			// we've either read it, or it wasn't found
+			#if 0
 			if(app.GetGameSettings(0,eGameSetting_PS3_EULA_Read)==0)
 			{
 				ui.NavigateToScene(0,eUIScene_EULA);
 			}
 			else
+			#endif
 			{
 				ui.NavigateToScene(0,eUIScene_SaveMessage);
 			}
 			break;
 		default:
-			ui.NavigateToScene(0,eUIScene_EULA);			
+			#if 0
+			ui.NavigateToScene(0,eUIScene_EULA);		
+			#else
+			ui.NavigateToScene(0,eUIScene_SaveMessage);	
+			#endif			
 		break;
 		}
 
diff --git a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
index 4a9dab43..4e217c77 100644
--- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
@@ -23,17 +23,17 @@ UIScene_InventoryMenu::UIScene_InventoryMenu(int iPad, void *_initData, UILayer
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	InventoryScreenInput *initData = (InventoryScreenInput *)_initData;
+	InventoryScreenInput *initData = static_cast<InventoryScreenInput *>(_initData);
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[initData->iPad] != NULL )
+	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Inventory_Menu, this);
 	}
 
-	InventoryMenu *menu = (InventoryMenu *)initData->player->inventoryMenu;
+	InventoryMenu *menu = static_cast<InventoryMenu *>(initData->player->inventoryMenu);
 
 	initData->player->awardStat(GenericStats::openInventory(),GenericStats::param_openInventory());
 
@@ -182,7 +182,7 @@ void UIScene_InventoryMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 	int index = (y * cols) + x;
 
-	UIControl_SlotList *slotList = NULL;
+	UIControl_SlotList *slotList = nullptr;
 	switch( eSection )
 	{
 	case eSectionInventoryArmor:
@@ -201,7 +201,7 @@ void UIScene_InventoryMenu::setSectionSelectedSlot(ESceneSection eSection, int x
 
 UIControl *UIScene_InventoryMenu::getSection(ESceneSection eSection)
 {
-	UIControl *control = NULL;
+	UIControl *control = nullptr;
 	switch( eSection )
 	{
 	case eSectionInventoryArmor:
@@ -220,7 +220,7 @@ UIControl *UIScene_InventoryMenu::getSection(ESceneSection eSection)
 void UIScene_InventoryMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	if(wcscmp((wchar_t *)region->name,L"player")==0)
 	{
@@ -253,7 +253,7 @@ void UIScene_InventoryMenu::updateEffectsDisplay()
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	shared_ptr<MultiplayerLocalPlayer> player = pMinecraft->localplayers[m_iPad];
 
-	if(player == NULL) return;
+	if(player == nullptr) return;
 
 	vector<MobEffectInstance *> *activeEffects = player->getActiveEffects();
 
diff --git a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
index c036f7bf..417c1700 100644
--- a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
@@ -16,17 +16,24 @@ UIScene_JoinMenu::UIScene_JoinMenu(int iPad, void *_initData, UILayer *parentLay
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	JoinMenuInitData *initData = (JoinMenuInitData *)_initData;
+	JoinMenuInitData *initData = static_cast<JoinMenuInitData *>(_initData);
 	m_selectedSession = initData->selectedSession;
 	m_friendInfoUpdatedOK = false;
 	m_friendInfoUpdatedERROR = false;
 	m_friendInfoRequestIssued = false;
+#ifdef _WINDOWS64
+	m_serverIndex = initData->serverIndex;
+	m_editServerPhase = eEditServer_Idle;
+	m_editServerButtonIndex = -1;
+	m_deleteServerButtonIndex = -1;
+#endif
 }
 
 void UIScene_JoinMenu::updateTooltips()
 {
 	int iA = -1;
 	int iY = -1;
+	int iX = -1;
 	if (getControlFocus() == eControl_GamePlayers)
 	{
 #ifdef _DURANGO
@@ -38,7 +45,15 @@ void UIScene_JoinMenu::updateTooltips()
 		iA = IDS_TOOLTIPS_SELECT;
 	}
 
-	ui.SetTooltips( DEFAULT_XUI_MENU_USER, iA, IDS_TOOLTIPS_BACK, -1, iY );
+#ifdef _WINDOWS64
+	if (m_serverIndex >= 0)
+	{
+		iX = IDS_TOOLTIPS_DELETE;
+		iY = IDS_TITLE_RENAME;
+	}
+#endif
+
+	ui.SetTooltips( DEFAULT_XUI_MENU_USER, iA, IDS_TOOLTIPS_BACK, iX, iY );
 
 }
 
@@ -62,7 +77,7 @@ void UIScene_JoinMenu::tick()
 #if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__
 		for( int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; i++ )
 		{
-			if( m_selectedSession->data.players[i] != NULL )
+			if( m_selectedSession->data.players[i] != nullptr )
 			{
 	#ifndef _CONTENT_PACKAGE
 				if(app.DebugSettingsOn() && (app.GetGameSettingsDebugMask()&(1L<<eDebugSetting_DebugLeaderboards)))
@@ -88,7 +103,7 @@ void UIScene_JoinMenu::tick()
 			}
 			else
 			{
-				// Leave the loop when we hit the first NULL player
+				// Leave the loop when we hit the first nullptr player
 				break;
 			}
 		}
@@ -107,6 +122,16 @@ void UIScene_JoinMenu::tick()
 		}
 #endif
 
+#ifdef _WINDOWS64
+		if (m_serverIndex >= 0)
+		{
+			m_editServerButtonIndex = m_buttonListPlayers.getItemCount();
+			m_buttonListPlayers.addItem(L"Edit Server");
+			m_deleteServerButtonIndex = m_buttonListPlayers.getItemCount();
+			m_buttonListPlayers.addItem(L"Delete Server");
+		}
+#endif
+
 		m_labelLabels[eLabel_Difficulty].init(app.GetString(IDS_LABEL_DIFFICULTY));
 		m_labelLabels[eLabel_GameType].init(app.GetString(IDS_LABEL_GAME_TYPE));
 		m_labelLabels[eLabel_GamertagsOn].init(app.GetString(IDS_LABEL_GAMERTAGS));
@@ -224,7 +249,7 @@ void UIScene_JoinMenu::tick()
 
 void UIScene_JoinMenu::friendSessionUpdated(bool success, void *pParam)
 {
-	UIScene_JoinMenu *scene = (UIScene_JoinMenu *)pParam;
+	UIScene_JoinMenu *scene = static_cast<UIScene_JoinMenu *>(pParam);
 	ui.NavigateBack(scene->m_iPad);
 	if( success )
 	{
@@ -238,7 +263,7 @@ void UIScene_JoinMenu::friendSessionUpdated(bool success, void *pParam)
 
 int UIScene_JoinMenu::ErrorDialogReturned(void *pParam, int iPad, const C4JStorage::EMessageResult)
 {
-	UIScene_JoinMenu *scene = (UIScene_JoinMenu *)pParam;
+	UIScene_JoinMenu *scene = static_cast<UIScene_JoinMenu *>(pParam);
 	ui.NavigateBack(scene->m_iPad);
 
 	return 0;
@@ -272,18 +297,44 @@ void UIScene_JoinMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 		break;
 #ifdef _DURANGO
 	case ACTION_MENU_Y:
-		if(m_selectedSession != NULL && getControlFocus() == eControl_GamePlayers && m_buttonListPlayers.getItemCount() > 0)
+		if(m_selectedSession != nullptr && getControlFocus() == eControl_GamePlayers && m_buttonListPlayers.getItemCount() > 0)
 		{
 			PlayerUID uid = m_selectedSession->searchResult.m_playerXuids[m_buttonListPlayers.getCurrentSelection()];
 			if( uid != INVALID_XUID ) ProfileManager.ShowProfileCard(ProfileManager.GetLockedProfile(),uid);
 		}
 		break;
 #endif
+#ifdef _WINDOWS64
+	case ACTION_MENU_X:
+		if(pressed && m_serverIndex >= 0)
+		{
+			BeginDeleteServer();
+			handled = true;
+		}
+		break;
+	case ACTION_MENU_Y:
+		if(pressed && m_serverIndex >= 0)
+		{
+			BeginEditServer();
+			handled = true;
+		}
+		break;
+#endif
 	case ACTION_MENU_OK:
 		if (getControlFocus() != eControl_GamePlayers)
 		{
 			sendInputToMovie(key, repeat, pressed, released);
 		}
+#ifdef _WINDOWS64
+		else if (pressed && m_serverIndex >= 0)
+		{
+			int sel = m_buttonListPlayers.getCurrentSelection();
+			if (sel == m_editServerButtonIndex)
+				BeginEditServer();
+			else if (sel == m_deleteServerButtonIndex)
+				BeginDeleteServer();
+		}
+#endif
 		handled = true;
 		break;
 #ifdef __ORBIS__
@@ -301,7 +352,7 @@ void UIScene_JoinMenu::handleInput(int iPad, int key, bool repeat, bool pressed,
 
 void UIScene_JoinMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_JoinGame:
 		{
@@ -318,16 +369,26 @@ void UIScene_JoinMenu::handlePress(F64 controlId, F64 childId)
 		}
 		break;
 	case eControl_GamePlayers:
+#ifdef _WINDOWS64
+		if (m_serverIndex >= 0)
+		{
+			int sel = (int)childId;
+			if (sel == m_editServerButtonIndex)
+				BeginEditServer();
+			else if (sel == m_deleteServerButtonIndex)
+				BeginDeleteServer();
+		}
+#endif
 		break;
 	};
 }
 
 void UIScene_JoinMenu::handleFocusChange(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_GamePlayers:
-		m_buttonListPlayers.updateChildFocus( (int) childId );
+		m_buttonListPlayers.updateChildFocus( static_cast<int>(childId) );
 	};
 	updateTooltips();
 }
@@ -370,7 +431,7 @@ void UIScene_JoinMenu::StartSharedLaunchFlow()
 
 int UIScene_JoinMenu::StartGame_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	UIScene_JoinMenu* pClass = (UIScene_JoinMenu*)ui.GetSceneFromCallbackId((size_t)pParam);
+	UIScene_JoinMenu* pClass = static_cast<UIScene_JoinMenu *>(ui.GetSceneFromCallbackId((size_t)pParam));
 
 	if(pClass)
 	{
@@ -473,7 +534,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 #if defined(__PS3__) || defined(__PSVITA__)
 	if(isSignedInLive)
 	{
-		ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&noUGC,NULL,NULL);
+		ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&noUGC,nullptr,nullptr);
 	}
 #else
 	ProfileManager.AllowedPlayerCreatedContent(ProfileManager.GetPrimaryPad(),false,&pccAllowed,&pccFriendsAllowed);
@@ -511,7 +572,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 	{
 #if defined(__ORBIS__) || defined(__PSVITA__)
 		bool chatRestricted = false;
-		ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,NULL,NULL);
+		ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,nullptr,nullptr);
 		if(chatRestricted)
 		{
 			ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, ProfileManager.GetPrimaryPad() );
@@ -534,6 +595,48 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 
 			if( exitReasonStringId == -1 )
 			{
+				Minecraft* pMinecraft = Minecraft::GetInstance();
+				int primaryPad = ProfileManager.GetPrimaryPad();
+				if( pMinecraft->m_connectionFailed[primaryPad] )
+				{
+					switch( pMinecraft->m_connectionFailedReason[primaryPad] )
+					{
+					case DisconnectPacket::eDisconnect_LoginTooLong:
+						exitReasonStringId = IDS_DISCONNECTED_LOGIN_TOO_LONG;
+						break;
+					case DisconnectPacket::eDisconnect_ServerFull:
+						exitReasonStringId = IDS_DISCONNECTED_SERVER_FULL;
+						break;
+					case DisconnectPacket::eDisconnect_Kicked:
+						exitReasonStringId = IDS_DISCONNECTED_KICKED;
+						break;
+					case DisconnectPacket::eDisconnect_NoUGC_AllLocal:
+						exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL;
+						break;
+					case DisconnectPacket::eDisconnect_NoUGC_Single_Local:
+						exitReasonStringId = IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL;
+						break;
+					case DisconnectPacket::eDisconnect_NoFlying:
+						exitReasonStringId = IDS_DISCONNECTED_FLYING;
+						break;
+					case DisconnectPacket::eDisconnect_Quitting:
+						exitReasonStringId = IDS_DISCONNECTED_SERVER_QUIT;
+						break;
+					case DisconnectPacket::eDisconnect_OutdatedServer:
+						exitReasonStringId = IDS_DISCONNECTED_SERVER_OLD;
+						break;
+					case DisconnectPacket::eDisconnect_OutdatedClient:
+						exitReasonStringId = IDS_DISCONNECTED_CLIENT_OLD;
+						break;
+					default:
+						exitReasonStringId = IDS_CONNECTION_LOST_SERVER;
+						break;
+					}
+				}
+			}
+
+			if( exitReasonStringId == -1 )
+			{
 				ui.NavigateBack(pClass->m_iPad);
 			}
 			else
@@ -566,7 +669,7 @@ void UIScene_JoinMenu::handleTimerComplete(int id)
 				int selectedIndex = 0;
 				for(unsigned int i = 0; i < MINECRAFT_NET_MAX_PLAYERS; ++i)
 				{
-					if( m_selectedSession->data.players[i] != NULL )
+					if( m_selectedSession->data.players[i] != nullptr )
 					{
 						if(m_selectedSession->data.players[i] == selectedPlayerXUID) selectedIndex = i;
 						playersList.InsertItems(i,1);
@@ -583,7 +686,7 @@ void UIScene_JoinMenu::handleTimerComplete(int id)
 					}
 					else
 					{
-						// Leave the loop when we hit the first NULL player
+						// Leave the loop when we hit the first nullptr player
 						break;
 					}
 				}
@@ -593,4 +696,279 @@ void UIScene_JoinMenu::handleTimerComplete(int id)
 		}
 		break;
 	};
-}
\ No newline at end of file
+}
+
+#ifdef _WINDOWS64
+void UIScene_JoinMenu::BeginDeleteServer()
+{
+	m_bIgnoreInput = true;
+	UINT uiIDA[2];
+	uiIDA[0] = IDS_CONFIRM_CANCEL;
+	uiIDA[1] = IDS_CONFIRM_OK;
+	ui.RequestAlertMessage(IDS_TOOLTIPS_DELETE, IDS_TEXT_DELETE_SAVE, uiIDA, 2, m_iPad, &UIScene_JoinMenu::DeleteServerDialogReturned, this);
+}
+
+int UIScene_JoinMenu::DeleteServerDialogReturned(void *pParam, int iPad, C4JStorage::EMessageResult result)
+{
+	UIScene_JoinMenu* pClass = (UIScene_JoinMenu*)pParam;
+
+	if (result == C4JStorage::EMessage_ResultDecline)
+	{
+		pClass->RemoveServerFromFile();
+		g_NetworkManager.ForceFriendsSessionRefresh();
+		pClass->navigateBack();
+	}
+	else
+	{
+		pClass->m_bIgnoreInput = false;
+	}
+
+	return 0;
+}
+
+void UIScene_JoinMenu::BeginEditServer()
+{
+	m_bIgnoreInput = true;
+	m_editServerPhase = eEditServer_IP;
+	m_editServerIP.clear();
+	m_editServerPort.clear();
+
+	wchar_t wDefaultIP[64] = {};
+	mbstowcs(wDefaultIP, m_selectedSession->data.hostIP, 63);
+
+	UIKeyboardInitData kbData;
+	kbData.title       = L"Server Address";
+	kbData.defaultText = wDefaultIP;
+	kbData.maxChars    = 128;
+	kbData.callback    = &UIScene_JoinMenu::EditServerKeyboardCallback;
+	kbData.lpParam     = this;
+	kbData.pcMode      = g_KBMInput.IsKBMActive();
+	ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData);
+}
+
+int UIScene_JoinMenu::EditServerKeyboardCallback(LPVOID lpParam, bool bRes)
+{
+	UIScene_JoinMenu *pClass = (UIScene_JoinMenu *)lpParam;
+
+	if (!bRes)
+	{
+		pClass->m_editServerPhase = eEditServer_Idle;
+		pClass->m_bIgnoreInput = false;
+		return 0;
+	}
+
+	uint16_t ui16Text[256];
+	ZeroMemory(ui16Text, sizeof(ui16Text));
+	Win64_GetKeyboardText(ui16Text, 256);
+
+	wchar_t wBuf[256] = {};
+	for (int k = 0; k < 255 && ui16Text[k]; k++)
+		wBuf[k] = (wchar_t)ui16Text[k];
+
+	if (wBuf[0] == 0)
+	{
+		pClass->m_editServerPhase = eEditServer_Idle;
+		pClass->m_bIgnoreInput = false;
+		return 0;
+	}
+
+	switch (pClass->m_editServerPhase)
+	{
+	case eEditServer_IP:
+	{
+		pClass->m_editServerIP = wBuf;
+		pClass->m_editServerPhase = eEditServer_Port;
+
+		wchar_t wDefaultPort[16] = {};
+		swprintf(wDefaultPort, 16, L"%d", pClass->m_selectedSession->data.hostPort);
+
+		UIKeyboardInitData kbData;
+		kbData.title       = L"Server Port";
+		kbData.defaultText = wDefaultPort;
+		kbData.maxChars    = 6;
+		kbData.callback    = &UIScene_JoinMenu::EditServerKeyboardCallback;
+		kbData.lpParam     = pClass;
+		kbData.pcMode      = g_KBMInput.IsKBMActive();
+		ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData);
+		break;
+	}
+	case eEditServer_Port:
+	{
+		pClass->m_editServerPort = wBuf;
+		pClass->m_editServerPhase = eEditServer_Name;
+
+		wchar_t wDefaultName[64] = {};
+		if (pClass->m_selectedSession->displayLabel)
+			wcsncpy(wDefaultName, pClass->m_selectedSession->displayLabel, 63);
+
+		UIKeyboardInitData kbData;
+		kbData.title       = L"Server Name";
+		kbData.defaultText = wDefaultName;
+		kbData.maxChars    = 64;
+		kbData.callback    = &UIScene_JoinMenu::EditServerKeyboardCallback;
+		kbData.lpParam     = pClass;
+		kbData.pcMode      = g_KBMInput.IsKBMActive();
+		ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData);
+		break;
+	}
+	case eEditServer_Name:
+	{
+		wstring newName = wBuf;
+		pClass->UpdateServerInFile(pClass->m_editServerIP, pClass->m_editServerPort, newName);
+		pClass->m_editServerPhase = eEditServer_Idle;
+		pClass->m_bIgnoreInput = false;
+
+		g_NetworkManager.ForceFriendsSessionRefresh();
+		pClass->navigateBack();
+		break;
+	}
+	default:
+		pClass->m_editServerPhase = eEditServer_Idle;
+		pClass->m_bIgnoreInput = false;
+		break;
+	}
+
+	return 0;
+}
+
+void UIScene_JoinMenu::UpdateServerInFile(const wstring& newIP, const wstring& newPort, const wstring& newName)
+{
+	char narrowNewIP[256] = {};
+	char narrowNewPort[16] = {};
+	char narrowNewName[256] = {};
+	wcstombs(narrowNewIP, newIP.c_str(), sizeof(narrowNewIP) - 1);
+	wcstombs(narrowNewPort, newPort.c_str(), sizeof(narrowNewPort) - 1);
+	wcstombs(narrowNewName, newName.c_str(), sizeof(narrowNewName) - 1);
+
+	uint16_t newPortNum = (uint16_t)atoi(narrowNewPort);
+
+	struct ServerEntry { std::string ip; uint16_t port; std::string name; };
+	std::vector<ServerEntry> entries;
+
+	FILE* file = fopen("servers.db", "rb");
+	if (file)
+	{
+		char magic[4] = {};
+		if (fread(magic, 1, 4, file) == 4 && memcmp(magic, "MCSV", 4) == 0)
+		{
+			uint32_t version = 0, count = 0;
+			fread(&version, sizeof(uint32_t), 1, file);
+			fread(&count, sizeof(uint32_t), 1, file);
+			if (version == 1)
+			{
+				for (uint32_t s = 0; s < count; s++)
+				{
+					uint16_t ipLen = 0, p = 0, nameLen = 0;
+					if (fread(&ipLen, sizeof(uint16_t), 1, file) != 1) break;
+					if (ipLen == 0 || ipLen > 256) break;
+					char ipBuf[257] = {};
+					if (fread(ipBuf, 1, ipLen, file) != ipLen) break;
+					if (fread(&p, sizeof(uint16_t), 1, file) != 1) break;
+					if (fread(&nameLen, sizeof(uint16_t), 1, file) != 1) break;
+					if (nameLen > 256) break;
+					char nameBuf[257] = {};
+					if (nameLen > 0 && fread(nameBuf, 1, nameLen, file) != nameLen) break;
+					entries.push_back({std::string(ipBuf), p, std::string(nameBuf)});
+				}
+			}
+		}
+		fclose(file);
+	}
+
+	// Find and update the matching entry by original IP and port
+	int idx = m_serverIndex;
+	if (idx >= 0 && idx < (int)entries.size())
+	{
+		entries[idx].ip = std::string(narrowNewIP);
+		entries[idx].port = newPortNum;
+		entries[idx].name = std::string(narrowNewName);
+	}
+
+	file = fopen("servers.db", "wb");
+	if (file)
+	{
+		fwrite("MCSV", 1, 4, file);
+		uint32_t version = 1;
+		uint32_t count = (uint32_t)entries.size();
+		fwrite(&version, sizeof(uint32_t), 1, file);
+		fwrite(&count, sizeof(uint32_t), 1, file);
+
+		for (size_t i = 0; i < entries.size(); i++)
+		{
+			uint16_t ipLen = (uint16_t)entries[i].ip.length();
+			fwrite(&ipLen, sizeof(uint16_t), 1, file);
+			fwrite(entries[i].ip.c_str(), 1, ipLen, file);
+			fwrite(&entries[i].port, sizeof(uint16_t), 1, file);
+			uint16_t nameLen = (uint16_t)entries[i].name.length();
+			fwrite(&nameLen, sizeof(uint16_t), 1, file);
+			fwrite(entries[i].name.c_str(), 1, nameLen, file);
+		}
+		fclose(file);
+	}
+}
+
+void UIScene_JoinMenu::RemoveServerFromFile()
+{
+	struct ServerEntry { std::string ip; uint16_t port; std::string name; };
+	std::vector<ServerEntry> entries;
+
+	FILE* file = fopen("servers.db", "rb");
+	if (file)
+	{
+		char magic[4] = {};
+		if (fread(magic, 1, 4, file) == 4 && memcmp(magic, "MCSV", 4) == 0)
+		{
+			uint32_t version = 0, count = 0;
+			fread(&version, sizeof(uint32_t), 1, file);
+			fread(&count, sizeof(uint32_t), 1, file);
+			if (version == 1)
+			{
+				for (uint32_t s = 0; s < count; s++)
+				{
+					uint16_t ipLen = 0, p = 0, nameLen = 0;
+					if (fread(&ipLen, sizeof(uint16_t), 1, file) != 1) break;
+					if (ipLen == 0 || ipLen > 256) break;
+					char ipBuf[257] = {};
+					if (fread(ipBuf, 1, ipLen, file) != ipLen) break;
+					if (fread(&p, sizeof(uint16_t), 1, file) != 1) break;
+					if (fread(&nameLen, sizeof(uint16_t), 1, file) != 1) break;
+					if (nameLen > 256) break;
+					char nameBuf[257] = {};
+					if (nameLen > 0 && fread(nameBuf, 1, nameLen, file) != nameLen) break;
+					entries.push_back({std::string(ipBuf), p, std::string(nameBuf)});
+				}
+			}
+		}
+		fclose(file);
+	}
+
+	// Remove the entry at m_serverIndex
+	int idx = m_serverIndex;
+	if (idx >= 0 && idx < (int)entries.size())
+	{
+		entries.erase(entries.begin() + idx);
+	}
+
+	file = fopen("servers.db", "wb");
+	if (file)
+	{
+		fwrite("MCSV", 1, 4, file);
+		uint32_t version = 1;
+		uint32_t count = (uint32_t)entries.size();
+		fwrite(&version, sizeof(uint32_t), 1, file);
+		fwrite(&count, sizeof(uint32_t), 1, file);
+
+		for (size_t i = 0; i < entries.size(); i++)
+		{
+			uint16_t ipLen = (uint16_t)entries[i].ip.length();
+			fwrite(&ipLen, sizeof(uint16_t), 1, file);
+			fwrite(entries[i].ip.c_str(), 1, ipLen, file);
+			fwrite(&entries[i].port, sizeof(uint16_t), 1, file);
+			uint16_t nameLen = (uint16_t)entries[i].name.length();
+			fwrite(&nameLen, sizeof(uint16_t), 1, file);
+			fwrite(entries[i].name.c_str(), 1, nameLen, file);
+		}
+		fclose(file);
+	}
+}
+#endif // _WINDOWS64
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_JoinMenu.h b/Minecraft.Client/Common/UI/UIScene_JoinMenu.h
index 817360ef..566697cd 100644
--- a/Minecraft.Client/Common/UI/UIScene_JoinMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_JoinMenu.h
@@ -62,6 +62,16 @@ private:
 	bool m_friendInfoUpdatedOK;
 	bool m_friendInfoUpdatedERROR;
 
+#ifdef _WINDOWS64
+	int m_serverIndex; // Index in servers.db, -1 if not a saved server
+	enum eEditServerPhase { eEditServer_Idle, eEditServer_IP, eEditServer_Port, eEditServer_Name };
+	eEditServerPhase m_editServerPhase;
+	wstring m_editServerIP;
+	wstring m_editServerPort;
+	int m_editServerButtonIndex;
+	int m_deleteServerButtonIndex;
+#endif
+
 public:
 	UIScene_JoinMenu(int iPad, void *initData, UILayer *parentLayer);
 	void tick();
@@ -95,4 +105,13 @@ protected:
 	
 	static int StartGame_SignInReturned(void *pParam, bool, int);
 	static void JoinGame(UIScene_JoinMenu* pClass);
+
+#ifdef _WINDOWS64
+	void BeginEditServer();
+	void BeginDeleteServer();
+	static int EditServerKeyboardCallback(LPVOID lpParam, bool bRes);
+	static int DeleteServerDialogReturned(void *pParam, int iPad, C4JStorage::EMessageResult result);
+	void UpdateServerInFile(const wstring& newIP, const wstring& newPort, const wstring& newName);
+	void RemoveServerFromFile();
+#endif
 };
diff --git a/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp b/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp
index 9e46a42e..2f2f9132 100644
--- a/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_Keyboard.cpp
@@ -17,8 +17,8 @@ UIScene_Keyboard::UIScene_Keyboard(int iPad, void *initData, UILayer *parentLaye
 	initialiseMovie();
 
 #ifdef _WINDOWS64
-	m_win64Callback = NULL;
-	m_win64CallbackParam = NULL;
+	m_win64Callback = nullptr;
+	m_win64CallbackParam = nullptr;
 	m_win64TextBuffer = L"";
 	m_win64MaxChars = 25;
 
@@ -28,7 +28,7 @@ UIScene_Keyboard::UIScene_Keyboard(int iPad, void *initData, UILayer *parentLaye
 	m_bPCMode = false;
 	if (initData)
 	{
-		UIKeyboardInitData* kbData = (UIKeyboardInitData*)initData;
+		UIKeyboardInitData* kbData = static_cast<UIKeyboardInitData *>(initData);
 		m_win64Callback = kbData->callback;
 		m_win64CallbackParam = kbData->lpParam;
 		if (kbData->title)       titleText        = kbData->title;
@@ -38,6 +38,7 @@ UIScene_Keyboard::UIScene_Keyboard(int iPad, void *initData, UILayer *parentLaye
 	}
 
 	m_win64TextBuffer = defaultText;
+	m_iCursorPos = (int)m_win64TextBuffer.length();
 
 	m_EnterTextLabel.init(titleText);
 	m_KeyboardTextInput.init(defaultText, -1);
@@ -105,12 +106,15 @@ UIScene_Keyboard::UIScene_Keyboard(int iPad, void *initData, UILayer *parentLaye
 		};
 		IggyName nameVisible = registerFastName(L"visible");
 		IggyValuePath* root = IggyPlayerRootPath(getMovie());
-		for (int i = 0; i < (int)(sizeof(s_keyNames) / sizeof(s_keyNames[0])); ++i)
+		for (int i = 0; i < static_cast<int>(sizeof(s_keyNames) / sizeof(s_keyNames[0])); ++i)
 		{
 			IggyValuePath keyPath;
 			if (IggyValuePathMakeNameRef(&keyPath, root, s_keyNames[i]))
-				IggyValueSetBooleanRS(&keyPath, nameVisible, NULL, false);
+				IggyValueSetBooleanRS(&keyPath, nameVisible, nullptr, false);
 		}
+
+		m_KeyboardTextInput.setCaretVisible(true);
+		m_KeyboardTextInput.setCaretIndex(m_iCursorPos);
 	}
 #endif
 
@@ -163,6 +167,16 @@ void UIScene_Keyboard::tick()
 {
 	UIScene::tick();
 
+	// Sync our buffer from Flash so we pick up changes made via controller/on-screen buttons.
+	// Without this, switching between controller and keyboard would use stale text.
+	// In PC mode we own the buffer — skip sync to preserve cursor position.
+	if (!m_bPCMode)
+	{
+		const wchar_t* flashText = m_KeyboardTextInput.getLabel();
+		if (flashText)
+			m_win64TextBuffer = flashText;
+	}
+
 	// Accumulate physical keyboard chars into our own buffer, then push to Flash via setLabel.
 	// This bypasses Iggy's focus system (char events only route to the focused element).
 	// The char buffer is cleared on open so Enter/clicks from the triggering action don't leak in.
@@ -172,7 +186,16 @@ void UIScene_Keyboard::tick()
 	{
 		if (ch == 0x08) // backspace
 		{
-			if (!m_win64TextBuffer.empty())
+			if (m_bPCMode)
+			{
+				if (m_iCursorPos > 0)
+				{
+					m_win64TextBuffer.erase(m_iCursorPos - 1, 1);
+					m_iCursorPos--;
+					changed = true;
+				}
+			}
+			else if (!m_win64TextBuffer.empty())
 			{
 				m_win64TextBuffer.pop_back();
 				changed = true;
@@ -186,15 +209,47 @@ void UIScene_Keyboard::tick()
 				m_bKeyboardDonePressed = true;
 			}
 		}
-		else if ((int)m_win64TextBuffer.length() < m_win64MaxChars)
+		else if (static_cast<int>(m_win64TextBuffer.length()) < m_win64MaxChars)
 		{
-			m_win64TextBuffer += ch;
+			if (m_bPCMode)
+			{
+				m_win64TextBuffer.insert(m_iCursorPos, 1, ch);
+				m_iCursorPos++;
+			}
+			else
+			{
+				m_win64TextBuffer += ch;
+			}
+			changed = true;
+		}
+	}
+
+	if (m_bPCMode)
+	{
+		// Arrow keys, Home, End, Delete for cursor movement
+		if (g_KBMInput.IsKeyPressed(VK_LEFT) && m_iCursorPos > 0)
+			m_iCursorPos--;
+		if (g_KBMInput.IsKeyPressed(VK_RIGHT) && m_iCursorPos < (int)m_win64TextBuffer.length())
+			m_iCursorPos++;
+		if (g_KBMInput.IsKeyPressed(VK_HOME))
+			m_iCursorPos = 0;
+		if (g_KBMInput.IsKeyPressed(VK_END))
+			m_iCursorPos = (int)m_win64TextBuffer.length();
+		if (g_KBMInput.IsKeyPressed(VK_DELETE) && m_iCursorPos < (int)m_win64TextBuffer.length())
+		{
+			m_win64TextBuffer.erase(m_iCursorPos, 1);
 			changed = true;
 		}
 	}
 
 	if (changed)
 		m_KeyboardTextInput.setLabel(m_win64TextBuffer.c_str(), true /*instant*/);
+
+	if (m_bPCMode)
+	{
+		m_KeyboardTextInput.setCaretVisible(true);
+		m_KeyboardTextInput.setCaretIndex(m_iCursorPos);
+	}
 }
 #endif
 
@@ -223,33 +278,37 @@ void UIScene_Keyboard::handleInput(int iPad, int key, bool repeat, bool pressed,
 			handled = true;
 			break;
 		case ACTION_MENU_X:					// X
-			out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcBackspaceButtonPressed, 0 , NULL );
-			handled = true;
-			break;
 		case ACTION_MENU_PAGEUP:			// LT
-			out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSymbolButtonPressed, 0 , NULL );
-			handled = true;
-			break;
 		case ACTION_MENU_Y:					// Y
-			out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSpaceButtonPressed, 0 , NULL );
-			handled = true;
-			break;
 		case ACTION_MENU_STICK_PRESS:		// LS
-			out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcCapsButtonPressed, 0 , NULL );
-			handled = true;
-			break;
 		case ACTION_MENU_LEFT_SCROLL:		// LB
-			out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcCursorLeftButtonPressed, 0 , NULL );
-			handled = true;
-			break;
 		case ACTION_MENU_RIGHT_SCROLL:		// RB
-			out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcCursorRightButtonPressed, 0 , NULL );
+#ifdef _WINDOWS64
+
+			if (m_bPCMode)
+			{
+				handled = true;
+				break;
+			}
+#endif
+			if (key == ACTION_MENU_X)
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcBackspaceButtonPressed, 0 , nullptr);
+			else if (key == ACTION_MENU_PAGEUP)
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSymbolButtonPressed, 0 , nullptr);
+			else if (key == ACTION_MENU_Y)
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSpaceButtonPressed, 0 , nullptr);
+			else if (key == ACTION_MENU_STICK_PRESS)
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcCapsButtonPressed, 0 , nullptr);
+			else if (key == ACTION_MENU_LEFT_SCROLL)
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcCursorLeftButtonPressed, 0 , nullptr);
+			else if (key == ACTION_MENU_RIGHT_SCROLL)
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcCursorRightButtonPressed, 0 , nullptr);
 			handled = true;
 			break;
 		case ACTION_MENU_PAUSEMENU:			// Start
 			if(!m_bKeyboardDonePressed)
 			{
-				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcDoneButtonPressed, 0 , NULL );
+				out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcDoneButtonPressed, 0 , nullptr );
 				
 				// kick off done timer
 				addTimer(KEYBOARD_DONE_TIMER_ID,KEYBOARD_DONE_TIMER_TIME);
@@ -263,11 +322,23 @@ void UIScene_Keyboard::handleInput(int iPad, int key, bool repeat, bool pressed,
 	switch(key)
 	{
 	case ACTION_MENU_OK:
+#ifdef _WINDOWS64
+		if (m_bPCMode)
+		{
+			// pressing enter sometimes causes a "y" to be entered.
+			handled = true;
+			break;
+		}
+#endif
+		// fall through for controller mode
 	case ACTION_MENU_LEFT:
 	case ACTION_MENU_RIGHT:
 	case ACTION_MENU_UP:
 	case ACTION_MENU_DOWN:
-		sendInputToMovie(key, repeat, pressed, released);
+#ifdef _WINDOWS64
+		if (!m_bPCMode)
+#endif
+			sendInputToMovie(key, repeat, pressed, released);
 		handled = true;
 		break;
 	}
@@ -275,7 +346,7 @@ void UIScene_Keyboard::handleInput(int iPad, int key, bool repeat, bool pressed,
 
 void UIScene_Keyboard::handlePress(F64 controlId, F64 childId)
 {
-	if((int)controlId == 0)
+	if(static_cast<int>(controlId) == 0)
 	{
 		// Done has been pressed. At this point we can query for the input string and pass it on to wherever it is needed.
 		// we can not query for m_KeyboardTextInput.getLabel() here because we're in an iggy callback so we need to wait a frame.
diff --git a/Minecraft.Client/Common/UI/UIScene_Keyboard.h b/Minecraft.Client/Common/UI/UIScene_Keyboard.h
index 054322f2..146934c1 100644
--- a/Minecraft.Client/Common/UI/UIScene_Keyboard.h
+++ b/Minecraft.Client/Common/UI/UIScene_Keyboard.h
@@ -13,6 +13,7 @@ private:
 	wstring m_win64TextBuffer;
 	int m_win64MaxChars;
 	bool m_bPCMode; // Hides on-screen keyboard buttons; physical keyboard only
+	int m_iCursorPos;
 #endif
 
 protected:
diff --git a/Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp b/Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp
index e9dc7eb9..c2a30d3c 100644
--- a/Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp
@@ -58,7 +58,7 @@ void UIScene_LanguageSelector::updateTooltips()
 
 void UIScene_LanguageSelector::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -112,18 +112,18 @@ void UIScene_LanguageSelector::handleInput(int iPad, int key, bool repeat, bool
 
 void UIScene_LanguageSelector::handlePress(F64 controlId, F64 childId)
 {
-	if( (int)controlId == eControl_Buttons )
+	if( static_cast<int>(controlId) == eControl_Buttons )
 	{
 		//CD - Added for audio
 		ui.PlayUISFX(eSFX_Press);
 
 		int newLanguage, newLocale;
-		newLanguage = uiLangMap[(int)childId];
-		newLocale =	uiLocaleMap[(int)childId];
+		newLanguage = uiLangMap[static_cast<int>(childId)];
+		newLocale =	uiLocaleMap[static_cast<int>(childId)];
 
 		app.SetMinecraftLanguage(m_iPad, newLanguage);
 		app.SetMinecraftLocale(m_iPad, newLocale);
 
 		app.CheckGameSettingsChanged(true, m_iPad);
 	}
-}
+}
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp
index d6f89832..b2981ebf 100644
--- a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp
@@ -20,7 +20,7 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu(int iPad, void *ini
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	m_params = (LaunchMoreOptionsMenuInitData *)initData;
+	m_params = static_cast<LaunchMoreOptionsMenuInitData *>(initData);
 
 	m_labelWorldOptions.init(app.GetString(IDS_WORLD_OPTIONS));
 
@@ -116,9 +116,9 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu(int iPad, void *ini
 	if(m_params->currentWorldSize != e_worldSize_Unknown)
 	{
 		m_labelWorldResize.init(app.GetString(IDS_INCREASE_WORLD_SIZE));
-		int min= int(m_params->currentWorldSize)-1;
+		int min= static_cast<int>(m_params->currentWorldSize)-1;
 		int max=3;
-		int curr = int(m_params->newWorldSize)-1;
+		int curr = static_cast<int>(m_params->newWorldSize)-1;
 		m_sliderWorldResize.init(app.GetString(m_iWorldSizeTitleA[curr]),eControl_WorldResize,min,max,curr);
 		m_checkboxes[eLaunchCheckbox_WorldResizeType].init(app.GetString(IDS_INCREASE_WORLD_SIZE_OVERWRITE_EDGES),eLaunchCheckbox_WorldResizeType,m_params->newWorldSizeOverwriteEdges);
 	}
@@ -257,6 +257,9 @@ void UIScene_LaunchMoreOptionsMenu::handleDestroy()
 void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
 	if(m_bIgnoreInput) return;
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) return;
+#endif
 
 	//app.DebugPrintf("UIScene_DebugOverlay handling input for pad %d, key %d, down- %s, pressed- %s, released- %s\n", iPad, key, down?"TRUE":"FALSE", pressed?"TRUE":"FALSE", released?"TRUE":"FALSE");
 	ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);
@@ -305,7 +308,7 @@ void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat,
 			m_tabIndex = m_tabIndex == 0 ? 1 : 0;
 			updateTooltips();
 			IggyDataValue result;
-			IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcChangeTab , 0 , NULL );
+			IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcChangeTab , 0 , nullptr );
 		}
 		break;
 	}
@@ -327,14 +330,16 @@ void UIScene_LaunchMoreOptionsMenu::handleTouchInput(unsigned int iPad, S32 x, S
 				m_tabIndex = iNewTabIndex;
 				updateTooltips();
 				IggyDataValue result;
-				IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcChangeTab , 0 , NULL );
+				IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcChangeTab , 0 , nullptr );
 			}
 			ui.TouchBoxRebuild(this);
 			break;
 		}
 	}
 }
+#endif
 
+#if defined(__PSVITA__) || defined(_WINDOWS64)
 UIControl* UIScene_LaunchMoreOptionsMenu::GetMainPanel()
 {
 	if(m_tabIndex == 0)
@@ -349,7 +354,7 @@ void UIScene_LaunchMoreOptionsMenu::handleCheckboxToggled(F64 controlId, bool se
 	//CD - Added for audio
 	ui.PlayUISFX(eSFX_Press);
 
-	switch((EControls)((int)controlId))
+	switch(static_cast<EControls>((int)controlId))
 	{
 	case eLaunchCheckbox_Online:
 		m_params->bOnlineGame = selected;
@@ -423,7 +428,7 @@ void UIScene_LaunchMoreOptionsMenu::handleCheckboxToggled(F64 controlId, bool se
 void UIScene_LaunchMoreOptionsMenu::handleFocusChange(F64 controlId, F64 childId)
 {
 	int stringId = 0;
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eLaunchCheckbox_Online:
 		stringId = IDS_GAMEOPTION_ONLINE;
@@ -544,13 +549,18 @@ void UIScene_LaunchMoreOptionsMenu::handleTimerComplete(int id)
 
 int UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback(LPVOID lpParam,bool bRes)
 {
-	UIScene_LaunchMoreOptionsMenu *pClass=(UIScene_LaunchMoreOptionsMenu *)lpParam;
+	UIScene_LaunchMoreOptionsMenu *pClass=static_cast<UIScene_LaunchMoreOptionsMenu *>(lpParam);
 	pClass->m_bIgnoreInput=false;
-	// 4J HEG - No reason to set value if keyboard was cancelled
 	if (bRes)
 	{
+#ifdef _WINDOWS64
+		uint16_t pchText[128];
+		ZeroMemory(pchText, 128 * sizeof(uint16_t));
+		Win64_GetKeyboardText(pchText, 128);
+		pClass->m_editSeed.setLabel((wchar_t *)pchText);
+		pClass->m_params->seed = (wchar_t *)pchText;
+#else
 #ifdef __PSVITA__
-		//CD - Changed to 2048 [SCE_IME_MAX_TEXT_LENGTH]
 		uint16_t pchText[2048];
 		ZeroMemory(pchText, 2048 * sizeof(uint16_t) );
 #else
@@ -560,18 +570,52 @@ int UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback(LPVOID lpParam,b
 		InputManager.GetText(pchText);
 		pClass->m_editSeed.setLabel((wchar_t *)pchText);
 		pClass->m_params->seed = (wchar_t *)pchText;
+#endif
 	}
 	return 0;
 }
 
+#ifdef _WINDOWS64
+void UIScene_LaunchMoreOptionsMenu::getDirectEditInputs(vector<UIControl_TextInput*> &inputs)
+{
+	inputs.push_back(&m_editSeed);
+}
+
+void UIScene_LaunchMoreOptionsMenu::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
+{
+	if (result == UIControl_TextInput::eDirectEdit_Confirmed)
+		m_params->seed = input->getEditBuffer();
+}
+#endif
+
 void UIScene_LaunchMoreOptionsMenu::handlePress(F64 controlId, F64 childId)
 {
 	if(m_bIgnoreInput) return;
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) return;
+#endif
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_EditSeed:
 		{
+#ifdef _WINDOWS64
+			if (g_KBMInput.IsKBMActive())
+			{
+				m_editSeed.beginDirectEdit(60);
+			}
+			else
+			{
+				m_bIgnoreInput = true;
+				UIKeyboardInitData kbData;
+				kbData.title       = app.GetString(IDS_CREATE_NEW_WORLD_SEED);
+				kbData.defaultText = m_editSeed.getLabel();
+				kbData.maxChars    = 60;
+				kbData.callback    = &UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback;
+				kbData.lpParam     = this;
+				ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData);
+			}
+#else
 			m_bIgnoreInput=true;
 #ifdef __PS3__
 			int language = XGetLanguage();
@@ -583,13 +627,13 @@ void UIScene_LaunchMoreOptionsMenu::handlePress(F64 controlId, F64 childId)
 				InputManager.RequestKeyboard(app.GetString(IDS_CREATE_NEW_WORLD_SEED),m_editSeed.getLabel(),(DWORD)0,60,&UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback,this,C_4JInput::EKeyboardMode_Default);
 				break;
 			default:
-				// 4J Stu - Use a different keyboard for non-asian languages so we don't have prediction on
 				InputManager.RequestKeyboard(app.GetString(IDS_CREATE_NEW_WORLD_SEED),m_editSeed.getLabel(),(DWORD)0,60,&UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback,this,C_4JInput::EKeyboardMode_Alphabet_Extended);
 				break;
 			}
 #else
 			InputManager.RequestKeyboard(app.GetString(IDS_CREATE_NEW_WORLD_SEED),m_editSeed.getLabel(),(DWORD)0,60,&UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback,this,C_4JInput::EKeyboardMode_Default);
 #endif
+#endif
 		}
 		break;
 	}
@@ -598,8 +642,8 @@ void UIScene_LaunchMoreOptionsMenu::handlePress(F64 controlId, F64 childId)
 
 void UIScene_LaunchMoreOptionsMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_WorldSize:
 #ifdef _LARGE_WORLDS
@@ -610,11 +654,11 @@ void UIScene_LaunchMoreOptionsMenu::handleSliderMove(F64 sliderId, F64 currentVa
 		break;
 	case eControl_WorldResize:
 #ifdef _LARGE_WORLDS
-		EGameHostOptionWorldSize changedSize = EGameHostOptionWorldSize(value+1);
+		EGameHostOptionWorldSize changedSize = static_cast<EGameHostOptionWorldSize>(value + 1);
 		if(changedSize >= m_params->currentWorldSize)
 		{
 			m_sliderWorldResize.handleSliderMove(value);
-			m_params->newWorldSize = EGameHostOptionWorldSize(value+1);
+			m_params->newWorldSize = static_cast<EGameHostOptionWorldSize>(value + 1);
 			m_sliderWorldResize.setLabel(app.GetString(m_iWorldSizeTitleA[value]));
 		}
 #endif
diff --git a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h
index 367db10d..caf9a71f 100644
--- a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h
@@ -140,6 +140,10 @@ protected:
 public:
 	virtual void tick();
 	virtual void handleDestroy();
+#ifdef _WINDOWS64
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs);
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result);
+#endif
 	// INPUT
 	virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
 	virtual void handleFocusChange(F64 controlId, F64 childId);
@@ -160,6 +164,8 @@ private:
 
 #ifdef __PSVITA__
 	virtual void handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased);
-	virtual UIControl* GetMainPanel();
 #endif //__PSVITA__
+#if defined(__PSVITA__) || defined(_WINDOWS64)
+	virtual UIControl* GetMainPanel();
+#endif
 };
diff --git a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
index 12b21905..ed0b3151 100644
--- a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
@@ -9,12 +9,12 @@
 #define PLAYER_ONLINE_TIMER_TIME 100
 
 // if the value is greater than 32000, it's an xzp icon that needs displayed, rather than the game icon
-const int UIScene_LeaderboardsMenu::TitleIcons[UIScene_LeaderboardsMenu::NUM_LEADERBOARDS][7] = 
+const int UIScene_LeaderboardsMenu::TitleIcons[UIScene_LeaderboardsMenu::NUM_LEADERBOARDS][7] =
 {
-	{ UIControl_LeaderboardList::e_ICON_TYPE_WALKED,		UIControl_LeaderboardList::e_ICON_TYPE_FALLEN,		Item::minecart_Id,		Item::boat_Id,					NULL },
-	{ Tile::dirt_Id,		Tile::cobblestone_Id,	Tile::sand_Id,			Tile::stone_Id,			Tile::gravel_Id,		Tile::clay_Id,			Tile::obsidian_Id },
-	{ Item::egg_Id,			Item::wheat_Id,			Tile::mushroom_brown_Id,		Tile::reeds_Id,			Item::bucket_milk_Id,	Tile::pumpkin_Id,		NULL },
-	{ UIControl_LeaderboardList::e_ICON_TYPE_ZOMBIE,		UIControl_LeaderboardList::e_ICON_TYPE_SKELETON,		UIControl_LeaderboardList::e_ICON_TYPE_CREEPER,		UIControl_LeaderboardList::e_ICON_TYPE_SPIDER,		UIControl_LeaderboardList::e_ICON_TYPE_SPIDERJOKEY,	UIControl_LeaderboardList::e_ICON_TYPE_ZOMBIEPIGMAN,	UIControl_LeaderboardList::e_ICON_TYPE_SLIME },
+    {UIControl_LeaderboardList::e_ICON_TYPE_WALKED, UIControl_LeaderboardList::e_ICON_TYPE_FALLEN, Item::minecart_Id, Item::boat_Id, -1},
+    {Tile::dirt_Id, Tile::cobblestone_Id, Tile::sand_Id, Tile::stone_Id, Tile::gravel_Id, Tile::clay_Id, Tile::obsidian_Id},
+    {Item::egg_Id, Item::wheat_Id, Tile::mushroom_brown_Id, Tile::reeds_Id, Item::bucket_milk_Id, Tile::pumpkin_Id, -1},
+    {UIControl_LeaderboardList::e_ICON_TYPE_ZOMBIE, UIControl_LeaderboardList::e_ICON_TYPE_SKELETON, UIControl_LeaderboardList::e_ICON_TYPE_CREEPER, UIControl_LeaderboardList::e_ICON_TYPE_SPIDER, UIControl_LeaderboardList::e_ICON_TYPE_SPIDERJOKEY, UIControl_LeaderboardList::e_ICON_TYPE_ZOMBIEPIGMAN, UIControl_LeaderboardList::e_ICON_TYPE_SLIME},
 };
 const UIScene_LeaderboardsMenu::LeaderboardDescriptor UIScene_LeaderboardsMenu::LEADERBOARD_DESCRIPTORS[UIScene_LeaderboardsMenu::NUM_LEADERBOARDS][4] = {
 	{
@@ -438,7 +438,7 @@ void UIScene_LeaderboardsMenu::ReadStats(int startIndex)
 	}
 	else
 	{
-		m_newEntryIndex = (unsigned int)startIndex;
+		m_newEntryIndex = static_cast<unsigned int>(startIndex);
 		// m_newReadSize	= min((int)READ_SIZE, (int)m_leaderboard.m_totalEntryCount-(startIndex-1));
 	}
 
@@ -462,7 +462,7 @@ void UIScene_LeaderboardsMenu::ReadStats(int startIndex)
 		{
 			m_interface.ReadStats_TopRank(
 				this, 
-				m_currentDifficulty, (LeaderboardManager::EStatsType) m_currentLeaderboard, 
+				m_currentDifficulty, static_cast<LeaderboardManager::EStatsType>(m_currentLeaderboard), 
 				m_newEntryIndex, m_newReadSize
 				);
 		}
@@ -472,7 +472,7 @@ void UIScene_LeaderboardsMenu::ReadStats(int startIndex)
 			PlayerUID uid;
 			ProfileManager.GetXUID(ProfileManager.GetPrimaryPad(),&uid, true);
 			m_interface.ReadStats_MyScore(	this,
-				m_currentDifficulty, (LeaderboardManager::EStatsType) m_currentLeaderboard,
+				m_currentDifficulty, static_cast<LeaderboardManager::EStatsType>(m_currentLeaderboard),
 				uid /*ignored on PS3*/,
 				m_newReadSize
 				);
@@ -483,7 +483,7 @@ void UIScene_LeaderboardsMenu::ReadStats(int startIndex)
 			PlayerUID uid;
 			ProfileManager.GetXUID(ProfileManager.GetPrimaryPad(),&uid, true);
 			m_interface.ReadStats_Friends(	this,
-				m_currentDifficulty, (LeaderboardManager::EStatsType) m_currentLeaderboard,
+				m_currentDifficulty, static_cast<LeaderboardManager::EStatsType>(m_currentLeaderboard),
 				uid /*ignored on PS3*/,
 				m_newEntryIndex, m_newReadSize
 				);
@@ -558,7 +558,7 @@ bool UIScene_LeaderboardsMenu::RetrieveStats()
 				else
 				{
 					m_leaderboard.m_entries[entryIndex].m_columns[i] = UINT_MAX;
-					swprintf(m_leaderboard.m_entries[entryIndex].m_wcColumns[i], 12, L"%.1fkm", ((float)m_leaderboard.m_entries[entryIndex].m_columns[i])/100.f/1000.f);
+					swprintf(m_leaderboard.m_entries[entryIndex].m_wcColumns[i], 12, L"%.1fkm", static_cast<float>(m_leaderboard.m_entries[entryIndex].m_columns[i])/100.f/1000.f);
 				}
 			}
 
@@ -576,7 +576,7 @@ bool UIScene_LeaderboardsMenu::RetrieveStats()
 		return true;
 	}
 
-	//assert( LeaderboardManager::Instance()->GetStats() != NULL );
+	//assert( LeaderboardManager::Instance()->GetStats() != nullptr );
 	//PXUSER_STATS_READ_RESULTS stats = LeaderboardManager::Instance()->GetStats();
 	//if( m_currentFilter == LeaderboardManager::eFM_Friends  )	LeaderboardManager::Instance()->SortFriendStats();
 
@@ -781,7 +781,7 @@ void UIScene_LeaderboardsMenu::CopyLeaderboardEntry(LeaderboardManager::ReadScor
 			else if(iDigitC<8)
 			{
 				// km with a .X
-				swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.1fkm", ((float)leaderboardEntry->m_columns[i])/1000.f);
+				swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.1fkm", static_cast<float>(leaderboardEntry->m_columns[i])/1000.f);
 #ifdef _DEBUG
 				//app.DebugPrintf("Display - %.1fkm\n", ((float)leaderboardEntry->m_columns[i])/1000.f);
 #endif
@@ -789,7 +789,7 @@ void UIScene_LeaderboardsMenu::CopyLeaderboardEntry(LeaderboardManager::ReadScor
 			else
 			{
 				// bigger than that, so no decimal point
-				swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.0fkm", ((float)leaderboardEntry->m_columns[i])/1000.f);
+				swprintf(leaderboardEntry->m_wcColumns[i], 12, L"%.0fkm", static_cast<float>(leaderboardEntry->m_columns[i])/1000.f);
 #ifdef _DEBUG
 				//app.DebugPrintf("Display - %.0fkm\n", ((float)leaderboardEntry->m_columns[i])/1000.f);
 #endif
@@ -964,14 +964,14 @@ int UIScene_LeaderboardsMenu::SetLeaderboardTitleIcons()
 void UIScene_LeaderboardsMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	int slotId = -1;
-	swscanf((wchar_t*)region->name,L"slot_%d",&slotId);
+	swscanf(static_cast<wchar_t *>(region->name),L"slot_%d",&slotId);
 	if (slotId == -1)
 	{
 		//app.DebugPrintf("This is not the control we are looking for\n");
 	}
 	else
 	{
-		shared_ptr<ItemInstance> item = shared_ptr<ItemInstance>( new ItemInstance(TitleIcons[m_currentLeaderboard][slotId], 1, 0) );
+		shared_ptr<ItemInstance> item = std::make_shared<ItemInstance>(TitleIcons[m_currentLeaderboard][slotId], 1, 0);
 		customDrawSlotControl(region,m_iPad,item,1.0f,false,false);
 	}
 }
@@ -979,14 +979,14 @@ void UIScene_LeaderboardsMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 void UIScene_LeaderboardsMenu::handleSelectionChanged(F64 selectedId)
 {
 	ui.PlayUISFX(eSFX_Focus);
-	m_newSel = (int)selectedId;
+	m_newSel = static_cast<int>(selectedId);
 	updateTooltips();
 }
 
 // Handle a request from Iggy for more data
 void UIScene_LeaderboardsMenu::handleRequestMoreData(F64 startIndex, bool up)
 {
-	unsigned int item = (int)startIndex;
+	unsigned int item = static_cast<int>(startIndex);
 
 	if( m_leaderboard.m_totalEntryCount > 0 && (item+1) < GetEntryStartIndex() )
 	{
@@ -995,7 +995,7 @@ void UIScene_LeaderboardsMenu::handleRequestMoreData(F64 startIndex, bool up)
 			int readIndex = (GetEntryStartIndex() + 1) - READ_SIZE;
 			if( readIndex <= 0 )
 				readIndex = 1;
-			assert( readIndex >= 1 && readIndex <= (int)m_leaderboard.m_totalEntryCount );
+            assert( readIndex >= 1 && readIndex <= static_cast<int>(m_leaderboard.m_totalEntryCount));
 			ReadStats(readIndex);
 		}
 	}
@@ -1004,7 +1004,7 @@ void UIScene_LeaderboardsMenu::handleRequestMoreData(F64 startIndex, bool up)
 		if( LeaderboardManager::Instance()->isIdle() )
 		{
 			int readIndex = (GetEntryStartIndex() + 1) + m_leaderboard.m_entries.size();
-			assert( readIndex >= 1 && readIndex <= (int)m_leaderboard.m_totalEntryCount );
+            assert( readIndex >= 1 && readIndex <= static_cast<int>(m_leaderboard.m_totalEntryCount));
 			ReadStats(readIndex);
 		}
 	}
@@ -1033,7 +1033,7 @@ void UIScene_LeaderboardsMenu::handleTimerComplete(int id)
 
 int UIScene_LeaderboardsMenu::ExitLeaderboards(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_LeaderboardsMenu* pClass = (UIScene_LeaderboardsMenu*)pParam;
+	UIScene_LeaderboardsMenu* pClass = static_cast<UIScene_LeaderboardsMenu *>(pParam);
 
 	pClass->navigateBack();
 
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
index ed3c8137..d61a7902 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
@@ -34,7 +34,7 @@ int UIScene_LoadMenu::m_iDifficultyTitleSettingA[4]=
 
 int UIScene_LoadMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
 {
-	UIScene_LoadMenu *pClass= (UIScene_LoadMenu *)ui.GetSceneFromCallbackId((size_t)lpParam);
+	UIScene_LoadMenu *pClass= static_cast<UIScene_LoadMenu *>(ui.GetSceneFromCallbackId((size_t)lpParam));
 
 	if(pClass)
 	{
@@ -50,7 +50,7 @@ int UIScene_LoadMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumb
 		}
 		else
 		{
-			app.DebugPrintf("Thumbnail data is NULL, or has size 0\n");
+			app.DebugPrintf("Thumbnail data is nullptr, or has size 0\n");
 			pClass->m_bThumbnailGetFailed = true;
 		}
 		pClass->m_bRetrievingSaveThumbnail = false;
@@ -64,7 +64,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	LoadMenuInitData *params = (LoadMenuInitData *)initData;
+	LoadMenuInitData *params = static_cast<LoadMenuInitData *>(initData);
 
 	m_labelGameName.init(app.GetString(IDS_WORLD_NAME));
 	m_labelSeed.init(L"");
@@ -102,7 +102,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 	m_bSaveThumbnailReady = false;
 	m_bRetrievingSaveThumbnail = true;
 	m_bShowTimer = false;
-	m_pDLCPack = NULL;
+	m_pDLCPack = nullptr;
 	m_bAvailableTexturePacksChecked=false;
 	m_bRequestQuadrantSignin = false;
 	m_iTexturePacksNotInstalled=0;
@@ -249,7 +249,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 #endif
 #endif
 #ifdef _WINDOWS64
-		if (params->saveDetails != NULL && params->saveDetails->UTF8SaveName[0] != '\0')
+		if (params->saveDetails != nullptr && params->saveDetails->UTF8SaveName[0] != '\0')
 		{
 			wchar_t wSaveName[128];
 			ZeroMemory(wSaveName, sizeof(wSaveName));
@@ -305,7 +305,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 		if(!m_bAvailableTexturePacksChecked)
 #endif
 		{		
-			DLC_INFO *pDLCInfo=NULL;
+			DLC_INFO *pDLCInfo=nullptr;
 
 			// first pass - look to see if there are any that are not in the list
 			bool bTexturePackAlreadyListed;
@@ -451,9 +451,9 @@ void UIScene_LoadMenu::tick()
 
 		// #ifdef _DEBUG
 		// 			// dump out the thumbnail
-		// 			HANDLE hThumbnail = CreateFile("GAME:\\thumbnail.png", GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, NULL);
+		// 			HANDLE hThumbnail = CreateFile("GAME:\\thumbnail.png", GENERIC_WRITE, 0, nullptr, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, nullptr);
 		// 			DWORD dwBytes;
-		// 			WriteFile(hThumbnail,pbImageData,dwImageBytes,&dwBytes,NULL);
+		// 			WriteFile(hThumbnail,pbImageData,dwImageBytes,&dwBytes,nullptr);
 		// 			XCloseHandle(hThumbnail);
 		// #endif
 
@@ -477,7 +477,7 @@ void UIScene_LoadMenu::tick()
 			m_MoreOptionsParams.bTNT = app.GetGameHostOption(uiHostOptions,eGameHostOption_TNT)>0?TRUE:FALSE;
 			m_MoreOptionsParams.bHostPrivileges = app.GetGameHostOption(uiHostOptions,eGameHostOption_CheatsEnabled)>0?TRUE:FALSE;
 			m_MoreOptionsParams.bDisableSaving = app.GetGameHostOption(uiHostOptions,eGameHostOption_DisableSaving)>0?TRUE:FALSE;
-			m_MoreOptionsParams.currentWorldSize = (EGameHostOptionWorldSize)app.GetGameHostOption(uiHostOptions,eGameHostOption_WorldSize);
+			m_MoreOptionsParams.currentWorldSize = static_cast<EGameHostOptionWorldSize>(app.GetGameHostOption(uiHostOptions, eGameHostOption_WorldSize));
 			m_MoreOptionsParams.newWorldSize = m_MoreOptionsParams.currentWorldSize;
 
 			m_MoreOptionsParams.bMobGriefing = app.GetGameHostOption(uiHostOptions, eGameHostOption_MobGriefing);
@@ -696,7 +696,7 @@ void UIScene_LoadMenu::handlePress(F64 controlId, F64 childId)
 	//CD - Added for audio
 	ui.PlayUISFX(eSFX_Press);
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_GameMode:
 		switch(m_iGameModeId)
@@ -725,7 +725,7 @@ void UIScene_LoadMenu::handlePress(F64 controlId, F64 childId)
 		break;
 	case eControl_TexturePackList:
 		{
-			UpdateCurrentTexturePack((int)childId);
+			UpdateCurrentTexturePack(static_cast<int>(childId));
 		}
 		break;
 	case eControl_LoadWorld:
@@ -771,7 +771,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow()
 		// texture pack hasn't been set yet, so check what it will be
 		TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);
 
-		if(pTexturePack==NULL)
+		if(pTexturePack==nullptr)
 		{
 #if TO_BE_IMPLEMENTED
 			// They've selected a texture pack they don't have yet
@@ -821,7 +821,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow()
 	{
 		// texture pack hasn't been set yet, so check what it will be
 		TexturePack *pTexturePack = pMinecraft->skins->getTexturePackById(m_MoreOptionsParams.dwTexturePack);
-		DLCTexturePack *pDLCTexPack=(DLCTexturePack *)pTexturePack;
+		DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(pTexturePack);
 		m_pDLCPack=pDLCTexPack->getDLCInfoParentPack();
 
 		// do we have a license?
@@ -849,7 +849,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow()
 				DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(m_pDLCPack->getPurchaseOfferId());
 				ULONGLONG ullOfferID_Full;
 
-				if(pDLCInfo!=NULL)
+				if(pDLCInfo!=nullptr)
 				{
 					ullOfferID_Full=pDLCInfo->ullOfferID_Full;
 				}
@@ -946,8 +946,8 @@ void UIScene_LoadMenu::StartSharedLaunchFlow()
 void UIScene_LoadMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
 	WCHAR TempString[256];
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_Difficulty:
 		m_sliderDifficulty.handleSliderMove(value);
@@ -1107,7 +1107,7 @@ void UIScene_LoadMenu::LaunchGame(void)
 					// inform them that leaderboard writes and achievements will be disabled
 					//ui.RequestMessageBox(IDS_TITLE_START_GAME, IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE, uiIDA, 1, m_iPad,&CScene_LoadGameSettings::ConfirmLoadReturned,this,app.GetStringTable());
 
-					if(m_levelGen != NULL)
+					if(m_levelGen != nullptr)
 					{
 						m_bIsCorrupt = false;
 						LoadDataComplete(this);
@@ -1150,7 +1150,7 @@ void UIScene_LoadMenu::LaunchGame(void)
 	}
 	else
 	{
-		if(m_levelGen != NULL)
+		if(m_levelGen != nullptr)
 		{
 			m_bIsCorrupt = false;
 			LoadDataComplete(this);
@@ -1182,7 +1182,7 @@ void UIScene_LoadMenu::LaunchGame(void)
 
 int UIScene_LoadMenu::CheckResetNetherReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultDecline) 
@@ -1206,11 +1206,11 @@ int UIScene_LoadMenu::CheckResetNetherReturned(void *pParam,int iPad,C4JStorage:
 
 int UIScene_LoadMenu::ConfirmLoadReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
-		if(pClass->m_levelGen != NULL)
+		if(pClass->m_levelGen != nullptr)
 		{
 			pClass->m_bIsCorrupt = false;
 			pClass->LoadDataComplete(pClass);
@@ -1246,7 +1246,7 @@ int UIScene_LoadMenu::ConfirmLoadReturned(void *pParam,int iPad,C4JStorage::EMes
 
 int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	if(!pClass->m_bIsCorrupt)
 	{
@@ -1312,7 +1312,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 #if defined(__PS3__) || defined(__PSVITA__)
 		if(isOnlineGame)
 		{
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,nullptr,&bContentRestricted,nullptr);
 		}
 #endif
 
@@ -1362,7 +1362,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 					// MGH -  added this so we don't try and upsell when we don't know if the player has PS Plus yet (if it can't connect to the PS Plus server).
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_OK;
-					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), NULL, NULL);
+					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), nullptr, nullptr);
 					return 0;
 				}
 
@@ -1381,7 +1381,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 // 				UINT uiIDA[2];
 // 				uiIDA[0]=IDS_PLAY_OFFLINE;
 // 				uiIDA[1]=IDS_PLAYSTATIONPLUS_SIGNUP;
-// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadMenu::PSPlusReturned,pClass, app.GetStringTable(),NULL,0,false);
+// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadMenu::PSPlusReturned,pClass, app.GetStringTable(),nullptr,0,false);
 			}
 
 #endif		
@@ -1392,7 +1392,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 				if(isOnlineGame)
 				{
 					bool chatRestricted = false;
-					ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,NULL,NULL);
+					ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),false,&chatRestricted,nullptr,nullptr);
 					if(chatRestricted)
 					{
 						ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, ProfileManager.GetPrimaryPad() );
@@ -1431,7 +1431,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 					// MGH -  added this so we don't try and upsell when we don't know if the player has PS Plus yet (if it can't connect to the PS Plus server).
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_OK;
-					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), NULL, NULL);
+					ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), nullptr, nullptr);
 					return 0;
 				}
 
@@ -1450,7 +1450,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 // 				UINT uiIDA[2];
 // 				uiIDA[0]=IDS_PLAY_OFFLINE;
 // 				uiIDA[1]=IDS_PLAYSTATIONPLUS_SIGNUP;
-// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadMenu::PSPlusReturned,pClass, app.GetStringTable(),NULL,0,false);
+// 				ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadMenu::PSPlusReturned,pClass, app.GetStringTable(),nullptr,0,false);
 			}
 #endif
 			else
@@ -1484,7 +1484,7 @@ int UIScene_LoadMenu::LoadDataComplete(void *pParam)
 
 int UIScene_LoadMenu::LoadSaveDataReturned(void *pParam,bool bIsCorrupt, bool bIsOwner)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	pClass->m_bIsCorrupt=bIsCorrupt;
 
@@ -1520,13 +1520,13 @@ int UIScene_LoadMenu::LoadSaveDataReturned(void *pParam,bool bIsCorrupt, bool bI
 
 int UIScene_LoadMenu::TrophyDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 	return LoadDataComplete(pClass);
 }
 
 int UIScene_LoadMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultDecline) 
@@ -1543,7 +1543,7 @@ int UIScene_LoadMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage:
 
 int UIScene_LoadMenu::DeleteSaveDataReturned(void *pParam,bool bSuccess)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	app.SetCorruptSaveDeleted(true);
 	pClass->navigateBack();
@@ -1554,7 +1554,7 @@ int UIScene_LoadMenu::DeleteSaveDataReturned(void *pParam,bool bSuccess)
 // 4J Stu - Shared functionality that is the same whether we needed a quadrant sign-in or not
 void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocalUsersMask)
 {
-	if(pClass->m_levelGen == NULL)
+	if(pClass->m_levelGen == nullptr)
 	{
 		INT saveOrCheckpointId = 0;
 		bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId);
@@ -1582,7 +1582,7 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocal
 
 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->seed = pClass->m_seed;
-	param->saveData = NULL;	
+	param->saveData = nullptr;	
 	param->levelGen = pClass->m_levelGen;
 	param->texturePackId = pClass->m_MoreOptionsParams.dwTexturePack;
 	param->levelName = pClass->m_levelName;
@@ -1642,7 +1642,7 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocal
 
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-	loadingParams->lpParam = (LPVOID)param;
+	loadingParams->lpParam = static_cast<LPVOID>(param);
 
 	// Reset the autosave time
 	app.SetAutosaveTimerTime();
@@ -1676,7 +1676,7 @@ void UIScene_LoadMenu::checkStateAndStartGame()
 
 int UIScene_LoadMenu::StartGame_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	UIScene_LoadMenu* pClass = (UIScene_LoadMenu*)pParam;
+	UIScene_LoadMenu* pClass = static_cast<UIScene_LoadMenu *>(pParam);
 
 	if(bContinue==true)
 	{
@@ -1779,7 +1779,7 @@ int UIScene_LoadMenu::StartGame_SignInReturned(void *pParam,bool bContinue, int
 						if(ProfileManager.IsSignedInLive(i))
 						{
 							bool chatRestricted = false;
-							ProfileManager.GetChatAndContentRestrictions(i,false,&chatRestricted,NULL,NULL);
+							ProfileManager.GetChatAndContentRestrictions(i,false,&chatRestricted,nullptr,nullptr);
 							if(chatRestricted)
 							{
 								ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, i );
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadMenu.h b/Minecraft.Client/Common/UI/UIScene_LoadMenu.h
index 085cb67f..53d66d55 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.h
@@ -16,7 +16,7 @@ private:
 	};
 
 	static int m_iDifficultyTitleSettingA[4];
-	
+
 	UIControl m_controlMainPanel;
 	UIControl_Label m_labelGameName, m_labelSeed, m_labelCreatedMode;
 	UIControl_Button m_buttonGamemode, m_buttonMoreOptions, m_buttonLoadWorld;
@@ -43,7 +43,7 @@ private:
 
 	LevelGenerationOptions *m_levelGen;
 	DLCPack * m_pDLCPack;
-	
+
 	int m_iSaveGameInfoIndex;
 	int m_CurrentDifficulty;
 	bool m_bGameModeCreative;
@@ -58,7 +58,7 @@ private:
 	bool m_bRequestQuadrantSignin;
 	bool m_bIsCorrupt;
 	bool m_bThumbnailGetFailed;
-	__int64 m_seed;
+	int64_t m_seed;
 	wstring m_levelName;
 
 #ifdef __PS3__
@@ -73,7 +73,7 @@ private:
 	bool m_bRebuildTouchBoxes;
 public:
 	UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLayer);
-	
+
 	virtual void updateTooltips();
 	virtual void updateComponents();
 
@@ -107,7 +107,7 @@ private:
 #ifdef _DURANGO
 	static void checkPrivilegeCallback(LPVOID lpParam, bool hasPrivilege, int iPad);
 #endif
-	
+
 	static int ConfirmLoadReturned(void *pParam,int iPad,C4JStorage::EMessageResult result);
 	static void StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocalUsersMask);
 	static int LoadSaveDataReturned(void *pParam,bool bIsCorrupt, bool bIsOwner);
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
index 8664aca1..d73148f5 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
@@ -36,13 +36,13 @@ static wstring ReadLevelNameFromSaveFile(const wstring& filePath)
     if (slashPos != wstring::npos)
     {
         wstring sidecarPath = filePath.substr(0, slashPos + 1) + L"worldname.txt";
-        FILE *fr = NULL;
+        FILE *fr = nullptr;
         if (_wfopen_s(&fr, sidecarPath.c_str(), L"r") == 0 && fr)
         {
             char buf[128] = {};
             if (fgets(buf, sizeof(buf), fr))
             {
-                int len = (int)strlen(buf);
+                int len = static_cast<int>(strlen(buf));
                 while (len > 0 && (buf[len-1] == '\n' || buf[len-1] == '\r' || buf[len-1] == ' '))
                     buf[--len] = '\0';
                 fclose(fr);
@@ -57,15 +57,15 @@ static wstring ReadLevelNameFromSaveFile(const wstring& filePath)
         }
     }
 
-    HANDLE hFile = CreateFileW(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+    HANDLE hFile = CreateFileW(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, nullptr);
     if (hFile == INVALID_HANDLE_VALUE) return L"";
 
-    DWORD fileSize = GetFileSize(hFile, NULL);
+    DWORD fileSize = GetFileSize(hFile, nullptr);
     if (fileSize < 12 || fileSize == INVALID_FILE_SIZE) { CloseHandle(hFile); return L""; }
 
     unsigned char *rawData = new unsigned char[fileSize];
     DWORD bytesRead = 0;
-    if (!ReadFile(hFile, rawData, fileSize, &bytesRead, NULL) || bytesRead != fileSize)
+    if (!ReadFile(hFile, rawData, fileSize, &bytesRead, nullptr) || bytesRead != fileSize)
     {
         CloseHandle(hFile);
         delete[] rawData;
@@ -73,7 +73,7 @@ static wstring ReadLevelNameFromSaveFile(const wstring& filePath)
     }
     CloseHandle(hFile);
 
-    unsigned char *saveData = NULL;
+    unsigned char *saveData = nullptr;
     unsigned int saveSize   = 0;
     bool freeSaveData = false;
 
@@ -120,10 +120,10 @@ static wstring ReadLevelNameFromSaveFile(const wstring& filePath)
                         ba.data   = (byte*)(saveData + off);
                         ba.length = len;
                         CompoundTag *root = NbtIo::decompress(ba);
-                        if (root != NULL)
+                        if (root != nullptr)
                         {
                             CompoundTag *dataTag = root->getCompound(L"Data");
-                            if (dataTag != NULL)
+                            if (dataTag != nullptr)
                                 result = dataTag->getString(L"LevelName");
                             delete root;
                         }
@@ -172,7 +172,7 @@ C4JStorage::SAVETRANSFER_FILE_DETAILS UIScene_LoadOrJoinMenu::m_debugTransferDet
 
 int UIScene_LoadOrJoinMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
 {
-    UIScene_LoadOrJoinMenu *pClass= (UIScene_LoadOrJoinMenu *)lpParam;
+    UIScene_LoadOrJoinMenu *pClass= static_cast<UIScene_LoadOrJoinMenu *>(lpParam);
 
     app.DebugPrintf("Received data for save thumbnail\n");
 
@@ -184,9 +184,9 @@ int UIScene_LoadOrJoinMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE p
     }
     else
     {
-        pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].pbThumbnailData = NULL;
+        pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].pbThumbnailData = nullptr;
         pClass->m_saveDetails[pClass->m_iRequestingThumbnailId].dwThumbnailSize = 0;
-        app.DebugPrintf("Save thumbnail data is NULL, or has size 0\n");
+        app.DebugPrintf("Save thumbnail data is nullptr, or has size 0\n");
     }
     pClass->m_bSaveThumbnailReady = true;
 
@@ -215,7 +215,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
     m_bIgnoreInput = false;
     m_bShowingPartyGamesOnly = false;
     m_bInParty = false;
-    m_currentSessions = NULL;
+    m_currentSessions = nullptr;
     m_iState=e_SavesIdle;
     //m_bRetrievingSaveInfo=false;
 
@@ -239,9 +239,9 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
     m_bRetrievingSaveThumbnails = false;
     m_bSaveThumbnailReady = false;
     m_bExitScene=false;
-    m_pSaveDetails=NULL;
+    m_pSaveDetails=nullptr;
     m_bSavesDisplayed=false;
-    m_saveDetails = NULL;
+    m_saveDetails = nullptr;
     m_iSaveDetailsCount = 0;
     m_iTexturePacksNotInstalled = 0;
 	m_bCopying = false;
@@ -320,7 +320,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
 #ifdef _XBOX
     // 4J-PB - there may be texture packs we don't have, so use the info from TMS for this
 
-    DLC_INFO *pDLCInfo=NULL;
+    DLC_INFO *pDLCInfo=nullptr;
 
     // first pass - look to see if there are any that are not in the list
     bool bTexturePackAlreadyListed;
@@ -399,11 +399,16 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
 
 UIScene_LoadOrJoinMenu::~UIScene_LoadOrJoinMenu()
 {
-    g_NetworkManager.SetSessionsUpdatedCallback( NULL, NULL );
+    g_NetworkManager.SetSessionsUpdatedCallback( nullptr, nullptr );
     app.SetLiveLinkRequired( false );
 
-    delete m_currentSessions;
-    m_currentSessions = NULL;
+    if (m_currentSessions)
+    {
+        for (const auto& it : *m_currentSessions)
+            delete it;
+        delete m_currentSessions;
+        m_currentSessions = nullptr;
+    }
 
 #if TO_BE_IMPLEMENTED
     // Reset the background downloading, in case we changed it by attempting to download a texture pack
@@ -520,6 +525,9 @@ void UIScene_LoadOrJoinMenu::Initialise()
 {
     m_iSaveListIndex = 0;
 	m_iGameListIndex = 0;
+#ifdef _WINDOWS64
+	m_addServerPhase = eAddServer_Idle;
+#endif
 
     m_iDefaultButtonsC = 0;
 	m_iMashUpButtonsC=0;
@@ -705,7 +713,7 @@ void UIScene_LoadOrJoinMenu::tick()
         if(!m_bSavesDisplayed)
         {
             m_pSaveDetails=StorageManager.ReturnSavesInfo();
-            if(m_pSaveDetails!=NULL)
+            if(m_pSaveDetails!=nullptr)
             {
                 //CD - Fix - Adding define for ORBIS/XBOXONE
 #if defined(_XBOX_ONE) || defined(__ORBIS__)
@@ -716,11 +724,11 @@ void UIScene_LoadOrJoinMenu::tick()
                 m_bSavesDisplayed=true;
                 UpdateGamesList();
 
-                if(m_saveDetails!=NULL)
+                if(m_saveDetails!=nullptr)
                 {
                     for(unsigned int i = 0; i < m_iSaveDetailsCount; ++i)
                     {
-                        if(m_saveDetails[i].pbThumbnailData!=NULL)
+                        if(m_saveDetails[i].pbThumbnailData!=nullptr)
                         {
                             delete m_saveDetails[i].pbThumbnailData;
                         }
@@ -1000,9 +1008,9 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
 #ifdef __ORBIS__
 		// We need to make sure this is non-null so that we have an idea of free space
         m_pSaveDetails=StorageManager.ReturnSavesInfo();
-        if(m_pSaveDetails==NULL)
+        if(m_pSaveDetails==nullptr)
         {
-            C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save");
+            C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,nullptr,this,"save");
         }
 #endif
 
@@ -1015,7 +1023,7 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
         if( savesDir.exists() )
         {
             m_saves = savesDir.listFiles();
-            uiSaveC = (unsigned int)m_saves->size();
+            uiSaveC = static_cast<unsigned int>(m_saves->size());
         }
         // add the New Game and Tutorial after the saves list is retrieved, if there are any saves
 
@@ -1049,9 +1057,9 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
         m_controlSavesTimer.setVisible(true);
 
         m_pSaveDetails=StorageManager.ReturnSavesInfo();
-        if(m_pSaveDetails==NULL)
+        if(m_pSaveDetails==nullptr)
         {
-            C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save");
+            C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad, nullptr,this,"save");
         }
 
 #if TO_BE_IMPLEMENTED
@@ -1169,6 +1177,43 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr
 			}
 		}
 #endif
+#ifdef _WINDOWS64
+		// Right click on a save opens save options (same as RB / ACTION_MENU_RIGHT_SCROLL)
+		if(pressed && !repeat && ProfileManager.IsFullVersion() && !StorageManager.GetSaveDisabled())
+		{
+			if(DoesSavesListHaveFocus() && (m_iDefaultButtonsC > 0) && (m_iSaveListIndex >= m_iDefaultButtonsC))
+			{
+				m_bIgnoreInput = true;
+				if(StorageManager.EnoughSpaceForAMinSaveGame())
+				{
+					UINT uiIDA[3];
+					uiIDA[0]=IDS_CONFIRM_CANCEL;
+					uiIDA[1]=IDS_TITLE_RENAMESAVE;
+					uiIDA[2]=IDS_TOOLTIPS_DELETESAVE;
+					ui.RequestAlertMessage(IDS_TOOLTIPS_SAVEOPTIONS, IDS_TEXT_SAVEOPTIONS, uiIDA, 3, iPad,&UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned,this);
+				}
+				else
+				{
+					UINT uiIDA[2];
+					uiIDA[0]=IDS_CONFIRM_CANCEL;
+					uiIDA[1]=IDS_CONFIRM_OK;
+					ui.RequestAlertMessage(IDS_TOOLTIPS_DELETESAVE, IDS_TEXT_DELETE_SAVE, uiIDA, 2, iPad,&UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned,this);
+				}
+				ui.PlayUISFX(eSFX_Press);
+			}
+			else if(DoesMashUpWorldHaveFocus() && (m_iSaveListIndex != JOIN_LOAD_CREATE_BUTTON_INDEX))
+			{
+				LevelGenerationOptions *levelGen = m_generators.at(m_iSaveListIndex - 1);
+				if(!levelGen->isTutorial() && levelGen->requiresTexturePack())
+				{
+					m_bIgnoreInput = true;
+					app.HideMashupPackWorld(m_iPad, levelGen->getRequiredTexturePackId());
+					m_iState = e_SavesRepopulateAfterMashupHide;
+				}
+				ui.PlayUISFX(eSFX_Press);
+			}
+		}
+#endif
         break;
     case ACTION_MENU_Y:
 #if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__)
@@ -1353,7 +1398,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr
 int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,bool bRes)
 {
     // 4J HEG - No reason to set value if keyboard was cancelled
-    UIScene_LoadOrJoinMenu *pClass=(UIScene_LoadOrJoinMenu *)lpParam;
+    UIScene_LoadOrJoinMenu *pClass=static_cast<UIScene_LoadOrJoinMenu *>(lpParam);
 	pClass->m_bIgnoreInput=false;
     if (bRes)
     {
@@ -1378,7 +1423,7 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
                 // Convert the ui16Text input to a wide string
                 wchar_t wNewName[128] = {};
                 for (int k = 0; k < 127 && ui16Text[k]; k++)
-                    wNewName[k] = (wchar_t)ui16Text[k];
+                    wNewName[k] = static_cast<wchar_t>(ui16Text[k]);
 
                 // Convert to narrow for storage and in-memory update
                 char narrowName[128] = {};
@@ -1389,7 +1434,7 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
                 mbstowcs(wFilename, pClass->m_saveDetails[listPos].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
                 wstring sidecarPath = wstring(L"Windows64\\GameHDD\\") + wstring(wFilename) + wstring(L"\\worldname.txt");
 
-                FILE *fw = NULL;
+                FILE *fw = nullptr;
                 if (_wfopen_s(&fw, sidecarPath.c_str(), L"w") == 0 && fw)
                 {
                     fputs(narrowName, fw);
@@ -1422,18 +1467,22 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
 }
 void UIScene_LoadOrJoinMenu::handleInitFocus(F64 controlId, F64 childId)
 {
-    app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleInitFocus - %d , %d\n", (int)controlId, (int)childId);
+    app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleInitFocus - %d , %d\n", static_cast<int>(controlId), static_cast<int>(childId));
 }
 
 void UIScene_LoadOrJoinMenu::handleFocusChange(F64 controlId, F64 childId)
 {
-    app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleFocusChange - %d , %d\n", (int)controlId, (int)childId);
+    app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleFocusChange - %d , %d\n", static_cast<int>(controlId), static_cast<int>(childId));
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_GamesList:
 		m_iGameListIndex = childId;
-		m_buttonListGames.updateChildFocus( (int) childId );
+#ifdef _WINDOWS64
+		// Offset past the "Add Server" button so m_iGameListIndex is a session index
+		m_iGameListIndex -= 1;
+#endif
+		m_buttonListGames.updateChildFocus( static_cast<int>(childId) );
 		break;
 	case eControl_SavesList:
 		m_iSaveListIndex = childId;
@@ -1455,18 +1504,18 @@ void UIScene_LoadOrJoinMenu::remoteStorageGetSaveCallback(LPVOID lpParam, SonyRe
 
 void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
 {
-    switch((int)controlId)
+    switch(static_cast<int>(controlId))
     {
     case eControl_SavesList:
         {
             m_bIgnoreInput=true;
 
-            int lGenID = (int)childId - 1;
+            int lGenID = static_cast<int>(childId) - 1;
 
             //CD - Added for audio
             ui.PlayUISFX(eSFX_Press);
 
-            if((int)childId == JOIN_LOAD_CREATE_BUTTON_INDEX)
+            if(static_cast<int>(childId) == JOIN_LOAD_CREATE_BUTTON_INDEX)
             {
                 app.SetTutorialMode( false );
 
@@ -1497,7 +1546,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
                     params->iSaveGameInfoIndex=-1;
                     //params->pbSaveRenamed=&m_bSaveRenamed;
                     params->levelGen = levelGen;
-                    params->saveDetails = NULL;
+                    params->saveDetails = nullptr;
 
                     // navigate to the settings scene
                     ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_LoadMenu, params);
@@ -1508,7 +1557,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
 #ifdef __ORBIS__
                 // check if this is a damaged save
 				PSAVE_INFO pSaveInfo = &m_pSaveDetails->SaveInfoA[((int)childId)-m_iDefaultButtonsC];
-                if(pSaveInfo->thumbnailData == NULL && pSaveInfo->modifiedTime == 0)		// no thumbnail data and time of zero and zero blocks useset for corrupt files
+                if(pSaveInfo->thumbnailData == nullptr && pSaveInfo->modifiedTime == 0)		// no thumbnail data and time of zero and zero blocks useset for corrupt files
                 {
                     // give the option to delete the save
                     UINT uiIDA[2];
@@ -1524,17 +1573,17 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
 
                     if(app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled())
                     {
-                        LoadSaveFromDisk(m_saves->at((int)childId-m_iDefaultButtonsC));
+                        LoadSaveFromDisk(m_saves->at(static_cast<int>(childId)-m_iDefaultButtonsC));
                     }
                     else
                     {
                         LoadMenuInitData *params = new LoadMenuInitData();
                         params->iPad = m_iPad;
                         // need to get the iIndex from the list item, since the position in the list doesn't correspond to the GetSaveGameInfo list because of sorting
-                        params->iSaveGameInfoIndex=m_saveDetails[((int)childId)-m_iDefaultButtonsC].saveId;
+                        params->iSaveGameInfoIndex=m_saveDetails[static_cast<int>(childId)-m_iDefaultButtonsC].saveId;
                         //params->pbSaveRenamed=&m_bSaveRenamed;
-                        params->levelGen = NULL;
-                        params->saveDetails = &m_saveDetails[ ((int)childId)-m_iDefaultButtonsC ];
+                        params->levelGen = nullptr;
+                        params->saveDetails = &m_saveDetails[ static_cast<int>(childId)-m_iDefaultButtonsC ];
 
 #ifdef _XBOX_ONE
                         // On XB1, saves might need syncing, in which case inform the user so they can decide whether they want to wait for this to happen
@@ -1560,6 +1609,14 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
         break;
     case eControl_GamesList:
         {
+#ifdef _WINDOWS64
+            if (static_cast<int>(childId) == ADD_SERVER_BUTTON_INDEX)
+            {
+                ui.PlayUISFX(eSFX_Press);
+                BeginAddServer();
+                break;
+            }
+#endif
             m_bIgnoreInput=true;
 
 			m_eAction = eAction_JoinGame;
@@ -1568,7 +1625,11 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
             ui.PlayUISFX(eSFX_Press);
 
 			{
-				int nIndex = (int)childId;
+				int nIndex = static_cast<int>(childId);
+#ifdef _WINDOWS64
+				// Offset by 1 because the "Add Server" button is at index 0
+				nIndex -= 1;
+#endif
 				m_iGameListIndex = nIndex;
 				CheckAndJoinGame(nIndex);
 			}
@@ -1588,7 +1649,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 		bool bContentRestricted=false;
 
 		// we're online, since we are joining a game
-		ProfileManager.GetChatAndContentRestrictions(m_iPad,true,&noUGC,&bContentRestricted,NULL);
+		ProfileManager.GetChatAndContentRestrictions(m_iPad,true,&noUGC,&bContentRestricted,nullptr);
 
 #ifdef __ORBIS__
 		// 4J Stu - On PS4 we don't restrict playing multiplayer based on chat restriction, so remove this check
@@ -1632,7 +1693,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 			UINT uiIDA[1];
 			uiIDA[0]=IDS_CONFIRM_OK;
 			// Not allowed to play online
-			ui.RequestAlertMessage(IDS_ONLINE_GAME, IDS_CHAT_RESTRICTION_UGC, uiIDA, 1, m_iPad,NULL,this);
+			ui.RequestAlertMessage(IDS_ONLINE_GAME, IDS_CHAT_RESTRICTION_UGC, uiIDA, 1, m_iPad,nullptr,this);
 #else
 			// Not allowed to play online
 			ProfileManager.ShowSystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, 0 );
@@ -1677,7 +1738,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 				// MGH -  added this so we don't try and upsell when we don't know if the player has PS Plus yet (if it can't connect to the PS Plus server).
 				UINT uiIDA[1];
 				uiIDA[0]=IDS_OK;
-				ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), NULL, NULL);
+				ui.RequestAlertMessage(IDS_ERROR_NETWORK_TITLE, IDS_ERROR_NETWORK, uiIDA, 1, ProfileManager.GetPrimaryPad(), nullptr, nullptr);
 				return;
 			}
 
@@ -1697,7 +1758,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 			//                     UINT uiIDA[2];
 			//                     uiIDA[0]=IDS_CONFIRM_OK;
 			//                     uiIDA[1]=IDS_PLAYSTATIONPLUS_SIGNUP;
-			//                     ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadOrJoinMenu::PSPlusReturned,this, app.GetStringTable(),NULL,0,false);
+			//                     ui.RequestMessageBox( IDS_FAILED_TO_CREATE_GAME_TITLE, IDS_NO_PLAYSTATIONPLUS, uiIDA,2,ProfileManager.GetPrimaryPad(),&UIScene_LoadOrJoinMenu::PSPlusReturned,this, app.GetStringTable(),nullptr,0,false);
 
 			m_bIgnoreInput=false;
 			return;
@@ -1706,12 +1767,34 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 #endif
 #endif
 
-		//CScene_MultiGameInfo::JoinMenuInitData *initData = new CScene_MultiGameInfo::JoinMenuInitData();
 		m_initData->iPad = 0;;
 		m_initData->selectedSession = m_currentSessions->at( gameIndex );
+#ifdef _WINDOWS64
+		{
+
+			int serverDbCount = 0;
+			FILE* dbFile = fopen("servers.db", "rb");
+			if (dbFile)
+			{
+				char magic[4] = {};
+				if (fread(magic, 1, 4, dbFile) == 4 && memcmp(magic, "MCSV", 4) == 0)
+				{
+					uint32_t version = 0, count = 0;
+					fread(&version, sizeof(uint32_t), 1, dbFile);
+					fread(&count, sizeof(uint32_t), 1, dbFile);
+					if (version == 1)
+						serverDbCount = static_cast<int>(count);
+				}
+				fclose(dbFile);
+			}
+			int lanCount = static_cast<int>(m_currentSessions->size()) - serverDbCount;
+			if (gameIndex >= lanCount && lanCount >= 0)
+				m_initData->serverIndex = gameIndex - lanCount;
+			else
+				m_initData->serverIndex = -1; 
+		}
+#endif
 
-		// check that we have the texture pack available
-		// If it's not the default texture pack
 		if(m_initData->selectedSession->data.texturePackParentId!=0)
 		{
 			int texturePacksCount = Minecraft::GetInstance()->skins->getTexturePackCount();
@@ -1729,8 +1812,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 
 			if(bHasTexturePackInstalled==false)
 			{
-				// upsell the texture pack
-				// tell sentient about the upsell of the full version of the skin pack
+
 #ifdef _XBOX
 				ULONGLONG ullOfferID_Full;
 				app.GetDLCFullOfferIDForPackID(m_initData->selectedSession->data.texturePackParentId,&ullOfferID_Full);
@@ -1743,8 +1825,6 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 				//uiIDA[1]=IDS_TEXTURE_PACK_TRIALVERSION;
 				uiIDA[1]=IDS_CONFIRM_CANCEL;
 
-
-				// Give the player a warning about the texture pack missing
 				ui.RequestAlertMessage(IDS_DLC_TEXTUREPACK_NOT_PRESENT_TITLE, IDS_DLC_TEXTUREPACK_NOT_PRESENT, uiIDA, 2, m_iPad,&UIScene_LoadOrJoinMenu::TexturePackDialogReturned,this);
 
 				return;
@@ -1762,7 +1842,6 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 		m_controlJoinTimer.setVisible( false );
 
 #ifdef _XBOX
-		// Reset the background downloading, in case we changed it by attempting to download a texture pack
 		XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_AUTO);
 #endif
 
@@ -1799,7 +1878,7 @@ void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen)
 
     NetworkGameInitData *param = new NetworkGameInitData();
     param->seed = 0;
-    param->saveData = NULL;
+    param->saveData = nullptr;
     param->settings = app.GetGameHostOption( eGameHostOption_Tutorial );
     param->levelGen = levelGen;
 
@@ -1818,7 +1897,7 @@ void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen)
 
     LoadingInputParams *loadingParams = new LoadingInputParams();
     loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-    loadingParams->lpParam = (LPVOID)param;
+    loadingParams->lpParam = static_cast<LPVOID>(param);
 
     UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
     completionData->bShowBackground=TRUE;
@@ -1832,9 +1911,9 @@ void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen)
 
 void UIScene_LoadOrJoinMenu::UpdateGamesListCallback(LPVOID pParam)
 {
-    if(pParam != NULL)
+    if(pParam != nullptr)
     {
-        UIScene_LoadOrJoinMenu *pScene = (UIScene_LoadOrJoinMenu *)pParam;
+        UIScene_LoadOrJoinMenu *pScene = static_cast<UIScene_LoadOrJoinMenu *>(pParam);
         pScene->UpdateGamesList();
     }
 }
@@ -1854,17 +1933,23 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
     }
 
 
-    FriendSessionInfo *pSelectedSession = NULL;
+    FriendSessionInfo *pSelectedSession = nullptr;
     if(DoesGamesListHaveFocus() && m_buttonListGames.getItemCount() > 0)
     {
         unsigned int nIndex = m_buttonListGames.getCurrentSelection();
+#ifdef _WINDOWS64
+        // Offset past the "Add Server" button
+        if (nIndex > 0)
+            pSelectedSession = m_currentSessions->at( nIndex - 1 );
+#else
         pSelectedSession = m_currentSessions->at( nIndex );
+#endif
     }
 
     SessionID selectedSessionId;
 	ZeroMemory(&selectedSessionId,sizeof(SessionID));
-    if( pSelectedSession != NULL )selectedSessionId = pSelectedSession->sessionId;
-    pSelectedSession = NULL;
+    if( pSelectedSession != nullptr )selectedSessionId = pSelectedSession->sessionId;
+    pSelectedSession = nullptr;
 
     m_controlJoinTimer.setVisible( false );
 
@@ -1874,12 +1959,41 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
     int iY = -1;
     int iX=-1;
 
-    delete m_currentSessions;
-    m_currentSessions = g_NetworkManager.GetSessionList( m_iPad, 1, m_bShowingPartyGamesOnly );
+    vector<FriendSessionInfo*>* newSessions = g_NetworkManager.GetSessionList( m_iPad, 1, m_bShowingPartyGamesOnly );
+
+    if (m_currentSessions != NULL && m_currentSessions->size() == newSessions->size())
+    {
+        bool same = true;
+        for (size_t i = 0; i < newSessions->size(); i++)
+        {
+            if (memcmp(&(*m_currentSessions)[i]->sessionId, &(*newSessions)[i]->sessionId, sizeof(SessionID)) != 0 ||
+                wcscmp((*m_currentSessions)[i]->displayLabel ? (*m_currentSessions)[i]->displayLabel : L"",
+                       (*newSessions)[i]->displayLabel ? (*newSessions)[i]->displayLabel : L"") != 0)
+            {
+                same = false;
+                break;
+            }
+        }
+        if (same)
+        {
+            for (auto& it : *newSessions)
+                delete it;
+            delete newSessions;
+            return;
+        }
+    }
+
+    if (m_currentSessions)
+    {
+        for (auto& it : *m_currentSessions)
+            delete it;
+        delete m_currentSessions;
+    }
+    m_currentSessions = newSessions;
 
     // Update the xui list displayed
     unsigned int xuiListSize = m_buttonListGames.getItemCount();
-    unsigned int filteredListSize = (unsigned int)m_currentSessions->size();
+    unsigned int filteredListSize = static_cast<unsigned int>(m_currentSessions->size());
 
     BOOL gamesListHasFocus = DoesGamesListHaveFocus();
 
@@ -1911,6 +2025,11 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
     // clear out the games list and re-fill
     m_buttonListGames.clearList();
 
+#ifdef _WINDOWS64
+    // Always add the "Add Server" button as the first entry in the games list
+    m_buttonListGames.addItem(wstring(L"Add Server"));
+#endif
+
     if( filteredListSize > 0 )
     {
         // Reset the focus to the selected session if it still exists
@@ -1930,12 +2049,12 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
                 HRESULT hr;
 
                 DWORD dwImageBytes=0;
-                PBYTE pbImageData=NULL;
+                PBYTE pbImageData=nullptr;
 
-                if(tp==NULL)
+                if(tp==nullptr)
                 {
                     DWORD dwBytes=0;
-                    PBYTE pbData=NULL;
+                    PBYTE pbData=nullptr;
                     app.GetTPD(sessionInfo->data.texturePackParentId,&pbData,&dwBytes);
 
                     // is it in the tpd data ?
@@ -1976,7 +2095,12 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
 
             if(memcmp( &selectedSessionId, &sessionInfo->sessionId, sizeof(SessionID) ) == 0)
             {
+#ifdef _WINDOWS64
+                // Offset past the "Add Server" button
+                m_buttonListGames.setCurrentSelection(sessionIndex + 1);
+#else
                 m_buttonListGames.setCurrentSelection(sessionIndex);
+#endif
                 break;
             }
             ++sessionIndex;
@@ -2134,9 +2258,9 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform save
     // Make our next save default to the name of the level
     StorageManager.SetSaveTitle(saveFile->getName().c_str());
 
-    __int64 fileSize = saveFile->length();
+    int64_t fileSize = saveFile->length();
     FileInputStream fis(*saveFile);
-    byteArray ba(fileSize);
+    byteArray ba(static_cast<unsigned int>(fileSize));
     fis.read(ba);
     fis.close();
 
@@ -2170,7 +2294,7 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform save
 
     LoadingInputParams *loadingParams = new LoadingInputParams();
     loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-    loadingParams->lpParam = (LPVOID)param;
+    loadingParams->lpParam = static_cast<LPVOID>(param);
 
     UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
     completionData->bShowBackground=TRUE;
@@ -2198,7 +2322,7 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromCloud()
     mbstowcs(wSaveName, app.getRemoteStorage()->getSaveNameUTF8(), strlen(app.getRemoteStorage()->getSaveNameUTF8())+1); // plus null
     StorageManager.SetSaveTitle(wSaveName);
 
-    __int64 fileSize = cloudFile.length();
+    int64_t fileSize = cloudFile.length();
     FileInputStream fis(cloudFile);
     byteArray ba(fileSize);
     fis.read(ba);
@@ -2276,7 +2400,7 @@ static bool Win64_DeleteSaveDirectory(const wchar_t* wPath)
 
 int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-    UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
+    UIScene_LoadOrJoinMenu* pClass = static_cast<UIScene_LoadOrJoinMenu *>(pParam);
     // results switched for this dialog
 
 	// Check that we have a valid save selected (can get a bad index if the save list has been refreshed)
@@ -2298,7 +2422,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JSt
                 if (pClass->m_saveDetails && displayIdx >= 0 && pClass->m_saveDetails[displayIdx].UTF8SaveFilename[0])
                 {
                     wchar_t wFilename[MAX_SAVEFILENAME_LENGTH] = {};
-                    mbstowcs_s(NULL, wFilename, MAX_SAVEFILENAME_LENGTH, pClass->m_saveDetails[displayIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
+                    mbstowcs_s(nullptr, wFilename, MAX_SAVEFILENAME_LENGTH, pClass->m_saveDetails[displayIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
                     wchar_t wFolderPath[MAX_PATH] = {};
                     swprintf_s(wFolderPath, MAX_PATH, L"Windows64\\GameHDD\\%s", wFilename);
                     bSuccess = Win64_DeleteSaveDirectory(wFolderPath);
@@ -2322,7 +2446,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JSt
 int UIScene_LoadOrJoinMenu::DeleteSaveDataReturned(LPVOID lpParam,bool bRes)
 {
 	ui.EnterCallbackIdCriticalSection();
-    UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)ui.GetSceneFromCallbackId((size_t)lpParam);
+    UIScene_LoadOrJoinMenu* pClass = static_cast<UIScene_LoadOrJoinMenu *>(ui.GetSceneFromCallbackId((size_t)lpParam));
 
 	if(pClass)
 	{
@@ -2342,7 +2466,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDataReturned(LPVOID lpParam,bool bRes)
 
 int UIScene_LoadOrJoinMenu::RenameSaveDataReturned(LPVOID lpParam,bool bRes)
 {
-    UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)lpParam;
+    UIScene_LoadOrJoinMenu* pClass = static_cast<UIScene_LoadOrJoinMenu *>(lpParam);
 
     if(bRes)
     {
@@ -2374,7 +2498,7 @@ void UIScene_LoadOrJoinMenu::LoadRemoteFileFromDisk(char* remoteFilename)
 
 int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-    UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
+    UIScene_LoadOrJoinMenu* pClass = static_cast<UIScene_LoadOrJoinMenu *>(pParam);
 
     // results switched for this dialog
     // EMessage_ResultAccept means cancel
@@ -2387,14 +2511,14 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JS
             {
                 wchar_t wSaveName[128];
                 ZeroMemory(wSaveName, 128 * sizeof(wchar_t));
-                mbstowcs_s(NULL, wSaveName, 128, pClass->m_saveDetails[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC].UTF8SaveName, _TRUNCATE);
+                mbstowcs_s(nullptr, wSaveName, 128, pClass->m_saveDetails[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC].UTF8SaveName, _TRUNCATE);
                 UIKeyboardInitData kbData;
                 kbData.title       = app.GetString(IDS_RENAME_WORLD_TITLE);
                 kbData.defaultText = wSaveName;
                 kbData.maxChars    = 25;
                 kbData.callback    = &UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback;
                 kbData.lpParam     = pClass;
-                kbData.pcMode      = !Win64_IsControllerConnected();
+                kbData.pcMode      = g_KBMInput.IsKBMActive();
                 ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData);
             }
 #elif defined _DURANGO
@@ -2504,7 +2628,7 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack(void *pParam,bool bCon
 	if(bContinue==true)
 	{
 		SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo(pClass->m_initData->selectedSession->data.texturePackParentId);
-		if(pSONYDLCInfo!=NULL)
+		if(pSONYDLCInfo!=nullptr)
 		{
 			char chName[42];
 			char chKeyName[20];
@@ -2513,7 +2637,7 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack(void *pParam,bool bCon
 			memset(chSkuID,0,SCE_NP_COMMERCE2_SKU_ID_LEN);
 			// we have to retrieve the skuid from the store info, it can't be hardcoded since Sony may change it.
 			// So we assume the first sku for the product is the one we want
-			// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a NULL terminating char
+			// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a nullptr terminating char
 			memset(chKeyName, 0, sizeof(chKeyName));
 			strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16);
 
@@ -2545,7 +2669,7 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedTexturePack(void *pParam,bool bCon
 
 int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-    UIScene_LoadOrJoinMenu *pClass = (UIScene_LoadOrJoinMenu *)pParam;
+    UIScene_LoadOrJoinMenu *pClass = static_cast<UIScene_LoadOrJoinMenu *>(pParam);
 
     // Exit with or without saving
     if(result==C4JStorage::EMessage_ResultAccept)
@@ -2567,7 +2691,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
 #endif
 
 		SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo(pClass->m_initData->selectedSession->data.texturePackParentId);
-		if(pSONYDLCInfo!=NULL)
+		if(pSONYDLCInfo!=nullptr)
 		{
 			char chName[42];
 			char chKeyName[20];
@@ -2576,7 +2700,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
 			memset(chSkuID,0,SCE_NP_COMMERCE2_SKU_ID_LEN);
 			// we have to retrieve the skuid from the store info, it can't be hardcoded since Sony may change it.
 			// So we assume the first sku for the product is the one we want
-			// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a NULL terminating char
+			// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a nullptr terminating char
 			memset(chKeyName, 0, sizeof(chKeyName));
 			strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16);
 
@@ -2610,7 +2734,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
 				wstring ProductId;
 				app.GetDLCFullOfferIDForPackID(pClass->m_initData->selectedSession->data.texturePackParentId,ProductId);
 
-				StorageManager.InstallOffer(1,(WCHAR *)ProductId.c_str(),NULL,NULL);
+				StorageManager.InstallOffer(1,(WCHAR *)ProductId.c_str(),nullptr,nullptr);
 			}
 			else
 			{
@@ -2802,7 +2926,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
     pMinecraft->progressRenderer->progressStart(IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD);
     pMinecraft->progressRenderer->progressStage( IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD );
 
-	ConsoleSaveFile* pSave = NULL;
+	ConsoleSaveFile* pSave = nullptr;
 
 	pClass->m_eSaveTransferState = eSaveTransfer_GetRemoteSaveInfo;
 
@@ -2857,10 +2981,10 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 				const char* pNameUTF8 = app.getRemoteStorage()->getSaveNameUTF8();
 				mbstowcs(wSaveName, pNameUTF8, strlen(pNameUTF8)+1); // plus null
 				StorageManager.SetSaveTitle(wSaveName);
-				PBYTE pbThumbnailData=NULL;
+				PBYTE pbThumbnailData=nullptr;
 				DWORD dwThumbnailDataSize=0;
 
-				PBYTE pbDataSaveImage=NULL;
+				PBYTE pbDataSaveImage=nullptr;
 				DWORD dwDataSizeSaveImage=0;
 
 				StorageManager.GetDefaultSaveImage(&pbDataSaveImage, &dwDataSizeSaveImage);			// Get the default save thumbnail (as set by SetDefaultImages) for use on saving games t
@@ -3021,10 +3145,10 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 
                 StorageManager.ResetSaveData();
 				{
-					PBYTE pbThumbnailData=NULL;
+					PBYTE pbThumbnailData=nullptr;
 					DWORD dwThumbnailDataSize=0;
 
-					PBYTE pbDataSaveImage=NULL;
+					PBYTE pbDataSaveImage=nullptr;
 					DWORD dwDataSizeSaveImage=0;
 
 					StorageManager.GetDefaultSaveImage(&pbDataSaveImage, &dwDataSizeSaveImage);			// Get the default save thumbnail (as set by SetDefaultImages) for use on saving games t
@@ -3232,7 +3356,7 @@ void UIScene_LoadOrJoinMenu::SaveTransferReturned(LPVOID lpParam, SonyRemoteStor
 }
 ConsoleSaveFile* UIScene_LoadOrJoinMenu::SonyCrossSaveConvert()
 {
-    return NULL;
+    return nullptr;
 }
 
 void UIScene_LoadOrJoinMenu::CancelSaveTransferCallback(LPVOID lpParam)
@@ -3455,7 +3579,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
 
 	SaveTransferStateContainer *pStateContainer = (SaveTransferStateContainer *) lpParameter;
     Minecraft *pMinecraft=Minecraft::GetInstance();
-    ConsoleSaveFile* pSave = NULL;
+    ConsoleSaveFile* pSave = nullptr;
 
 	while(StorageManager.SaveTransferClearState()!=C4JStorage::eSaveTransfer_Idle)
 	{
@@ -3542,7 +3666,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
 						bool bHostOptionsRead = false;
 						unsigned int uiHostOptions = 0;
 						DWORD dwTexturePack;
-						__int64 seedVal;
+						int64_t seedVal;
 
 						char szSeed[50];
 						ZeroMemory(szSeed,50);
@@ -3557,7 +3681,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
 
 						int iTextMetadataBytes = app.CreateImageTextData(bTextMetadata, seedVal, true, uiHostOptions, dwTexturePack);
 						// set the icon and save image
-						StorageManager.SetSaveImages(ba.data, ba.length, NULL, 0, bTextMetadata, iTextMetadataBytes);
+						StorageManager.SetSaveImages(ba.data, ba.length, nullptr, 0, bTextMetadata, iTextMetadataBytes);
 
                         delete ba.data;
                     }
@@ -3720,12 +3844,12 @@ void UIScene_LoadOrJoinMenu::RequestFileData( SaveTransferStateContainer *pClass
         File targetFile( wstring(L"FakeTMSPP\\").append(filename) );
         if(targetFile.exists())
         {
-            HANDLE hSaveFile = CreateFile( targetFile.getPath().c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, NULL);
+            HANDLE hSaveFile = CreateFile( targetFile.getPath().c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, nullptr);
 
             m_debugTransferDetails.pbData = new BYTE[m_debugTransferDetails.ulFileLen];
 
             DWORD numberOfBytesRead = 0;
-            ReadFile( hSaveFile,m_debugTransferDetails.pbData,m_debugTransferDetails.ulFileLen,&numberOfBytesRead,NULL);
+            ReadFile( hSaveFile,m_debugTransferDetails.pbData,m_debugTransferDetails.ulFileLen,&numberOfBytesRead,nullptr);
             assert(numberOfBytesRead == m_debugTransferDetails.ulFileLen);
 
             CloseHandle(hSaveFile);
@@ -3753,7 +3877,7 @@ int UIScene_LoadOrJoinMenu::SaveTransferReturned(LPVOID lpParam,C4JStorage::SAVE
     app.DebugPrintf("Save Transfer - size is %d\n",pSaveTransferDetails->ulFileLen);
 
     // if the file data is null, then assume this is the file size retrieval
-    if(pSaveTransferDetails->pbData==NULL)
+    if(pSaveTransferDetails->pbData==nullptr)
     {
         pClass->m_eSaveTransferState=C4JStorage::eSaveTransfer_FileSizeRetrieved;
         UIScene_LoadOrJoinMenu::s_ulFileSize=pSaveTransferDetails->ulFileLen;
@@ -4013,3 +4137,168 @@ int UIScene_LoadOrJoinMenu::CopySaveErrorDialogFinishedCallback(void *pParam,int
 }
 
 #endif // _XBOX_ONE
+#ifdef _WINDOWS64
+// adding servers bellow
+
+void UIScene_LoadOrJoinMenu::BeginAddServer()
+{
+    m_addServerPhase = eAddServer_IP;
+    m_addServerIP.clear();
+    m_addServerPort.clear();
+
+    UIKeyboardInitData kbData;
+    kbData.title       = L"Server Address";
+    kbData.defaultText = L"";
+    kbData.maxChars    = 128;
+    kbData.callback    = &UIScene_LoadOrJoinMenu::AddServerKeyboardCallback;
+    kbData.lpParam     = this;
+    kbData.pcMode      = g_KBMInput.IsKBMActive();
+    ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData);
+}
+
+int UIScene_LoadOrJoinMenu::AddServerKeyboardCallback(LPVOID lpParam, bool bRes)
+{
+    UIScene_LoadOrJoinMenu *pClass = static_cast<UIScene_LoadOrJoinMenu*>(lpParam);
+
+    if (!bRes)
+    {
+        pClass->m_addServerPhase = eAddServer_Idle;
+        pClass->m_bIgnoreInput = false;
+        return 0;
+    }
+
+    uint16_t ui16Text[256];
+    ZeroMemory(ui16Text, sizeof(ui16Text));
+    Win64_GetKeyboardText(ui16Text, 256);
+
+    wchar_t wBuf[256] = {};
+    for (int k = 0; k < 255 && ui16Text[k]; k++)
+        wBuf[k] = static_cast<wchar_t>(ui16Text[k]);
+
+    if (wBuf[0] == 0)
+    {
+        pClass->m_addServerPhase = eAddServer_Idle;
+        pClass->m_bIgnoreInput = false;
+        return 0;
+    }
+
+    switch (pClass->m_addServerPhase)
+    {
+    case eAddServer_IP:
+    {
+        pClass->m_addServerIP = wBuf;
+        pClass->m_addServerPhase = eAddServer_Port;
+
+        UIKeyboardInitData kbData;
+        kbData.title       = L"Server Port";
+        kbData.defaultText = L"25565";
+        kbData.maxChars    = 6;
+        kbData.callback    = &UIScene_LoadOrJoinMenu::AddServerKeyboardCallback;
+        kbData.lpParam     = pClass;
+        kbData.pcMode      = g_KBMInput.IsKBMActive();
+        ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData);
+        break;
+    }
+    case eAddServer_Port:
+    {
+        pClass->m_addServerPort = wBuf;
+        pClass->m_addServerPhase = eAddServer_Name;
+
+        UIKeyboardInitData kbData;
+        kbData.title       = L"Server Name";
+        kbData.defaultText = L"Minecraft Server";
+        kbData.maxChars    = 64;
+        kbData.callback    = &UIScene_LoadOrJoinMenu::AddServerKeyboardCallback;
+        kbData.lpParam     = pClass;
+        kbData.pcMode      = g_KBMInput.IsKBMActive();
+        ui.NavigateToScene(pClass->m_iPad, eUIScene_Keyboard, &kbData);
+        break;
+    }
+    case eAddServer_Name:
+    {
+        wstring name = wBuf;
+        pClass->AppendServerToFile(pClass->m_addServerIP, pClass->m_addServerPort, name);
+        pClass->m_addServerPhase = eAddServer_Idle;
+        pClass->m_bIgnoreInput = false;
+
+        g_NetworkManager.ForceFriendsSessionRefresh();
+        break;
+    }
+    default:
+        pClass->m_addServerPhase = eAddServer_Idle;
+        pClass->m_bIgnoreInput = false;
+        break;
+    }
+
+    return 0;
+}
+
+void UIScene_LoadOrJoinMenu::AppendServerToFile(const wstring& ip, const wstring& port, const wstring& name)
+{
+    char narrowIP[256] = {};
+    char narrowPort[16] = {};
+    char narrowName[256] = {};
+    wcstombs(narrowIP, ip.c_str(), sizeof(narrowIP) - 1);
+    wcstombs(narrowPort, port.c_str(), sizeof(narrowPort) - 1);
+    wcstombs(narrowName, name.c_str(), sizeof(narrowName) - 1);
+
+    uint16_t portNum = static_cast<uint16_t>(atoi(narrowPort));
+
+    struct ServerEntry { std::string ip; uint16_t port; std::string name; };
+    std::vector<ServerEntry> entries;
+
+    FILE* file = fopen("servers.db", "rb");
+    if (file)
+    {
+        char magic[4] = {};
+        if (fread(magic, 1, 4, file) == 4 && memcmp(magic, "MCSV", 4) == 0)
+        {
+            uint32_t version = 0, count = 0;
+            fread(&version, sizeof(uint32_t), 1, file);
+            fread(&count, sizeof(uint32_t), 1, file);
+            if (version == 1)
+            {
+                for (uint32_t s = 0; s < count; s++)
+                {
+                    uint16_t ipLen = 0, p = 0, nameLen = 0;
+                    if (fread(&ipLen, sizeof(uint16_t), 1, file) != 1) break;
+                    if (ipLen == 0 || ipLen > 256) break;
+                    char ipBuf[257] = {};
+                    if (fread(ipBuf, 1, ipLen, file) != ipLen) break;
+                    if (fread(&p, sizeof(uint16_t), 1, file) != 1) break;
+                    if (fread(&nameLen, sizeof(uint16_t), 1, file) != 1) break;
+                    if (nameLen > 256) break;
+                    char nameBuf[257] = {};
+                    if (nameLen > 0 && fread(nameBuf, 1, nameLen, file) != nameLen) break;
+                    entries.push_back({std::string(ipBuf), p, std::string(nameBuf)});
+                }
+            }
+        }
+        fclose(file);
+    }
+
+    entries.push_back({std::string(narrowIP), portNum, std::string(narrowName)});
+
+    file = fopen("servers.db", "wb");
+    if (file)
+    {
+        fwrite("MCSV", 1, 4, file);
+        uint32_t version = 1;
+        uint32_t count = static_cast<uint32_t>(entries.size());
+        fwrite(&version, sizeof(uint32_t), 1, file);
+        fwrite(&count, sizeof(uint32_t), 1, file);
+
+        for (size_t i = 0; i < entries.size(); i++)
+        {
+            uint16_t ipLen = static_cast<uint16_t>(entries[i].ip.length());
+            fwrite(&ipLen, sizeof(uint16_t), 1, file);
+            fwrite(entries[i].ip.c_str(), 1, ipLen, file);
+            fwrite(&entries[i].port, sizeof(uint16_t), 1, file);
+            uint16_t nameLen = static_cast<uint16_t>(entries[i].name.length());
+            fwrite(&nameLen, sizeof(uint16_t), 1, file);
+            fwrite(entries[i].name.c_str(), 1, nameLen, file);
+        }
+        fclose(file);
+    }
+}
+#endif // _WINDOWS64
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h
index 3599aa37..9f5fe17f 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.h
@@ -175,6 +175,18 @@ public:
 
 private:
 	void CheckAndJoinGame(int gameIndex);
+
+#ifdef _WINDOWS64
+	static const int ADD_SERVER_BUTTON_INDEX = 0;
+	enum eAddServerPhase { eAddServer_Idle, eAddServer_IP, eAddServer_Port, eAddServer_Name };
+	eAddServerPhase m_addServerPhase;
+	wstring m_addServerIP;
+	wstring m_addServerPort;
+	void BeginAddServer();
+	void AppendServerToFile(const wstring& ip, const wstring& port, const wstring& name);
+	static int AddServerKeyboardCallback(LPVOID lpParam, bool bRes);
+#endif
+
 #if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__)
 	static int MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EMessageResult result);
 	static int PSN_SignInReturned(void *pParam,bool bContinue, int iPad);
diff --git a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
index fe743adc..93f1edf1 100644
--- a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
@@ -12,7 +12,7 @@
 
 Random *UIScene_MainMenu::random = new Random();
 
-EUIScene UIScene_MainMenu::eNavigateWhenReady = (EUIScene) -1;
+EUIScene UIScene_MainMenu::eNavigateWhenReady = static_cast<EUIScene>(-1);
 
 UIScene_MainMenu::UIScene_MainMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
@@ -33,29 +33,29 @@ UIScene_MainMenu::UIScene_MainMenu(int iPad, void *initData, UILayer *parentLaye
 	m_bIgnorePress=false;
 
 
-	m_buttons[(int)eControl_PlayGame].init(IDS_PLAY_GAME,eControl_PlayGame);
+	m_buttons[static_cast<int>(eControl_PlayGame)].init(IDS_PLAY_GAME,eControl_PlayGame);
 
 #ifdef _XBOX_ONE
 	if(!ProfileManager.IsFullVersion()) m_buttons[(int)eControl_PlayGame].setLabel(IDS_PLAY_TRIAL_GAME);
 	app.SetReachedMainMenu();
 #endif
 
-	m_buttons[(int)eControl_Leaderboards].init(IDS_LEADERBOARDS,eControl_Leaderboards);
-	m_buttons[(int)eControl_Achievements].init( (UIString)IDS_ACHIEVEMENTS,eControl_Achievements);
-	m_buttons[(int)eControl_HelpAndOptions].init(IDS_HELP_AND_OPTIONS,eControl_HelpAndOptions);
+	m_buttons[static_cast<int>(eControl_Leaderboards)].init(IDS_LEADERBOARDS,eControl_Leaderboards);
+	m_buttons[static_cast<int>(eControl_Achievements)].init( (UIString)IDS_ACHIEVEMENTS,eControl_Achievements);
+	m_buttons[static_cast<int>(eControl_HelpAndOptions)].init(IDS_HELP_AND_OPTIONS,eControl_HelpAndOptions);
 	if(ProfileManager.IsFullVersion())
 	{
 		m_bTrialVersion=false;
-		m_buttons[(int)eControl_UnlockOrDLC].init(IDS_DOWNLOADABLECONTENT,eControl_UnlockOrDLC);
+		m_buttons[static_cast<int>(eControl_UnlockOrDLC)].init(IDS_DOWNLOADABLECONTENT,eControl_UnlockOrDLC);
 	}
 	else
 	{
 		m_bTrialVersion=true;
-		m_buttons[(int)eControl_UnlockOrDLC].init(IDS_UNLOCK_FULL_GAME,eControl_UnlockOrDLC);
+		m_buttons[static_cast<int>(eControl_UnlockOrDLC)].init(IDS_UNLOCK_FULL_GAME,eControl_UnlockOrDLC);
 	}
 
 #ifndef _DURANGO
-	m_buttons[(int)eControl_Exit].init(app.GetString(IDS_EXIT_GAME),eControl_Exit);
+	m_buttons[static_cast<int>(eControl_Exit)].init(app.GetString(IDS_EXIT_GAME),eControl_Exit);
 #else
 	m_buttons[(int)eControl_XboxHelp].init(IDS_XBOX_HELP_APP, eControl_XboxHelp);
 #endif
@@ -104,7 +104,7 @@ UIScene_MainMenu::UIScene_MainMenu(int iPad, void *initData, UILayer *parentLaye
 	m_bLoadTrialOnNetworkManagerReady = false;
 
 	// 4J Stu - Clear out any loaded game rules
-	app.setLevelGenerationOptions(NULL);
+	app.setLevelGenerationOptions(nullptr);
 
 	// 4J Stu - Reset the leaving game flag so that we correctly handle signouts while in the menus
 	g_NetworkManager.ResetLeavingGame();
@@ -182,7 +182,7 @@ void UIScene_MainMenu::handleGainFocus(bool navBack)
 	if(navBack && ProfileManager.IsFullVersion())
 	{
 		// Replace the Unlock Full Game with Downloadable Content
-		m_buttons[(int)eControl_UnlockOrDLC].setLabel(IDS_DOWNLOADABLECONTENT);
+		m_buttons[static_cast<int>(eControl_UnlockOrDLC)].setLabel(IDS_DOWNLOADABLECONTENT);
 	}
 
 #if TO_BE_IMPLEMENTED
@@ -196,7 +196,7 @@ void UIScene_MainMenu::handleGainFocus(bool navBack)
 #ifdef __PSVITA__
 	int splashIndex = eSplashRandomStart + 2 + random->nextInt( (int)m_splashes.size() - (eSplashRandomStart + 2) ); 
 #else
-	int splashIndex = eSplashRandomStart + 1 + random->nextInt( (int)m_splashes.size() - (eSplashRandomStart + 1) );
+	int splashIndex = eSplashRandomStart + 1 + random->nextInt( static_cast<int>(m_splashes.size()) - (eSplashRandomStart + 1) );
 #endif
 
 	// Override splash text on certain dates
@@ -303,12 +303,12 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
 	int primaryPad = ProfileManager.GetPrimaryPad();
 	
 #ifdef _XBOX_ONE
-	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad, const int iController) = NULL;
+	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad, const int iController) = nullptr;
 #else
-	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = NULL;
+	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = nullptr;
 #endif
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_PlayGame:
 #ifdef __ORBIS__
@@ -368,7 +368,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
 			UINT uiIDA[2];
 			uiIDA[0]=IDS_CANCEL;
 			uiIDA[1]=IDS_OK;
-			ui.RequestErrorMessage(IDS_WARNING_ARCADE_TITLE, IDS_WARNING_ARCADE_TEXT, uiIDA, 2, XUSER_INDEX_ANY,&UIScene_MainMenu::ExitGameReturned,this);
+			ui.RequestErrorMessage(IDS_WINDOWS_EXIT, IDS_WARNING_ARCADE_TEXT, uiIDA, 2, XUSER_INDEX_ANY,&UIScene_MainMenu::ExitGameReturned,this);
 		}
 		else
 		{
@@ -396,7 +396,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
 	bool confirmUser = false;
 
 	// Note: if no sign in returned func, assume this isn't required
-	if (signInReturnedFunc != NULL)
+	if (signInReturnedFunc != nullptr)
 	{
 		if(ProfileManager.IsSignedIn(primaryPad))
 		{
@@ -466,10 +466,10 @@ void UIScene_MainMenu::customDrawSplash(IggyCustomDrawCallbackRegion *region)
 
 	// 4J Stu - Move this to the ctor when the main menu is not the first scene we navigate to
 	ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
-	m_fScreenWidth=(float)pMinecraft->width_phys;
-	m_fRawWidth=(float)ssc.rawWidth;
-	m_fScreenHeight=(float)pMinecraft->height_phys;
-	m_fRawHeight=(float)ssc.rawHeight;
+	m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
+	m_fRawWidth=static_cast<float>(ssc.rawWidth);
+	m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
+	m_fRawHeight=static_cast<float>(ssc.rawHeight);
 
 
 	// Setup GDraw, normal game render states and matrices
@@ -513,7 +513,7 @@ void UIScene_MainMenu::customDrawSplash(IggyCustomDrawCallbackRegion *region)
 
 int UIScene_MainMenu::MustSignInReturned(void *pParam, int iPad, C4JStorage::EMessageResult result)
 {
-	UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
+	UIScene_MainMenu* pClass = static_cast<UIScene_MainMenu *>(pParam);
 
 	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
@@ -643,7 +643,7 @@ int UIScene_MainMenu::HelpAndOptions_SignInReturned(void *pParam,bool bContinue,
 int UIScene_MainMenu::HelpAndOptions_SignInReturned(void *pParam,bool bContinue,int iPad)
 #endif
 {
-	UIScene_MainMenu *pClass = (UIScene_MainMenu *)pParam;
+	UIScene_MainMenu *pClass = static_cast<UIScene_MainMenu *>(pParam);
 
 	if(bContinue)
 	{
@@ -714,7 +714,7 @@ int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, in
 int UIScene_MainMenu::CreateLoad_SignInReturned(void *pParam, bool bContinue, int iPad)
 #endif
 {
-	UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
+	UIScene_MainMenu* pClass = static_cast<UIScene_MainMenu *>(pParam);
 	
 	if(bContinue)
 	{
@@ -916,7 +916,7 @@ int UIScene_MainMenu::Leaderboards_SignInReturned(void *pParam,bool bContinue,in
 int UIScene_MainMenu::Leaderboards_SignInReturned(void *pParam,bool bContinue,int iPad)
 #endif
 {
-	UIScene_MainMenu *pClass = (UIScene_MainMenu *)pParam;
+	UIScene_MainMenu *pClass = static_cast<UIScene_MainMenu *>(pParam);
 
 	if(bContinue)
 	{
@@ -940,7 +940,7 @@ int UIScene_MainMenu::Leaderboards_SignInReturned(void *pParam,bool bContinue,in
 		{
 			bool bContentRestricted=false;
 #if defined(__PS3__) || defined(__PSVITA__)
-			ProfileManager.GetChatAndContentRestrictions(iPad,true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(iPad,true,nullptr,&bContentRestricted,nullptr);
 #endif
 			if(bContentRestricted)
 			{				
@@ -986,7 +986,7 @@ int UIScene_MainMenu::Achievements_SignInReturned(void *pParam,bool bContinue,in
 int UIScene_MainMenu::Achievements_SignInReturned(void *pParam,bool bContinue,int iPad)
 #endif
 {
-	UIScene_MainMenu *pClass = (UIScene_MainMenu *)pParam;
+	UIScene_MainMenu *pClass = static_cast<UIScene_MainMenu *>(pParam);
 
 	if (bContinue)
 	{
@@ -1020,7 +1020,7 @@ int UIScene_MainMenu::UnlockFullGame_SignInReturned(void *pParam,bool bContinue,
 int UIScene_MainMenu::UnlockFullGame_SignInReturned(void *pParam,bool bContinue,int iPad)
 #endif
 {
-	UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
+	UIScene_MainMenu* pClass = static_cast<UIScene_MainMenu *>(pParam);
 
 	if (bContinue)
 	{
@@ -1098,7 +1098,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_PlayGame(void *
 
 	UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
 
-	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = NULL;
+	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = nullptr;
 
 	// 4J-PB - Check if there is a patch for the game
 	pClass->m_errorCode = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad());
@@ -1141,7 +1141,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_PlayGame(void *
 
 // 		UINT uiIDA[1];
 // 		uiIDA[0]=IDS_OK;
-// 		ui.RequestMessageBox(IDS_PATCH_AVAILABLE_TITLE, IDS_PATCH_AVAILABLE_TEXT, uiIDA, 1, XUSER_INDEX_ANY,NULL,pClass);
+// 		ui.RequestMessageBox(IDS_PATCH_AVAILABLE_TITLE, IDS_PATCH_AVAILABLE_TEXT, uiIDA, 1, XUSER_INDEX_ANY,nullptr,pClass);
 	}
 
 	// Check if PSN is unavailable because of age restriction
@@ -1157,7 +1157,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_PlayGame(void *
 	bool confirmUser = false;
 
 	// Note: if no sign in returned func, assume this isn't required
-	if (signInReturnedFunc != NULL)
+	if (signInReturnedFunc != nullptr)
 	{
 		if(ProfileManager.IsSignedIn(primaryPad))
 		{
@@ -1187,7 +1187,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_Leaderboards(vo
 
 	UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
 
-	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = NULL;
+	int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = nullptr;
 
 	// 4J-PB - Check if there is a patch for the game
 	pClass->m_errorCode = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad());
@@ -1228,7 +1228,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_Leaderboards(vo
 
 // 		UINT uiIDA[1];
 // 		uiIDA[0]=IDS_OK;
-// 		ui.RequestMessageBox(IDS_PATCH_AVAILABLE_TITLE, IDS_PATCH_AVAILABLE_TEXT, uiIDA, 1, XUSER_INDEX_ANY,NULL,pClass);
+// 		ui.RequestMessageBox(IDS_PATCH_AVAILABLE_TITLE, IDS_PATCH_AVAILABLE_TEXT, uiIDA, 1, XUSER_INDEX_ANY,nullptr,pClass);
 	}
 
 	bool confirmUser = false;
@@ -1247,7 +1247,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_Leaderboards(vo
 	}
 
 	// Note: if no sign in returned func, assume this isn't required
-	if (signInReturnedFunc != NULL)
+	if (signInReturnedFunc != nullptr)
 	{
 		if(ProfileManager.IsSignedIn(primaryPad))
 		{
@@ -1600,7 +1600,7 @@ void UIScene_MainMenu::RunLeaderboards(int iPad)
 
 		bool bContentRestricted=false;
 #if defined(__PS3__) || defined(__PSVITA__)
-		ProfileManager.GetChatAndContentRestrictions(iPad,true,NULL,&bContentRestricted,NULL);
+		ProfileManager.GetChatAndContentRestrictions(iPad,true,nullptr,&bContentRestricted,nullptr);
 #endif
 		if(bContentRestricted)
 		{
@@ -1608,7 +1608,7 @@ void UIScene_MainMenu::RunLeaderboards(int iPad)
 			// you can't see leaderboards
 			UINT uiIDA[1];
 			uiIDA[0]=IDS_CONFIRM_OK;
-			ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, ProfileManager.GetPrimaryPad(),NULL,this);
+			ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, ProfileManager.GetPrimaryPad(),nullptr,this);
 #endif
 		}
 		else
@@ -1669,7 +1669,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad)
 
 // 			UINT uiIDA[1];
 // 			uiIDA[0]=IDS_OK;
-// 			ui.RequestMessageBox(IDS_PATCH_AVAILABLE_TITLE, IDS_PATCH_AVAILABLE_TEXT, uiIDA, 1, XUSER_INDEX_ANY,NULL,this);
+// 			ui.RequestMessageBox(IDS_PATCH_AVAILABLE_TITLE, IDS_PATCH_AVAILABLE_TEXT, uiIDA, 1, XUSER_INDEX_ANY,nullptr,this);
 			return;
 		}
 
@@ -1704,7 +1704,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad)
 				{
 					bool bContentRestricted=false;
 #if defined(__PS3__) || defined(__PSVITA__)
-					ProfileManager.GetChatAndContentRestrictions(iPad,true,NULL,&bContentRestricted,NULL);
+					ProfileManager.GetChatAndContentRestrictions(iPad,true,nullptr,&bContentRestricted,nullptr);
 #endif
 					if(bContentRestricted)
 					{
@@ -1713,7 +1713,7 @@ void UIScene_MainMenu::RunUnlockOrDLC(int iPad)
 						// you can't see the store
 						UINT uiIDA[1];
 						uiIDA[0]=IDS_CONFIRM_OK;
-						ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, ProfileManager.GetPrimaryPad(),NULL,this);
+						ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, ProfileManager.GetPrimaryPad(),nullptr,this);
 #endif
 					}
 					else
@@ -1898,7 +1898,7 @@ void UIScene_MainMenu::tick()
 		{
 			app.DebugPrintf("[MainMenu] Navigating away from MainMenu.\n");
 			ui.NavigateToScene(lockedProfile, eNavigateWhenReady);
-			eNavigateWhenReady = (EUIScene) -1;
+			eNavigateWhenReady = static_cast<EUIScene>(-1);
 		}
 #ifdef _DURANGO
 		else
@@ -1925,7 +1925,7 @@ void UIScene_MainMenu::tick()
 
 			// 4J-PB - need to check this user can access the store
 			bool bContentRestricted=false;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -2102,7 +2102,7 @@ void UIScene_MainMenu::LoadTrial(void)
 
 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->seed = 0;
-	param->saveData = NULL;
+	param->saveData = nullptr;
 	param->settings = app.GetGameHostOption( eGameHostOption_Tutorial ) | app.GetGameHostOption(eGameHostOption_DisableSaving);
 
 	vector<LevelGenerationOptions *> *generators = app.getLevelGenerators();
@@ -2110,7 +2110,7 @@ void UIScene_MainMenu::LoadTrial(void)
 
 	LoadingInputParams *loadingParams = new LoadingInputParams();
 	loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
-	loadingParams->lpParam = (LPVOID)param;
+	loadingParams->lpParam = static_cast<LPVOID>(param);
 
 	UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
 	completionData->bShowBackground=TRUE;
@@ -2129,7 +2129,7 @@ void UIScene_MainMenu::LoadTrial(void)
 
 void UIScene_MainMenu::handleUnlockFullVersion()
 {
-	m_buttons[(int)eControl_UnlockOrDLC].setLabel(IDS_DOWNLOADABLECONTENT,true);
+	m_buttons[static_cast<int>(eControl_UnlockOrDLC)].setLabel(IDS_DOWNLOADABLECONTENT,true);
 }
 
 
diff --git a/Minecraft.Client/Common/UI/UIScene_MessageBox.cpp b/Minecraft.Client/Common/UI/UIScene_MessageBox.cpp
index 6b8dc552..7a0749d4 100644
--- a/Minecraft.Client/Common/UI/UIScene_MessageBox.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_MessageBox.cpp
@@ -7,7 +7,7 @@ UIScene_MessageBox::UIScene_MessageBox(int iPad, void *initData, UILayer *parent
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	MessageBoxInfo *param = (MessageBoxInfo *)initData;
+	MessageBoxInfo *param = static_cast<MessageBoxInfo *>(initData);
 
 	m_buttonCount = param->uiOptionC;
 
@@ -41,7 +41,7 @@ UIScene_MessageBox::UIScene_MessageBox(int iPad, void *initData, UILayer *parent
 	m_labelTitle.init(app.GetString(param->uiTitle));
 	m_labelContent.init(app.GetString(param->uiText));
 
-	out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcAutoResize , 0 , NULL );
+	out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcAutoResize , 0 , nullptr );
 
 	m_Func = param->Func;
 	m_lpParam = param->lpParam;
@@ -84,10 +84,10 @@ void UIScene_MessageBox::handleReload()
 	value[0].number = m_buttonCount;
 
 	value[1].type = IGGY_DATATYPE_number;
-	value[1].number = (F64)getControlFocus();
+	value[1].number = static_cast<F64>(getControlFocus());
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcInit , 2 , value );
 
-	out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcAutoResize , 0 , NULL );
+	out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcAutoResize , 0 , nullptr );
 }
 
 void UIScene_MessageBox::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
@@ -120,7 +120,7 @@ void UIScene_MessageBox::handleInput(int iPad, int key, bool repeat, bool presse
 void UIScene_MessageBox::handlePress(F64 controlId, F64 childId)
 {
 	C4JStorage::EMessageResult result = C4JStorage::EMessage_Cancelled;
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case 0:
 		result = C4JStorage::EMessage_ResultAccept;
diff --git a/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp b/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp
index 998679ca..118712a4 100644
--- a/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_NewUpdateMessage.cpp
@@ -19,8 +19,8 @@ UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void *initData, UIL
 	message=app.FormatHTMLString(m_iPad,message);
 
 	vector<wstring> paragraphs;
-	int lastIndex = 0;
-	for (	int index = message.find(L"\r\n", lastIndex, 2);
+	size_t lastIndex = 0;
+	for (	size_t index = message.find(L"\r\n", lastIndex, 2);
 			index != wstring::npos; 
 			index = message.find(L"\r\n", lastIndex, 2)
 		)
@@ -100,7 +100,7 @@ void UIScene_NewUpdateMessage::handleInput(int iPad, int key, bool repeat, bool
 
 void UIScene_NewUpdateMessage::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Confirm:
 		{
diff --git a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
index 6f502db8..7cec38b3 100644
--- a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
@@ -101,9 +101,9 @@ UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void *initData, UILayer *parentLa
 	TelemetryManager->RecordPauseOrInactive(m_iPad);
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft != NULL && pMinecraft->localgameModes[iPad] != NULL )
+	if(pMinecraft != nullptr && pMinecraft->localgameModes[iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[iPad]);
 
 		// This just allows it to be shown
 		gameMode->getTutorial()->showTutorialPopup(false);
@@ -114,9 +114,9 @@ UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void *initData, UILayer *parentLa
 UIScene_PauseMenu::~UIScene_PauseMenu()
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft != NULL && pMinecraft->localgameModes[m_iPad] != NULL )
+	if(pMinecraft != nullptr && pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
 
 		// This just allows it to be shown
 		gameMode->getTutorial()->showTutorialPopup(true);
@@ -506,7 +506,7 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 {
 	if(m_bIgnoreInput) return;
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case BUTTON_PAUSE_RESUMEGAME:
 		if( m_iPad == ProfileManager.GetPrimaryPad() && g_NetworkManager.IsLocalGame() )
@@ -593,7 +593,7 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 			{	
 				bool bContentRestricted=false;
 #if defined(__PS3__) || defined(__PSVITA__)
-				ProfileManager.GetChatAndContentRestrictions(m_iPad,true,NULL,&bContentRestricted,NULL);
+				ProfileManager.GetChatAndContentRestrictions(m_iPad,true,nullptr,&bContentRestricted,nullptr);
 #endif
 				if(bContentRestricted)
 				{
@@ -654,9 +654,9 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 				if(m_iPad==ProfileManager.GetPrimaryPad())
 				{
 					int playTime = -1;
-					if( pMinecraft->localplayers[m_iPad] != NULL )
+					if( pMinecraft->localplayers[m_iPad] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[m_iPad]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[m_iPad]->getSessionTimer());
 					}
 
 #if defined(_XBOX_ONE) || defined(__ORBIS__)
@@ -723,9 +723,9 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 				else
 				{
 					int playTime = -1;
-					if( pMinecraft->localplayers[m_iPad] != NULL )
+					if( pMinecraft->localplayers[m_iPad] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[m_iPad]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[m_iPad]->getSessionTimer());
 					}
 
 					TelemetryManager->RecordLevelExit(m_iPad, eSen_LevelExitStatus_Exited);
@@ -741,9 +741,9 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 				if(m_iPad==ProfileManager.GetPrimaryPad())
 				{
 					int playTime = -1;
-					if( pMinecraft->localplayers[m_iPad] != NULL )
+					if( pMinecraft->localplayers[m_iPad] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[m_iPad]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[m_iPad]->getSessionTimer());
 					}	
 
 					// adjust the trial time played
@@ -759,9 +759,9 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId)
 				else
 				{
 					int playTime = -1;
-					if( pMinecraft->localplayers[m_iPad] != NULL )
+					if( pMinecraft->localplayers[m_iPad] != nullptr )
 					{
-						playTime = (int)pMinecraft->localplayers[m_iPad]->getSessionTimer();
+						playTime = static_cast<int>(pMinecraft->localplayers[m_iPad]->getSessionTimer());
 					}
 
 					TelemetryManager->RecordLevelExit(m_iPad, eSen_LevelExitStatus_Exited);
@@ -839,7 +839,7 @@ void UIScene_PauseMenu::PerformActionSaveGame()
 	if(!Minecraft::GetInstance()->skins->isUsingDefaultSkin())
 	{
 		TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
-		DLCTexturePack *pDLCTexPack=(DLCTexturePack *)tPack;
+		DLCTexturePack *pDLCTexPack=static_cast<DLCTexturePack *>(tPack);
 
 		m_pDLCPack=pDLCTexPack->getDLCInfoParentPack();//tPack->getDLCPack();
 
@@ -979,7 +979,7 @@ int UIScene_PauseMenu::UnlockFullSaveReturned(void *pParam,int iPad,C4JStorage::
 			// 4J-PB - need to check this user can access the store
 #if defined(__PS3__) || defined(__PSVITA__)
 			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -1003,7 +1003,7 @@ int UIScene_PauseMenu::UnlockFullSaveReturned(void *pParam,int iPad,C4JStorage::
 
 int UIScene_PauseMenu::SaveGame_SignInReturned(void *pParam,bool bContinue, int iPad)
 {
-	UIScene_PauseMenu* pClass = (UIScene_PauseMenu*)ui.GetSceneFromCallbackId((size_t)pParam);
+	UIScene_PauseMenu* pClass = static_cast<UIScene_PauseMenu *>(ui.GetSceneFromCallbackId((size_t)pParam));
 	if(pClass) pClass->SetIgnoreInput(false);
 
 	if(bContinue==true)
@@ -1112,7 +1112,7 @@ int UIScene_PauseMenu::ViewLeaderboards_SignInReturned(void *pParam,bool bContin
 		{
 #ifndef __ORBIS__
 			bool bContentRestricted=false;
-			ProfileManager.GetChatAndContentRestrictions(pClass->m_iPad,true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(pClass->m_iPad,true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				// you can't see leaderboards
@@ -1183,7 +1183,7 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4J
 #ifndef __ORBIS__
 			// 4J-PB - need to check this user can access the store
 			bool bContentRestricted=false;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -1203,7 +1203,7 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4J
 				app.DebugPrintf("Texture Pack - %s\n",pchPackName);
 				SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName);		
 
-				if(pSONYDLCInfo!=NULL)
+				if(pSONYDLCInfo!=nullptr)
 				{
 					char chName[42];
 					char chKeyName[20];
@@ -1214,7 +1214,7 @@ int UIScene_PauseMenu::WarningTrialTexturePackReturned(void *pParam,int iPad,C4J
 					// we have to retrieve the skuid from the store info, it can't be hardcoded since Sony may change it.
 					// So we assume the first sku for the product is the one we want
 
-					// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a NULL terminating char
+					// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a nullptr terminating char
 					memset(chKeyName, 0, sizeof(chKeyName));
 					strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16);
 
@@ -1260,7 +1260,7 @@ int UIScene_PauseMenu::BuyTexturePack_SignInReturned(void *pParam,bool bContinue
 #ifndef __ORBIS__
 			// 4J-PB - need to check this user can access the store
 			bool bContentRestricted=false;
-			ProfileManager.GetChatAndContentRestrictions(iPad,true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(iPad,true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
@@ -1280,7 +1280,7 @@ int UIScene_PauseMenu::BuyTexturePack_SignInReturned(void *pParam,bool bContinue
 				app.DebugPrintf("Texture Pack - %s\n",pchPackName);
 				SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName);		
 
-				if(pSONYDLCInfo!=NULL)
+				if(pSONYDLCInfo!=nullptr)
 				{
 					char chName[42];
 					char chKeyName[20];
@@ -1291,7 +1291,7 @@ int UIScene_PauseMenu::BuyTexturePack_SignInReturned(void *pParam,bool bContinue
 					// we have to retrieve the skuid from the store info, it can't be hardcoded since Sony may change it.
 					// So we assume the first sku for the product is the one we want
 
-					// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a NULL terminating char
+					// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a nullptr terminating char
 					memset(chKeyName, 0, sizeof(chKeyName));
 					strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16);
 
diff --git a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
index 0cb6cf2b..76676561 100644
--- a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
@@ -11,7 +11,7 @@ UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void *_initData, UILaye
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	m_signInInfo = *((SignInInfo *)_initData);
+	m_signInInfo = *static_cast<SignInInfo *>(_initData);
 
 	m_bIgnoreInput = false;
 	
@@ -167,7 +167,7 @@ int UIScene_QuadrantSignin::SignInReturned(void *pParam,bool bContinue, int iPad
 {
 	app.DebugPrintf("SignInReturned for pad %d\n", iPad);
 
-	UIScene_QuadrantSignin *pClass = (UIScene_QuadrantSignin *)pParam;
+	UIScene_QuadrantSignin *pClass = static_cast<UIScene_QuadrantSignin *>(pParam);
 
 #ifdef _XBOX_ONE
 	if(bContinue && pClass->m_signInInfo.requireOnline && ProfileManager.IsSignedIn(iPad))
@@ -264,7 +264,7 @@ void UIScene_QuadrantSignin::setControllerState(int iPad, EControllerStatus stat
 		value[0].number = iPad;
 
 		value[1].type = IGGY_DATATYPE_number;
-		value[1].number = (int)state;
+		value[1].number = static_cast<int>(state);
 
 		IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetControllerStatus , 2 , value );
 	}
@@ -272,9 +272,9 @@ void UIScene_QuadrantSignin::setControllerState(int iPad, EControllerStatus stat
 
 int UIScene_QuadrantSignin::AvatarReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
 {
-	UIScene_QuadrantSignin *pClass = (UIScene_QuadrantSignin *)lpParam;
+	UIScene_QuadrantSignin *pClass = static_cast<UIScene_QuadrantSignin *>(lpParam);
 	app.DebugPrintf(app.USER_SR,"AvatarReturned callback\n");
-	if(pbThumbnail != NULL)
+	if(pbThumbnail != nullptr)
 	{
 		// 4J-JEV - Added to ensure each new texture gets a unique name.
 		static unsigned int quadrantImageCount = 0;
diff --git a/Minecraft.Client/Common/UI/UIScene_ReinstallMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ReinstallMenu.cpp
index 3b67f79e..c713a390 100644
--- a/Minecraft.Client/Common/UI/UIScene_ReinstallMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ReinstallMenu.cpp
@@ -36,7 +36,7 @@ void UIScene_ReinstallMenu::updateTooltips()
 
 void UIScene_ReinstallMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
diff --git a/Minecraft.Client/Common/UI/UIScene_SaveMessage.cpp b/Minecraft.Client/Common/UI/UIScene_SaveMessage.cpp
index b58f86fd..0b8e0ca4 100644
--- a/Minecraft.Client/Common/UI/UIScene_SaveMessage.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SaveMessage.cpp
@@ -19,7 +19,7 @@ UIScene_SaveMessage::UIScene_SaveMessage(int iPad, void *initData, UILayer *pare
 	IggyDataValue result;
 
 	// Russian needs to resize the box
-	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcAutoResize , 0 , NULL );
+	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcAutoResize , 0 , nullptr );
 
 	// 4J-PB - If we have a signed in user connected, let's get the DLC now
 	for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
@@ -101,7 +101,7 @@ void UIScene_SaveMessage::handleInput(int iPad, int key, bool repeat, bool press
 
 void UIScene_SaveMessage::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Confirm:
 
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsAudioMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsAudioMenu.cpp
index 6d892d70..083fbd35 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsAudioMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsAudioMenu.cpp
@@ -47,7 +47,7 @@ void UIScene_SettingsAudioMenu::updateTooltips()
 
 void UIScene_SettingsAudioMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -93,8 +93,8 @@ void UIScene_SettingsAudioMenu::handleInput(int iPad, int key, bool repeat, bool
 void UIScene_SettingsAudioMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
 	WCHAR TempString[256];
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_Music:
 		m_sliderMusic.handleSliderMove(value);
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsControlMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsControlMenu.cpp
index d5447f77..7dbd243b 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsControlMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsControlMenu.cpp
@@ -47,7 +47,7 @@ void UIScene_SettingsControlMenu::updateTooltips()
 
 void UIScene_SettingsControlMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -93,8 +93,8 @@ void UIScene_SettingsControlMenu::handleInput(int iPad, int key, bool repeat, bo
 void UIScene_SettingsControlMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
 	WCHAR TempString[256];
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_SensitivityInGame:
 		m_sliderSensitivityInGame.handleSliderMove(value);
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp
index 0a76a5e5..b258d8c3 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp
@@ -2,24 +2,26 @@
 #include "UI.h"
 #include "UIScene_SettingsGraphicsMenu.h"
 #include "..\..\Minecraft.h"
+#include "..\..\Options.h"
 #include "..\..\GameRenderer.h"
 
 namespace
 {
-	const int FOV_MIN = 70;
-	const int FOV_MAX = 110;
-	const int FOV_SLIDER_MAX = 100;
+    constexpr int FOV_MIN = 70;
+    constexpr int FOV_MAX = 110;
+    constexpr int FOV_SLIDER_MAX = 100;
 
-	int clampFov(int value)
+	int ClampFov(int value)
 	{
 		if (value < FOV_MIN) return FOV_MIN;
 		if (value > FOV_MAX) return FOV_MAX;
 		return value;
 	}
 
-	int fovToSliderValue(float fov)
+    [[maybe_unused]]
+    int FovToSliderValue(float fov)
 	{
-		int clampedFov = clampFov((int)(fov + 0.5f));
+		const int clampedFov = ClampFov(static_cast<int>(fov + 0.5f));
 		return ((clampedFov - FOV_MIN) * FOV_SLIDER_MAX) / (FOV_MAX - FOV_MIN);
 	}
 
@@ -31,13 +33,31 @@ namespace
 	}
 }
 
+int UIScene_SettingsGraphicsMenu::LevelToDistance(int level)
+{
+	static const int table[6] = {2,4,8,16,32,64};
+	if(level < 0) level = 0;
+	if(level > 5) level = 5;
+	return table[level];
+}
+
+int UIScene_SettingsGraphicsMenu::DistanceToLevel(int dist)
+{
+    static const int table[6] = {2,4,8,16,32,64};
+    for(int i = 0; i < 6; i++){
+        if(table[i] == dist)
+            return i;
+    }
+    return 3;
+}
+
 UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 	Minecraft* pMinecraft = Minecraft::GetInstance();
 	
-	m_bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	m_bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	m_checkboxClouds.init(app.GetString(IDS_CHECKBOX_RENDER_CLOUDS),eControl_Clouds,(app.GetGameSettings(m_iPad,eGameSetting_Clouds)!=0));
 	m_checkboxBedrockFog.init(app.GetString(IDS_CHECKBOX_RENDER_BEDROCKFOG),eControl_BedrockFog,(app.GetGameSettings(m_iPad,eGameSetting_BedrockFog)!=0));
@@ -45,21 +65,25 @@ UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, void *initD
 
 	
 	WCHAR TempString[256];
+
+	swprintf(TempString, 256, L"Render Distance: %d",app.GetGameSettings(m_iPad,eGameSetting_RenderDistance));	
+	m_sliderRenderDistance.init(TempString,eControl_RenderDistance,0,5,DistanceToLevel(app.GetGameSettings(m_iPad,eGameSetting_RenderDistance)));
 	
-	swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),app.GetGameSettings(m_iPad,eGameSetting_Gamma));	
+	swprintf( TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),app.GetGameSettings(m_iPad,eGameSetting_Gamma));	
 	m_sliderGamma.init(TempString,eControl_Gamma,0,100,app.GetGameSettings(m_iPad,eGameSetting_Gamma));
 
-	int initialFov = clampFov((int)(pMinecraft->gameRenderer->GetFovVal() + 0.5f));
-	swprintf((WCHAR*)TempString, 256, L"FOV: %d", initialFov);
-	m_sliderFOV.init(TempString, eControl_FOV, 0, FOV_SLIDER_MAX, fovToSliderValue((float)initialFov));
+    const int initialFovSlider = app.GetGameSettings(m_iPad, eGameSetting_FOV);
+	const int initialFovDeg = sliderValueToFov(initialFovSlider);
+	swprintf(TempString, 256, L"FOV: %d", initialFovDeg);
+	m_sliderFOV.init(TempString, eControl_FOV, 0, FOV_SLIDER_MAX, initialFovSlider);
 	
-	swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_INTERFACEOPACITY ),app.GetGameSettings(m_iPad,eGameSetting_InterfaceOpacity));	
+	swprintf( TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_INTERFACEOPACITY ),app.GetGameSettings(m_iPad,eGameSetting_InterfaceOpacity));	
 	m_sliderInterfaceOpacity.init(TempString,eControl_InterfaceOpacity,0,100,app.GetGameSettings(m_iPad,eGameSetting_InterfaceOpacity));
 
 	doHorizontalResizeCheck();
-	
-	bool bInGame=(Minecraft::GetInstance()->level!=NULL);
-	bool bIsPrimaryPad=(ProfileManager.GetPrimaryPad()==m_iPad);
+
+	const bool bInGame=(Minecraft::GetInstance()->level!=nullptr);
+	const bool bIsPrimaryPad=(ProfileManager.GetPrimaryPad()==m_iPad);
 	// if we're not in the game, we need to use basescene 0 
 	if(bInGame)
 	{
@@ -113,7 +137,7 @@ void UIScene_SettingsGraphicsMenu::updateTooltips()
 
 void UIScene_SettingsGraphicsMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	const bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -164,14 +188,29 @@ void UIScene_SettingsGraphicsMenu::handleInput(int iPad, int key, bool repeat, b
 void UIScene_SettingsGraphicsMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
 	WCHAR TempString[256];
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	const int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
+	case eControl_RenderDistance:
+		{
+			m_sliderRenderDistance.handleSliderMove(value);
+
+			const int dist = LevelToDistance(value);
+
+			app.SetGameSettings(m_iPad,eGameSetting_RenderDistance,dist);
+
+			const Minecraft* mc = Minecraft::GetInstance();
+			mc->options->viewDistance = 3 - value;
+			swprintf(TempString,256,L"Render Distance: %d",dist);
+			m_sliderRenderDistance.setLabel(TempString);
+		}
+		break;
+
 	case eControl_Gamma:
 		m_sliderGamma.handleSliderMove(value);
 		
 		app.SetGameSettings(m_iPad,eGameSetting_Gamma,value);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),value);
+		swprintf( TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_GAMMA ),value);
 		m_sliderGamma.setLabel(TempString);
 
 		break;
@@ -179,12 +218,13 @@ void UIScene_SettingsGraphicsMenu::handleSliderMove(F64 sliderId, F64 currentVal
 	case eControl_FOV:
 		{
 			m_sliderFOV.handleSliderMove(value);
-			Minecraft* pMinecraft = Minecraft::GetInstance();
-			int fovValue = sliderValueToFov(value);
-			pMinecraft->gameRenderer->SetFovVal((float)fovValue);
-			WCHAR TempString[256];
-			swprintf((WCHAR*)TempString, 256, L"FOV: %d", fovValue);
-			m_sliderFOV.setLabel(TempString);
+			const Minecraft* pMinecraft = Minecraft::GetInstance();
+			const int fovValue = sliderValueToFov(value);
+			pMinecraft->gameRenderer->SetFovVal(static_cast<float>(fovValue));
+			app.SetGameSettings(m_iPad, eGameSetting_FOV, value);
+			WCHAR tempString[256];
+			swprintf(tempString, 256, L"FOV: %d", fovValue);
+			m_sliderFOV.setLabel(tempString);
 		}
 		break;
 
@@ -192,7 +232,7 @@ void UIScene_SettingsGraphicsMenu::handleSliderMove(F64 sliderId, F64 currentVal
 		m_sliderInterfaceOpacity.handleSliderMove(value);
 		
 		app.SetGameSettings(m_iPad,eGameSetting_InterfaceOpacity,value);
-		swprintf( (WCHAR *)TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_INTERFACEOPACITY ),value);	
+		swprintf( TempString, 256, L"%ls: %d%%", app.GetString( IDS_SLIDER_INTERFACEOPACITY ),value);	
 		m_sliderInterfaceOpacity.setLabel(TempString);
 
 		break;
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.h b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.h
index c6e1e394..99022c83 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "UIScene.h"
+#include "Common/UI/UIControl_CheckBox.h"
+#include "Common/UI/UIControl_Slider.h"
 
 class UIScene_SettingsGraphicsMenu : public UIScene
 {
@@ -10,17 +12,19 @@ private:
 		eControl_Clouds,
 		eControl_BedrockFog,
 		eControl_CustomSkinAnim,
+		eControl_RenderDistance,
 		eControl_Gamma,
 		eControl_FOV,
 		eControl_InterfaceOpacity
 	};
 
 	UIControl_CheckBox m_checkboxClouds, m_checkboxBedrockFog, m_checkboxCustomSkinAnim; // Checkboxes
-	UIControl_Slider m_sliderGamma, m_sliderFOV, m_sliderInterfaceOpacity; // Sliders
+	UIControl_Slider m_sliderRenderDistance, m_sliderGamma, m_sliderFOV, m_sliderInterfaceOpacity; // Sliders
 	UI_BEGIN_MAP_ELEMENTS_AND_NAMES(UIScene)
 		UI_MAP_ELEMENT( m_checkboxClouds, "Clouds")
 		UI_MAP_ELEMENT( m_checkboxBedrockFog, "BedrockFog")
 		UI_MAP_ELEMENT( m_checkboxCustomSkinAnim, "CustomSkinAnim")
+		UI_MAP_ELEMENT( m_sliderRenderDistance, "RenderDistance")
 		UI_MAP_ELEMENT( m_sliderGamma, "Gamma")
 		UI_MAP_ELEMENT(m_sliderFOV, "FOV")
 		UI_MAP_ELEMENT( m_sliderInterfaceOpacity, "InterfaceOpacity")
@@ -45,4 +49,8 @@ public:
 	virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
 
 	virtual void handleSliderMove(F64 sliderId, F64 currentValue);
+
+	static int LevelToDistance(int dist);
+
+	static int DistanceToLevel(int dist);
 };
\ No newline at end of file
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
index 39a0b7c6..2ae9c897 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
@@ -8,7 +8,7 @@ UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void *initData, UILayer *pa
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 	
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	m_buttons[BUTTON_ALL_OPTIONS].init(IDS_OPTIONS,BUTTON_ALL_OPTIONS);
 	m_buttons[BUTTON_ALL_AUDIO].init(IDS_AUDIO,BUTTON_ALL_AUDIO);
@@ -51,7 +51,7 @@ wstring UIScene_SettingsMenu::getMoviePath()
 
 void UIScene_SettingsMenu::handleReload()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(ProfileManager.GetPrimaryPad()!=m_iPad)
 	{
 		removeControl( &m_buttons[BUTTON_ALL_AUDIO], bNotInGame);
@@ -68,7 +68,7 @@ void UIScene_SettingsMenu::updateTooltips()
 
 void UIScene_SettingsMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -119,7 +119,7 @@ void UIScene_SettingsMenu::handlePress(F64 controlId, F64 childId)
 	//CD - Added for audio
 	ui.PlayUISFX(eSFX_Press);
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case BUTTON_ALL_OPTIONS:
 		ui.NavigateToScene(m_iPad, eUIScene_SettingsOptionsMenu);
@@ -151,7 +151,7 @@ void UIScene_SettingsMenu::handlePress(F64 controlId, F64 childId)
 
 int UIScene_SettingsMenu::ResetDefaultsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_SettingsMenu* pClass = (UIScene_SettingsMenu*)pParam;
+	UIScene_SettingsMenu* pClass = static_cast<UIScene_SettingsMenu *>(pParam);
 
 	// results switched for this dialog
 	if(result==C4JStorage::EMessage_ResultDecline) 
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsOptionsMenu.cpp
index 6898d489..7b4d3d9d 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsOptionsMenu.cpp
@@ -29,7 +29,7 @@ UIScene_SettingsOptionsMenu::UIScene_SettingsOptionsMenu(int iPad, void *initDat
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 	
-	m_bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	m_bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	m_checkboxViewBob.init(IDS_VIEW_BOBBING,eControl_ViewBob,(app.GetGameSettings(m_iPad,eGameSetting_ViewBob)!=0));
 	m_checkboxShowHints.init(IDS_HINTS,eControl_ShowHints,(app.GetGameSettings(m_iPad,eGameSetting_Hints)!=0));
@@ -99,7 +99,7 @@ UIScene_SettingsOptionsMenu::UIScene_SettingsOptionsMenu(int iPad, void *initDat
 	bool bRemoveAutosave=false;
 	bool bRemoveInGameGamertags=false;
 	
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	bool bPrimaryPlayer = ProfileManager.GetPrimaryPad()==m_iPad;
 	if(!bPrimaryPlayer)
 	{
@@ -196,7 +196,7 @@ void UIScene_SettingsOptionsMenu::updateTooltips()
 
 void UIScene_SettingsOptionsMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -243,7 +243,7 @@ void UIScene_SettingsOptionsMenu::handlePress(F64 controlId, F64 childId)
 	//CD - Added for audio
 	ui.PlayUISFX(eSFX_Press);
 
-	switch((int)controlId)
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Languages:
 		m_bNavigateToLanguageSelector = true;
@@ -324,7 +324,7 @@ void UIScene_SettingsOptionsMenu::handleReload()
 	bool bRemoveAutosave=false;
 	bool bRemoveInGameGamertags=false;
 	
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	bool bPrimaryPlayer = ProfileManager.GetPrimaryPad()==m_iPad;
 	if(!bPrimaryPlayer)
 	{
@@ -378,8 +378,8 @@ void UIScene_SettingsOptionsMenu::handleReload()
 
 void UIScene_SettingsOptionsMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_Autosave:
 		m_sliderAutosave.handleSliderMove(value);
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp
index 917012d6..873564f6 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp
@@ -7,7 +7,7 @@ UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void *initData, UILayer
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	m_bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	m_bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 
 	m_checkboxDisplayHUD.init(app.GetString(IDS_CHECKBOX_DISPLAY_HUD),eControl_DisplayHUD,(app.GetGameSettings(m_iPad,eGameSetting_DisplayHUD)!=0));
 	m_checkboxDisplayHand.init(app.GetString(IDS_CHECKBOX_DISPLAY_HAND),eControl_DisplayHand,(app.GetGameSettings(m_iPad,eGameSetting_DisplayHand)!=0));
@@ -26,7 +26,7 @@ UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void *initData, UILayer
 
 	doHorizontalResizeCheck();
 
-	bool bInGame=(Minecraft::GetInstance()->level!=NULL);
+	bool bInGame=(Minecraft::GetInstance()->level!=nullptr);
 	bool bPrimaryPlayer = ProfileManager.GetPrimaryPad()==m_iPad;
 
 	// if we're not in the game, we need to use basescene 0 
@@ -57,7 +57,7 @@ void UIScene_SettingsUIMenu::updateTooltips()
 
 void UIScene_SettingsUIMenu::updateComponents()
 {
-	bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
+	bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
 	if(bNotInGame)
 	{
 		m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -146,8 +146,8 @@ void UIScene_SettingsUIMenu::handleInput(int iPad, int key, bool repeat, bool pr
 void UIScene_SettingsUIMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 {
 	WCHAR TempString[256];
-	int value = (int)currentValue;
-	switch((int)sliderId)
+	int value = static_cast<int>(currentValue);
+	switch(static_cast<int>(sliderId))
 	{
 	case eControl_UISize:
 		m_sliderUISize.handleSliderMove(value);
diff --git a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
index c29bac2d..5ef783d3 100644
--- a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
@@ -13,11 +13,17 @@ UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void *_initData, UILayer
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 
-	SignEntryScreenInput* initData = (SignEntryScreenInput*)_initData;
+	SignEntryScreenInput* initData = static_cast<SignEntryScreenInput *>(_initData);
 	m_sign = initData->sign;
 
 	m_bConfirmed = false;
 	m_bIgnoreInput = false;
+	m_iSignCursorFrame = 0;
+#ifdef _WINDOWS64
+	m_iActiveDirectEditLine = -1;
+	m_bNeedsInitialEdit = true;
+	m_bSkipTickNav = false;
+#endif
 
 	m_buttonConfirm.init(app.GetString(IDS_DONE), eControl_Confirm);
 	m_labelMessage.init(app.GetString(IDS_EDIT_SIGN_MESSAGE));
@@ -53,6 +59,7 @@ UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void *_initData, UILayer
 
 UIScene_SignEntryMenu::~UIScene_SignEntryMenu()
 {
+	m_sign->SetSelectedLine(-1);
 	m_parentLayer->removeComponent(eUIComponent_MenuBackground);
 }
 
@@ -77,6 +84,79 @@ void UIScene_SignEntryMenu::tick()
 {
 	UIScene::tick();
 
+#ifdef _WINDOWS64
+	// On first tick, auto-start editing line 1 if KBM is active (Java-style flow)
+	if (m_bNeedsInitialEdit)
+	{
+		m_bNeedsInitialEdit = false;
+		if (g_KBMInput.IsKBMActive())
+		{
+			SetFocusToElement(eControl_Line1);
+			m_iActiveDirectEditLine = 0;
+			m_textInputLines[0].beginDirectEdit(15);
+		}
+	}
+
+	// UP/DOWN navigation — must happen after tickDirectEdit (so typed chars are consumed)
+	// and before sign cursor update (so the cursor is correct for this frame's render)
+	// m_bSkipTickNav prevents double-processing when handleInput auto-started editing this frame
+	if (m_iActiveDirectEditLine >= 0 && !m_bSkipTickNav)
+	{
+		int navDir = 0;
+		if (g_KBMInput.IsKeyPressed(VK_DOWN)) navDir = 1;
+		else if (g_KBMInput.IsKeyPressed(VK_UP)) navDir = -1;
+
+		if (navDir != 0)
+		{
+			int newLine = m_iActiveDirectEditLine + navDir;
+			if (newLine >= eControl_Line1 && newLine <= eControl_Line4)
+			{
+				m_textInputLines[m_iActiveDirectEditLine].confirmDirectEdit();
+				SetFocusToElement(newLine);
+				m_iActiveDirectEditLine = newLine;
+				m_textInputLines[newLine].beginDirectEdit(15);
+			}
+			else if (navDir > 0)
+			{
+				m_textInputLines[m_iActiveDirectEditLine].confirmDirectEdit();
+				SetFocusToElement(eControl_Confirm);
+				m_iActiveDirectEditLine = -1;
+			}
+		}
+	}
+	m_bSkipTickNav = false;
+
+	if (m_iActiveDirectEditLine >= 0 && !m_textInputLines[m_iActiveDirectEditLine].isDirectEditing())
+		m_iActiveDirectEditLine = -1;
+#endif
+
+	// Blinking > text < cursor on the 3D sign
+	m_iSignCursorFrame++;
+	if (m_iSignCursorFrame / 6 % 2 == 0)
+	{
+#ifdef _WINDOWS64
+		if (m_iActiveDirectEditLine >= 0)
+			m_sign->SetSelectedLine(m_iActiveDirectEditLine);
+		else
+#endif
+		{
+			int focusedLine = -1;
+			for (int i = eControl_Line1; i <= eControl_Line4; i++)
+			{
+				if (controlHasFocus(i))
+				{
+					focusedLine = i;
+					break;
+				}
+			}
+			m_sign->SetSelectedLine(focusedLine);
+		}
+	}
+	else
+	{
+		m_sign->SetSelectedLine(-1);
+	}
+
 	if(m_bConfirmed)
 	{
 		m_bConfirmed = false;
@@ -95,9 +175,9 @@ void UIScene_SignEntryMenu::tick()
 		if (pMinecraft->level->isClientSide)
 		{
 			shared_ptr<MultiplayerLocalPlayer> player = pMinecraft->localplayers[m_iPad];
-			if(player != NULL && player->connection && player->connection->isStarted())
+			if(player != nullptr && player->connection && player->connection->isStarted())
 			{
-				player->connection->send( shared_ptr<SignUpdatePacket>( new SignUpdatePacket(m_sign->x, m_sign->y, m_sign->z, m_sign->IsVerified(), m_sign->IsCensored(), m_sign->GetMessages()) ) );
+				player->connection->send(std::make_shared<SignUpdatePacket>(m_sign->x, m_sign->y, m_sign->z, m_sign->IsVerified(), m_sign->IsCensored(), m_sign->GetMessages()));
 			}
 		}
 		ui.CloseUIScenes(m_iPad);
@@ -107,6 +187,9 @@ void UIScene_SignEntryMenu::tick()
 void UIScene_SignEntryMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
 	if(m_bConfirmed || m_bIgnoreInput) return;
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) { handled = true; return; }
+#endif
 
 	ui.AnimateKeyPress(iPad, key, repeat, pressed, released);
 
@@ -132,32 +215,125 @@ void UIScene_SignEntryMenu::handleInput(int iPad, int key, bool repeat, bool pre
 #ifdef __ORBIS__
 	case ACTION_MENU_TOUCHPAD_PRESS:
 #endif
+		sendInputToMovie(key, repeat, pressed, released);
+		handled = true;
+		break;
 	case ACTION_MENU_UP:
 	case ACTION_MENU_DOWN:
 		sendInputToMovie(key, repeat, pressed, released);
+#ifdef _WINDOWS64
+		// Auto-start editing if focus moved to a line (e.g. UP from Confirm)
+		if (g_KBMInput.IsKBMActive())
+		{
+			for (int i = eControl_Line1; i <= eControl_Line4; i++)
+			{
+				if (controlHasFocus(i))
+				{
+					m_iActiveDirectEditLine = i;
+					m_textInputLines[i].beginDirectEdit(15);
+					m_bSkipTickNav = true;
+					break;
+				}
+			}
+		}
+#endif
 		handled = true;
 		break;
 	}
 }
 
+#ifdef _WINDOWS64
+void UIScene_SignEntryMenu::getDirectEditInputs(vector<UIControl_TextInput*> &inputs)
+{
+	for (int i = 0; i < 4; i++)
+		inputs.push_back(&m_textInputLines[i]);
+}
+
+void UIScene_SignEntryMenu::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
+{
+	int line = -1;
+	for (int i = 0; i < 4; i++)
+	{
+		if (input == &m_textInputLines[i]) { line = i; break; }
+	}
+	if (line != m_iActiveDirectEditLine) return;
+
+	if (result == UIControl_TextInput::eDirectEdit_Confirmed)
+	{
+		int newLine = line + 1;
+		if (newLine <= eControl_Line4)
+		{
+			SetFocusToElement(newLine);
+			m_iActiveDirectEditLine = newLine;
+			m_textInputLines[newLine].beginDirectEdit(15);
+		}
+		else
+		{
+			m_iActiveDirectEditLine = -1;
+			m_bConfirmed = true;
+		}
+	}
+	else if (result == UIControl_TextInput::eDirectEdit_Cancelled)
+	{
+		m_iActiveDirectEditLine = -1;
+		wstring temp = L"";
+		for (int j = 0; j < 4; j++)
+			m_sign->SetMessage(j, temp);
+		navigateBack();
+		ui.PlayUISFX(eSFX_Back);
+	}
+}
+
+bool UIScene_SignEntryMenu::handleMouseClick(F32 x, F32 y)
+{
+	if (m_iActiveDirectEditLine >= 0)
+	{
+		// During direct edit, only the Done button is clickable.
+		// Hit-test it manually — all other clicks are consumed but ignored.
+		m_buttonConfirm.UpdateControl();
+		S32 cx = m_buttonConfirm.getXPos();
+		S32 cy = m_buttonConfirm.getYPos();
+		S32 cw = m_buttonConfirm.getWidth();
+		S32 ch = m_buttonConfirm.getHeight();
+		if (cw > 0 && ch > 0 && x >= cx && x <= cx + cw && y >= cy && y <= cy + ch)
+		{
+			m_textInputLines[m_iActiveDirectEditLine].confirmDirectEdit();
+			m_iActiveDirectEditLine = -1;
+			m_bConfirmed = true;
+		}
+		return true;
+	}
+	return UIScene::handleMouseClick(x, y);
+}
+#endif
+
 int UIScene_SignEntryMenu::KeyboardCompleteCallback(LPVOID lpParam,bool bRes)
 {
-	// 4J HEG - No reason to set value if keyboard was cancelled
-	UIScene_SignEntryMenu *pClass=(UIScene_SignEntryMenu *)lpParam;
+	const auto pClass=static_cast<UIScene_SignEntryMenu *>(lpParam);
 	pClass->m_bIgnoreInput = false;
 	if (bRes)
 	{
+#ifdef _WINDOWS64
+		uint16_t pchText[128];
+		ZeroMemory(pchText, 128 * sizeof(uint16_t));
+		Win64_GetKeyboardText(pchText, 128);
+		pClass->m_textInputLines[pClass->m_iEditingLine].setLabel(reinterpret_cast<wchar_t *>(pchText));
+#else
 		uint16_t pchText[128];
 		ZeroMemory(pchText, 128 * sizeof(uint16_t) );
 		InputManager.GetText(pchText);
 		pClass->m_textInputLines[pClass->m_iEditingLine].setLabel((wchar_t *)pchText);
+#endif
 	}
 	return 0;
 }
 
 void UIScene_SignEntryMenu::handlePress(F64 controlId, F64 childId)
 {
-	switch((int)controlId)
+#ifdef _WINDOWS64
+	if (isDirectEditBlocking()) return;
+#endif
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_Confirm:
 		{
@@ -169,7 +345,29 @@ void UIScene_SignEntryMenu::handlePress(F64 controlId, F64 childId)
 	case eControl_Line3:
 	case eControl_Line4:
 		{
-			m_iEditingLine = (int)controlId;
+			m_iEditingLine = static_cast<int>(controlId);
+#ifdef _WINDOWS64
+			if (g_KBMInput.IsKBMActive())
+			{
+				// Only start editing from keyboard (Enter on focused line), not mouse clicks
+				if (!g_KBMInput.IsMouseButtonPressed(KeyboardMouseInput::MOUSE_LEFT))
+				{
+					m_iActiveDirectEditLine = m_iEditingLine;
+					m_textInputLines[m_iEditingLine].beginDirectEdit(15);
+				}
+			}
+			else
+			{
+				m_bIgnoreInput = true;
+				UIKeyboardInitData kbData;
+				kbData.title       = app.GetString(IDS_SIGN_TITLE);
+				kbData.defaultText = m_textInputLines[m_iEditingLine].getLabel();
+				kbData.maxChars    = 15;
+				kbData.callback    = &UIScene_SignEntryMenu::KeyboardCompleteCallback;
+				kbData.lpParam     = this;
+				ui.NavigateToScene(m_iPad, eUIScene_Keyboard, &kbData, eUILayer_Fullscreen, eUIGroup_Fullscreen);
+			}
+#else
 			m_bIgnoreInput = true;
 #ifdef _XBOX_ONE
 			// 4J-PB - Xbox One uses the Windows virtual keyboard, and doesn't have the Xbox 360 Latin keyboard type, so we can't restrict the input set to alphanumeric. The closest we get is the emailSmtpAddress type.
@@ -186,7 +384,8 @@ void UIScene_SignEntryMenu::handlePress(F64 controlId, F64 childId)
 				break;
 			}
 #else
-			InputManager.RequestKeyboard(app.GetString(IDS_SIGN_TITLE),m_textInputLines[m_iEditingLine].getLabel(),(DWORD)m_iPad,15,&UIScene_SignEntryMenu::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Alphabet);
+			InputManager.RequestKeyboard(app.GetString(IDS_SIGN_TITLE),m_textInputLines[m_iEditingLine].getLabel(),static_cast<DWORD>(m_iPad),15,&UIScene_SignEntryMenu::KeyboardCompleteCallback,this,C_4JInput::EKeyboardMode_Alphabet);
+#endif
 #endif
 		}
 		break;
diff --git a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.h b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.h
index 28b37d53..4e1c2a5b 100644
--- a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.h
@@ -21,6 +21,12 @@ private:
 	int m_iEditingLine;
 	bool m_bConfirmed;
 	bool m_bIgnoreInput;
+	int m_iSignCursorFrame;
+#ifdef _WINDOWS64
+	int m_iActiveDirectEditLine;
+	bool m_bNeedsInitialEdit;
+	bool m_bSkipTickNav;
+#endif
 
 	UIControl_Button m_buttonConfirm;
 	UIControl_Label m_labelMessage;
@@ -50,6 +56,11 @@ protected:
 public:
 	// INPUT
 	virtual void handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled);
+#ifdef _WINDOWS64
+	virtual void getDirectEditInputs(vector<UIControl_TextInput*> &inputs);
+	virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result);
+	virtual bool handleMouseClick(F32 x, F32 y);
+#endif
 
 protected:
 	void handlePress(F64 controlId, F64 childId);
diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
index d4f26ae7..a3482a24 100644
--- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
@@ -13,7 +13,7 @@
 //#define SKIN_SELECT_PACK_PLAYER_CUSTOM 1
 #define SKIN_SELECT_MAX_DEFAULTS 2
 
-WCHAR *UIScene_SkinSelectMenu::wchDefaultNamesA[]=
+const WCHAR *UIScene_SkinSelectMenu::wchDefaultNamesA[]=
 {
 	L"USE LOCALISED VERSION", // Server selected
 	L"Steve",
@@ -40,7 +40,7 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void *initData, UILayer
 	m_bIgnoreInput=false;
 	m_bNoSkinsToShow = false;
 	
-	m_currentPack = NULL;
+	m_currentPack = nullptr;
 	m_packIndex = SKIN_SELECT_PACK_DEFAULT;
 	m_skinIndex = 0;
 
@@ -48,7 +48,7 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void *initData, UILayer
 	m_currentSkinPath = app.GetPlayerSkinName(iPad);
 	m_selectedSkinPath = L"";
 	m_selectedCapePath = L"";
-	m_vAdditionalSkinBoxes = NULL;
+	m_vAdditionalSkinBoxes = nullptr;
 
 	m_bSlidingSkins = false;
 	m_bAnimatingMove = false;
@@ -107,7 +107,7 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void *initData, UILayer
 			// Change to display the favorites if there are any. The current skin will be in there (probably) - need to check for it
 			m_currentPack = app.m_dlcManager.getPackContainingSkin(m_currentSkinPath);
 			bool bFound;
-			if(m_currentPack != NULL)
+			if(m_currentPack != nullptr)
 			{
 				m_packIndex = app.m_dlcManager.getPackIndex(m_currentPack,bFound,DLCManager::e_DLCType_Skin) + SKIN_SELECT_MAX_DEFAULTS;
 			}
@@ -436,7 +436,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad)
 }
 		break;
 	default:
-		if( m_currentPack != NULL )
+		if( m_currentPack != nullptr )
 		{
 			bool renableInputAfterOperation = true;
 			m_bIgnoreInput = true;
@@ -520,7 +520,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad)
 						DLC_INFO *pDLCInfo = app.GetDLCInfoForTrialOfferID(m_currentPack->getPurchaseOfferId());
 						ULONGLONG ullOfferID_Full;
 
-						if(pDLCInfo!=NULL)
+						if(pDLCInfo!=nullptr)
 						{
 							ullOfferID_Full=pDLCInfo->ullOfferID_Full;
 						}
@@ -534,7 +534,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad)
 #endif
 						bool bContentRestricted=false;
 #if defined(__PS3__) || defined(__PSVITA__)
-						ProfileManager.GetChatAndContentRestrictions(m_iPad,true,NULL,&bContentRestricted,NULL);
+						ProfileManager.GetChatAndContentRestrictions(m_iPad,true,nullptr,&bContentRestricted,nullptr);
 #endif
 						if(bContentRestricted)
 						{
@@ -599,7 +599,7 @@ void UIScene_SkinSelectMenu::InputActionOK(unsigned int iPad)
 void UIScene_SkinSelectMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	int characterId = -1;
-	swscanf((wchar_t*)region->name,L"Character%d",&characterId);
+	swscanf(static_cast<wchar_t *>(region->name),L"Character%d",&characterId);
 	if (characterId == -1)
 	{
 		app.DebugPrintf("Invalid character to render found\n");
@@ -635,8 +635,8 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 	wstring skinOrigin = L"";
 	bool bSkinIsFree=false;
 	bool bLicensed=false;
-	DLCSkinFile *skinFile=NULL;
-	DLCPack *Pack=NULL;
+	DLCSkinFile *skinFile=nullptr;
+	DLCPack *Pack=nullptr;
 	BYTE sidePreviewControlsL,sidePreviewControlsR;
 	m_bNoSkinsToShow=false;
 
@@ -646,7 +646,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 
 	m_controlSkinNamePlate.setVisible( false );
 
-	if( m_currentPack != NULL )
+	if( m_currentPack != nullptr )
 	{
 		skinFile = m_currentPack->getSkinFile(m_skinIndex);
 		m_selectedSkinPath = skinFile->getPath();
@@ -673,7 +673,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 	{	
 		m_selectedSkinPath = L"";
 		m_selectedCapePath = L"";
-		m_vAdditionalSkinBoxes = NULL;
+		m_vAdditionalSkinBoxes = nullptr;
 
 		switch(m_packIndex)
 		{
@@ -758,13 +758,13 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 		// add the boxes to the humanoid model, but only if we've not done this already
 
 		vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
-		if(pAdditionalModelParts==NULL)
+		if(pAdditionalModelParts==nullptr)
 		{
 			pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),m_vAdditionalSkinBoxes);
 		}
 	}
 
-	if(skinFile!=NULL)
+	if(skinFile!=nullptr)
 	{
 		app.SetAnimOverrideBitmask(skinFile->getSkinID(),skinFile->getAnimOverrideBitmask());
 	}
@@ -779,7 +779,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 
 	wstring otherSkinPath = L"";
 	wstring otherCapePath = L"";
-	vector<SKIN_BOX *> *othervAdditionalSkinBoxes=NULL;
+	vector<SKIN_BOX *> *othervAdditionalSkinBoxes=nullptr;
 	wchar_t chars[256];
 
 	// turn off all displays
@@ -824,11 +824,11 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 	{
 		if(showNext)
 		{
-			skinFile=NULL;
+			skinFile=nullptr;
 
 			m_characters[eCharacter_Next1 + i].setVisible(true);
 
-			if( m_currentPack != NULL )
+			if( m_currentPack != nullptr )
 			{
 				skinFile = m_currentPack->getSkinFile(nextIndex);
 				otherSkinPath = skinFile->getPath();
@@ -840,7 +840,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 			{	
 				otherSkinPath = L"";
 				otherCapePath = L"";
-				othervAdditionalSkinBoxes=NULL;
+				othervAdditionalSkinBoxes=nullptr;
 				switch(m_packIndex)
 				{
 				case SKIN_SELECT_PACK_DEFAULT:
@@ -872,13 +872,13 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 			if(othervAdditionalSkinBoxes && othervAdditionalSkinBoxes->size()!=0)
 			{
 				vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
-				if(pAdditionalModelParts==NULL)
+				if(pAdditionalModelParts==nullptr)
 				{
 					pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),othervAdditionalSkinBoxes);
 				}
 			}
 			// 4J-PB - anim override needs set before SetTexture
-			if(skinFile!=NULL)
+			if(skinFile!=nullptr)
 			{
 				app.SetAnimOverrideBitmask(skinFile->getSkinID(),skinFile->getAnimOverrideBitmask());
 			}
@@ -895,11 +895,11 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 	{
 		if(showPrevious)
 		{
-			skinFile=NULL;
+			skinFile=nullptr;
 			
 			m_characters[eCharacter_Previous1 + i].setVisible(true);
 
-			if( m_currentPack != NULL )
+			if( m_currentPack != nullptr )
 			{
 				skinFile = m_currentPack->getSkinFile(previousIndex);
 				otherSkinPath = skinFile->getPath();
@@ -911,7 +911,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 			{	
 				otherSkinPath = L"";
 				otherCapePath = L"";
-				othervAdditionalSkinBoxes=NULL;
+				othervAdditionalSkinBoxes=nullptr;
 				switch(m_packIndex)
 				{
 				case SKIN_SELECT_PACK_DEFAULT:
@@ -943,7 +943,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
 			if(othervAdditionalSkinBoxes && othervAdditionalSkinBoxes->size()!=0)
 			{
 				vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
-				if(pAdditionalModelParts==NULL)
+				if(pAdditionalModelParts==nullptr)
 				{
 					pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),othervAdditionalSkinBoxes);
 				}
@@ -1021,7 +1021,7 @@ int UIScene_SkinSelectMenu::getNextSkinIndex(DWORD sourceIndex)
 		{
 			nextSkin = eDefaultSkins_ServerSelected;
 		}
-		else if(m_currentPack != NULL && nextSkin>=m_currentPack->getSkinCount())
+		else if(m_currentPack != nullptr && nextSkin>=m_currentPack->getSkinCount())
 		{
 			nextSkin = 0;
 		}		
@@ -1055,7 +1055,7 @@ int UIScene_SkinSelectMenu::getPreviousSkinIndex(DWORD sourceIndex)
 			{
 				previousSkin = eDefaultSkins_Count - 1;
 			}
-			else if(m_currentPack != NULL)
+			else if(m_currentPack != nullptr)
 			{
 				previousSkin = m_currentPack->getSkinCount()-1;
 			}
@@ -1079,10 +1079,10 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
 	}
 	else
 	{
-		m_currentPack = NULL;
+		m_currentPack = nullptr;
 	}
 	m_skinIndex = 0;
-	if(m_currentPack != NULL)
+	if(m_currentPack != nullptr)
 	{
 		bool found;
 		DWORD currentSkinIndex = m_currentPack->getSkinIndexAt(m_currentSkinPath, found);
@@ -1099,7 +1099,7 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
 				DWORD defaultSkinIndex = GET_DEFAULT_SKIN_ID_FROM_BITMASK(m_originalSkinId);
 				if( ugcSkinIndex == 0 )
 				{
-					m_skinIndex = (EDefaultSkins) defaultSkinIndex;
+					m_skinIndex = static_cast<EDefaultSkins>(defaultSkinIndex);
 				}
 			}	
 			break;
@@ -1130,7 +1130,7 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
 std::wstring fakeWideToRealWide(const wchar_t* original)
 {
 	const char* name = reinterpret_cast<const char*>(original);
-	int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
+	int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, nullptr, 0);
 	std::wstring wName(len, 0);
 	MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len);
 	return wName.c_str();
@@ -1500,7 +1500,7 @@ void UIScene_SkinSelectMenu::HandleDLCMountingComplete()
 	if(app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin)>0)
 	{
 		m_currentPack = app.m_dlcManager.getPackContainingSkin(m_currentSkinPath);
-		if(m_currentPack != NULL)
+		if(m_currentPack != nullptr)
 		{
 			bool bFound = false;
 			m_packIndex = app.m_dlcManager.getPackIndex(m_currentPack,bFound,DLCManager::e_DLCType_Skin) + SKIN_SELECT_MAX_DEFAULTS;
@@ -1520,7 +1520,7 @@ void UIScene_SkinSelectMenu::HandleDLCMountingComplete()
 
 	m_bIgnoreInput=false;
 	app.m_dlcManager.checkForCorruptDLCAndAlert();
-	bool bInGame=(Minecraft::GetInstance()->level!=NULL);
+	bool bInGame=(Minecraft::GetInstance()->level!=nullptr);
 
 #if TO_BE_IMPLEMENTED
 	if(bInGame) XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_AUTO);
@@ -1534,7 +1534,7 @@ void UIScene_SkinSelectMenu::showNotOnlineDialog(int iPad)
 {
 	// need to be signed in to live. get them to sign in to online
 #if defined(__PS3__)
-	SQRNetworkManager_PS3::AttemptPSNSignIn(NULL, this);		
+	SQRNetworkManager_PS3::AttemptPSNSignIn(nullptr, this);		
 
 #elif defined(__PSVITA__)
 	if(CGameNetworkManager::usingAdhocMode() && SQRNetworkManager_AdHoc_Vita::GetAdhocStatus())
@@ -1543,15 +1543,15 @@ void UIScene_SkinSelectMenu::showNotOnlineDialog(int iPad)
 		UINT uiIDA[2];
 		uiIDA[0]=IDS_PRO_NOTONLINE_ACCEPT;
 		uiIDA[1]=IDS_CANCEL;
-		ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&UIScene_SkinSelectMenu::MustSignInReturned,NULL);
+		ui.RequestErrorMessage(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_NOTONLINE_TEXT, uiIDA, 2, ProfileManager.GetPrimaryPad(),&UIScene_SkinSelectMenu::MustSignInReturned,nullptr);
 	}
 	else
 	{
-		SQRNetworkManager_Vita::AttemptPSNSignIn(NULL, this);		
+		SQRNetworkManager_Vita::AttemptPSNSignIn(nullptr, this);		
 	}
 
 #elif defined(__ORBIS__)
-	SQRNetworkManager_Orbis::AttemptPSNSignIn(NULL, this, false, iPad);
+	SQRNetworkManager_Orbis::AttemptPSNSignIn(nullptr, this, false, iPad);
 
 #elif defined(_DURANGO)
 
@@ -1563,7 +1563,7 @@ void UIScene_SkinSelectMenu::showNotOnlineDialog(int iPad)
 
 int UIScene_SkinSelectMenu::UnlockSkinReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
 {
-	UIScene_SkinSelectMenu* pScene = (UIScene_SkinSelectMenu*)pParam;
+	UIScene_SkinSelectMenu* pScene = static_cast<UIScene_SkinSelectMenu *>(pParam);
 
 	if	(	(result == C4JStorage::EMessage_ResultAccept)
 		&&	ProfileManager.IsSignedIn(iPad)
@@ -1579,7 +1579,7 @@ int UIScene_SkinSelectMenu::UnlockSkinReturned(void *pParam,int iPad,C4JStorage:
 			const char *pchPackName=wstringtofilename(wStrPackName);
 			SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName);
 
-			if (pSONYDLCInfo != NULL)
+			if (pSONYDLCInfo != nullptr)
 			{
 				char chName[42];
 				char chKeyName[20];
@@ -1593,7 +1593,7 @@ int UIScene_SkinSelectMenu::UnlockSkinReturned(void *pParam,int iPad,C4JStorage:
 				// while the store is screwed, hardcode the sku
 				//sprintf(chName,"%s-%s-%s",app.GetCommerceCategory(),pSONYDLCInfo->chDLCKeyname,"EURO");
 	
-				// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a NULL terminating char
+				// MGH -  keyname in the DLC file is 16 chars long, but there's no space for a nullptr terminating char
 				memset(chKeyName, 0, sizeof(chKeyName));
 				strncpy(chKeyName, pSONYDLCInfo->chDLCKeyname, 16);
 
@@ -1623,7 +1623,7 @@ int UIScene_SkinSelectMenu::UnlockSkinReturned(void *pParam,int iPad,C4JStorage:
 			// need to re-enable input because the user can back out of the store purchase, and we'll be stuck
 			pScene->m_bIgnoreInput = false;  // MGH - moved this to outside the pSONYDLCInfo, so we don't get stuck
 #elif defined _XBOX_ONE
-			StorageManager.InstallOffer(1,(WCHAR *)(pScene->m_currentPack->getPurchaseOfferId().c_str()), &RenableInput, pScene, NULL);
+			StorageManager.InstallOffer(1,(WCHAR *)(pScene->m_currentPack->getPurchaseOfferId().c_str()), &RenableInput, pScene, nullptr);
 #endif		
 		}
 		else // Is signed in, but not live.
@@ -1642,7 +1642,7 @@ int UIScene_SkinSelectMenu::UnlockSkinReturned(void *pParam,int iPad,C4JStorage:
 
 int UIScene_SkinSelectMenu::RenableInput(LPVOID lpVoid, int, int)
 {
-	((UIScene_SkinSelectMenu*) lpVoid)->m_bIgnoreInput = false;
+	static_cast<UIScene_SkinSelectMenu *>(lpVoid)->m_bIgnoreInput = false;
 	return 0;
 }
 
diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
index e8d76096..60579ac6 100644
--- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
@@ -6,7 +6,7 @@
 class UIScene_SkinSelectMenu : public UIScene
 {
 private:
-	static WCHAR *wchDefaultNamesA[eDefaultSkins_Count];
+	static const WCHAR *wchDefaultNamesA[eDefaultSkins_Count];
 
 	// 4J Stu - How many to show on each side of the main control
 	static const BYTE sidePreviewControls = 4;
diff --git a/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp b/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
index f6916d13..017af93e 100644
--- a/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
@@ -12,7 +12,7 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *pa
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();
 	
-	TeleportMenuInitData *initParam = (TeleportMenuInitData *)initData;
+	TeleportMenuInitData *initParam = static_cast<TeleportMenuInitData *>(initData);
 
 	m_teleportToPlayer = initParam->teleportToPlayer;
 
@@ -41,7 +41,7 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *pa
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i );
 
-		if( player != NULL && !(player->IsLocal() && player->GetUserIndex() == m_iPad) )
+		if( player != nullptr && !(player->IsLocal() && player->GetUserIndex() == m_iPad) )
 		{
 			m_players[m_playersCount] = player->GetSmallId();
 			++m_playersCount;
@@ -59,7 +59,7 @@ UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *pa
 			}
 
 			int voiceStatus = 0;
-			if(player != NULL && player->HasVoice() )
+			if(player != nullptr && player->HasVoice() )
 			{
 				if( player->IsMutedByLocalUser(m_iPad) )
 				{
@@ -131,7 +131,7 @@ void UIScene_TeleportMenu::handleReload()
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerByIndex( i );
 
-		if( player != NULL && !(player->IsLocal() && player->GetUserIndex() == m_iPad)  )
+		if( player != nullptr && !(player->IsLocal() && player->GetUserIndex() == m_iPad)  )
 		{
 			m_players[m_playersCount] = player->GetSmallId();
 			++m_playersCount;
@@ -149,7 +149,7 @@ void UIScene_TeleportMenu::handleReload()
 			}
 
 			int voiceStatus = 0;
-			if(player != NULL && player->HasVoice() )
+			if(player != nullptr && player->HasVoice() )
 			{
 				if( player->IsMutedByLocalUser(m_iPad) )
 				{
@@ -189,7 +189,7 @@ void UIScene_TeleportMenu::tick()
 	{
 		INetworkPlayer *player = g_NetworkManager.GetPlayerBySmallId( m_players[i] );
 
-		if( player != NULL )
+		if( player != nullptr )
 		{
 			m_players[i] = player->GetSmallId();
 
@@ -250,11 +250,11 @@ void UIScene_TeleportMenu::handleInput(int iPad, int key, bool repeat, bool pres
 
 void UIScene_TeleportMenu::handlePress(F64 controlId, F64 childId)
 {
-	app.DebugPrintf("Pressed = %d, %d\n", (int)controlId, (int)childId);
-	switch((int)controlId)
+	app.DebugPrintf("Pressed = %d, %d\n", static_cast<int>(controlId), static_cast<int>(childId));
+	switch(static_cast<int>(controlId))
 	{
 	case eControl_GamePlayers:
-		int currentSelection = (int)childId;
+		int currentSelection = static_cast<int>(childId);
 		INetworkPlayer *selectedPlayer = g_NetworkManager.GetPlayerBySmallId( m_players[ currentSelection ] );
 		INetworkPlayer *thisPlayer = g_NetworkManager.GetLocalPlayerByUserIndex(m_iPad);
 		
@@ -275,7 +275,7 @@ void UIScene_TeleportMenu::handlePress(F64 controlId, F64 childId)
 
 void UIScene_TeleportMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer *pPlayer, bool leaving)
 {
-	UIScene_TeleportMenu *scene = (UIScene_TeleportMenu *)callbackParam;
+	UIScene_TeleportMenu *scene = static_cast<UIScene_TeleportMenu *>(callbackParam);
 	bool playerFound = false;
 	int foundIndex = 0;
 	for(int i = 0; i < scene->m_playersCount; ++i)
@@ -320,7 +320,7 @@ void UIScene_TeleportMenu::OnPlayerChanged(void *callbackParam, INetworkPlayer *
 		}
 
 		int voiceStatus = 0;
-		if(pPlayer != NULL && pPlayer->HasVoice() )
+		if(pPlayer != nullptr && pPlayer->HasVoice() )
 		{
 			if( pPlayer->IsMutedByLocalUser(scene->m_iPad) )
 			{
diff --git a/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
index 0a35c8e5..bb9e30af 100644
--- a/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
@@ -25,13 +25,13 @@ UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void *_initData, UILayer *par
 	m_labelRequest1.init(L"");
 	m_labelRequest2.init(L"");
 
-	TradingScreenInput *initData = (TradingScreenInput *)_initData;
+	TradingScreenInput *initData = static_cast<TradingScreenInput *>(_initData);
 	m_merchant = initData->trader;
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[iPad] != NULL )
+	if( pMinecraft->localgameModes[iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[iPad];
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[iPad]);
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
 		gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Trading_Menu, this);
 	}
@@ -87,15 +87,15 @@ void UIScene_TradingMenu::handleDestroy()
 {
 	app.DebugPrintf("UIScene_TradingMenu::handleDestroy\n");
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if( pMinecraft->localgameModes[m_iPad] != NULL )
+	if( pMinecraft->localgameModes[m_iPad] != nullptr )
 	{
-		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
+		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(pMinecraft->localplayers[m_iPad] != NULL) pMinecraft->localplayers[m_iPad]->closeContainer();
+	if(pMinecraft->localplayers[m_iPad] != nullptr) pMinecraft->localplayers[m_iPad]->closeContainer();
 
 	ui.OverrideSFX(m_iPad,ACTION_MENU_A,false);
 	ui.OverrideSFX(m_iPad,ACTION_MENU_OK,false);
@@ -155,11 +155,11 @@ void UIScene_TradingMenu::handleInput(int iPad, int key, bool repeat, bool press
 void UIScene_TradingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 {
 	Minecraft *pMinecraft = Minecraft::GetInstance();
-	if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
+	if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
 
 	shared_ptr<ItemInstance> item = nullptr;
 	int slotId = -1;
-	swscanf((wchar_t*)region->name,L"slot_%d",&slotId);
+	swscanf(static_cast<wchar_t *>(region->name),L"slot_%d",&slotId);
 
 	if(slotId < MerchantMenu::USE_ROW_SLOT_END)
 	{			
@@ -190,7 +190,7 @@ void UIScene_TradingMenu::customDraw(IggyCustomDrawCallbackRegion *region)
 			};
 		}
 	}
-	if(item != NULL) customDrawSlotControl(region,m_iPad,item,1.0f,item->isFoil(),true);
+	if(item != nullptr) customDrawSlotControl(region,m_iPad,item,1.0f,item->isFoil(),true);
 }
 
 void UIScene_TradingMenu::showScrollRightArrow(bool show)
diff --git a/Minecraft.Client/Common/UI/UIScene_TrialExitUpsell.cpp b/Minecraft.Client/Common/UI/UIScene_TrialExitUpsell.cpp
index 9ef8f189..9338daba 100644
--- a/Minecraft.Client/Common/UI/UIScene_TrialExitUpsell.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_TrialExitUpsell.cpp
@@ -50,7 +50,7 @@ void UIScene_TrialExitUpsell::handleInput(int iPad, int key, bool repeat, bool p
 			// 4J-PB - need to check this user can access the store
 #if defined(__PS3__) || defined(__PSVITA__)
 			bool bContentRestricted;
-			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,NULL,&bContentRestricted,NULL);
+			ProfileManager.GetChatAndContentRestrictions(ProfileManager.GetPrimaryPad(),true,nullptr,&bContentRestricted,nullptr);
 			if(bContentRestricted)
 			{
 				UINT uiIDA[1];
diff --git a/Minecraft.Client/Common/UI/UISplitScreenHelpers.h b/Minecraft.Client/Common/UI/UISplitScreenHelpers.h
new file mode 100644
index 00000000..e451b3f2
--- /dev/null
+++ b/Minecraft.Client/Common/UI/UISplitScreenHelpers.h
@@ -0,0 +1,114 @@
+#pragma once
+
+// Shared split-screen UI helpers to avoid duplicating viewport math
+// across HUD, Chat, Tooltips, and container menus.
+
+// Compute the raw viewport rectangle for a given viewport type.
+inline void GetViewportRect(F32 screenW, F32 screenH, C4JRender::eViewportType viewport,
+	F32 &originX, F32 &originY, F32 &viewW, F32 &viewH)
+{
+	originX = originY = 0;
+	viewW = screenW;
+	viewH = screenH;
+	switch(viewport)
+	{
+	case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
+		viewH = screenH * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
+		originY = screenH * 0.5f; viewH = screenH * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
+		viewW = screenW * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
+		originX = screenW * 0.5f; viewW = screenW * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
+		viewW = screenW * 0.5f; viewH = screenH * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
+		originX = screenW * 0.5f; viewW = screenW * 0.5f; viewH = screenH * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
+		originY = screenH * 0.5f; viewW = screenW * 0.5f; viewH = screenH * 0.5f; break;
+	case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
+		originX = screenW * 0.5f; originY = screenH * 0.5f;
+		viewW = screenW * 0.5f; viewH = screenH * 0.5f; break;
+	default: break;
+	}
+}
+
+// Fit a 16:9 rectangle inside the given dimensions.
+inline void Fit16x9(F32 viewW, F32 viewH, S32 &fitW, S32 &fitH, S32 &offsetX, S32 &offsetY)
+{
+	const F32 kAspect = 16.0f / 9.0f;
+	if(viewW / viewH > kAspect)
+	{
+		fitH = (S32)viewH;
+		fitW = (S32)(viewH * kAspect);
+	}
+	else
+	{
+		fitW = (S32)viewW;
+		fitH = (S32)(viewW / kAspect);
+	}
+	offsetX = (S32)((viewW - fitW) * 0.5f);
+	offsetY = (S32)((viewH - fitH) * 0.5f);
+}
+
+// Convenience: just fit 16:9 dimensions, ignore offsets.
+inline void Fit16x9(S32 &width, S32 &height)
+{
+	S32 offX, offY;
+	Fit16x9((F32)width, (F32)height, width, height, offX, offY);
+}
+
+// Compute the uniform scale and tileYStart for split-screen tile rendering.
+// Used by HUD, Chat, and Tooltips to scale the SWF movie to cover the viewport tile.
+inline void ComputeTileScale(S32 tileWidth, S32 tileHeight, S32 movieWidth, S32 movieHeight,
+	bool needsYTile, F32 &outScale, S32 &outTileYStart)
+{
+	F32 scaleW = (F32)tileWidth / (F32)movieWidth;
+	F32 scaleH = (F32)tileHeight / (F32)movieHeight;
+	F32 scale = (scaleW > scaleH) ? scaleW : scaleH;
+	if(scale < 1.0f) scale = 1.0f;
+
+	outTileYStart = 0;
+	if(needsYTile)
+	{
+		S32 dispH = (S32)(movieHeight * scale);
+		outTileYStart = dispH - tileHeight;
+		if(outTileYStart < 0) outTileYStart = 0;
+		scaleH = (F32)(outTileYStart + tileHeight) / (F32)movieHeight;
+		scale = (scaleW > scaleH) ? scaleW : scaleH;
+		if(scale < 1.0f) scale = 1.0f;
+	}
+
+	outScale = scale;
+}
+
+// Compute the render offset to center split-screen SWF content in the viewport.
+// Used by Chat and Tooltips (HUD uses repositionHud instead).
+inline void ComputeSplitContentOffset(C4JRender::eViewportType viewport, S32 movieWidth, S32 movieHeight,
+	F32 scale, S32 tileWidth, S32 tileHeight, S32 tileYStart,
+	S32 &outXOffset, S32 &outYOffset)
+{
+	S32 contentCenterX, contentCenterY;
+	if(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_LEFT || viewport == C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT)
+	{
+		contentCenterX = (S32)(movieWidth * scale / 4);
+		contentCenterY = (S32)(movieHeight * scale / 2);
+	}
+	else if(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_TOP || viewport == C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM)
+	{
+		contentCenterX = (S32)(movieWidth * scale / 2);
+		contentCenterY = (S32)(movieHeight * scale * 3 / 4);
+	}
+	else
+	{
+		contentCenterX = (S32)(movieWidth * scale / 4);
+		contentCenterY = (S32)(movieHeight * scale * 3 / 4);
+	}
+
+	outXOffset = 0;
+	outYOffset = 0;
+	if(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_LEFT || viewport == C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT || viewport == C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT)
+		outXOffset = -(tileWidth / 2 - contentCenterX);
+	if(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_TOP || viewport == C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT || viewport == C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT)
+		outYOffset = -(tileHeight / 2 - (contentCenterY - tileYStart));
+}
diff --git a/Minecraft.Client/Common/UI/UIString.cpp b/Minecraft.Client/Common/UI/UIString.cpp
index 288fa87a..04d8b8e3 100644
--- a/Minecraft.Client/Common/UI/UIString.cpp
+++ b/Minecraft.Client/Common/UI/UIString.cpp
@@ -139,7 +139,7 @@ UIString::~UIString()
 
 bool UIString::empty()
 {
-	return m_core.get() == NULL;
+	return m_core.get() == nullptr;
 }
 
 bool UIString::compare(const UIString &uiString)
@@ -149,19 +149,19 @@ bool UIString::compare(const UIString &uiString)
 
 bool UIString::needsUpdating()
 {
-	if (m_core != NULL)	return m_core->needsUpdating();
+	if (m_core != nullptr)	return m_core->needsUpdating();
 	else				return false;
 }
 
 void UIString::setUpdated()
 {
-	if (m_core != NULL)	m_core->setUpdated();
+	if (m_core != nullptr)	m_core->setUpdated();
 }
 
 wstring &UIString::getString()
 {
 	static wstring blank(L"");
-	if (m_core != NULL) return m_core->getString();
+	if (m_core != nullptr) return m_core->getString();
 	else				return blank;
 }
 
diff --git a/Minecraft.Client/Common/UI/UIStructs.h b/Minecraft.Client/Common/UI/UIStructs.h
index ac83458f..99c3d7bd 100644
--- a/Minecraft.Client/Common/UI/UIStructs.h
+++ b/Minecraft.Client/Common/UI/UIStructs.h
@@ -196,8 +196,8 @@ typedef struct _ConnectionProgressParams
 		showTooltips = false;
 		setFailTimer = false;
 		timerTime = 0;
-		cancelFunc = NULL;
-		cancelFuncParam = NULL;
+		cancelFunc = nullptr;
+		cancelFuncParam = nullptr;
 	}
 } ConnectionProgressParams;
 
@@ -250,7 +250,7 @@ typedef struct _SaveListDetails
 	_SaveListDetails()
 	{
 		saveId = 0;
-		pbThumbnailData = NULL;
+		pbThumbnailData = nullptr;
 		dwThumbnailSize = 0;
 #ifdef _DURANGO
 		ZeroMemory(UTF16SaveName,sizeof(wchar_t)*128);
@@ -280,6 +280,9 @@ typedef struct _JoinMenuInitData
 {
 	FriendSessionInfo *selectedSession;
 	int iPad;
+#ifdef _WINDOWS64
+	int serverIndex; // Index of the server in servers.db, -1 if not a saved server
+#endif
 } JoinMenuInitData;
 
 // Native keyboard (Windows64 replacement for InputManager.RequestKeyboard WinAPI dialog)
@@ -403,15 +406,15 @@ typedef struct _LoadingInputParams
 
 	_LoadingInputParams()
 	{
-		func = NULL;
-		lpParam = NULL;
-		completionData = NULL;
+		func = nullptr;
+		lpParam = nullptr;
+		completionData = nullptr;
 
 		cancelText = -1;
-		cancelFunc = NULL;
-		completeFunc = NULL;
-		m_cancelFuncParam = NULL;
-		m_completeFuncParam = NULL;
+		cancelFunc = nullptr;
+		completeFunc = nullptr;
+		m_cancelFuncParam = nullptr;
+		m_completeFuncParam = nullptr;
 		waitForThreadToDelete = false;
 	}
 } LoadingInputParams;
@@ -439,7 +442,7 @@ typedef struct _TutorialPopupInfo
 
 	_TutorialPopupInfo()
 	{
-		interactScene = NULL;
+		interactScene = nullptr;
 		desc = L"";
 		title = L"";
 		icon = -1;
@@ -447,7 +450,7 @@ typedef struct _TutorialPopupInfo
 		isFoil = false;
 		allowFade = true;
 		isReminder = false;
-		tutorial = NULL;
+		tutorial = nullptr;
 	}
 
 } TutorialPopupInfo;
diff --git a/Minecraft.Client/Common/UI/UITTFFont.cpp b/Minecraft.Client/Common/UI/UITTFFont.cpp
index 5d72ed97..359ac76b 100644
--- a/Minecraft.Client/Common/UI/UITTFFont.cpp
+++ b/Minecraft.Client/Common/UI/UITTFFont.cpp
@@ -11,9 +11,9 @@ UITTFFont::UITTFFont(const string &name, const string &path, S32 fallbackCharact
 
 #ifdef _UNICODE
 	wstring wPath = convStringToWstring(path);
-	HANDLE file = CreateFile(wPath.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	HANDLE file = CreateFile(wPath.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 #else
-	HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	HANDLE file = CreateFile(path.c_str(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 #endif
 	if( file == INVALID_HANDLE_VALUE )
 	{
@@ -30,7 +30,7 @@ UITTFFont::UITTFFont(const string &name, const string &path, S32 fallbackCharact
 		DWORD bytesRead;
 
 		pbData =  (PBYTE) new BYTE[dwFileSize];
-		BOOL bSuccess = ReadFile(file,pbData,dwFileSize,&bytesRead,NULL);
+		BOOL bSuccess = ReadFile(file,pbData,dwFileSize,&bytesRead,nullptr);
 		if(bSuccess==FALSE)
 		{
 			app.FatalLoadError();