Fix pistons permanently breaking server-wide on dedicated servers

triggerEvent() set ignoreUpdate to true at the start but three early return paths skipped the reset at the end. Once any of these paths was hit, the TLS flag stayed true permanently, blocking all piston neighbor updates for the rest of the server session.
fix splitscreen xuids (#1413 )
2026-03-26 10:56:33 -05:00 · 2026-03-26 10:19:20 -04:00 · 2026-03-26 10:15:11 -04:00 · 2026-03-26 01:37:23 -05:00 · 2026-03-24 23:25:18 -05:00 · 2026-03-24 05:04:07 -04:00
165 changed files with 1204 additions and 75220 deletions
@@ -1,3 +0,0 @@
-.github/workflows/docker-nightly.yml merge=ours
-.github/workflows/nightly.yml merge=ours
-docker-compose.dedicated-server.ghcr.yml merge=ours
@@ -50,7 +50,7 @@ jobs:
        buildPresetAdditionalArgs: "['--target', 'Minecraft.Server']"

    - name: Zip Build
-      run: 7z a -r LCEServer${{ matrix.platform }}.zip ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Server/Release/* -x!*.ipdb -x!*.iobj
+      run: 7z a -r LCEServer${{ matrix.platform }}.zip ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Server/Release/* "-x!*.ipdb" "-x!*.iobj"

    - name: Stage artifacts
      run: |
@@ -93,7 +93,7 @@ jobs:
        files: |
          artifacts/*

-  docker-publish:
+  docker:
    name: Build and Push Docker Image
    runs-on: ubuntu-latest
    needs: build
@@ -157,7 +157,7 @@ jobs:
          MC_RUNTIME_DIR=runtime

  cleanup:
-    needs: [build, release]
+    needs: [build, release, docker]
    if: always()
    runs-on: ubuntu-latest
    steps:
@@ -1,33 +1,84 @@
-name: Nightly Releases
+name: Nightly Release

 on:
-  workflow_dispatch:
+  workflow_dispatch: 
+  push:
+    branches:
+    - 'main'
+    paths-ignore:
+      - '.gitignore'
+      - '*.md'
+      - '.github/**'
+      - '!.github/workflows/nightly.yml'

 permissions:
  contents: write

+concurrency:
+  group: nightly
+  cancel-in-progress: true
+
 jobs:
  build:
-    name: Build Windows64
    runs-on: windows-latest

+    strategy:
+      matrix:
+        platform: [Windows64]
+
    steps:
    - name: Checkout
      uses: actions/checkout@v6

-    - name: Setup msbuild
-      uses: microsoft/setup-msbuild@v2
+    - name: Set platform lowercase
+      run: echo "MATRIX_PLATFORM=$('${{ matrix.platform }}'.ToLower())" >> $env:GITHUB_ENV

-    - name: Build
-      run: MSBuild.exe MinecraftConsoles.sln /p:Configuration=Release /p:Platform="Windows64"
+    - name: Setup MSVC
+      uses: ilammy/msvc-dev-cmd@v1
+
+    - name: Setup CMake
+      uses: lukka/get-cmake@latest
+    
+    - name: Run CMake
+      uses: lukka/run-cmake@v10
+      env:
+        VCPKG_ROOT: "" # Disable vcpkg for CI builds
+      with:
+        configurePreset: ${{ env.MATRIX_PLATFORM }}
+        buildPreset: ${{ env.MATRIX_PLATFORM }}-release
+        buildPresetAdditionalArgs: "['--target', 'Minecraft.Client']"

    - name: Zip Build
-      run: 7z a -r LCEWindows64.zip ./x64/Release/*
+      run: 7z a -r LCE${{ matrix.platform }}.zip ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Client/Release/* "-x!*.ipdb" "-x!*.iobj"

-    - name: Zip Dedicated Server Build
-      run: 7z a -r LCEServerWindows64.zip ./x64/Minecraft.Server/Release/*
+    - name: Stage artifacts
+      run: |
+        New-Item -ItemType Directory -Force -Path staging
+        Copy-Item LCE${{ matrix.platform }}.zip staging/

-    - name: Update Client release
+    - name: Stage exe and pdb
+      if: matrix.platform == 'Windows64'
+      run: |
+        Copy-Item ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Client/Release/Minecraft.Client.exe staging/
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v6
+      with:
+        name: build-${{ matrix.platform }}
+        path: staging/*
+
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Download all artifacts
+      uses: actions/download-artifact@v7
+      with:
+        path: artifacts
+        merge-multiple: true
+
+    - name: Update release
      uses: andelf/nightly-release@main
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -35,27 +86,19 @@ jobs:
        tag_name: nightly
        name: Nightly Client Release
        body: |
-          Requires at least Windows 7 and DirectX 11 compatible GPU to run. Compiled with MSVC v14.44.35207 in Release mode with Whole Program Optimization, as well as `/O2 /Ot /Oi /Ob3 /GF /fp:precise`.
+          Requires at least Windows 7 and DirectX 11 compatible GPU to run.
          
          # 🚨 First time here? 🚨
          If you've never downloaded the game before, you need to download `LCEWindows64.zip` and extract it to the folder where you'd like to keep the game. The other files are included in this `.zip` file!
        files: |
-            LCEWindows64.zip
-            ./x64/Release/Minecraft.Client.exe
-            ./x64/Release/Minecraft.Client.pdb
+          artifacts/*

-    - name: Update Dedicated Server release
-      uses: andelf/nightly-release@main
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  cleanup:
+    needs: [build, release]
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+    - name: Cleanup artifacts
+      uses: geekyeggo/delete-artifact@v5
      with:
-        tag_name: nightly-dedicated-server
-        name: Nightly Dedicated Server Release
-        body: |
-          Dedicated Server runtime for Windows64.
-
-          Download `LCEServerWindows64.zip` and extract it to a folder where you'd like to keep the server runtime.
-        files: |
-            LCEServerWindows64.zip
-            ./x64/Minecraft.Server/Release/Minecraft.Server.exe
-            ./x64/Minecraft.Server/Release/Minecraft.Server.pdb
+        name: build-*
@@ -26,7 +26,6 @@ mono_crash.*
 [Rr]elease/
 [Rr]eleases/
 x64/
-x64_*/
 x86/
 [Ww][Ii][Nn]32/
 [Aa][Rr][Mm]/
@@ -6,7 +6,6 @@
 #include "..\Minecraft.World\SharedConstants.h"
 #include "..\Minecraft.World\StringHelpers.h"
 #include "..\Minecraft.World\ChatPacket.h"
-#include "..\Minecraft.World\ArabicShaping.h"

 const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters;
 vector<wstring> ChatScreen::s_chatHistory;
@@ -15,12 +14,7 @@ wstring ChatScreen::s_historyDraft;

 bool ChatScreen::isAllowedChatChar(wchar_t c)
 {
-	if (c < 0x20) return false;
-	// Block Unicode bidirectional override characters that can be used to
-	// spoof chat messages or impersonate players.
-	if (c >= 0x202A && c <= 0x202E) return false; // LRE, RLE, PDF, LRO, RLO
-	if (c >= 0x2066 && c <= 0x2069) return false; // LRI, RLI, FSI, PDI
-	return true;
+	return c >= 0x20 && (c == L'\u00A7' || allowedChars.empty() || allowedChars.find(c) != wstring::npos);
 }

 ChatScreen::ChatScreen()
@@ -99,9 +93,6 @@ void ChatScreen::keyPressed(wchar_t ch, int eventKey)
    if (eventKey == Keyboard::KEY_RETURN)
 	{
        wstring trim = trimString(message);
-        { char buf[64]; sprintf_s(buf, "[CHAT] Sending (%d chars): ", (int)trim.length()); OutputDebugStringA(buf); }
-        OutputDebugStringW(trim.c_str());
-        OutputDebugStringA("\n");
        if (trim.length() > 0)
 		{
            if (!minecraft->handleClientSideCommand(trim))
@@ -144,7 +135,6 @@ void ChatScreen::keyPressed(wchar_t ch, int eventKey)
 	{
        message.insert(cursorIndex, 1, ch);
        cursorIndex++;
-        { char buf[64]; sprintf_s(buf, "[CHAT] Char U+%04X accepted (%d chars)\n", (unsigned)ch, (int)message.length()); OutputDebugStringA(buf); }
    }
 }

@@ -155,21 +145,14 @@ void ChatScreen::render(int xm, int ym, float a)
    int x = 4;
    drawString(font, prefix, x, height - 12, 0xe0e0e0);
    x += font->width(prefix);
-
-    // Shape the full message as one unit so letter connections and word order
-    // are correct. Track where the logical cursor maps in the visual string.
-    int visualCursorPos = 0;
-    wstring shaped = shapeArabicText(message, cursorIndex, &visualCursorPos);
-
-    // Render the full shaped message without re-shaping it
-    drawStringPreshaped(font, shaped, x, height - 12, 0xe0e0e0);
-
-    // Place the cursor at the correct visual position
-    wstring beforeCursorVisual = shaped.substr(0, visualCursorPos);
-    int cursorX = x + font->widthPreshaped(beforeCursorVisual);
+    wstring beforeCursor = message.substr(0, cursorIndex);
+    wstring afterCursor = message.substr(cursorIndex);
+    drawStringLiteral(font, beforeCursor, x, height - 12, 0xe0e0e0);
+    x += font->widthLiteral(beforeCursor);
    if (frame / 6 % 2 == 0)
-        drawString(font, L"_", cursorX, height - 12, 0xe0e0e0);
-
+        drawString(font, L"_", x, height - 12, 0xe0e0e0);
+    x += font->width(L"_");
+    drawStringLiteral(font, afterCursor, x, height - 12, 0xe0e0e0);
    Screen::render(xm, ym, a);
 }

@@ -342,7 +342,7 @@ void ClientConnection::handleLogin(shared_ptr<LoginPacket> packet)
 		Level *dimensionLevel = minecraft->getLevel( packet->dimension );
 		if( dimensionLevel == nullptr )
 		{
-			level = new MultiPlayerLevel(this, new LevelSettings(packet->seed, GameType::byId(packet->gameType), false, packet->m_isHardcore, packet->m_newSeaLevel, packet->m_pLevelType, packet->m_xzSize, packet->m_hellScale), packet->dimension, packet->difficulty);
+			level = new MultiPlayerLevel(this, new LevelSettings(packet->seed, GameType::byId(packet->gameType), false, false, packet->m_newSeaLevel, packet->m_pLevelType, packet->m_xzSize, packet->m_hellScale), packet->dimension, packet->difficulty);

 			// 4J Stu - We want to share the SavedDataStorage between levels
 			int otherDimensionId = packet->dimension == 0 ? -1 : 0;
@@ -411,7 +411,7 @@ void ClientConnection::handleLogin(shared_ptr<LoginPacket> packet)
 				activeLevel = minecraft->getLevel(otherDimensionId);
 			}

-			MultiPlayerLevel *dimensionLevel = new MultiPlayerLevel(this, new LevelSettings(packet->seed, GameType::byId(packet->gameType), false, packet->m_isHardcore, packet->m_newSeaLevel, packet->m_pLevelType, packet->m_xzSize, packet->m_hellScale), packet->dimension, packet->difficulty);
+			MultiPlayerLevel *dimensionLevel = new MultiPlayerLevel(this, new LevelSettings(packet->seed, GameType::byId(packet->gameType), false, false, packet->m_newSeaLevel, packet->m_pLevelType, packet->m_xzSize, packet->m_hellScale), packet->dimension, packet->difficulty);

 			dimensionLevel->savedDataStorage = activeLevel->savedDataStorage;

@@ -2870,7 +2870,7 @@ void ClientConnection::handleRespawn(shared_ptr<RespawnPacket> packet)
 		MultiPlayerLevel *dimensionLevel = (MultiPlayerLevel *)minecraft->getLevel( packet->dimension );
 		if( dimensionLevel == nullptr )
 		{
-			dimensionLevel = new MultiPlayerLevel(this, new LevelSettings(packet->mapSeed, packet->playerGameType, false, packet->m_isHardcore, packet->m_newSeaLevel, packet->m_pLevelType, packet->m_xzSize, packet->m_hellScale), packet->dimension, packet->difficulty);
+			dimensionLevel = new MultiPlayerLevel(this, new LevelSettings(packet->mapSeed, packet->playerGameType, false, minecraft->level->getLevelData()->isHardcore(), packet->m_newSeaLevel, packet->m_pLevelType, packet->m_xzSize, packet->m_hellScale), packet->dimension, packet->difficulty);

 			// 4J Stu - We want to shared the savedDataStorage between both levels
 			//if( dimensionLevel->savedDataStorage != nullptr )
@@ -3315,9 +3315,7 @@ void ClientConnection::handleTileEditorOpen(shared_ptr<TileEditorOpenPacket> pac

 void ClientConnection::handleSignUpdate(shared_ptr<SignUpdatePacket> packet)
 {
-	app.DebugPrintf("[SIGN] handleSignUpdate at (%d, %d, %d):\n", packet->x, packet->y, packet->z);
-	for (int i = 0; i < MAX_SIGN_LINES; i++)
-		app.DebugPrintf("[SIGN]   Line%d: \"%ls\"\n", i+1, packet->lines[i].c_str());
+	app.DebugPrintf("ClientConnection::handleSignUpdate - ");
 	if (minecraft->level->hasChunkAt(packet->x, packet->y, packet->z))
 	{
 		shared_ptr<TileEntity> te = minecraft->level->getTileEntity(packet->x, packet->y, packet->z);
@@ -3331,7 +3329,7 @@ void ClientConnection::handleSignUpdate(shared_ptr<SignUpdatePacket> packet)
 				ste->SetMessage(i,packet->lines[i]);
 			}

-			app.DebugPrintf("[SIGN]   verified=%d censored=%d\n", packet->m_bVerified, packet->m_bCensored);
+			app.DebugPrintf("verified = %d\tCensored = %d\n",packet->m_bVerified,packet->m_bCensored);
 			ste->SetVerified(packet->m_bVerified);
 			ste->SetCensored(packet->m_bCensored);

@@ -3339,12 +3337,12 @@ void ClientConnection::handleSignUpdate(shared_ptr<SignUpdatePacket> packet)
 		}
 		else
 		{
-			app.DebugPrintf("[SIGN]   ERROR: tile entity is not a SignTileEntity\n");
+			app.DebugPrintf("dynamic_pointer_cast<SignTileEntity>(te) == nullptr\n");
 		}
 	}
 	else
 	{
-		app.DebugPrintf("[SIGN]   ERROR: chunk not loaded at position\n");
+		app.DebugPrintf("hasChunkAt failed\n");
 	}
 }

@@ -4038,6 +4036,8 @@ void ClientConnection::handleSetPlayerTeamPacket(shared_ptr<SetPlayerTeamPacket>

 void ClientConnection::handleParticleEvent(shared_ptr<LevelParticlesPacket> packet)
 {
+    ePARTICLE_TYPE particleId = (ePARTICLE_TYPE)Integer::parseInt(packet->getName());
+
 	for (int i = 0; i < packet->getCount(); i++)
 	{
 		double xVarience = random->nextGaussian() * packet->getXDist();
@@ -4047,10 +4047,6 @@ void ClientConnection::handleParticleEvent(shared_ptr<LevelParticlesPacket> pack
 		double ya = random->nextGaussian() * packet->getMaxSpeed();
 		double za = random->nextGaussian() * packet->getMaxSpeed();

-		// TODO: determine particle ID from name
-		assert(0);
-		ePARTICLE_TYPE particleId = eParticleType_heart;
-
 		level->addParticle(particleId, packet->getX() + xVarience, packet->getY() + yVarience, packet->getZ() + zVarience, xa, ya, za);
 	}
 }
@@ -1,13 +1,5 @@
 #include "stdafx.h"
 #include "ClientConstants.h"
-#include "Common/BuildVer.h"

 const wstring ClientConstants::VERSION_STRING = wstring(L"Minecraft LCE ") + VER_FILEVERSION_STR_W;//+ SharedConstants::VERSION_STRING;
 const wstring ClientConstants::BRANCH_STRING = VER_BRANCHVERSION_STR_W;
-
-// Default value for the toggle. If BuildVer defines VER_SHOW_VERSION_WATERMARK, use that.
-#ifdef VER_SHOW_VERSION_WATERMARK
-const bool ClientConstants::SHOW_VERSION_WATERMARK = (VER_SHOW_VERSION_WATERMARK != 0);
-#else
-const bool ClientConstants::SHOW_VERSION_WATERMARK = false;
-#endif
@@ -15,8 +15,5 @@ public:
 	static const wstring VERSION_STRING;
 	static const wstring BRANCH_STRING;

-	// Toggle to show/hide the version/branch watermark in the debug overlay
-	static const bool SHOW_VERSION_WATERMARK;
-
 	static const bool DEADMAU5_CAMERA_CHEATS = false;
 };
@@ -45,7 +45,6 @@
 #define GAME_HOST_OPTION_BITMASK_DOTILEDROPS		0x08000000
 #define GAME_HOST_OPTION_BITMASK_NATURALREGEN		0x10000000
 #define GAME_HOST_OPTION_BITMASK_DODAYLIGHTCYCLE	0x20000000
-#define GAME_HOST_OPTION_BITMASK_HARDCORE		0x40000000 // 4J Added - for hardcore mode
 #define GAME_HOST_OPTION_BITMASK_ALL				0xFFFFFFFF

 #define GAME_HOST_OPTION_BITMASK_WORLDSIZE_BITSHIFT	20
@@ -648,7 +648,6 @@ enum eGameHostOption
 	eGameHostOption_DoTileDrops,
 	eGameHostOption_NaturalRegeneration,
 	eGameHostOption_DoDaylightCycle,
-	eGameHostOption_Hardcore, // 4J Added - for hardcore mode
 };

 // 4J-PB - If any new DLC items are added to the TMSFiles, this array needs updated
@@ -879,8 +878,7 @@ enum EControllerActions
 	MINECRAFT_ACTION_SPAWN_CREEPER,
 	MINECRAFT_ACTION_CHANGE_SKIN,
 	MINECRAFT_ACTION_FLY_TOGGLE,
-	MINECRAFT_ACTION_RENDER_DEBUG,
-	MINECRAFT_ACTION_SCREENSHOT
+	MINECRAFT_ACTION_RENDER_DEBUG
 };

 enum eMCLang
@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonMedia", "CommonMedia.vcxproj", "{21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}"
-EndProject
-Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 2
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark
-		SccProjectUniqueName0 = CommonMedia.vcxproj
-		SccLocalPath0 = .
-		SccLocalPath1 = .
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}.Debug|Win32.ActiveCfg = Debug|Win32
-		{21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}.Debug|Win32.Build.0 = Debug|Win32
-		{21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}.Release|Win32.ActiveCfg = Release|Win32
-		{21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Media\ChestMenu720.swf" />
-    <None Include="Media\CreateWorldMenu720.swf" />
-    <None Include="Media\CreativeMenu720.swf" />
-    <None Include="Media\DebugMenu720.swf" />
-    <None Include="Media\FullscreenProgress720.swf" />
-    <None Include="Media\HUD720.swf" />
-    <None Include="Media\InventoryMenu720.swf" />
-    <None Include="Media\languages.loc" />
-    <None Include="Media\LaunchMoreOptionsMenu720.swf" />
-    <None Include="Media\LoadMenu720.swf" />
-    <None Include="Media\LoadOrJoinMenu720.swf" />
-    <None Include="Media\MainMenu720.swf" />
-    <None Include="Media\media.arc" />
-    <None Include="Media\Panorama720.swf" />
-    <None Include="Media\PauseMenu720.swf" />
-    <None Include="Media\skin.swf" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Media\strings.resx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="Media\media.txt" />
-    <Text Include="Media\strings_begin.txt" />
-    <Text Include="Media\strings_Controls.txt" />
-    <Text Include="Media\strings_Credits.txt" />
-    <Text Include="Media\strings_Descriptions.txt" />
-    <Text Include="Media\strings_end.txt" />
-    <Text Include="Media\strings_HowToPlay.txt" />
-    <Text Include="Media\strings_ItemsAndTiles.txt" />
-    <Text Include="Media\strings_Misc.txt" />
-    <Text Include="Media\strings_PotionsAndEnchantments.txt" />
-    <Text Include="Media\strings_Tips.txt" />
-    <Text Include="Media\strings_Tooltips.txt" />
-    <Text Include="Media\strings_Tutorial.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Durango\strings.h" />
-    <ClInclude Include="..\Orbis\strings.h" />
-    <ClInclude Include="..\PS3\strings.h" />
-    <ClInclude Include="..\Windows64\strings.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{21BBD32C-AF5E-4741-8B80-3B73FC0D0F27}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-    <SccProjectName>SAK</SccProjectName>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccProvider>SAK</SccProvider>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine>echo Creating languages.loc
-copy .\Media\strings.resx .\Media\en-EN.lang
-copy .\Media\fr-FR\strings.resx .\Media\fr-FR\fr-FR.lang
-copy .\Media\ja-JP\strings.resx .\Media\ja-JP\ja-JP.lang
-..\..\..\Tools\NewLocalisationPacker.exe --static .\Media .\Media\languages.loc
-
-echo Making archive
-..\..\..\Tools\ArchiveFilePacker.exe -cd $(ProjectDir)\Media media.arc media.txt
-
-echo Copying Durango strings.h
-copy .\Media\strings.h ..\Durango\strings.h
-
-echo Copying PS3 strings.h
-copy .\Media\strings.h ..\PS3\strings.h
-
-echo Copying PS4 strings.h
-copy .\Media\strings.h ..\Orbis\strings.h
-
-echo Copying Win strings.h
-copy .\Media\strings.h ..\Windows64\strings.h</NMakeBuildCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="IggyMedia">
-      <UniqueIdentifier>{55c7ab2e-b3e5-4aed-9ffe-3308591d9c34}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Strings">
-      <UniqueIdentifier>{eaa0eb72-0b27-4080-ad53-f68e42f37ba8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Archive">
-      <UniqueIdentifier>{711ad95b-eb56-4e18-b001-34ad7b8075a3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Archive\Win64">
-      <UniqueIdentifier>{1432ec3d-c5d0-46da-91b6-e7737095a97e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Archive\PS4">
-      <UniqueIdentifier>{4b2aeaf1-04d7-454d-b2d9-08364799831c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Archive\PS3">
-      <UniqueIdentifier>{4b0eaef6-fa2f-4605-b0da-a81ffb5659bc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Archive\Durango">
-      <UniqueIdentifier>{bf1c74da-21f1-4bdd-98ed-83457946e4cc}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Media\ChestMenu720.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-    <None Include="Media\CreateWorldMenu720.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-    <None Include="Media\CreativeMenu720.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-    <None Include="Media\DebugMenu720.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-    <None Include="Media\FullscreenProgress720.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-    <None Include="Media\HUD720.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-    <None Include="Media\InventoryMenu720.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-    <None Include="Media\media.arc">
-      <Filter>Archive</Filter>
-    </None>
-    <None Include="Media\languages.loc">
-      <Filter>Archive</Filter>
-    </None>
-    <None Include="Media\skin.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-    <None Include="Media\MainMenu720.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-    <None Include="Media\Panorama720.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-    <None Include="Media\LoadOrJoinMenu720.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-    <None Include="Media\LaunchMoreOptionsMenu720.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-    <None Include="Media\LoadMenu720.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-    <None Include="Media\PauseMenu720.swf">
-      <Filter>IggyMedia</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Media\strings.resx">
-      <Filter>Strings</Filter>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="Media\strings_begin.txt">
-      <Filter>Strings</Filter>
-    </Text>
-    <Text Include="Media\strings_Controls.txt">
-      <Filter>Strings</Filter>
-    </Text>
-    <Text Include="Media\strings_Credits.txt">
-      <Filter>Strings</Filter>
-    </Text>
-    <Text Include="Media\strings_Descriptions.txt">
-      <Filter>Strings</Filter>
-    </Text>
-    <Text Include="Media\strings_end.txt">
-      <Filter>Strings</Filter>
-    </Text>
-    <Text Include="Media\strings_HowToPlay.txt">
-      <Filter>Strings</Filter>
-    </Text>
-    <Text Include="Media\strings_ItemsAndTiles.txt">
-      <Filter>Strings</Filter>
-    </Text>
-    <Text Include="Media\strings_Misc.txt">
-      <Filter>Strings</Filter>
-    </Text>
-    <Text Include="Media\strings_PotionsAndEnchantments.txt">
-      <Filter>Strings</Filter>
-    </Text>
-    <Text Include="Media\strings_Tips.txt">
-      <Filter>Strings</Filter>
-    </Text>
-    <Text Include="Media\strings_Tooltips.txt">
-      <Filter>Strings</Filter>
-    </Text>
-    <Text Include="Media\strings_Tutorial.txt">
-      <Filter>Strings</Filter>
-    </Text>
-    <Text Include="Media\media.txt">
-      <Filter>Archive</Filter>
-    </Text>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Durango\strings.h">
-      <Filter>Archive\Durango</Filter>
-    </ClInclude>
-    <ClInclude Include="..\PS3\strings.h">
-      <Filter>Archive\PS3</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Orbis\strings.h">
-      <Filter>Archive\PS4</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Windows64\strings.h">
-      <Filter>Archive\Win64</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
@@ -8084,16 +8084,6 @@ void CMinecraftApp::SetGameHostOption(unsigned int &uiHostSettings, eGameHostOpt
 		uiHostSettings&=~GAME_HOST_OPTION_BITMASK_WORLDSIZE;
 		uiHostSettings|=(GAME_HOST_OPTION_BITMASK_WORLDSIZE & (uiVal<<GAME_HOST_OPTION_BITMASK_WORLDSIZE_BITSHIFT));
 		break;
-	case eGameHostOption_Hardcore: // 4J Added - for hardcore mode
-		if(uiVal!=0)
-		{
-			uiHostSettings |= GAME_HOST_OPTION_BITMASK_HARDCORE;
-		}
-		else
-		{
-			uiHostSettings &= ~GAME_HOST_OPTION_BITMASK_HARDCORE;
-		}
-		break;
 	case eGameHostOption_All:
 		uiHostSettings=uiVal;
 		break;
@@ -8195,9 +8185,6 @@ unsigned int CMinecraftApp::GetGameHostOption(unsigned int uiHostSettings, eGame
 	case eGameHostOption_DoDaylightCycle:
 		return !(uiHostSettings&GAME_HOST_OPTION_BITMASK_DODAYLIGHTCYCLE);
 		break;
-	case eGameHostOption_Hardcore: // 4J Added - for hardcore mode
-		return (uiHostSettings&GAME_HOST_OPTION_BITMASK_HARDCORE) ? 1 : 0;
-		break;
 	}

 	return false;
@@ -805,10 +805,6 @@ public:
 	void SetCorruptSaveDeleted(bool bVal) {m_bCorruptSaveDeleted=bVal;}
 	bool GetCorruptSaveDeleted(void) {return m_bCorruptSaveDeleted;}

-	// 4J Added: Store save folder name for hardcore world deletion on Win64
-	void SetCurrentSaveFolderName(const wstring& name) { m_currentSaveFolderName = name; }
-	const wstring& GetCurrentSaveFolderName() const { return m_currentSaveFolderName; }
-
 	void EnterSaveNotificationSection();
 	void LeaveSaveNotificationSection();
 private:
@@ -830,7 +826,6 @@ private:
 	CRITICAL_SECTION csAdditionalSkinBoxes;
 	CRITICAL_SECTION csAnimOverrideBitmask;
 	bool m_bCorruptSaveDeleted;
-	wstring m_currentSaveFolderName; // 4J Added: for hardcore world deletion on Win64

 	DWORD m_dwAdditionalModelParts[XUSER_MAX_COUNT];

@@ -38220,56 +38220,6 @@
 <Time>19</Time>
 <Command>stop</Command>
 </NamedFrame>
-<NamedFrame>
-<Name>NormalHardcore</Name>
-<Time>20</Time>
-<Command>stop</Command>
-</NamedFrame>
-<NamedFrame>
-<Name>HalfHardcore</Name>
-<Time>21</Time>
-<Command>stop</Command>
-</NamedFrame>
-<NamedFrame>
-<Name>FullHardcore</Name>
-<Time>22</Time>
-<Command>stop</Command>
-</NamedFrame>
-<NamedFrame>
-<Name>HalfPoisonHardcore</Name>
-<Time>23</Time>
-<Command>stop</Command>
-</NamedFrame>
-<NamedFrame>
-<Name>FullPoisonHardcore</Name>
-<Time>24</Time>
-<Command>stop</Command>
-</NamedFrame>
-<NamedFrame>
-<Name>NormalFlashHardcore</Name>
-<Time>25</Time>
-<Command>stop</Command>
-</NamedFrame>
-<NamedFrame>
-<Name>HalfFlashHardcore</Name>
-<Time>26</Time>
-<Command>stop</Command>
-</NamedFrame>
-<NamedFrame>
-<Name>FullFlashHardcore</Name>
-<Time>27</Time>
-<Command>stop</Command>
-</NamedFrame>
-<NamedFrame>
-<Name>HalfPoisonFlashHardcore</Name>
-<Time>28</Time>
-<Command>stop</Command>
-</NamedFrame>
-<NamedFrame>
-<Name>FullPoisonFlashHardcore</Name>
-<Time>29</Time>
-<Command>stop</Command>
-</NamedFrame>
 </NamedFrames>
 <Timeline>
 <Id>Border</Id>
@@ -38324,16 +38274,6 @@
 <Interpolation>0</Interpolation>
 <Prop>Graphics\HUD\Health_Background_Flash.png</Prop>
 </KeyFrame>
-<KeyFrame>
-<Time>20</Time>
-<Interpolation>0</Interpolation>
-<Prop>Graphics\HUD\Health_Background_Hardcore.png</Prop>
-</KeyFrame>
-<KeyFrame>
-<Time>25</Time>
-<Interpolation>0</Interpolation>
-<Prop>Graphics\HUD\Health_Background_Hardcore_Flash.png</Prop>
-</KeyFrame>
 </Timeline>
 <Timeline>
 <Id>Heart</Id>
@@ -38459,66 +38399,6 @@
 <Prop>true</Prop>
 <Prop>Graphics\HUD\HorseHealth_Half_Flash.png</Prop>
 </KeyFrame>
-<KeyFrame>
-<Time>20</Time>
-<Interpolation>0</Interpolation>
-<Prop>false</Prop>
-<Prop></Prop>
-</KeyFrame>
-<KeyFrame>
-<Time>21</Time>
-<Interpolation>0</Interpolation>
-<Prop>true</Prop>
-<Prop>Graphics\HUD\Health_Half_Hardcore.png</Prop>
-</KeyFrame>
-<KeyFrame>
-<Time>22</Time>
-<Interpolation>0</Interpolation>
-<Prop>true</Prop>
-<Prop>Graphics\HUD\Health_Full_Hardcore.png</Prop>
-</KeyFrame>
-<KeyFrame>
-<Time>23</Time>
-<Interpolation>0</Interpolation>
-<Prop>true</Prop>
-<Prop>Graphics\HUD\Health_Half_Poison_Hardcore.png</Prop>
-</KeyFrame>
-<KeyFrame>
-<Time>24</Time>
-<Interpolation>0</Interpolation>
-<Prop>true</Prop>
-<Prop>Graphics\HUD\Health_Full_Poison_Hardcore.png</Prop>
-</KeyFrame>
-<KeyFrame>
-<Time>25</Time>
-<Interpolation>0</Interpolation>
-<Prop>false</Prop>
-<Prop></Prop>
-</KeyFrame>
-<KeyFrame>
-<Time>26</Time>
-<Interpolation>0</Interpolation>
-<Prop>true</Prop>
-<Prop>Graphics\HUD\Health_Half_Flash_Hardcore.png</Prop>
-</KeyFrame>
-<KeyFrame>
-<Time>27</Time>
-<Interpolation>0</Interpolation>
-<Prop>true</Prop>
-<Prop>Graphics\HUD\Health_Full_Flash_Hardcore.png</Prop>
-</KeyFrame>
-<KeyFrame>
-<Time>28</Time>
-<Interpolation>0</Interpolation>
-<Prop>true</Prop>
-<Prop>Graphics\HUD\Health_Half_Poison_Flash_Hardcore.png</Prop>
-</KeyFrame>
-<KeyFrame>
-<Time>29</Time>
-<Interpolation>0</Interpolation>
-<Prop>true</Prop>
-<Prop>Graphics\HUD\Health_Full_Poison_Flash_Hardcore.png</Prop>
-</KeyFrame>
 </Timeline>
 </Timelines>
 </XuiVisual>
@@ -47,7 +47,8 @@ public:
 	{
 		JOINGAME_SUCCESS,
 		JOINGAME_FAIL_GENERAL,
-		JOINGAME_FAIL_SERVER_FULL
+		JOINGAME_FAIL_SERVER_FULL,
+		JOINGAME_PENDING
 	} eJoinGameResult;

 	void			Initialise();
@@ -173,6 +173,11 @@ bool CPlatformNetworkManagerStub::Initialise(CGameNetworkManager *pGameNetworkMa
 	m_bSearchPending = false;

 	m_bIsOfflineGame = false;
+#ifdef _WINDOWS64
+	m_bJoinPending = false;
+	m_joinLocalUsersMask = 0;
+	m_joinHostName[0] = 0;
+#endif
 	m_pSearchParam = nullptr;
 	m_SessionsUpdatedCallback = nullptr;

@@ -282,6 +287,38 @@ void CPlatformNetworkManagerStub::DoWork()
 			m_bLeaveGameOnTick = false;
 		}
 	}
+
+	if (m_bJoinPending)
+	{
+		WinsockNetLayer::eJoinState state = WinsockNetLayer::GetJoinState();
+		if (state == WinsockNetLayer::eJoinState_Success)
+		{
+			WinsockNetLayer::FinalizeJoin();
+
+			BYTE localSmallId = WinsockNetLayer::GetLocalSmallId();
+
+			IQNet::m_player[localSmallId].m_smallId = localSmallId;
+			IQNet::m_player[localSmallId].m_isRemote = false;
+			IQNet::m_player[localSmallId].m_isHostPlayer = false;
+			IQNet::m_player[localSmallId].m_resolvedXuid = Win64Xuid::ResolvePersistentXuid();
+
+			Minecraft* pMinecraft = Minecraft::GetInstance();
+			wcscpy_s(IQNet::m_player[localSmallId].m_gamertag, 32, pMinecraft->user->name.c_str());
+			IQNet::s_playerCount = localSmallId + 1;
+
+			NotifyPlayerJoined(&IQNet::m_player[0]);
+			NotifyPlayerJoined(&IQNet::m_player[localSmallId]);
+
+			m_pGameNetworkManager->StateChange_AnyToStarting();
+			m_bJoinPending = false;
+		}
+		else if (state == WinsockNetLayer::eJoinState_Failed ||
+				 state == WinsockNetLayer::eJoinState_Rejected ||
+				 state == WinsockNetLayer::eJoinState_Cancelled)
+		{
+			m_bJoinPending = false;
+		}
+	}
 #endif
 }

@@ -511,36 +548,22 @@ int CPlatformNetworkManagerStub::JoinGame(FriendSessionInfo* searchResult, int l
 	IQNet::m_player[0].m_smallId = 0;
 	IQNet::m_player[0].m_isRemote = true;
 	IQNet::m_player[0].m_isHostPlayer = true;
-	// Remote host still maps to legacy host XUID in mixed old/new sessions.
 	IQNet::m_player[0].m_resolvedXuid = Win64Xuid::GetLegacyEmbeddedHostXuid();
 	wcsncpy_s(IQNet::m_player[0].m_gamertag, 32, searchResult->data.hostName, _TRUNCATE);

 	WinsockNetLayer::StopDiscovery();

-	if (!WinsockNetLayer::JoinGame(hostIP, hostPort))
+	wcsncpy_s(m_joinHostName, 32, searchResult->data.hostName, _TRUNCATE);
+	m_joinLocalUsersMask = localUsersMask;
+
+	if (!WinsockNetLayer::BeginJoinGame(hostIP, hostPort))
 	{
 		app.DebugPrintf("Win64 LAN: Failed to connect to %s:%d\n", hostIP, hostPort);
 		return CGameNetworkManager::JOINGAME_FAIL_GENERAL;
 	}

-	BYTE localSmallId = WinsockNetLayer::GetLocalSmallId();
-
-	IQNet::m_player[localSmallId].m_smallId = localSmallId;
-	IQNet::m_player[localSmallId].m_isRemote = false;
-	IQNet::m_player[localSmallId].m_isHostPlayer = false;
-	// Local non-host identity is the persistent uid.dat XUID.
-	IQNet::m_player[localSmallId].m_resolvedXuid = Win64Xuid::ResolvePersistentXuid();
-
-	Minecraft* pMinecraft = Minecraft::GetInstance();
-	wcscpy_s(IQNet::m_player[localSmallId].m_gamertag, 32, pMinecraft->user->name.c_str());
-	IQNet::s_playerCount = localSmallId + 1;
-
-	NotifyPlayerJoined(&IQNet::m_player[0]);
-	NotifyPlayerJoined(&IQNet::m_player[localSmallId]);
-
-	m_pGameNetworkManager->StateChange_AnyToStarting();
-
-	return CGameNetworkManager::JOINGAME_SUCCESS;
+	m_bJoinPending = true;
+	return CGameNetworkManager::JOINGAME_PENDING;
 #else
 	return CGameNetworkManager::JOINGAME_SUCCESS;
 #endif
@@ -77,6 +77,12 @@ private:
 	bool			m_bIsPrivateGame;
 	int				m_flagIndexSize;

+#ifdef _WINDOWS64
+	bool			m_bJoinPending;
+	int				m_joinLocalUsersMask;
+	wchar_t			m_joinHostName[32];
+#endif
+
 	// This is only maintained by the host, and is not valid on client machines
 	GameSessionData m_hostGameSessionData;
 	CGameNetworkManager *m_pGameNetworkManager;
@@ -9,6 +9,7 @@
 #include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
 #include "..\..\MultiplayerLocalPlayer.h"
 #include "..\..\Minecraft.h"
+#include "..\..\Options.h"

 #ifdef __ORBIS__
 #include <pad.h>
@@ -16,8 +17,6 @@

 #ifdef _WINDOWS64
 #include "..\..\Windows64\KeyboardMouseInput.h"
-
-SavedInventoryCursorPos g_savedInventoryCursorPos = { 0.0f, 0.0f, false };
 #endif

 IUIScene_AbstractContainerMenu::IUIScene_AbstractContainerMenu()
@@ -1677,7 +1676,13 @@ vector<HtmlString> *IUIScene_AbstractContainerMenu::GetItemDescription(Slot *slo
 {
 	if(slot == nullptr) return nullptr;

-	vector<HtmlString> *lines = slot->getItem()->getHoverText(nullptr, false);
+	bool advanced = false;
+	if (const Minecraft* pMinecraft = Minecraft::GetInstance())
+	{
+		if (pMinecraft->options)
+			advanced = pMinecraft->options->advancedTooltips;
+	}
+	vector<HtmlString> *lines = slot->getItem()->getHoverText(nullptr, advanced);

 	// Add rarity to first line
 	if (lines->size() > 0)
@@ -1,15 +1,5 @@
 #pragma once

-#ifdef _WINDOWS64
-struct SavedInventoryCursorPos
-{
-	float x;
-	float y;
-	bool hasSavedPos;
-};
-extern SavedInventoryCursorPos g_savedInventoryCursorPos;
-#endif
-
 // Uncomment to enable tap input detection to jump 1 slot. Doesn't work particularly well yet, and I feel the system does not need it.
 // Would probably be required if we decide to slow down the pointer movement.
 // 4J Stu - There was a request to be able to navigate the scenes with the dpad, so I have used much of the TAP_DETECTION
@@ -20,9 +20,9 @@ protected:
 		eGroupTab_Right
 	};

-	static const int m_iMaxHSlotC = 12;
-	static const int m_iMaxHCraftingSlotC = 10;
-	static const int m_iMaxVSlotC = 17; 
+	static const int m_iMaxHSlotC = 40;
+	static const int m_iMaxHCraftingSlotC = 40;
+	static const int m_iMaxVSlotC = 99; 
 	static const int m_iMaxDisplayedVSlotC = 3;
 	static const int m_iIngredients3x3SlotC = 9;
 	static const int m_iIngredients2x2SlotC = 4;
@@ -410,72 +410,11 @@ int IUIScene_PauseMenu::ExitWorldThreadProc( void* lpParameter )
 	return S_OK;
 }

-#ifdef _WINDOWS64
-static bool Win64_DeleteSaveDirectory(const wchar_t* wPath)
-{
-	wchar_t wSearch[MAX_PATH];
-	swprintf_s(wSearch, MAX_PATH, L"%s\\*", wPath);
-	WIN32_FIND_DATAW fd;
-	HANDLE hFind = FindFirstFileW(wSearch, &fd);
-	if (hFind != INVALID_HANDLE_VALUE)
-	{
-		do
-		{
-			if (wcscmp(fd.cFileName, L".") == 0 || wcscmp(fd.cFileName, L"..") == 0) continue;
-			wchar_t wChild[MAX_PATH];
-			swprintf_s(wChild, MAX_PATH, L"%s\\%s", wPath, fd.cFileName);
-			if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-				Win64_DeleteSaveDirectory(wChild);
-			else
-				DeleteFileW(wChild);
-		} while (FindNextFileW(hFind, &fd));
-		FindClose(hFind);
-	}
-	return RemoveDirectoryW(wPath) != 0;
-}
-#endif // _WINDOWS64
-
 // This function performs the meat of exiting from a level. It should be called from a thread other than the main thread.
 void IUIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 {
 	Minecraft *pMinecraft=Minecraft::GetInstance();

-	// 4J Added: Capture hardcore delete info before the server is destroyed
-#ifdef _WINDOWS64
-	bool shouldDeleteHardcoreWorld = false;
-	wstring hardcoreSaveFolderName;
-	if (MinecraftServer::getInstance() != nullptr && MinecraftServer::getInstance()->getDeleteWorldOnExit())
-	{
-		shouldDeleteHardcoreWorld = true;
-		// Try 1: Use the save folder name stored by UIScene_LoadMenu::StartGameFromSave (works for existing saves)
-		hardcoreSaveFolderName = app.GetCurrentSaveFolderName();
-		if (!hardcoreSaveFolderName.empty())
-		{
-			app.DebugPrintf("Hardcore mode: save folder from app = '%ls'\n", hardcoreSaveFolderName.c_str());
-		}
-		// Try 2: StorageManager (may work for new saves after first autosave)
-		if (hardcoreSaveFolderName.empty())
-		{
-			char szSaveFolder[MAX_SAVEFILENAME_LENGTH] = {};
-			StorageManager.GetSaveUniqueFilename(szSaveFolder);
-			if (szSaveFolder[0] != '\0')
-			{
-				wchar_t wSaveFolder[MAX_SAVEFILENAME_LENGTH] = {};
-				mbstowcs(wSaveFolder, szSaveFolder, MAX_SAVEFILENAME_LENGTH - 1);
-				hardcoreSaveFolderName = wSaveFolder;
-				app.DebugPrintf("Hardcore mode: save folder from StorageManager = '%s'\n", szSaveFolder);
-			}
-		}
-		// Try 3: Stored during loadLevel
-		if (hardcoreSaveFolderName.empty())
-		{
-			hardcoreSaveFolderName = MinecraftServer::getInstance()->getSaveFolderName();
-			app.DebugPrintf("Hardcore mode: save folder from server = '%ls'\n", hardcoreSaveFolderName.c_str());
-		}
-		MinecraftServer::getInstance()->setDeleteWorldOnExit(false);
-	}
-#endif
-
 	int exitReasonStringId = pMinecraft->progressRenderer->getCurrentTitle();
 	int exitReasonTitleId = IDS_CONNECTION_LOST;

@@ -686,17 +625,6 @@ void IUIScene_PauseMenu::_ExitWorld(LPVOID lpParameter)
 	{
 		Sleep(1);
 	}
-	// 4J Added: Hardcore mode — delete world save data now that the server is fully stopped
-#ifdef _WINDOWS64
-	if (shouldDeleteHardcoreWorld && !hardcoreSaveFolderName.empty())
-	{
-		wchar_t wFolderPath[MAX_PATH] = {};
-		swprintf_s(wFolderPath, MAX_PATH, L"Windows64\\GameHDD\\%s", hardcoreSaveFolderName.c_str());
-		app.DebugPrintf("Hardcore mode: Deleting world save folder '%ls'\n", wFolderPath);
-		Win64_DeleteSaveDirectory(wFolderPath);
-	}
-#endif
-
 	pMinecraft->setLevel(nullptr,exitReasonStringId,nullptr,saveStats);

 	TelemetryManager->Flush();
@@ -4,6 +4,7 @@
 #include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
 #include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
 #include "..\..\Minecraft.h"
+#include "..\..\Options.h"
 #include "..\..\MultiPlayerLocalPlayer.h"
 #include "..\..\ClientConnection.h"
 #include "IUIScene_TradingMenu.h"
@@ -368,7 +369,13 @@ void IUIScene_TradingMenu::setTradeItem(int index, shared_ptr<ItemInstance> item

 vector<HtmlString> *IUIScene_TradingMenu::GetItemDescription(shared_ptr<ItemInstance> item)
 {
-	vector<HtmlString> *lines = item->getHoverText(nullptr, false);
+	bool advanced = false;
+	if (const Minecraft* pMinecraft = Minecraft::GetInstance())
+	{
+		if (pMinecraft->options)
+			advanced = pMinecraft->options->advancedTooltips;
+	}
+	vector<HtmlString> *lines = item->getHoverText(nullptr, advanced);

 	// Add rarity to first line
 	if (lines->size() > 0)
@@ -141,9 +141,6 @@ S32 UIBitmapFont::GetCodepointGlyph(U32 codepoint)
 	// 4J-JEV: Change "right single quotation marks" to apostrophies.
 	if (codepoint == 0x2019) codepoint = 0x27;

-	if (!m_cFontData->hasGlyph(codepoint))
-		return IGGY_GLYPH_INVALID;
-
 	return m_cFontData->getGlyphId(codepoint);
 }

@@ -256,6 +253,19 @@ rrbool UIBitmapFont::GetGlyphBitmap(S32 glyph,F32 pixel_scale,IggyBitmapCharacte
 	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)

@@ -3,7 +3,6 @@
 #include "UIControl.h"
 #include "..\..\..\Minecraft.World\StringHelpers.h"
 #include "..\..\..\Minecraft.World\JavaMath.h"
-#include "..\..\..\Minecraft.World\ArabicShaping.h"

 UIControl_Base::UIControl_Base()
 {
@@ -33,16 +32,13 @@ void UIControl_Base::tick()
 		//app.DebugPrintf("Calling SetLabel - '%ls'\n", m_label.c_str());
 		m_bLabelChanged = false;

-		// Shape the text before sending to Iggy; m_label stays unshaped for future updates
-		wstring shaped = shapeArabicText(m_label.getString());
-
 		IggyDataValue result;
 		IggyDataValue value[1];
 		value[0].type = IGGY_DATATYPE_string_UTF16;
 		IggyStringUTF16 stringVal;

-		stringVal.string = (IggyUTF16*) shaped.c_str();
-		stringVal.length = (int)shaped.length();
+		stringVal.string = (IggyUTF16*) m_label.c_str();
+		stringVal.length = m_label.length();
 		value[0].string16 = stringVal;

 		IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_setLabelFunc , 1 , value );
@@ -60,16 +56,13 @@ void UIControl_Base::setLabel(UIString label, bool instant, bool force)
 	{
 		m_bLabelChanged = false;

-		// Shape the text before sending to Iggy; m_label stays unshaped for future updates
-		wstring shaped = shapeArabicText(m_label.getString());
-
 		IggyDataValue result;
 		IggyDataValue value[1];
 		value[0].type = IGGY_DATATYPE_string_UTF16;
 		IggyStringUTF16 stringVal;

-		stringVal.string = (IggyUTF16*) shaped.c_str();
-		stringVal.length = (int)shaped.length();
+		stringVal.string = (IggyUTF16*)m_label.c_str();
+		stringVal.length = m_label.length();
 		value[0].string16 = stringVal;

 		IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_setLabelFunc , 1 , value );
@@ -2,7 +2,6 @@
 #include "UI.h"
 #include "UIControl_Label.h"
 #include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\ArabicShaping.h"

 UIControl_Label::UIControl_Label()
 {
@@ -23,15 +22,13 @@ void UIControl_Label::init(UIString label)
 {
 	m_label = label;

-	wstring shaped = shapeArabicText(m_label.getString());
-
 	IggyDataValue result;
 	IggyDataValue value[1];
 	value[0].type = IGGY_DATATYPE_string_UTF16;
 	IggyStringUTF16 stringVal;

-	stringVal.string = (IggyUTF16*)shaped.c_str();
-	stringVal.length = (int)shaped.length();
+	stringVal.string = (IggyUTF16*)label.c_str();
+	stringVal.length = label.length();
 	value[0].string16 = stringVal;
 	IggyResult out = IggyPlayerCallMethodRS ( m_parentScene->getMovie() , &result, getIggyValuePath() , m_initFunc , 1 , value );
 }
@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_SaveList.h"
-#include "..\..\..\Minecraft.World\ArabicShaping.h"

 bool UIControl_SaveList::setupControl(UIScene *scene, IggyValuePath *parent, const string &controlName)
 {
@@ -70,14 +69,12 @@ void UIControl_SaveList::addItem(const string &label, const wstring &iconName, i

 void UIControl_SaveList::addItem(const wstring &label, const wstring &iconName, int data)
 {
-	wstring shaped = shapeArabicText(label);
-
 	IggyDataValue result;
 	IggyDataValue value[3];

 	IggyStringUTF16 stringVal;
-	stringVal.string = (IggyUTF16*)shaped.c_str();
-	stringVal.length = static_cast<S32>(shaped.length());
+	stringVal.string = (IggyUTF16*)label.c_str();
+	stringVal.length = static_cast<S32>(label.length());
 	value[0].type = IGGY_DATATYPE_string_UTF16;
 	value[0].string16 = stringVal;

@@ -66,12 +66,44 @@ void UIControl_Slider::init(UIString label, int id, int min, int max, int curren
 #endif
 }

+bool IsUsingKeyboardMouse()
+{
+#ifdef _WINDOWS64
+
+    if (g_KBMInput.IsKBMActive()) return true;
+
+    return g_KBMInput.HasAnyInput();
+#else
+    return false;
+#endif
+}
+
 void UIControl_Slider::handleSliderMove(int newValue)
 {
 	if (m_current!=newValue)
 	{
-		ui.PlayUISFX(eSFX_Scroll);
-		m_current = newValue;
+		int valueCount = 1;
+		if (!m_allPossibleLabels.empty()) {
+			valueCount = static_cast<int>(m_allPossibleLabels.size());
+		}
+		else {
+			long long range = static_cast<long long>(m_max) - static_cast<long long>(m_min) + 1;
+			if (range <= 0) range = 1;
+			valueCount = static_cast<int>(range);
+		}
+
+		if (IsUsingKeyboardMouse() == true) {
+            if (newValue % 10 == 0) {
+                ui.PlayUISFX(eSFX_Scroll);
+                m_current = newValue;
+			} else if (valueCount <= 20) {
+				ui.PlayUISFX(eSFX_Scroll);
+				m_current = newValue;
+			}
+		} else {
+			ui.PlayUISFX(eSFX_Scroll);
+			m_current = newValue;
+		}

 		if(newValue < m_allPossibleLabels.size())
 		{
@@ -216,13 +216,23 @@ UIControl_TextInput::EDirectEditResult UIControl_TextInput::tickDirectEdit()
 	if (g_KBMInput.IsKeyPressed('V') && g_KBMInput.IsKeyDown(VK_CONTROL))
 	{
 		wstring pasted = Screen::getClipboard();
-		for (size_t i = 0; i < pasted.length(); i++)
+		wstring sanitized;
+		sanitized.reserve(pasted.length());
+
+		for (wchar_t pc : pasted)
+		{        
+			if (pc >= 0x20) // Keep printable characters
+			{
+				if (m_iCharLimit > 0 && (m_editBuffer.length() + sanitized.length()) >= (size_t)m_iCharLimit)
+					break;
+				sanitized += pc;
+			}
+		}
+
+		if (!sanitized.empty())
 		{
-			wchar_t pc = pasted[i];
-			if (pc < 0x20) continue; // skip control characters
-			if (m_iCharLimit > 0 && (int)m_editBuffer.length() >= m_iCharLimit) break;
-			m_editBuffer.insert(m_iCursorPos, 1, pc);
-			m_iCursorPos++;
+			m_editBuffer.insert(m_iCursorPos, sanitized);
+			m_iCursorPos += (int)sanitized.length();
 			changed = true;
 		}
 	}
@@ -13,7 +13,6 @@
 #include "..\..\EnderDragonRenderer.h"
 #include "..\..\MultiPlayerLocalPlayer.h"
 #include "UIFontData.h"
-#include "UIUnicodeBitmapFont.h"
 #include "UISplitScreenHelpers.h"
 #ifdef _WINDOWS64
 #include "..\..\Windows64\KeyboardMouseInput.h"
@@ -194,7 +193,6 @@ UIController::UIController()
 	m_mcTTFFont = nullptr;
 	m_moj7 = nullptr;
 	m_moj11 = nullptr;
-	m_unicodeBitmapFont = nullptr;

 	// 4J-JEV: It's important that these remain the same, unless updateCurrentLanguage is going to be called.
 	m_eCurrentFont = m_eTargetFont = eFont_NotLoaded;
@@ -309,14 +307,6 @@ void UIController::postInit()
 	IggySetAS3ExternalFunctionCallbackUTF16 ( &UIController::ExternalFunctionCallback, this );
 	IggySetTextureSubstitutionCallbacks ( &UIController::TextureSubstitutionCreateCallback , &UIController::TextureSubstitutionDestroyCallback, this );

-	// Load a unicode bitmap font as Iggy's global fallback for characters not
-	// covered by the Mojangles bitmap font (CJK, Thai, Arabic, Korean, etc.).
-	// Uses the same glyph page PNGs as the legacy Font class, with matching
-	// Mojangles metrics for correct vertical alignment.
-	m_unicodeBitmapFont = new UIUnicodeBitmapFont("Mojangles_Unicode_Bitmap", SFontData::Mojangles_7);
-	m_unicodeBitmapFont->registerFont();
-	IggyFontSetFallbackFontUTF8("Mojangles_Unicode_Bitmap", -1, IGGY_FONTFLAG_none);
-
 	SetupFont();
 	//
 	loadSkins();
@@ -7,7 +7,6 @@ using namespace std;

 class UIAbstractBitmapFont;
 class UIBitmapFont;
-class UIUnicodeBitmapFont;
 class UITTFFont;
 class UIComponent_DebugUIConsole;
 class UIComponent_DebugUIMarketingGuide;
@@ -64,7 +63,6 @@ private:
 	UIAbstractBitmapFont *m_mcBitmapFont;
 	UITTFFont *m_mcTTFFont;
 	UIBitmapFont *m_moj7, *m_moj11;
-	UIUnicodeBitmapFont *m_unicodeBitmapFont;

 	std::mt19937 m_randomGenerator;
 	std::uniform_real_distribution<float> m_randomDistribution;
@@ -335,11 +335,6 @@ bool CFontData::unicodeIsWhitespace(unsigned int unicode)
 	return false;
 }

-bool CFontData::hasGlyph(unsigned int unicodepoint)
-{
-	return m_unicodeMap.find(unicodepoint) != m_unicodeMap.end();
-}
-
 void CFontData::moveCursor(unsigned char *&cursor, unsigned int dx, unsigned int dy)
 {
 	cursor += (dy * m_sFontData->m_uiGlyphMapX) + dx;
@@ -125,9 +125,6 @@ public:
 	// Returns true if this unicodepoint is whitespace
 	bool				unicodeIsWhitespace(unsigned int unicodepoint);

-	// Returns true if this unicodepoint exists in the font's glyph map.
-	bool				hasGlyph(unsigned int unicodepoint);
-
 private:

 	// Move a pointer in an image dx pixels right and dy pixels down, wrap around in either dimension leads to unknown behaviour.
@@ -41,10 +41,6 @@ void UIScene_AbstractContainerMenu::handleDestroy()
 	app.DebugPrintf("UIScene_AbstractContainerMenu::handleDestroy\n");

 #ifdef _WINDOWS64
-	g_savedInventoryCursorPos.x = m_pointerPos.x;
-	g_savedInventoryCursorPos.y = m_pointerPos.y;
-	g_savedInventoryCursorPos.hasSavedPos = true;
-
 	g_KBMInput.SetScreenCursorHidden(false);
 	g_KBMInput.SetCursorHiddenForUI(false);
 #endif
@@ -173,16 +169,16 @@ void UIScene_AbstractContainerMenu::PlatformInitialize(int iPad, int startIndex)
 	m_pointerPos = vPointerPos;

 #ifdef _WINDOWS64
-	if (g_savedInventoryCursorPos.hasSavedPos)
+	if ((iPad == 0) && g_KBMInput.IsKBMActive())
 	{
-		m_pointerPos.x = g_savedInventoryCursorPos.x;
-		m_pointerPos.y = g_savedInventoryCursorPos.y;
-
-		if (m_pointerPos.x < m_fPointerMinX) m_pointerPos.x = m_fPointerMinX;
-		if (m_pointerPos.x > m_fPointerMaxX) m_pointerPos.x = m_fPointerMaxX;
-		if (m_pointerPos.y < m_fPointerMinY) m_pointerPos.y = m_fPointerMinY;
-		if (m_pointerPos.y > m_fPointerMaxY) m_pointerPos.y = m_fPointerMaxY;
+		m_pointerPos.x = ((m_fPanelMinX + m_fPanelMaxX) * 0.5f) - m_fPointerImageOffsetX;
+		m_pointerPos.y = ((m_fPanelMinY + m_fPanelMaxY) * 0.5f) - m_fPointerImageOffsetY;
 	}
+
+	if (m_pointerPos.x < m_fPointerMinX) m_pointerPos.x = m_fPointerMinX;
+	if (m_pointerPos.x > m_fPointerMaxX) m_pointerPos.x = m_fPointerMaxX;
+	if (m_pointerPos.y < m_fPointerMinY) m_pointerPos.y = m_fPointerMinY;
+	if (m_pointerPos.y > m_fPointerMaxY) m_pointerPos.y = m_fPointerMaxY;
 #endif

 	IggyEvent mouseEvent;
@@ -2,6 +2,16 @@
 #include "UI.h"
 #include "UIScene_ConnectingProgress.h"
 #include "..\..\Minecraft.h"
+#ifdef _WINDOWS64
+#include "..\..\Windows64\Network\WinsockNetLayer.h"
+#include "..\..\..\Minecraft.World\DisconnectPacket.h"
+
+static int ConnectingProgress_OnRejectedDialogOK(LPVOID, int iPad, const C4JStorage::EMessageResult)
+{
+	ui.NavigateBack(iPad);
+	return 0;
+}
+#endif

 UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
@@ -43,6 +53,12 @@ UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void *_initData
 	m_cancelFuncParam = param->cancelFuncParam;
 	m_removeLocalPlayer = false;
 	m_showingButton = false;
+
+#ifdef _WINDOWS64
+	WinsockNetLayer::eJoinState initState = WinsockNetLayer::GetJoinState();
+	m_asyncJoinActive = (initState != WinsockNetLayer::eJoinState_Idle && initState != WinsockNetLayer::eJoinState_Cancelled);
+	m_asyncJoinFailed = false;
+#endif
 }

 UIScene_ConnectingProgress::~UIScene_ConnectingProgress()
@@ -53,6 +69,18 @@ UIScene_ConnectingProgress::~UIScene_ConnectingProgress()

 void UIScene_ConnectingProgress::updateTooltips()
 {
+#ifdef _WINDOWS64
+	if (m_asyncJoinActive)
+	{
+		ui.SetTooltips( m_iPad, -1, IDS_TOOLTIPS_BACK);
+		return;
+	}
+	if (m_asyncJoinFailed)
+	{
+		ui.SetTooltips( m_iPad, IDS_TOOLTIPS_SELECT, -1);
+		return;
+	}
+#endif
 	// 4J-PB - removing the option of cancel join, since it didn't work anyway
 	//ui.SetTooltips( m_iPad, -1, m_showTooltips?IDS_TOOLTIPS_CANCEL_JOIN:-1);
 	ui.SetTooltips( m_iPad, -1, -1);
@@ -62,6 +90,85 @@ void UIScene_ConnectingProgress::tick()
 {
 	UIScene::tick();

+#ifdef _WINDOWS64
+	if (m_asyncJoinActive)
+	{
+		WinsockNetLayer::eJoinState state = WinsockNetLayer::GetJoinState();
+		if (state == WinsockNetLayer::eJoinState_Connecting)
+		{
+			// connecting.............
+			int attempt = WinsockNetLayer::GetJoinAttempt();
+			int maxAttempts = WinsockNetLayer::GetJoinMaxAttempts();
+			char buf[128];
+			if (attempt <= 1)
+				sprintf_s(buf, "Connecting...");
+			else
+				sprintf_s(buf, "Connecting failed, trying again (%d/%d)", attempt, maxAttempts);
+			wchar_t wbuf[128];
+			mbstowcs(wbuf, buf, 128);
+			m_labelTitle.setLabel(wstring(wbuf));
+		}
+		else if (state == WinsockNetLayer::eJoinState_Success)
+		{
+			m_asyncJoinActive = false;
+			// go go go
+		}
+		else if (state == WinsockNetLayer::eJoinState_Cancelled)
+		{
+			// cancel
+			m_asyncJoinActive = false;
+			navigateBack();
+		}
+		else if (state == WinsockNetLayer::eJoinState_Rejected)
+		{
+			// server full and banned are passed differently compared to other disconnects it seems
+			m_asyncJoinActive = false;
+			DisconnectPacket::eDisconnectReason reason = WinsockNetLayer::GetJoinRejectReason();
+			int exitReasonStringId;
+			switch (reason)
+			{
+			case DisconnectPacket::eDisconnect_ServerFull:
+				exitReasonStringId = IDS_DISCONNECTED_SERVER_FULL;
+				break;
+			case DisconnectPacket::eDisconnect_Banned:
+				exitReasonStringId = IDS_DISCONNECTED_KICKED;
+				break;
+			default:
+				exitReasonStringId = IDS_CONNECTION_LOST_SERVER;
+				break;
+			}
+			UINT uiIDA[1];
+			uiIDA[0] = IDS_CONFIRM_OK;
+			ui.RequestErrorMessage(IDS_CONNECTION_FAILED, exitReasonStringId, uiIDA, 1, ProfileManager.GetPrimaryPad(), ConnectingProgress_OnRejectedDialogOK, nullptr, nullptr);
+		}
+		else if (state == WinsockNetLayer::eJoinState_Failed)
+		{
+			// FAIL
+			m_asyncJoinActive = false;
+			m_asyncJoinFailed = true;
+
+			int maxAttempts = WinsockNetLayer::GetJoinMaxAttempts();
+			char buf[256];
+			sprintf_s(buf, "Failed to connect after %d attempts. The server may be unavailable.", maxAttempts);
+			wchar_t wbuf[256];
+			mbstowcs(wbuf, buf, 256);
+
+			// TIL that these exist
+			// not going to use a actual popup due to it requiring messing with strings which can really mess things up
+			// i dont trust myself with that
+			// these need to be touched up later as teh button is a bit offset
+			m_labelTitle.setLabel(L"Unable to connect to server");
+			m_progressBar.setLabel(wstring(wbuf));
+			m_progressBar.showBar(false);
+			m_progressBar.setVisible(true);
+			m_buttonConfirm.setVisible(true);
+			m_showingButton = true;
+			m_controlTimer.setVisible(false);
+		}
+		return;
+	}
+#endif
+
 	if( m_removeLocalPlayer )
 	{
 		m_removeLocalPlayer = false;
@@ -94,6 +201,8 @@ void UIScene_ConnectingProgress::handleGainFocus(bool navBack)

 void UIScene_ConnectingProgress::handleLoseFocus()
 {
+	if (!m_runFailTimer) return;
+
 	int millisecsLeft = getTimer(0)->targetTime - System::currentTimeMillis();
 	int millisecsTaken = getTimer(0)->duration - millisecsLeft;
 	app.DebugPrintf("\n");
@@ -208,6 +317,17 @@ void UIScene_ConnectingProgress::handleInput(int iPad, int key, bool repeat, boo
 		switch(key)
 		{
 // 4J-PB - Removed the option to cancel join - it didn't work anyway
+#ifdef _WINDOWS64
+		case ACTION_MENU_CANCEL:
+			if (pressed && m_asyncJoinActive)
+			{
+				m_asyncJoinActive = false;
+				WinsockNetLayer::CancelJoinGame();
+				navigateBack();
+				handled = true;
+			}
+			break;
+#endif
 // 		case ACTION_MENU_CANCEL:
 // 			{
 // 				if(m_cancelFunc != nullptr)
@@ -250,6 +370,13 @@ void UIScene_ConnectingProgress::handlePress(F64 controlId, F64 childId)
 	case eControl_Confirm:
 		if(m_showingButton)
 		{
+#ifdef _WINDOWS64
+			if (m_asyncJoinFailed)
+			{
+				navigateBack();
+			}
+			else
+#endif
 			if( m_iPad != ProfileManager.GetPrimaryPad() && g_NetworkManager.IsInSession() )
 			{
 				// The connection failed if we see the button, so the temp player should be removed and the viewports updated again
@@ -13,6 +13,11 @@ private:
 	void (*m_cancelFunc)(LPVOID param);
 	LPVOID m_cancelFuncParam;

+#ifdef _WINDOWS64
+	bool m_asyncJoinActive;
+	bool m_asyncJoinFailed;
+#endif
+
 	enum EControls
 	{
 		eControl_Confirm
@@ -26,8 +26,6 @@
 #define GAME_CREATE_ONLINE_TIMER_ID 0
 #define GAME_CREATE_ONLINE_TIMER_TIME 100

-static bool s_bHardcore = false; // 4J Added: tracks when difficulty slider is at Hardcore position (file-scope to avoid header layout changes)
-
 int UIScene_CreateWorldMenu::m_iDifficultyTitleSettingA[4]=
 {
 	IDS_DIFFICULTY_TITLE_PEACEFUL,
@@ -61,9 +59,8 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay

 	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)]));
-	m_sliderDifficulty.init(TempString,eControl_Difficulty,0,4,app.GetGameSettings(m_iPad,eGameSetting_Difficulty));
+	m_sliderDifficulty.init(TempString,eControl_Difficulty,0,3,app.GetGameSettings(m_iPad,eGameSetting_Difficulty));

-	s_bHardcore = false;
 	m_MoreOptionsParams.bGenerateOptions=TRUE;
 	m_MoreOptionsParams.bStructures=TRUE;
 	m_MoreOptionsParams.bFlatWorld=FALSE;
@@ -657,13 +654,8 @@ void UIScene_CreateWorldMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 	case eControl_Difficulty:
 		m_sliderDifficulty.handleSliderMove(value);

-		// 4J Added: Difficulty value 4 = Hardcore (store actual difficulty as Hard, track hardcore separately)
-		s_bHardcore = (value >= 4);
-		app.SetGameSettings(m_iPad, eGameSetting_Difficulty, s_bHardcore ? 3 : value);
-		if (value >= 4)
-			swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ), L"Hardcore");
-		else
-			swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[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]));
 		m_sliderDifficulty.setLabel(TempString);
 		break;
 	}
@@ -831,7 +823,7 @@ void UIScene_CreateWorldMenu::checkStateAndStartGame()
 			// 4J Stu - This is a bit messy and is due to the library incorrectly returning false for IsSignedInLive if the npAvailability isn't SCE_OK
 			UINT uiIDA[1];
 			uiIDA[0]=IDS_OK;
-			ui.RequestAlertMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, iPadNotSignedInLive);
+			ui.RequestErrorMessage(IDS_ONLINE_SERVICE_TITLE, IDS_CONTENT_RESTRICTION, uiIDA, 1, iPadNotSignedInLive);
 		}
 		else
 		{
@@ -1121,10 +1113,6 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 	StorageManager.ResetSaveData();
 	// Make our next save default to the name of the level
 	StorageManager.SetSaveTitle((wchar_t *)wWorldName.c_str());
-#ifdef _WINDOWS64
-	// New world — save folder doesn't exist yet, clear for now (will be set after first autosave)
-	app.SetCurrentSaveFolderName(L"");
-#endif

 	wstring wSeed;
 	if(!pClass->m_MoreOptionsParams.seed.empty() )
@@ -1191,9 +1179,7 @@ void UIScene_CreateWorldMenu::CreateGame(UIScene_CreateWorldMenu* pClass, DWORD
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	pMinecraft->skins->selectTexturePackById(pClass->m_MoreOptionsParams.dwTexturePack);

-	// 4J Added: If hardcore was selected on difficulty slider, set difficulty to Hard and enable hardcore flag
-	app.SetGameHostOption(eGameHostOption_Difficulty, Minecraft::GetInstance()->options->difficulty);
-	app.SetGameHostOption(eGameHostOption_Hardcore, s_bHardcore ? 1 : 0);
+	app.SetGameHostOption(eGameHostOption_Difficulty,Minecraft::GetInstance()->options->difficulty);
 	app.SetGameHostOption(eGameHostOption_FriendsOfFriends,pClass->m_MoreOptionsParams.bAllowFriendsOfFriends);
 	app.SetGameHostOption(eGameHostOption_Gamertags,app.GetGameSettings(pClass->m_iPad,eGameSetting_GamertagsVisible)?1:0);

@@ -3,43 +3,24 @@
 #include "UIScene_DeathMenu.h"
 #include "IUIScene_PauseMenu.h"
 #include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLevel.h"
 #include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h"

 UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
 	// Setup all the Iggy references we need for this scene
 	initialiseMovie();

+	m_buttonRespawn.init(app.GetString(IDS_RESPAWN),eControl_Respawn);
 	m_buttonExitGame.init(app.GetString(IDS_EXIT_GAME),eControl_ExitGame);

 	m_labelTitle.setLabel(app.GetString(IDS_YOU_DIED));

-	// 4J Added: In hardcore mode, disable respawn and show hardcore death message
-	Minecraft *pMC = Minecraft::GetInstance();
-	bool isHardcore = false;
-	if (pMC != nullptr && pMC->level != nullptr)
-	{
-		isHardcore = pMC->level->getLevelData()->isHardcore();
-	}
-
-	if (isHardcore)
-	{
-		m_buttonRespawn.init(app.GetString(IDS_HARDCORE_DEATH_MESSAGE), eControl_Respawn);
-		m_buttonRespawn.setVisible(false);
-	}
-	else
-	{
-		m_buttonRespawn.init(app.GetString(IDS_RESPAWN), eControl_Respawn);
-	}
-
 	m_bIgnoreInput = false;

-	if(pMC != nullptr && pMC->localgameModes[iPad] != nullptr )
+	Minecraft *pMinecraft = Minecraft::GetInstance();
+	if(pMinecraft != nullptr && pMinecraft->localgameModes[iPad] != nullptr )
 	{
-		TutorialMode *gameMode = static_cast<TutorialMode *>(pMC->localgameModes[iPad]);
+		TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[iPad]);

 		// This just allows it to be shown
 		gameMode->getTutorial()->showTutorialPopup(false);
@@ -103,16 +84,8 @@ void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId)
 	switch(static_cast<int>(controlId))
 	{
 	case eControl_Respawn:
-		{
-			// 4J Added: Safeguard - don't respawn in hardcore mode
-			Minecraft *pMC = Minecraft::GetInstance();
-			if (pMC != nullptr && pMC->level != nullptr && pMC->level->getLevelData()->isHardcore())
-			{
-				break;
-			}
-			m_bIgnoreInput = true;
-			app.SetAction(m_iPad,eAppAction_Respawn);
-		}
+		m_bIgnoreInput = true;
+		app.SetAction(m_iPad,eAppAction_Respawn);
 #ifdef _DURANGO
 		//InputManager.SetEnabledGtcButtons(_360_GTC_MENU|_360_GTC_PAUSE|_360_GTC_VIEW);
 #endif
@@ -136,16 +109,7 @@ void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId)
 						playTime = static_cast<int>(pMinecraft->localplayers[m_iPad]->getSessionTimer());
 					}
 					TelemetryManager->RecordLevelExit(m_iPad, eSen_LevelExitStatus_Failed);
-
-					// 4J Added: Hardcore mode — skip save dialog, exit without saving, delete world
-					if (pMinecraft->level != nullptr && pMinecraft->level->getLevelData()->isHardcore() && g_NetworkManager.IsHost())
-					{
-						MinecraftServer::getInstance()->setSaveOnExit(false);
-						MinecraftServer::getInstance()->setDeleteWorldOnExit(true);
-						app.SetAction(m_iPad, eAppAction_ExitWorld);
-						break;
-					}
-
+					
 #if defined (_XBOX_ONE) || defined(__ORBIS__)
 					if(g_NetworkManager.IsHost() && StorageManager.GetSaveDisabled())
 					{
@@ -583,6 +583,24 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 		// Alert the app the we no longer want to be informed of ethernet connections
 		app.SetLiveLinkRequired( false );

+#ifdef _WINDOWS64
+		if (result == CGameNetworkManager::JOINGAME_PENDING)
+		{
+			pClass->m_bIgnoreInput = false;
+
+			ConnectionProgressParams *param = new ConnectionProgressParams();
+			param->iPad = ProfileManager.GetPrimaryPad();
+			param->stringId = -1;
+			param->showTooltips = true;
+			param->setFailTimer = false;
+			param->timerTime = 0;
+			param->cancelFunc = nullptr;
+			param->cancelFuncParam = nullptr;
+			ui.NavigateToScene(ProfileManager.GetPrimaryPad(), eUIScene_ConnectingProgress, param);
+			return;
+		}
+#endif
+
 		if( result != CGameNetworkManager::JOINGAME_SUCCESS )
 		{
 			int exitReasonStringId = -1;
@@ -229,19 +229,29 @@ void UIScene_Keyboard::tick()
 	if (g_KBMInput.IsKeyPressed('V') && g_KBMInput.IsKeyDown(VK_CONTROL))
 	{
 		wstring pasted = Screen::getClipboard();
-		for (size_t i = 0; i < pasted.length(); i++)
+		wstring sanitized;
+		sanitized.reserve(pasted.length());
+
+		for (wchar_t pc : pasted)
+		{
+			if (pc >= 0x20) // Keep printable characters
+			{
+				if (static_cast<int>(m_win64TextBuffer.length() + sanitized.length()) >= m_win64MaxChars)
+					break;
+				sanitized += pc;
+			}
+		}
+
+		if (!sanitized.empty())
 		{
-			wchar_t pc = pasted[i];
-			if (pc < 0x20) continue; // skip control characters
-			if (static_cast<int>(m_win64TextBuffer.length()) >= m_win64MaxChars) break;
 			if (m_bPCMode)
 			{
-				m_win64TextBuffer.insert(m_iCursorPos, 1, pc);
-				m_iCursorPos++;
+				m_win64TextBuffer.insert(m_iCursorPos, sanitized);
+				m_iCursorPos += (int)sanitized.length();
 			}
 			else
 			{
-				m_win64TextBuffer += pc;
+				m_win64TextBuffer += sanitized;
 			}
 			changed = true;
 		}
@@ -24,13 +24,12 @@
 #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME 50
 #endif

-int UIScene_LoadMenu::m_iDifficultyTitleSettingA[5]=
+int UIScene_LoadMenu::m_iDifficultyTitleSettingA[4]=
 {
 	IDS_DIFFICULTY_TITLE_PEACEFUL,
 	IDS_DIFFICULTY_TITLE_EASY,
 	IDS_DIFFICULTY_TITLE_NORMAL,
-	IDS_DIFFICULTY_TITLE_HARD,
-	IDS_GAMEMODE_HARDCORE
+	IDS_DIFFICULTY_TITLE_HARD
 };

 int UIScene_LoadMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
@@ -111,7 +110,6 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 	m_bThumbnailGetFailed = false;
 	m_seed = 0;
 	m_bIsCorrupt = false;
-	m_bHardcore = false;

 	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.
@@ -255,34 +253,10 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 		{
 			wchar_t wSaveName[128];
 			ZeroMemory(wSaveName, sizeof(wSaveName));
-			MultiByteToWideChar(CP_UTF8, 0, params->saveDetails->UTF8SaveName, -1, wSaveName, 127);
+			mbstowcs(wSaveName, params->saveDetails->UTF8SaveName, 127);
 			m_levelName = wstring(wSaveName);
 			m_labelGameName.init(m_levelName);
 		}
-		if (params->saveDetails != nullptr)
-		{
-			// Set thumbnail name from save filename (needed for texture display in tick)
-			wchar_t wFilename[MAX_SAVEFILENAME_LENGTH];
-			ZeroMemory(wFilename, sizeof(wFilename));
-			mbstowcs(wFilename, params->saveDetails->UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
-			m_thumbnailName = wFilename;
-
-			if (params->saveDetails->pbThumbnailData && params->saveDetails->dwThumbnailSize > 0)
-			{
-				m_pbThumbnailData = params->saveDetails->pbThumbnailData;
-				m_uiThumbnailSize = params->saveDetails->dwThumbnailSize;
-				m_bSaveThumbnailReady = true;
-				m_bRetrievingSaveThumbnail = false;
-			}
-
-			m_bHardcore = params->saveDetails->isHardcore;
-			if (m_bHardcore)
-			{
-				WCHAR TempString[256];
-				swprintf((WCHAR *)TempString, 256, L"%ls: %ls", app.GetString(IDS_SLIDER_DIFFICULTY), L"Hardcore");
-				m_sliderDifficulty.init(TempString, eControl_Difficulty, 0, 4, 4);
-			}
-		}
 #endif
 	}

@@ -572,14 +546,6 @@ void UIScene_LoadMenu::tick()
 			{
 				m_MoreOptionsParams.bAllowFriendsOfFriends = TRUE;
 			}
-
-			m_bHardcore = app.GetGameHostOption(uiHostOptions, eGameHostOption_Hardcore) > 0;
-			if (m_bHardcore)
-			{
-				WCHAR TempString[256];
-				swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ), L"Hardcore");
-				m_sliderDifficulty.init(TempString, eControl_Difficulty, 0, 4, 4);
-			}
 		}

 		Minecraft *pMinecraft = Minecraft::GetInstance();
@@ -984,15 +950,10 @@ void UIScene_LoadMenu::handleSliderMove(F64 sliderId, F64 currentValue)
 	switch(static_cast<int>(sliderId))
 	{
 	case eControl_Difficulty:
-		if (m_bHardcore)
-		{
-			m_sliderDifficulty.handleSliderMove(4);
-			break;
-		}
 		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;
 	}
@@ -1206,7 +1167,7 @@ void UIScene_LoadMenu::LaunchGame(void)
 #if TO_BE_IMPLEMENTED
 			if(eLoadStatus==C4JStorage::ELoadGame_DeviceRemoved)
 			{
-				// disable saving
+				// disable saving 
 				StorageManager.SetSaveDisabled(true);
 				StorageManager.SetSaveDeviceSelected(m_iPad,false);
 				UINT uiIDA[1];
@@ -1619,24 +1580,6 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocal

 	PSAVE_DETAILS pSaveDetails=StorageManager.ReturnSavesInfo();

-#ifdef _WINDOWS64
-	// 4J Added: Store save folder name for potential hardcore world deletion
-	app.DebugPrintf("StartGameFromSave: pSaveDetails=%p, levelGen=%p, saveInfoIndex=%d\n", pSaveDetails, pClass->m_levelGen, pClass->m_iSaveGameInfoIndex);
-	if (pSaveDetails != nullptr && pClass->m_levelGen == nullptr)
-	{
-		app.DebugPrintf("StartGameFromSave: UTF8SaveFilename='%s'\n", pSaveDetails->SaveInfoA[(int)pClass->m_iSaveGameInfoIndex].UTF8SaveFilename);
-		wchar_t wFolder[MAX_SAVEFILENAME_LENGTH] = {};
-		mbstowcs(wFolder, pSaveDetails->SaveInfoA[(int)pClass->m_iSaveGameInfoIndex].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
-		app.SetCurrentSaveFolderName(wFolder);
-		app.DebugPrintf("StartGameFromSave: stored folder name '%ls'\n", wFolder);
-	}
-	else
-	{
-		app.DebugPrintf("StartGameFromSave: no save details or is levelGen, clearing folder name\n");
-		app.SetCurrentSaveFolderName(L"");
-	}
-#endif
-
 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->seed = pClass->m_seed;
 	param->saveData = nullptr;	
@@ -1669,7 +1612,6 @@ void UIScene_LoadMenu::StartGameFromSave(UIScene_LoadMenu* pClass, DWORD dwLocal
 	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_Hardcore, pClass->m_bHardcore ? 1 : 0);

 #ifdef _LARGE_WORLDS
 	app.SetGameHostOption(eGameHostOption_WorldSize, pClass->m_MoreOptionsParams.worldSize+1 );  // 0 is GAME_HOST_OPTION_WORLDSIZE_UNKNOWN
@@ -15,7 +15,7 @@ private:
 		eControl_OnlineGame,
 	};

-	static int m_iDifficultyTitleSettingA[5];
+	static int m_iDifficultyTitleSettingA[4];

 	UIControl m_controlMainPanel;
 	UIControl_Label m_labelGameName, m_labelSeed, m_labelCreatedMode;
@@ -71,7 +71,6 @@ private:
 	wstring m_thumbnailName;

 	bool m_bRebuildTouchBoxes;
-	bool m_bHardcore;
 public:
 	UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLayer);

@@ -29,7 +29,7 @@
 #include "..\..\..\Minecraft.World\NbtIo.h"
 #include "..\..\..\Minecraft.World\compression.h"

-static wstring ReadLevelNameFromSaveFile(const wstring& filePath, bool *outHardcore = nullptr)
+static wstring ReadLevelNameFromSaveFile(const wstring& filePath)
 {
    // Check for a worldname.txt sidecar written by the rename feature first
    size_t slashPos = filePath.rfind(L'\\');
@@ -49,7 +49,7 @@ static wstring ReadLevelNameFromSaveFile(const wstring& filePath, bool *outHardc
                if (len > 0)
                {
                    wchar_t wbuf[128] = {};
-                    MultiByteToWideChar(CP_UTF8, 0, buf, -1, wbuf, 127);
+                    mbstowcs(wbuf, buf, 127);
                    return wstring(wbuf);
                }
            }
@@ -124,11 +124,7 @@ static wstring ReadLevelNameFromSaveFile(const wstring& filePath, bool *outHardc
                        {
                            CompoundTag *dataTag = root->getCompound(L"Data");
                            if (dataTag != nullptr)
-                            {
                                result = dataTag->getString(L"LevelName");
-                                if (outHardcore)
-                                    *outHardcore = dataTag->getBoolean(L"hardcore");
-                            }
                            delete root;
                        }
                    }
@@ -792,17 +788,13 @@ void UIScene_LoadOrJoinMenu::tick()
 #else
 #ifdef _WINDOWS64
                    {
-                        bool saveHardcore = false;
-                        wstring levelName = ReadLevelNameFromSaveFile(filePath, &saveHardcore);
-                        m_saveDetails[i].isHardcore = saveHardcore;
+                        wstring levelName = ReadLevelNameFromSaveFile(filePath);
+
                        if (!levelName.empty())
                        {
                            m_buttonListSaves.addItem(levelName, wstring(L""));
-                            {
-                                int n = WideCharToMultiByte(CP_UTF8, 0, levelName.c_str(), -1, m_saveDetails[i].UTF8SaveName, 127, nullptr, nullptr);
-                                if (n <= 0) m_saveDetails[i].UTF8SaveName[0] = '\0';
-                                m_saveDetails[i].UTF8SaveName[127] = '\0';
-                            }
+                            wcstombs(m_saveDetails[i].UTF8SaveName, levelName.c_str(), 127);
+                            m_saveDetails[i].UTF8SaveName[127] = '\0';
                        }
                        else
                        {
@@ -1447,9 +1439,9 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
                for (int k = 0; k < 127 && ui16Text[k]; k++)
                    wNewName[k] = static_cast<wchar_t>(ui16Text[k]);

-                // Convert to narrow for storage and in-memory update (UTF-8 to preserve Unicode)
-                char narrowName[256] = {};
-                WideCharToMultiByte(CP_UTF8, 0, wNewName, -1, narrowName, 255, nullptr, nullptr);
+                // Convert to narrow for storage and in-memory update
+                char narrowName[128] = {};
+                wcstombs(narrowName, wNewName, 127);

                // Build the sidecar path: Windows64\GameHDD\{folder}\worldname.txt
                wchar_t wFilename[MAX_SAVEFILENAME_LENGTH] = {};
@@ -1465,7 +1457,7 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo

                // Update the in-memory display name so the list reflects it immediately
                strncpy_s(pClass->m_saveDetails[listPos].UTF8SaveName, narrowName, 127);
-                pClass->m_saveDetails[listPos].UTF8SaveName[127] = '\0'; // UTF8SaveName is still 128 bytes; narrowName fits as Arabic is <=2 bytes/char in UTF-8
+                pClass->m_saveDetails[listPos].UTF8SaveName[127] = '\0';

                // Reuse the existing callback to trigger the list repopulate
                UIScene_LoadOrJoinMenu::RenameSaveDataReturned(pClass, true);
@@ -2533,7 +2525,7 @@ int UIScene_LoadOrJoinMenu::SaveOptionsDialogReturned(void *pParam,int iPad,C4JS
            {
                wchar_t wSaveName[128];
                ZeroMemory(wSaveName, 128 * sizeof(wchar_t));
-                MultiByteToWideChar(CP_UTF8, 0, pClass->m_saveDetails[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC].UTF8SaveName, -1, wSaveName, 127);
+                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;
@@ -222,9 +222,8 @@ void UIScene_SettingsGraphicsMenu::handleSliderMove(F64 sliderId, F64 currentVal
 			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);
+			swprintf(TempString, 256, L"FOV: %d", fovValue);
+			m_sliderFOV.setLabel(TempString);
 		}
 		break;

@@ -247,14 +247,11 @@ typedef struct _SaveListDetails
 #endif
 #endif

-	bool isHardcore;
-
 	_SaveListDetails()
 	{
 		saveId = 0;
 		pbThumbnailData = nullptr;
 		dwThumbnailSize = 0;
-		isHardcore = false;
 #ifdef _DURANGO
 		ZeroMemory(UTF16SaveName,sizeof(wchar_t)*128);
 		ZeroMemory(UTF16SaveFilename,sizeof(wchar_t)*MAX_SAVEFILENAME_LENGTH);
@@ -4,7 +4,7 @@
 #include "..\..\..\Minecraft.World\File.h"
 #include "UITTFFont.h"

-UITTFFont::UITTFFont(const string &name, const string &path, S32 fallbackCharacter, bool registerAsDefaultFonts)
+UITTFFont::UITTFFont(const string &name, const string &path, S32 fallbackCharacter) 
 	: m_strFontName(name)
 {
 	app.DebugPrintf("UITTFFont opening %s\n",path.c_str());
@@ -41,12 +41,9 @@ UITTFFont::UITTFFont(const string &name, const string &path, S32 fallbackCharact

 		IggyFontInstallTruetypeFallbackCodepointUTF8( m_strFontName.c_str(), -1, IGGY_FONTFLAG_none, fallbackCharacter );

-		if (registerAsDefaultFonts)
-		{
-			// 4J Stu - These are so we can use the default flash controls
-			IggyFontInstallTruetypeUTF8 ( (void *)pbData, IGGY_TTC_INDEX_none, "Times New Roman", -1, IGGY_FONTFLAG_none );
-			IggyFontInstallTruetypeUTF8 ( (void *)pbData, IGGY_TTC_INDEX_none, "Arial", -1, IGGY_FONTFLAG_none );
-		}
+		// 4J Stu - These are so we can use the default flash controls
+		IggyFontInstallTruetypeUTF8 ( (void *)pbData, IGGY_TTC_INDEX_none, "Times New Roman", -1, IGGY_FONTFLAG_none );
+		IggyFontInstallTruetypeUTF8 ( (void *)pbData, IGGY_TTC_INDEX_none, "Arial", -1, IGGY_FONTFLAG_none );
 	}
 }

@@ -9,7 +9,7 @@ private:
 	//DWORD dwDataSize;

 public:
-	UITTFFont(const string &name, const string &path, S32 fallbackCharacter, bool registerAsDefaultFonts = true);
+	UITTFFont(const string &name, const string &path, S32 fallbackCharacter);
 	~UITTFFont();

 	string getFontName();
@@ -1,164 +0,0 @@
-#include "stdafx.h"
-#include "BufferedImage.h"
-#include "UIFontData.h"
-#include "UIUnicodeBitmapFont.h"
-
-UIUnicodeBitmapFont::UIUnicodeBitmapFont(const string &fontname, SFontData &referenceFontData)
-	: UIAbstractBitmapFont(fontname)
-{
-	m_numGlyphs = 65536;
-	m_referenceFontData = &referenceFontData;
-	memset(m_glyphPages, 0, sizeof(m_glyphPages));
-	memset(m_unicodeWidth, 0, sizeof(m_unicodeWidth));
-
-	FILE *f = nullptr;
-	fopen_s(&f, "Common/res/1_2_2/font/glyph_sizes.bin", "rb");
-	if (f)
-	{
-		fread(m_unicodeWidth, 1, 65536, f);
-		fclose(f);
-	}
-}
-
-UIUnicodeBitmapFont::~UIUnicodeBitmapFont()
-{
-	for (int i = 0; i < 256; i++)
-		delete[] m_glyphPages[i];
-}
-
-void UIUnicodeBitmapFont::loadGlyphPage(int page)
-{
-	wchar_t fileName[64];
-	swprintf(fileName, 64, L"/1_2_2/font/glyph_%02X.png", page);
-	BufferedImage bimg(fileName);
-	int *rawData = bimg.getData();
-	if (!rawData) return;
-
-	int size = 256 * 256;
-	m_glyphPages[page] = new unsigned char[size];
-	for (int i = 0; i < size; i++)
-		m_glyphPages[page][i] = (rawData[i] & 0xFF000000) >> 24;
-}
-
-IggyFontMetrics *UIUnicodeBitmapFont::GetFontMetrics(IggyFontMetrics *metrics)
-{
-	metrics->ascent = m_referenceFontData->m_fAscent;
-	metrics->descent = m_referenceFontData->m_fDescent;
-	metrics->average_glyph_width_for_tab_stops = 8.0f;
-	metrics->largest_glyph_bbox_y1 = metrics->descent;
-	return metrics;
-}
-
-S32 UIUnicodeBitmapFont::GetCodepointGlyph(U32 codepoint)
-{
-	if (codepoint < 65536 && m_unicodeWidth[codepoint] != 0)
-		return (S32)codepoint;
-	return IGGY_GLYPH_INVALID;
-}
-
-IggyGlyphMetrics *UIUnicodeBitmapFont::GetGlyphMetrics(S32 glyph, IggyGlyphMetrics *metrics)
-{
-	if (glyph < 0 || glyph >= 65536) { metrics->x0 = metrics->x1 = metrics->advance = metrics->y0 = metrics->y1 = 0; return metrics; }
-	int left = m_unicodeWidth[glyph] >> 4;
-	int right = (m_unicodeWidth[glyph] & 0xF) + 1;
-	float pixelWidth = (right - left) / 2.0f + 1.0f;
-	float advance = pixelWidth * m_referenceFontData->m_fAdvPerPixel;
-
-	metrics->x0 = 0.0f;
-	metrics->x1 = advance;
-	metrics->advance = advance;
-	metrics->y0 = 0.0f;
-	metrics->y1 = 1.0f;
-	return metrics;
-}
-
-rrbool UIUnicodeBitmapFont::IsGlyphEmpty(S32 glyph)
-{
-	if (glyph < 0 || glyph >= 65536) return true;
-	return m_unicodeWidth[glyph] == 0;
-}
-
-F32 UIUnicodeBitmapFont::GetKerningForGlyphPair(S32 first_glyph, S32 second_glyph)
-{
-	return 0.0f;
-}
-
-rrbool UIUnicodeBitmapFont::CanProvideBitmap(S32 glyph, F32 pixel_scale)
-{
-	return glyph >= 0 && glyph < 65536;
-}
-
-rrbool UIUnicodeBitmapFont::GetGlyphBitmap(S32 glyph, F32 pixel_scale, IggyBitmapCharacter *bitmap)
-{
-	if (glyph < 0 || glyph >= 65536) return false;
-	int page = glyph / 256;
-	if (!m_glyphPages[page])
-	{
-		loadGlyphPage(page);
-		if (!m_glyphPages[page]) return false;
-	}
-
-	int cx = (glyph % 16) * 16;
-	int cy = ((glyph & 0xFF) / 16) * 16;
-
-	bitmap->pixels_one_per_byte = m_glyphPages[page] + (cy * 256) + cx;
-	bitmap->width_in_pixels = 16;
-	bitmap->height_in_pixels = 16;
-	bitmap->stride_in_bytes = 256;
-
-	bitmap->top_left_x = 0;
-	bitmap->top_left_y = -static_cast<S32>(16) * m_referenceFontData->m_fAscent;
-
-	bitmap->oversample = 0;
-
-	// Scale parameters: match UIBitmapFont's approach.
-	// truePixelScale = the pixel_scale at which 1 glyph pixel = 1 screen pixel.
-	// For 16px glyphs displayed at the same visual size as Mojangles_7 (8px glyphs with advPerPixel 1/10):
-	// The reference truePixelScale for Mojangles_7 is 1.0f/m_fAdvPerPixel = 10.0f
-	// Since our glyphs are 16px (2x the Mojangles 8px), our truePixelScale is 20.0f
-	float truePixelScale = 2.0f / m_referenceFontData->m_fAdvPerPixel;
-
-#ifdef _WINDOWS64
-	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
-	float glyphScale = 1.0f;
-	while ((0.5f + glyphScale) * truePixelScale < pixel_scale)
-		glyphScale++;
-
-	if (glyphScale <= 1 && pixel_scale < truePixelScale)
-	{
-		bitmap->pixel_scale_correct = truePixelScale;
-		bitmap->pixel_scale_min = 0.0f;
-		bitmap->pixel_scale_max = truePixelScale * 1.001f;
-		bitmap->point_sample = false;
-	}
-	else
-	{
-		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
-
-	bitmap->user_context_for_free = nullptr;
-	return true;
-}
-
-void UIUnicodeBitmapFont::FreeGlyphBitmap(S32 glyph, F32 pixel_scale, IggyBitmapCharacter *bitmap)
-{
-	// Pixel data lives in m_glyphPages -- nothing to free.
-}
@@ -1,27 +0,0 @@
-#pragma once
-#include "UIBitmapFont.h"
-
-struct SFontData;
-
-class UIUnicodeBitmapFont : public UIAbstractBitmapFont
-{
-private:
-	unsigned char m_unicodeWidth[65536];
-	unsigned char* m_glyphPages[256];
-	SFontData* m_referenceFontData;
-
-	void loadGlyphPage(int page);
-
-public:
-	UIUnicodeBitmapFont(const string &fontname, SFontData &referenceFontData);
-	~UIUnicodeBitmapFont();
-
-	virtual IggyFontMetrics *GetFontMetrics(IggyFontMetrics *metrics);
-	virtual S32 GetCodepointGlyph(U32 codepoint);
-	virtual IggyGlyphMetrics *GetGlyphMetrics(S32 glyph, IggyGlyphMetrics *metrics);
-	virtual rrbool IsGlyphEmpty(S32 glyph);
-	virtual F32 GetKerningForGlyphPair(S32 first_glyph, S32 second_glyph);
-	virtual rrbool CanProvideBitmap(S32 glyph, F32 pixel_scale);
-	virtual rrbool GetGlyphBitmap(S32 glyph, F32 pixel_scale, IggyBitmapCharacter *bitmap);
-	virtual void FreeGlyphBitmap(S32 glyph, F32 pixel_scale, IggyBitmapCharacter *bitmap);
-};
@@ -2,7 +2,6 @@
 #include "XUI_Chat.h"
 #include "..\..\Minecraft.h"
 #include "..\..\Gui.h"
-#include "..\..\..\Minecraft.World\ArabicShaping.h"

 HRESULT CScene_Chat::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
@@ -30,8 +29,7 @@ HRESULT CScene_Chat::OnTimer( XUIMessageTimer *pXUIMessageTimer, BOOL &bHandled)
 		{
 			m_Backgrounds[i].SetOpacity(opacity);
 			m_Labels[i].SetOpacity(opacity);
-			wstring shaped = shapeArabicText(pGui->getMessage(m_iPad, i));
-			m_Labels[i].SetText( shaped.c_str() );
+			m_Labels[i].SetText( pGui->getMessage(m_iPad,i).c_str() );
 		}
 		else
 		{
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "XUI_Ctrl_4JList.h"
-#include "..\..\..\Minecraft.World\ArabicShaping.h"

 static bool TimeSortFn(const void *a, const void *b);

@@ -295,16 +294,8 @@ HRESULT CXuiCtrl4JList::OnGetSourceDataText(XUIMessageGetSourceText *pGetSourceT
 	if( ( 0 == pGetSourceTextData->iData ) && ( ( pGetSourceTextData->bItemData ) ) )
 	{
 		EnterCriticalSection(&m_AccessListData);
-		LPCWSTR rawText = GetData(pGetSourceTextData->iItem).pwszText;
-		if (rawText)
-		{
-			m_shapedTextCache = shapeArabicText(rawText);
-			pGetSourceTextData->szText = m_shapedTextCache.c_str();
-		}
-		else
-		{
-			pGetSourceTextData->szText = rawText;
-		}
+		pGetSourceTextData->szText =
+			GetData(pGetSourceTextData->iItem).pwszText;
 		LeaveCriticalSection(&m_AccessListData);
 		bHandled = TRUE;
 	}
@@ -75,5 +75,4 @@ private:
 	static bool IndexSortFn(const void *a, const void *b);

 	HXUIOBJ m_hSelectionChangedHandlerObj;
-	std::wstring m_shapedTextCache; // temp buffer for Arabic-shaped text in OnGetSourceDataText
 };
@@ -11,7 +11,6 @@
 #include "..\..\..\Minecraft.World\Entity.h"
 #include "..\..\..\Minecraft.Client\MultiplayerLocalPlayer.h"
 #include "..\..\..\Minecraft.World\Level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h"
 #include "..\..\..\Minecraft.World\ChunkSource.h"
 #include "..\..\..\Minecraft.Client\ProgressRenderer.h"
 #include "..\..\..\Minecraft.Client\GameRenderer.h"
@@ -19,7 +18,6 @@
 #include "..\..\..\Minecraft.World\Pos.h"
 #include "..\..\..\Minecraft.World\Dimension.h"
 #include "..\..\Minecraft.h"
-#include "..\..\MinecraftServer.h"
 #include "..\..\Options.h"
 #include "..\..\LocalPlayer.h"
 #include "..\..\..\Minecraft.World\compression.h"
@@ -39,26 +37,9 @@ HRESULT CScene_Death::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 	}
 	
 	XuiControlSetText(m_Title,app.GetString(IDS_YOU_DIED));
+	XuiControlSetText(m_Buttons[BUTTON_DEATH_RESPAWN],app.GetString(IDS_RESPAWN));
 	XuiControlSetText(m_Buttons[BUTTON_DEATH_EXITGAME],app.GetString(IDS_EXIT_GAME));

-	// 4J Added: In hardcore mode, disable respawn and show hardcore death message
-	Minecraft *pMinecraft = Minecraft::GetInstance();
-	bool isHardcore = false;
-	if (pMinecraft != nullptr && pMinecraft->level != nullptr)
-	{
-		isHardcore = pMinecraft->level->getLevelData()->isHardcore();
-	}
-
-	if (isHardcore)
-	{
-		XuiControlSetText(m_Buttons[BUTTON_DEATH_RESPAWN], app.GetString(IDS_HARDCORE_DEATH_MESSAGE));
-		XuiElementSetShow(m_Buttons[BUTTON_DEATH_RESPAWN], FALSE);
-	}
-	else
-	{
-		XuiControlSetText(m_Buttons[BUTTON_DEATH_RESPAWN], app.GetString(IDS_RESPAWN));
-	}
-
 	// Display the tooltips
 	ui.SetTooltips( m_iPad, IDS_TOOLTIPS_SELECT);

@@ -129,16 +110,7 @@ HRESULT CScene_Death::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* pNoti
 						playTime = static_cast<int>(pMinecraft->localplayers[pNotifyPressData->UserIndex]->getSessionTimer());
 					}
 					TelemetryManager->RecordLevelExit(pNotifyPressData->UserIndex, eSen_LevelExitStatus_Failed);
-
-					// 4J Added: Hardcore mode — skip save dialog, exit without saving, delete world
-					if (pMinecraft->level != nullptr && pMinecraft->level->getLevelData()->isHardcore() && g_NetworkManager.IsHost())
-					{
-						MinecraftServer::getInstance()->setSaveOnExit(false);
-						MinecraftServer::getInstance()->setDeleteWorldOnExit(true);
-						app.SetAction(pNotifyPressData->UserIndex, eAppAction_ExitWorld);
-						break;
-					}
-
+					
 					if(StorageManager.GetSaveDisabled())
 					{
 						uiIDA[0]=IDS_CONFIRM_CANCEL;
@@ -200,12 +172,6 @@ HRESULT CScene_Death::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* pNoti
 		break;
 	case BUTTON_DEATH_RESPAWN:
 		{
-			// 4J Added: Safeguard - don't respawn in hardcore mode
-			Minecraft *pMC = Minecraft::GetInstance();
-			if (pMC != nullptr && pMC->level != nullptr && pMC->level->getLevelData()->isHardcore())
-			{
-				break;
-			}
 			m_bIgnoreInput = true;
 			app.SetAction(pNotifyPressData->UserIndex,eAppAction_Respawn);
 		}
@@ -186,8 +186,7 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 		if (pMinecraft->localplayers[m_iPad]->invulnerableTime < 10) blink = false;
 		int iHealth = pMinecraft->localplayers[m_iPad]->getHealth();
 		int iLastHealth = pMinecraft->localplayers[m_iPad]->lastHealth;
-		bool bHasPoison = pMinecraft->localplayers[m_iPad]->hasEffect(MobEffect::poison);
-		bool isHardcore = pMinecraft->level != nullptr && pMinecraft->level->getLevelData()->isHardcore();
+		bool bHasPoison = pMinecraft->localplayers[m_iPad]->hasEffect(MobEffect::poison); 
 		for (int icon = 0; icon < Player::MAX_HEALTH / 2; icon++)
 		{
 			if(blink)
@@ -197,15 +196,11 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 					// Full
 					if(bHasPoison)
 					{
-						m_healthIcon[icon].PlayVisualRange(
-							isHardcore ? L"FullPoisonFlashHardcore" : L"FullPoisonFlash", nullptr,
-							isHardcore ? L"FullPoisonFlashHardcore" : L"FullPoisonFlash");
+						m_healthIcon[icon].PlayVisualRange(L"FullPoisonFlash",nullptr,L"FullPoisonFlash");
 					}
 					else
 					{
-						m_healthIcon[icon].PlayVisualRange(
-							isHardcore ? L"FullFlashHardcore" : L"FullFlash", nullptr,
-							isHardcore ? L"FullFlashHardcore" : L"FullFlash");
+						m_healthIcon[icon].PlayVisualRange(L"FullFlash",nullptr,L"FullFlash");
 					}
 				}
 				else if (icon * 2 + 1 == iLastHealth || icon * 2 + 1 == iHealth)
@@ -213,23 +208,17 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 					// Half
 					if(bHasPoison)
 					{
-						m_healthIcon[icon].PlayVisualRange(
-							isHardcore ? L"HalfPoisonFlashHardcore" : L"HalfPoisonFlash", nullptr,
-							isHardcore ? L"HalfPoisonFlashHardcore" : L"HalfPoisonFlash");
+						m_healthIcon[icon].PlayVisualRange(L"HalfPoisonFlash",nullptr,L"HalfPoisonFlash");
 					}
 					else
 					{
-						m_healthIcon[icon].PlayVisualRange(
-							isHardcore ? L"HalfFlashHardcore" : L"HalfFlash", nullptr,
-							isHardcore ? L"HalfFlashHardcore" : L"HalfFlash");
+						m_healthIcon[icon].PlayVisualRange(L"HalfFlash",nullptr,L"HalfFlash");
 					}
 				}
 				else
 				{
 					// Empty
-					m_healthIcon[icon].PlayVisualRange(
-						isHardcore ? L"NormalFlashHardcore" : L"NormalFlash", nullptr,
-						isHardcore ? L"NormalFlashHardcore" : L"NormalFlash");
+					m_healthIcon[icon].PlayVisualRange(L"NormalFlash",nullptr,L"NormalFlash");
 				}
 			}
 			else
@@ -239,15 +228,11 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 					// Full
 					if(bHasPoison)
 					{
-						m_healthIcon[icon].PlayVisualRange(
-							isHardcore ? L"FullPoisonHardcore" : L"FullPoison", nullptr,
-							isHardcore ? L"FullPoisonHardcore" : L"FullPoison");
+						m_healthIcon[icon].PlayVisualRange(L"FullPoison",nullptr,L"FullPoison");
 					}
 					else
 					{
-						m_healthIcon[icon].PlayVisualRange(
-							isHardcore ? L"FullHardcore" : L"Full", nullptr,
-							isHardcore ? L"FullHardcore" : L"Full");
+						m_healthIcon[icon].PlayVisualRange(L"Full",nullptr,L"Full");
 					}
 				}
 				else if (icon * 2 + 1 == iHealth)
@@ -255,23 +240,17 @@ HRESULT CXuiSceneHud::OnCustomMessage_TickScene()
 					// Half
 					if(bHasPoison)
 					{
-						m_healthIcon[icon].PlayVisualRange(
-							isHardcore ? L"HalfPoisonHardcore" : L"HalfPoison", nullptr,
-							isHardcore ? L"HalfPoisonHardcore" : L"HalfPoison");
+						m_healthIcon[icon].PlayVisualRange(L"HalfPoison",nullptr,L"HalfPoison");
 					}
 					else
 					{
-						m_healthIcon[icon].PlayVisualRange(
-							isHardcore ? L"HalfHardcore" : L"Half", nullptr,
-							isHardcore ? L"HalfHardcore" : L"Half");
+						m_healthIcon[icon].PlayVisualRange(L"Half",nullptr,L"Half");
 					}
 				}
 				else
 				{
 					// Empty
-					m_healthIcon[icon].PlayVisualRange(
-						isHardcore ? L"NormalHardcore" : L"Normal", nullptr,
-						isHardcore ? L"NormalHardcore" : L"Normal");
+					m_healthIcon[icon].PlayVisualRange(L"Normal",nullptr,L"Normal");
 				}
 			}

@@ -1,30 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameRules", "GameRules.vcxproj", "{0DD2FD59-36AC-476F-9201-D687A4CE9E98}"
-EndProject
-Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 2
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark
-		SccProjectUniqueName0 = GameRules.vcxproj
-		SccLocalPath0 = .
-		SccLocalPath1 = .
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Xbox 360 = Debug|Xbox 360
-		Release|Xbox 360 = Release|Xbox 360
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
-		{0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
-		{0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
-		{0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
-		{0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Release|Xbox 360.Build.0 = Release|Xbox 360
-		{0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Xbox 360">
-      <Configuration>Debug</Configuration>
-      <Platform>Xbox 360</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Xbox 360">
-      <Configuration>Release</Configuration>
-      <Platform>Xbox 360</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0DD2FD59-36AC-476F-9201-D687A4CE9E98}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-    <SccProjectName>SAK</SccProjectName>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccProvider>SAK</SccProvider>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
-    <NMakeOutput>
-    </NMakeOutput>
-    <NMakePreprocessorDefinitions>_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine>BuildGameRule.cmd Tutorial</NMakeBuildCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
-    <NMakeOutput>GameRules.xex</NMakeOutput>
-    <NMakePreprocessorDefinitions>NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
-    <CustomBuild>
-      <Command>
-      </Command>
-    </CustomBuild>
-    <Deploy>
-      <DeploymentType>CopyToHardDrive</DeploymentType>
-    </Deploy>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="..\Tutorial.pck" />
-    <None Include="Tutorial\GameRules.xml">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Tutorial\schematics\Boat.sch" />
-    <None Include="Tutorial\schematics\CasTes1.sch" />
-    <None Include="Tutorial\schematics\CasTes2.sch" />
-    <None Include="Tutorial\schematics\CastleBottom.sch" />
-    <None Include="Tutorial\schematics\CastleFront.sch" />
-    <None Include="Tutorial\schematics\CastleLeft.sch" />
-    <None Include="Tutorial\schematics\CastleMain.sch" />
-    <None Include="Tutorial\schematics\CastleRight.sch" />
-    <None Include="Tutorial\schematics\CastleTop.sch" />
-    <None Include="Tutorial\schematics\JungleTemp.sch" />
-    <None Include="Tutorial\schematics\Lava.sch" />
-    <None Include="Tutorial\schematics\MinecraftSign.sch" />
-    <None Include="Tutorial\schematics\Mushroom.sch" />
-    <None Include="Tutorial\schematics\Pyramid.sch" />
-    <None Include="Tutorial\schematics\Ship.sch" />
-    <None Include="Tutorial\schematics\SnowHouse.sch" />
-    <None Include="Tutorial\schematics\Spider.sch" />
-    <None Include="Tutorial\schematics\Stairs.sch" />
-    <None Include="Tutorial\schematics\StoneCircle.sch" />
-    <None Include="Tutorial\schematics\Tower.sch" />
-    <None Include="Tutorial\schematics\Tutorial.sch" />
-    <None Include="Tutorial\Strings\en-EN.lang" />
-    <None Include="Tutorial\Strings\Microsoft\de-DE.lang" />
-    <None Include="Tutorial\Strings\Microsoft\es-ES.lang" />
-    <None Include="Tutorial\Strings\Microsoft\fr-FR.lang" />
-    <None Include="Tutorial\Strings\Microsoft\it-IT.lang" />
-    <None Include="Tutorial\Strings\Microsoft\ja-JP.lang" />
-    <None Include="Tutorial\Strings\Microsoft\ko-KR.lang" />
-    <None Include="Tutorial\Strings\Microsoft\pt-BR.lang" />
-    <None Include="Tutorial\Strings\Microsoft\pt-PT.lang" />
-    <None Include="Tutorial\Strings\Microsoft\zh-CHT.lang" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xsd Include="GameRulesDefinition.xsd">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
-    </Xsd>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Shared">
-      <UniqueIdentifier>{ab02d5da-7fb3-494b-a636-03764d9a8acd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tutorial">
-      <UniqueIdentifier>{e1a87048-bca2-46e6-a234-91d7d64eb983}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tutorial\schematics">
-      <UniqueIdentifier>{da425f4a-cf76-48e8-87cb-d9fda0f42365}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tutorial\Loc">
-      <UniqueIdentifier>{c0ba5f53-4881-495e-8158-5d87f379426d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tutorial\Loc\Microsoft">
-      <UniqueIdentifier>{61651432-41a1-42f0-a853-c7795d813418}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packs">
-      <UniqueIdentifier>{e194e42b-1c9b-4e35-9a4b-dabd68eab3e0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Tutorial\GameRules.xml">
-      <Filter>Tutorial</Filter>
-    </None>
-    <None Include="Tutorial\Strings\en-EN.lang">
-      <Filter>Tutorial\Loc</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\de-DE.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\es-ES.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\fr-FR.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\it-IT.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\ja-JP.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\ko-KR.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\pt-BR.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\pt-PT.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\zh-CHT.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="..\Tutorial.pck">
-      <Filter>Packs</Filter>
-    </None>
-    <None Include="Tutorial\schematics\JungleTemp.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Lava.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\MinecraftSign.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Mushroom.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Ship.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Spider.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Stairs.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\StoneCircle.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Tower.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Pyramid.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\CasTes1.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\CasTes2.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Boat.sch" />
-    <None Include="Tutorial\schematics\CastleBottom.sch" />
-    <None Include="Tutorial\schematics\CastleFront.sch" />
-    <None Include="Tutorial\schematics\CastleLeft.sch" />
-    <None Include="Tutorial\schematics\CastleMain.sch" />
-    <None Include="Tutorial\schematics\CastleRight.sch" />
-    <None Include="Tutorial\schematics\CastleTop.sch" />
-    <None Include="Tutorial\schematics\Tutorial.sch" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xsd Include="GameRulesDefinition.xsd">
-      <Filter>Shared</Filter>
-    </Xsd>
-  </ItemGroup>
-</Project>
@@ -1,30 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameRules", "GameRules.vcxproj", "{0DD2FD59-36AC-476F-9201-D687A4CE9E98}"
-EndProject
-Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 2
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = http://tfs_server:8080/tfs/storiespark
-		SccProjectUniqueName0 = GameRules.vcxproj
-		SccLocalPath0 = .
-		SccLocalPath1 = .
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Xbox 360 = Debug|Xbox 360
-		Release|Xbox 360 = Release|Xbox 360
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
-		{0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
-		{0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
-		{0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
-		{0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Release|Xbox 360.Build.0 = Release|Xbox 360
-		{0DD2FD59-36AC-476F-9201-D687A4CE9E98}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Xbox 360">
-      <Configuration>Debug</Configuration>
-      <Platform>Xbox 360</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Xbox 360">
-      <Configuration>Release</Configuration>
-      <Platform>Xbox 360</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0DD2FD59-36AC-476F-9201-D687A4CE9E98}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-    <SccProjectName>SAK</SccProjectName>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccProvider>SAK</SccProvider>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
-    <NMakeOutput>
-    </NMakeOutput>
-    <NMakePreprocessorDefinitions>_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeBuildCommandLine>BuildGameRule.cmd Tutorial</NMakeBuildCommandLine>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
-    <NMakeOutput>GameRules.xex</NMakeOutput>
-    <NMakePreprocessorDefinitions>NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
-    <CustomBuild>
-      <Command>
-      </Command>
-    </CustomBuild>
-    <Deploy>
-      <DeploymentType>CopyToHardDrive</DeploymentType>
-    </Deploy>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="..\Tutorial.pck" />
-    <None Include="Tutorial\GameRules.xml">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Tutorial\schematics\Boat.sch" />
-    <None Include="Tutorial\schematics\CasTes1.sch" />
-    <None Include="Tutorial\schematics\CasTes2.sch" />
-    <None Include="Tutorial\schematics\CastleBottom.sch" />
-    <None Include="Tutorial\schematics\CastleFront.sch" />
-    <None Include="Tutorial\schematics\CastleLeft.sch" />
-    <None Include="Tutorial\schematics\CastleMain.sch" />
-    <None Include="Tutorial\schematics\CastleRight.sch" />
-    <None Include="Tutorial\schematics\CastleTop.sch" />
-    <None Include="Tutorial\schematics\JungleTemp.sch" />
-    <None Include="Tutorial\schematics\Lava.sch" />
-    <None Include="Tutorial\schematics\MinecraftSign.sch" />
-    <None Include="Tutorial\schematics\Mushroom.sch" />
-    <None Include="Tutorial\schematics\Pyramid.sch" />
-    <None Include="Tutorial\schematics\Ship.sch" />
-    <None Include="Tutorial\schematics\SnowHouse.sch" />
-    <None Include="Tutorial\schematics\Spider.sch" />
-    <None Include="Tutorial\schematics\Stairs.sch" />
-    <None Include="Tutorial\schematics\StoneCircle.sch" />
-    <None Include="Tutorial\schematics\Tower.sch" />
-    <None Include="Tutorial\schematics\Tutorial.sch" />
-    <None Include="Tutorial\Strings\en-EN.lang" />
-    <None Include="Tutorial\Strings\Microsoft\de-DE.lang" />
-    <None Include="Tutorial\Strings\Microsoft\es-ES.lang" />
-    <None Include="Tutorial\Strings\Microsoft\fr-FR.lang" />
-    <None Include="Tutorial\Strings\Microsoft\it-IT.lang" />
-    <None Include="Tutorial\Strings\Microsoft\ja-JP.lang" />
-    <None Include="Tutorial\Strings\Microsoft\ko-KR.lang" />
-    <None Include="Tutorial\Strings\Microsoft\pt-BR.lang" />
-    <None Include="Tutorial\Strings\Microsoft\pt-PT.lang" />
-    <None Include="Tutorial\Strings\Microsoft\zh-CHT.lang" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xsd Include="GameRulesDefinition.xsd">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
-    </Xsd>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Shared">
-      <UniqueIdentifier>{ab02d5da-7fb3-494b-a636-03764d9a8acd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tutorial">
-      <UniqueIdentifier>{e1a87048-bca2-46e6-a234-91d7d64eb983}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tutorial\schematics">
-      <UniqueIdentifier>{da425f4a-cf76-48e8-87cb-d9fda0f42365}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tutorial\Loc">
-      <UniqueIdentifier>{c0ba5f53-4881-495e-8158-5d87f379426d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tutorial\Loc\Microsoft">
-      <UniqueIdentifier>{61651432-41a1-42f0-a853-c7795d813418}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packs">
-      <UniqueIdentifier>{e194e42b-1c9b-4e35-9a4b-dabd68eab3e0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Tutorial\GameRules.xml">
-      <Filter>Tutorial</Filter>
-    </None>
-    <None Include="Tutorial\Strings\en-EN.lang">
-      <Filter>Tutorial\Loc</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\de-DE.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\es-ES.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\fr-FR.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\it-IT.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\ja-JP.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\ko-KR.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\pt-BR.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\pt-PT.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="Tutorial\Strings\Microsoft\zh-CHT.lang">
-      <Filter>Tutorial\Loc\Microsoft</Filter>
-    </None>
-    <None Include="..\Tutorial.pck">
-      <Filter>Packs</Filter>
-    </None>
-    <None Include="Tutorial\schematics\JungleTemp.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Lava.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\MinecraftSign.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Mushroom.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Ship.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Spider.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Stairs.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\StoneCircle.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Tower.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Pyramid.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\CasTes1.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\CasTes2.sch">
-      <Filter>Tutorial\schematics</Filter>
-    </None>
-    <None Include="Tutorial\schematics\Boat.sch" />
-    <None Include="Tutorial\schematics\CastleBottom.sch" />
-    <None Include="Tutorial\schematics\CastleFront.sch" />
-    <None Include="Tutorial\schematics\CastleLeft.sch" />
-    <None Include="Tutorial\schematics\CastleMain.sch" />
-    <None Include="Tutorial\schematics\CastleRight.sch" />
-    <None Include="Tutorial\schematics\CastleTop.sch" />
-    <None Include="Tutorial\schematics\Tutorial.sch" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xsd Include="GameRulesDefinition.xsd">
-      <Filter>Shared</Filter>
-    </Xsd>
-  </ItemGroup>
-</Project>
@@ -8,7 +8,6 @@
 #include "..\Minecraft.World\net.minecraft.h"
 #include "..\Minecraft.World\StringHelpers.h"
 #include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\ArabicShaping.h"

 Font::Font(Options *options, const wstring& name, Textures* textures, bool enforceUnicode, ResourceLocation *textureLocation, int cols, int rows, int charWidth, int charHeight, unsigned short charMap[]/* = nullptr */) : textures(textures)
 {
@@ -17,7 +16,7 @@ Font::Font(Options *options, const wstring& name, Textures* textures, bool enfor
 	charWidths = new int[charC];

 	// 4J - added initialisers
-	memset(charWidths, 0, charC * sizeof(int));
+	memset(charWidths, 0, charC);

 	enforceUnicodeSheet = false;
 	bidirectional = false;
@@ -27,19 +26,6 @@ Font::Font(Options *options, const wstring& name, Textures* textures, bool enfor
 	m_underline = false;
 	m_strikethrough = false;

-	memset(unicodeTexID, 0, sizeof(unicodeTexID));
-	memset(unicodeWidth, 0, sizeof(unicodeWidth));
-	lastBoundTexture = 0;
-
-	// Load unicode glyph sizes
-	FILE *glyphFile = nullptr;
-	fopen_s(&glyphFile, "Common/res/1_2_2/font/glyph_sizes.bin", "rb");
-	if (glyphFile)
-	{
-		fread(unicodeWidth, 1, 65536, glyphFile);
-		fclose(glyphFile);
-	}
-
 	// Set up member variables
 	m_cols = cols;
 	m_rows = rows;
@@ -59,46 +45,46 @@ Font::Font(Options *options, const wstring& name, Textures* textures, bool enfor
 	random = new Random();

 	// Load the image
-    BufferedImage *img = textures->readImage(textureLocation->getTexture(), name);
+	BufferedImage *img = textures->readImage(textureLocation->getTexture(), name);

 	/* - 4J - TODO
 	try {
-        img = ImageIO.read(Textures.class.getResourceAsStream(name));
-    } catch (IOException e) {
-        throw new RuntimeException(e);
-    }
+		img = ImageIO.read(Textures.class.getResourceAsStream(name));
+	} catch (IOException e) {
+		throw new RuntimeException(e);
+	}
 	*/

-    int w = img->getWidth();
-    int h = img->getHeight();
-    intArray rawPixels(w * h);
-    img->getRGB(0, 0, w, h, rawPixels, 0, w);
+	int w = img->getWidth();
+	int h = img->getHeight();
+	intArray rawPixels(w * h);
+	img->getRGB(0, 0, w, h, rawPixels, 0, w);

-    for (int i = 0; i < charC; i++)
+	for (int i = 0; i < charC; i++)
 	{
-        int xt = i % m_cols;
-        int yt = i / m_cols;
+		int xt = i % m_cols;
+		int yt = i / m_cols;

-        int x = 7;
-        for (; x >= 0; x--)
+		int x = 7;
+		for (; x >= 0; x--)
 		{
-            int xPixel = xt * 8 + x;
-            bool emptyColumn = true;
-            for (int y = 0; y < 8 && emptyColumn; y++)
+			int xPixel = xt * 8 + x;
+			bool emptyColumn = true;
+			for (int y = 0; y < 8 && emptyColumn; y++)
 			{
-                int yPixel = (yt * 8 + y) * w;
+				int yPixel = (yt * 8 + y) * w;
 				bool emptyPixel = (rawPixels[xPixel + yPixel] >> 24) == 0; // Check the alpha value
-                if (!emptyPixel) emptyColumn = false;
-            }
-            if (!emptyColumn)
+				if (!emptyPixel) emptyColumn = false;
+			}
+			if (!emptyColumn)
 			{
-                break;
-            }
-        }
+				break;
+			}
+		}

-        if (i == ' ') x = 4 - 2;
-        charWidths[i] = x + 2;
-    }
+		if (i == ' ') x = 4 - 2;
+		charWidths[i] = x + 2;
+	}

 	delete img;

@@ -144,6 +130,7 @@ Font::~Font()
 }
 #endif

+// Legacy helper used by renderCharacter() only.
 void Font::renderStyleLine(float x0, float y0, float x1, float y1)
 {
 	Tesselator* t = Tesselator::getInstance();
@@ -160,7 +147,20 @@ void Font::renderStyleLine(float x0, float y0, float x1, float y1)
 	t->end();
 }

-void Font::addCharacterQuad(wchar_t c)
+void Font::addSolidQuad(float x0, float y0, float x1, float y1)
+{
+	Tesselator *t = Tesselator::getInstance();
+	t->tex(0.0f, 0.0f);
+	t->vertex(x0, y1, 0.0f);
+	t->tex(0.0f, 0.0f);
+	t->vertex(x1, y1, 0.0f);
+	t->tex(0.0f, 0.0f);
+	t->vertex(x1, y0, 0.0f);
+	t->tex(0.0f, 0.0f);
+	t->vertex(x0, y0, 0.0f);
+}
+
+void Font::emitCharacterGeometry(wchar_t c)
 {
 	float xOff = c % m_cols * m_charWidth;
 	float yOff = c / m_cols * m_charHeight; // was m_charWidth — wrong when glyphs aren't square
@@ -194,52 +194,45 @@ void Font::addCharacterQuad(wchar_t c)
 		t->tex(xOff / fontWidth, yOff / fontHeight);
 		t->vertex(x0 + dx, y0, 0.0f);
 	}
-
-	xPos += static_cast<float>(charWidths[c]);
 }

+void Font::addCharacterQuad(wchar_t c)
+{
+	float height = m_charHeight - .01f;
+	float x0 = xPos;
+	float y0 = yPos;
+	float y1 = yPos + height;
+	float advance = static_cast<float>(charWidths[c]);
+
+	emitCharacterGeometry(c);
+
+	if (m_underline)
+	{
+		addSolidQuad(x0, y1 - 1.0f, xPos + advance, y1);
+	}
+
+	if (m_strikethrough)
+	{
+		float mid = y0 + height * 0.5f;
+		addSolidQuad(x0, mid - 0.5f, xPos + advance, mid + 0.5f);
+	}
+
+	xPos += advance;
+}
+
+// Legacy helper used by drawLiteral() only.
 void Font::renderCharacter(wchar_t c)
 {
-	float xOff = c % m_cols * m_charWidth;
-	float yOff = c / m_cols * m_charHeight; // was m_charWidth — wrong when glyphs aren't square
-
-	float width = charWidths[c] - .01f;
 	float height = m_charHeight - .01f;
-
-	float fontWidth = m_cols * m_charWidth;
-	float fontHeight = m_rows * m_charHeight;
-
-	const float shear = m_italic ? (height * 0.25f) : 0.0f;
-	float x0 = xPos, x1 = xPos + width + shear;
-	float y0 = yPos, y1 = yPos + height;
+	float x0 = xPos;
+	float y0 = yPos;
+	float y1 = yPos + height;

 	Tesselator *t = Tesselator::getInstance();
 	t->begin();
-	t->tex(xOff / fontWidth, (yOff + 7.99f) / fontHeight);
-	t->vertex(x0, y1, 0.0f);
-	t->tex((xOff + width) / fontWidth, (yOff + 7.99f) / fontHeight);
-	t->vertex(x1, y1, 0.0f);
-	t->tex((xOff + width) / fontWidth, yOff / fontHeight);
-	t->vertex(x1, y0, 0.0f);
-	t->tex(xOff / fontWidth, yOff / fontHeight);
-	t->vertex(x0, y0, 0.0f);
+	emitCharacterGeometry(c);
 	t->end();

-	if (m_bold)
-	{
-		float dx = 1.0f;
-		t->begin();
-		t->tex(xOff / fontWidth, (yOff + 7.99f) / fontHeight);
-		t->vertex(x0 + dx, y1, 0.0f);
-		t->tex((xOff + width) / fontWidth, (yOff + 7.99f) / fontHeight);
-		t->vertex(x1 + dx, y1, 0.0f);
-		t->tex((xOff + width) / fontWidth, yOff / fontHeight);
-		t->vertex(x1 + dx, y0, 0.0f);
-		t->tex(xOff / fontWidth, yOff / fontHeight);
-		t->vertex(x0 + dx, y0, 0.0f);
-		t->end();
-	}
-
 	if (m_underline)
 		renderStyleLine(x0, y1 - 1.0f, xPos + static_cast<float>(charWidths[c]), y1);

@@ -254,8 +247,8 @@ void Font::renderCharacter(wchar_t c)

 void Font::drawShadow(const wstring& str, int x, int y, int color)
 {
-    draw(str, x + 1, y + 1, color, true);
-    draw(str, x, y, color, false);
+	draw(str, x + 1, y + 1, color, true);
+	draw(str, x, y, color, false);
 }

 void Font::drawShadowLiteral(const wstring& str, int x, int y, int color)
@@ -275,87 +268,7 @@ void Font::drawLiteral(const wstring& str, int x, int y, int color)
 	yPos = static_cast<float>(y);
 	wstring cleanStr = sanitize(str);
 	for (size_t i = 0; i < cleanStr.length(); ++i)
-	{
-		wchar_t c = cleanStr.at(i);
-		if (isUnicodeGlyphChar(c))
-		{
-			renderUnicodeCharacter(c);
-			textures->bindTexture(m_textureLocation);
-			lastBoundTexture = fontTexture;
-		}
-		else
-		{
-			renderCharacter(c);
-		}
-	}
-}
-
-// Like sanitize() but skips the shapeArabicText() call - for pre-shaped strings.
-wstring Font::sanitizePreshaped(const wstring& str)
-{
-	wstring sb = str;
-	for (unsigned int i = 0; i < sb.length(); i++)
-	{
-		if (CharacterExists(sb[i]))
-			sb[i] = MapCharacter(sb[i]);
-		else if (unicodeWidth[sb[i]] != 0)
-		{
-			// Leave as-is: raw codepoint for glyph page rendering
-		}
-		else
-		{
-			sb[i] = 0;
-		}
-	}
-	return sb;
-}
-
-void Font::drawLiteralPreshaped(const wstring& str, int x, int y, int color)
-{
-	if (str.empty()) return;
-	if ((color & 0xFC000000) == 0) color |= 0xFF000000;
-	textures->bindTexture(m_textureLocation);
-	glColor4f((color >> 16 & 255) / 255.0F, (color >> 8 & 255) / 255.0F, (color & 255) / 255.0F, (color >> 24 & 255) / 255.0F);
-	xPos = static_cast<float>(x);
-	yPos = static_cast<float>(y);
-	wstring cleanStr = sanitizePreshaped(str);
-	for (size_t i = 0; i < cleanStr.length(); ++i)
-	{
-		wchar_t c = cleanStr.at(i);
-		if (isUnicodeGlyphChar(c))
-		{
-			renderUnicodeCharacter(c);
-			textures->bindTexture(m_textureLocation);
-			lastBoundTexture = fontTexture;
-		}
-		else
-		{
-			renderCharacter(c);
-		}
-	}
-}
-
-void Font::drawShadowLiteralPreshaped(const wstring& str, int x, int y, int color)
-{
-	int shadowColor = (color & 0xFCFCFC) >> 2 | (color & 0xFF000000);
-	drawLiteralPreshaped(str, x + 1, y + 1, shadowColor);
-	drawLiteralPreshaped(str, x, y, color);
-}
-
-int Font::widthPreshaped(const wstring& str)
-{
-	wstring cleanStr = sanitizePreshaped(str);
-	if (cleanStr.empty()) return 0;
-	int len = 0;
-	for (size_t i = 0; i < cleanStr.length(); ++i)
-	{
-		wchar_t wc = cleanStr.at(i);
-		if (isUnicodeGlyphChar(wc))
-			len += (int)unicodeCharWidth(wc);
-		else
-			len += charWidths[static_cast<unsigned>(wc)];
-	}
-	return len;
+		renderCharacter(cleanStr.at(i));
 }

 void Font::drawShadowWordWrap(const wstring &str, int x, int y, int w, int color, int h)
@@ -383,7 +296,7 @@ static bool isSectionFormatCode(wchar_t ca)
 	return l == L'l' || l == L'o' || l == L'n' || l == L'm' || l == L'r' || l == L'k';
 }

-void Font::draw(const wstring &str, bool dropShadow)
+void Font::draw(const wstring &str, bool dropShadow, int initialColor)
 {
 	// Bind the texture
 	textures->bindTexture(m_textureLocation);
@@ -391,8 +304,11 @@ void Font::draw(const wstring &str, bool dropShadow)
 	m_bold = m_italic = m_underline = m_strikethrough = false;
 	wstring cleanStr = sanitize(str);

+	int currentColor = initialColor;
+
 	Tesselator *t = Tesselator::getInstance();
 	t->begin();
+	t->color(currentColor & 0x00ffffff, (currentColor >> 24) & 255);

 	for (int i = 0; i < static_cast<int>(cleanStr.length()); ++i)
 	{
@@ -404,10 +320,8 @@ void Font::draw(const wstring &str, bool dropShadow)
 			wchar_t ca = cleanStr[i+1];
 			if (!isSectionFormatCode(ca))
 			{
-				t->end();
-				renderCharacter(167);
-				renderCharacter(ca);
-				t->begin();
+				addCharacterQuad(167);
+				addCharacterQuad(ca);
 				i += 1;
 				continue;
 			}
@@ -423,7 +337,12 @@ void Font::draw(const wstring &str, bool dropShadow)
 				else if (l == L'o') m_italic = true;
 				else if (l == L'n') m_underline = true;
 				else if (l == L'm') m_strikethrough = true;
-				else if (l == L'r') m_bold = m_italic = m_underline = m_strikethrough = noise = false;
+				else if (l == L'r')
+				{
+					m_bold = m_italic = m_underline = m_strikethrough = noise = false;
+					currentColor = initialColor;
+					t->color(currentColor & 0x00ffffff, (currentColor >> 24) & 255);
+				}
 				else if (l == L'k') noise = true;
 			}
 			else
@@ -431,15 +350,15 @@ void Font::draw(const wstring &str, bool dropShadow)
 				noise = false;
 				if (colorN < 0 || colorN > 15) colorN = 15;
 				if (dropShadow) colorN += 16;
-				int color = colors[colorN];
-				glColor3f((color >> 16) / 255.0F, ((color >> 8) & 255) / 255.0F, (color & 255) / 255.0F);
+				currentColor = (initialColor & 0xff000000) | colors[colorN];
+				t->color(currentColor & 0x00ffffff, (currentColor >> 24) & 255);
 			}
 			i += 1;
 			continue;
 		}

 		// "noise" for crazy splash screen message
-		if (noise && !isUnicodeGlyphChar(c))
+		if (noise)
 		{
 			int newc;
 			do
@@ -449,18 +368,7 @@ void Font::draw(const wstring &str, bool dropShadow)
 			c = newc;
 		}

-		if (isUnicodeGlyphChar(c))
-		{
-			t->end();
-			renderUnicodeCharacter(c);
-			textures->bindTexture(m_textureLocation);
-			lastBoundTexture = fontTexture;
-			t->begin();
-		}
-		else
-		{
-			addCharacterQuad(c);
-		}
+		addCharacterQuad(c);
 	}

 	t->end();
@@ -476,11 +384,11 @@ void Font::draw(const wstring& str, int x, int y, int color, bool dropShadow)
 		if (dropShadow) // divide RGB by 4, preserve alpha
 			color = (color & 0xfcfcfc) >> 2 | (color & (-1 << 24));

-		glColor4f((color >> 16 & 255) / 255.0F, (color >> 8 & 255) / 255.0F, (color & 255) / 255.0F, (color >> 24 & 255) / 255.0F);
+		glColor4f(1.0F, 1.0F, 1.0F, 1.0F);

 		xPos = x;
 		yPos = y;
-		draw(str, dropShadow);
+		draw(str, dropShadow, color);
 	}
 }

@@ -501,22 +409,11 @@ int Font::width(const wstring& str)
 				++i;
 			else
 			{
-				if (isUnicodeGlyphChar(167))
-					len += (int)unicodeCharWidth(167);
-				else
-					len += charWidths[167];
+				len += charWidths[167];
 				if (i + 1 < cleanStr.length())
-				{
-					wchar_t nextC = cleanStr[++i];
-					if (isUnicodeGlyphChar(nextC))
-						len += (int)unicodeCharWidth(nextC);
-					else if (static_cast<unsigned>(nextC) < static_cast<unsigned>(m_cols * m_rows))
-						len += charWidths[static_cast<unsigned>(nextC)];
-				}
+					len += charWidths[static_cast<unsigned>(cleanStr[++i])];
 			}
 		}
-		else if (isUnicodeGlyphChar(c))
-			len += (int)unicodeCharWidth(c);
 		else
 			len += charWidths[c];
 	}
@@ -530,37 +427,27 @@ int Font::widthLiteral(const wstring& str)
 	if (cleanStr == L"") return 0;
 	int len = 0;
 	for (size_t i = 0; i < cleanStr.length(); ++i)
-	{
-		wchar_t wc = cleanStr.at(i);
-		if (isUnicodeGlyphChar(wc))
-			len += (int)unicodeCharWidth(wc);
-		else
-			len += charWidths[static_cast<unsigned>(wc)];
-	}
+		len += charWidths[static_cast<unsigned>(cleanStr.at(i))];
 	return len;
 }

 wstring Font::sanitize(const wstring& str)
 {
-	wstring sb = shapeArabicText(str);
+	wstring sb = str;

-    for (unsigned int i = 0; i < sb.length(); i++)
+	for (unsigned int i = 0; i < sb.length(); i++)
 	{
-        if (CharacterExists(sb[i]))
+		if (CharacterExists(sb[i]))
 		{
 			sb[i] = MapCharacter(sb[i]);
 		}
-		else if (unicodeWidth[sb[i]] != 0)
-		{
-			// Leave as-is: raw codepoint for glyph page rendering
-		}
 		else
 		{
 			// If this character isn't supported, just show the first character (empty square box character)
 			sb[i] = 0;
 		}
-    }
-    return sb;
+	}
+	return sb;
 }

 int Font::MapCharacter(wchar_t c)
@@ -613,95 +500,95 @@ void Font::drawWordWrap(const wstring &string, int x, int y, int w, int col, boo

 void Font::drawWordWrapInternal(const wstring& string, int x, int y, int w, int col, bool darken, int h)
 {
-    vector<wstring>lines = stringSplit(string,L'\n');
-    if (lines.size() > 1)
+	vector<wstring>lines = stringSplit(string,L'\n');
+	if (lines.size() > 1)
 	{
-        for ( auto& it : lines )
-        {
+		for ( auto& it : lines )
+		{
 			// 4J Stu - Don't draw text that will be partially cutoff/overlap something it shouldn't
 			if( (y + this->wordWrapHeight(it, w)) > h) break;
-            drawWordWrapInternal(it, x, y, w, col, h);
-            y += this->wordWrapHeight(it, w);
-        }
-        return;
-    }
-    vector<wstring> words = stringSplit(string,L' ');
-    unsigned int pos = 0;
-    while (pos < words.size())
+			drawWordWrapInternal(it, x, y, w, col, h);
+			y += this->wordWrapHeight(it, w);
+		}
+		return;
+	}
+	vector<wstring> words = stringSplit(string,L' ');
+	unsigned int pos = 0;
+	while (pos < words.size())
 	{
-        wstring line = words[pos++] + L" ";
-        while (pos < words.size() && width(line + words[pos]) < w)
+		wstring line = words[pos++] + L" ";
+		while (pos < words.size() && width(line + words[pos]) < w)
 		{
-            line += words[pos++] + L" ";
-        }
-        while (width(line) > w)
+			line += words[pos++] + L" ";
+		}
+		while (width(line) > w)
 		{
-            int l = 0;
-            while (width(line.substr(0, l + 1)) <= w)
+			int l = 0;
+			while (width(line.substr(0, l + 1)) <= w)
 			{
-                l++;
-            }
-            if (trimString(line.substr(0, l)).length() > 0)
+				l++;
+			}
+			if (trimString(line.substr(0, l)).length() > 0)
 			{
-                draw(line.substr(0, l), x, y, col);
-                y += 8;
-            }
-            line = line.substr(l);
+				draw(line.substr(0, l), x, y, col);
+				y += 8;
+			}
+			line = line.substr(l);

 			// 4J Stu - Don't draw text that will be partially cutoff/overlap something it shouldn't
 			if( (y + 8) > h) break;
-        }
+		}
 		// 4J Stu - Don't draw text that will be partially cutoff/overlap something it shouldn't
-        if (trimString(line).length() > 0 && !( (y + 8) > h) )
+		if (trimString(line).length() > 0 && !( (y + 8) > h) )
 		{
-            draw(line, x, y, col);
-            y += 8;
-        }
-    }
+			draw(line, x, y, col);
+			y += 8;
+		}
+	}

 }

 int Font::wordWrapHeight(const wstring& string, int w)
 {
-    vector<wstring> lines = stringSplit(string,L'\n');
-    if (lines.size() > 1)
+	vector<wstring> lines = stringSplit(string,L'\n');
+	if (lines.size() > 1)
 	{
-        int h = 0;
-        for ( auto& it : lines )
-        {
-            h += this->wordWrapHeight(it, w);
-        }
-        return h;
-    }
+		int h = 0;
+		for ( auto& it : lines )
+		{
+			h += this->wordWrapHeight(it, w);
+		}
+		return h;
+	}
 	vector<wstring> words = stringSplit(string,L' ');
-    unsigned int pos = 0;
-    int y = 0;
-    while (pos < words.size())
+	unsigned int pos = 0;
+	int y = 0;
+	while (pos < words.size())
 	{
-        wstring line = words[pos++] + L" ";
-        while (pos < words.size() && width(line + words[pos]) < w)
+		wstring line = words[pos++] + L" ";
+		while (pos < words.size() && width(line + words[pos]) < w)
 		{
-            line += words[pos++] + L" ";
-        }
-        while (width(line) > w)
+			line += words[pos++] + L" ";
+		}
+		while (width(line) > w)
 		{
-            int l = 0;
+			int l = 0;
 			while (width(line.substr(0, l + 1)) <= w)
 			{
-                l++;
-            }
-            if (trimString(line.substr(0, l)).length() > 0)
+				l++;
+			}
+			if (trimString(line.substr(0, l)).length() > 0)
 			{
-                y += 8;
-            }
-            line = line.substr(l);
-        }
-        if (trimString(line).length() > 0) {
-            y += 8;
-        }
-    }
-    if (y < 8) y += 8;
-    return y;
+				y += 8;
+			}
+			line = line.substr(l);
+		}
+		if (trimString(line).length() > 0) {
+			y += 8;
+		}
+	}
+	if (y < 8) y += 8;
+	return y;

 }

@@ -797,22 +684,33 @@ void Font::renderFakeCB(IntBuffer *ib)
 		}
 	}
 }
-*/

 void Font::loadUnicodePage(int page)
 {
-	wchar_t fileName[40];
-	swprintf(fileName, 40, L"/1_2_2/font/glyph_%02X.png", page);
+	wchar_t fileName[25];
+	//String fileName = String.format("/1_2_2/font/glyph_%02X.png", page);
+	swprintf(fileName,25,L"/1_2_2/font/glyph_%02X.png",page);
 	BufferedImage *image = new BufferedImage(fileName);
+	//try
+	//{
+	//	image = ImageIO.read(Textures.class.getResourceAsStream(fileName.toString()));
+	//}
+	//catch (IOException e)
+	//{
+	//	throw new RuntimeException(e);
+	//}
+
 	unicodeTexID[page] = textures->getTexture(image);
 	lastBoundTexture = unicodeTexID[page];
-	delete image;
 }

 void Font::renderUnicodeCharacter(wchar_t c)
 {
 	if (unicodeWidth[c] == 0)
+	{
+		// System.out.println("no-width char " + c);
 		return;
+	}

 	int page = c / 256;

@@ -824,17 +722,19 @@ void Font::renderUnicodeCharacter(wchar_t c)
 		lastBoundTexture = unicodeTexID[page];
 	}

+	// first column with non-trans pixels
 	int firstLeft = unicodeWidth[c] >> 4;
+	// last column with non-trans pixels
 	int firstRight = unicodeWidth[c] & 0xF;

-	float left = (float)firstLeft;
-	float right = (float)(firstRight + 1);
+	float left = firstLeft;
+	float right = firstRight + 1;

-	float xOff = (c % 16) * 16 + left;
-	float yOff = ((c & 0xFF) / 16) * 16;
+	float xOff = c % 16 * 16 + left;
+	float yOff = (c & 0xFF) / 16 * 16;
 	float width = right - left - .02f;

-	Tesselator *t = Tesselator::getInstance();
+    Tesselator *t = Tesselator::getInstance();
 	t->begin(GL_TRIANGLE_STRIP);
 	t->tex(xOff / 256.0F, yOff / 256.0F);
 	t->vertex(xPos, yPos, 0.0f);
@@ -848,17 +748,5 @@ void Font::renderUnicodeCharacter(wchar_t c)

 	xPos += (right - left) / 2 + 1;
 }
-
-float Font::unicodeCharWidth(wchar_t c)
-{
-	if (unicodeWidth[c] == 0) return 0;
-	int firstLeft = unicodeWidth[c] >> 4;
-	int firstRight = unicodeWidth[c] & 0xF;
-	return (firstRight + 1 - firstLeft) / 2.0f + 1;
-}
-
-bool Font::isUnicodeGlyphChar(wchar_t c)
-{
-	return c >= m_cols * m_rows && unicodeWidth[c] != 0;
-}
+*/

@@ -18,10 +18,6 @@ private:

 	Textures *textures;

-	int unicodeTexID[256];
-	unsigned char unicodeWidth[65536];
-	int lastBoundTexture;
-
 	float xPos;
 	float yPos;

@@ -42,7 +38,7 @@ private:
 	std::map<int, int> m_charMap;

 public:
-    Font(Options *options, const wstring& name, Textures* textures, bool enforceUnicode, ResourceLocation *textureLocation, int cols, int rows, int charWidth, int charHeight, unsigned short charMap[] = nullptr);
+	Font(Options *options, const wstring& name, Textures* textures, bool enforceUnicode, ResourceLocation *textureLocation, int cols, int rows, int charWidth, int charHeight, unsigned short charMap[] = nullptr);
 #ifndef _XBOX
 	// 4J Stu - This dtor clashes with one in xui! We never delete these anyway so take it out for now. Can go back when we have got rid of XUI
 	~Font();
@@ -52,6 +48,8 @@ public:
 private:
 	void renderCharacter(wchar_t c); // 4J added
 	void addCharacterQuad(wchar_t c);
+	void addSolidQuad(float x0, float y0, float x1, float y1);
+	void emitCharacterGeometry(wchar_t c);
 	void renderStyleLine(float x0, float y0, float x1, float y1); // solid line for underline/strikethrough

 public:
@@ -69,23 +67,15 @@ public:
 private:
 	wstring reorderBidi(const wstring &str);

-	void draw(const wstring &str, bool dropShadow);
+	void draw(const wstring &str, bool dropShadow, int baseColor);
    void draw(const wstring& str, int x, int y, int color, bool dropShadow);
 	void drawLiteral(const wstring& str, int x, int y, int color); // no § parsing
 	int MapCharacter(wchar_t c); // 4J added
 	bool CharacterExists(wchar_t c); // 4J added
-	void loadUnicodePage(int page);
-	void renderUnicodeCharacter(wchar_t c);
-	float unicodeCharWidth(wchar_t c);
-	bool isUnicodeGlyphChar(wchar_t c);
-	wstring sanitizePreshaped(const wstring& str); // sanitize without re-shaping Arabic
-	void drawLiteralPreshaped(const wstring& str, int x, int y, int color);

 public:
    int width(const wstring& str);
 	int widthLiteral(const wstring& str); // width without skipping § codes (for chat input)
-	int widthPreshaped(const wstring& str); // width of already-shaped text, no re-shaping
-	void drawShadowLiteralPreshaped(const wstring& str, int x, int y, int color);
    wstring sanitize(const wstring& str);
 	void drawWordWrap(const wstring &string, int x, int y, int w, int col, int h); // 4J Added h param

@@ -499,10 +499,11 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)

 					int y0 = 0;

-					//if (minecraft->level->getLevelData()->isHardcore())
-					//{
-					//	y0 = 5;
-					//}
+					// No hardcore on console
+					/*if (minecraft->level.getLevelData().isHardcore())
+					{
+						y0 = 5;
+					}*/

 					blit(xo, yo, 16 + bg * 9, 9 * y0, 9, 9);
 					if (blink)
@@ -853,11 +854,10 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
 	//            font.draw(str, x + 1, y, 0xffffff);
 	//        }

-
 	lastTickA = a;
 	// 4J Stu - This is now displayed in a xui scene
 #if 0
-// Jukebox CD message
+	// Jukebox CD message
    if (overlayMessageTime > 0)
 	{
        float t = overlayMessageTime - a;
@@ -1065,116 +1065,151 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
        vector<wstring> lines;

        // Only show version/branch for player 0 to avoid cluttering each splitscreen viewport
-        if (iPad == 0 && ClientConstants::SHOW_VERSION_WATERMARK)
+        if (iPad == 0)
        {
            lines.push_back(ClientConstants::VERSION_STRING);
            lines.push_back(ClientConstants::BRANCH_STRING);
        }
+
        if (minecraft->options->renderDebug && minecraft->player != nullptr && minecraft->level != nullptr)
        {
            lines.push_back(minecraft->fpsString);
            lines.push_back(L"E: " + std::to_wstring(minecraft->level->getAllEntities().size()));
            int renderDistance = app.GetGameSettings(iPad, eGameSetting_RenderDistance);
+            // Calculate the chunk sections using 16 * (2n + 1)^2
            lines.push_back(L"C: " + std::to_wstring(16 * (2 * renderDistance + 1) * (2 * renderDistance + 1)) + L" D: " + std::to_wstring(renderDistance));
            lines.push_back(minecraft->gatherStats4());

+            // Dimension
            wstring dimension = L"unknown";
            switch (minecraft->player->dimension)
            {
-            case -1: dimension = L"minecraft:the_nether"; break;
-            case 0:  dimension = L"minecraft:overworld";  break;
-            case 1:  dimension = L"minecraft:the_end";    break;
+            case -1:
+                dimension = L"minecraft:the_nether";
+                break;
+            case 0:
+                dimension = L"minecraft:overworld";
+                break;
+            case 1:
+                dimension = L"minecraft:the_end";
+                break;
            }
            lines.push_back(dimension);
-            lines.push_back(L"");

+            lines.push_back(L""); // Spacer
+
+            // Players block pos
            int xBlockPos = Mth::floor(minecraft->player->x);
            int yBlockPos = Mth::floor(minecraft->player->y);
            int zBlockPos = Mth::floor(minecraft->player->z);
+
+            // Chunk player is in
            int xChunkPos = xBlockPos >> 4;
            int yChunkPos = yBlockPos >> 4;
            int zChunkPos = zBlockPos >> 4;
+
+            // Players offset within the chunk
            int xChunkOffset = xBlockPos & 15;
            int yChunkOffset = yBlockPos & 15;
            int zChunkOffset = zBlockPos & 15;

-            WCHAR posString[44];
+            // Format the position like java with limited decumal places
+            WCHAR posString[44]; // Allows upto 7 digit positions (+-9_999_999)
            swprintf(posString, 44, L"%.3f / %.5f / %.3f", minecraft->player->x, minecraft->player->y, minecraft->player->z);

            lines.push_back(L"XYZ: " + std::wstring(posString));
            lines.push_back(L"Block: " + std::to_wstring(xBlockPos) + L" " + std::to_wstring(yBlockPos) + L" " + std::to_wstring(zBlockPos));
            lines.push_back(L"Chunk: " + std::to_wstring(xChunkOffset) + L" " + std::to_wstring(yChunkOffset) + L" " + std::to_wstring(zChunkOffset) + L" in " + std::to_wstring(xChunkPos) + L" " + std::to_wstring(yChunkPos) + L" " + std::to_wstring(zChunkPos));

+			// Wrap the yRot to 360 then adjust to (-180 to 180) range to match java
            float yRotDisplay = fmod(minecraft->player->yRot, 360.0f);
            if (yRotDisplay >  180.0f) yRotDisplay -= 360.0f;
            if (yRotDisplay < -180.0f) yRotDisplay += 360.0f;
+            // Generate the angle string in the format "yRot / xRot" with one decimal place, similar to java edition
            WCHAR angleString[16];
            swprintf(angleString, 16, L"%.1f / %.1f", yRotDisplay, minecraft->player->xRot);

+			// Work out the named direction
            int direction = Mth::floor(minecraft->player->yRot * 4.0f / 360.0f + 0.5) & 0x3;
            const wchar_t* cardinals[] = { L"south", L"west", L"north", L"east" };
            lines.push_back(L"Facing: " + std::wstring(cardinals[direction]) + L" (" + angleString + L")");

+			// We have to limit y to 256 as we don't get any information past that
            if (minecraft->level != NULL && minecraft->level->hasChunkAt(xBlockPos, fmod(yBlockPos, 256), zBlockPos))
            {
                LevelChunk *chunkAt = minecraft->level->getChunkAt(xBlockPos, zBlockPos);
                if (chunkAt != NULL)
                {
-                    int skyLight   = chunkAt->getBrightness(LightLayer::Sky,   xChunkOffset, yChunkOffset, zChunkOffset);
+                    int skyLight = chunkAt->getBrightness(LightLayer::Sky, xChunkOffset, yChunkOffset, zChunkOffset);
                    int blockLight = chunkAt->getBrightness(LightLayer::Block, xChunkOffset, yChunkOffset, zChunkOffset);
-                    int maxLight   = fmax(skyLight, blockLight);
+                    int maxLight = fmax(skyLight, blockLight);
                    lines.push_back(L"Light: " + std::to_wstring(maxLight) + L" (" + std::to_wstring(skyLight) + L" sky, " + std::to_wstring(blockLight) + L" block)");
+
                    lines.push_back(L"CH S: " + std::to_wstring(chunkAt->getHeightmap(xChunkOffset, zChunkOffset)));
+
                    Biome *biome = chunkAt->getBiome(xChunkOffset, zChunkOffset, minecraft->level->getBiomeSource());
                    lines.push_back(L"Biome: " + biome->m_name + L" (" + std::to_wstring(biome->id) + L")");
+
                    lines.push_back(L"Difficulty: " + std::to_wstring(minecraft->level->difficulty) + L" (Day " + std::to_wstring(minecraft->level->getGameTime() / Level::TICKS_PER_DAY) + L")");
                }
            }

-            lines.push_back(L"");
+			// This is all LCE only stuff, it was never on java
+            lines.push_back(L""); // Spacer
            lines.push_back(L"Seed: " + std::to_wstring(minecraft->level->getLevelData()->getSeed()));
-            lines.push_back(minecraft->gatherStats1());
-            lines.push_back(minecraft->gatherStats2());
-            lines.push_back(minecraft->gatherStats3());
-        }
+            lines.push_back(minecraft->gatherStats1()); // Time to autosave
+            lines.push_back(minecraft->gatherStats2()); // Empty currently - CPlatformNetworkManagerStub::GatherStats()
+            lines.push_back(minecraft->gatherStats3()); // RTT

-#ifdef _DEBUG
-        if (minecraft->options->renderDebug && minecraft->player != nullptr && minecraft->level != nullptr && minecraft->level->dimension->id == 0)
-        {
-            wstring wfeature[eTerrainFeature_Count];
-            wfeature[eTerrainFeature_Stronghold] = L"Stronghold: ";
-            wfeature[eTerrainFeature_Mineshaft]  = L"Mineshaft: ";
-            wfeature[eTerrainFeature_Village]    = L"Village: ";
-            wfeature[eTerrainFeature_Ravine]     = L"Ravine: ";
-
-            // maxW in font units: physical width divided by font scale
-            float maxW = (static_cast<float>(g_rScreenWidth) - debugLeft - 8) / fontScale;
-            float maxWForContent = maxW - static_cast<float>(font->width(L"..."));
-            bool truncated[eTerrainFeature_Count] = {};
-
-            for (size_t i = 0; i < app.m_vTerrainFeatures.size(); i++)
+#ifdef _DEBUG // Only show terrain features in debug builds not release
+			
+			// No point trying to render this when not in the overworld
+            if (minecraft->level->dimension->id == 0)
            {
-                FEATURE_DATA *pFeatureData = app.m_vTerrainFeatures[i];
-                int type = pFeatureData->eTerrainFeature;
-                if (type < eTerrainFeature_Stronghold || type > eTerrainFeature_Ravine) continue;
-                if (truncated[type]) continue;
-                wstring itemInfo = L"[" + std::to_wstring(pFeatureData->x * 16) + L", " + std::to_wstring(pFeatureData->z * 16) + L"] ";
-                if (font->width(wfeature[type] + itemInfo) <= maxWForContent)
-                    wfeature[type] += itemInfo;
-                else
+                wstring wfeature[eTerrainFeature_Count];
+                wfeature[eTerrainFeature_Stronghold] = L"Stronghold: ";
+                wfeature[eTerrainFeature_Mineshaft] = L"Mineshaft: ";
+                wfeature[eTerrainFeature_Village] = L"Village: ";
+                wfeature[eTerrainFeature_Ravine] = L"Ravine: ";
+
+                // maxW in font units: physical width divided by font scale
+                float maxW = (static_cast<float>(g_rScreenWidth) - debugLeft - 8) / fontScale;
+                float maxWForContent = maxW - static_cast<float>(font->width(L"..."));
+                bool truncated[eTerrainFeature_Count] = {};
+
+                for (size_t i = 0; i < app.m_vTerrainFeatures.size(); i++)
                {
-                    wfeature[type] += L"...";
-                    truncated[type] = true;
+                    FEATURE_DATA *pFeatureData = app.m_vTerrainFeatures[i];
+                    int type = pFeatureData->eTerrainFeature;
+                    if (type < eTerrainFeature_Stronghold || type > eTerrainFeature_Ravine) continue;
+                    if (truncated[type]) continue;
+
+                    wstring itemInfo = L"[" + std::to_wstring(pFeatureData->x * 16) + L", " + std::to_wstring(pFeatureData->z * 16) + L"] ";
+                    if (font->width(wfeature[type] + itemInfo) <= maxWForContent)
+                    {
+                        wfeature[type] += itemInfo;
+                    }
+                    else
+                    {
+                        wfeature[type] += L"...";
+                        truncated[type] = true;
+                    }
                }
+
+                lines.push_back(L""); // Spacer
+                for (int i = eTerrainFeature_Stronghold; i <= static_cast<int>(eTerrainFeature_Ravine); i++)
+                {
+                    lines.push_back(wfeature[i]);
+                }
+                lines.push_back(L""); // Spacer
            }
-
-            lines.push_back(L"");
-            for (int i = eTerrainFeature_Stronghold; i <= static_cast<int>(eTerrainFeature_Ravine); i++)
-                lines.push_back(wfeature[i]);
-            lines.push_back(L"");
-        }
 #endif
+        }

+		// Disable the depth test so the text shows on top of the paperdoll
+        glDisable(GL_DEPTH_TEST);
+
+        // Loop through the lines and draw them all on screen
        int yPos = debugTop;
        for (const auto &line : lines)
        {
@@ -1182,6 +1217,9 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
            yPos += 10;
        }

+		// Restore the depth test
+        glEnable(GL_DEPTH_TEST);
+
        glMatrixMode(GL_MODELVIEW);
        glPopMatrix();
        glMatrixMode(GL_PROJECTION);
@@ -1386,9 +1424,6 @@ void Gui::clearMessages(int iPad)

 void Gui::addMessage(const wstring& _string,int iPad,bool bIsDeathMessage)
 {
-	{ char buf[32]; sprintf_s(buf, "[CHAT] Display (pad=%d): ", iPad); OutputDebugStringA(buf); }
-	OutputDebugStringW(_string.c_str());
-	OutputDebugStringA("\n");
 	wstring string = _string;	// 4J - Take copy of input as it is const
 	//int iScale=1;

@@ -1610,7 +1645,7 @@ void Gui::renderGraph(int dataLength, int dataPos, int64_t *dataA, float dataASc

 			t->vertex((float)(xScale*i + 0.5f), (float)( height - aVal + 0.5f), static_cast<float>(0));
 			t->vertex((float)(xScale*i + 0.5f), (float)( height + 0.5f), static_cast<float>(0));
-			}
+		}

 		if( dataB != NULL )
 		{
@@ -110,11 +110,6 @@ void GuiComponent::drawStringLiteral(Font *font, const wstring& str, int x, int
 	font->drawShadowLiteral(str, x, y, color);
 }

-void GuiComponent::drawStringPreshaped(Font *font, const wstring& str, int x, int y, int color)
-{
-	font->drawShadowLiteralPreshaped(str, x, y, color);
-}
-
 void GuiComponent::blit(int x, int y, int sx, int sy, int w, int h)
 {
    float us = 1 / 256.0f;
@@ -16,6 +16,5 @@ public:
 	void drawCenteredString(Font *font, const wstring& str, int x, int y, int color);
    void drawString(Font *font, const wstring& str, int x, int y, int color);
 	void drawStringLiteral(Font* font, const wstring& str, int x, int y, int color);
-	void drawStringPreshaped(Font* font, const wstring& str, int x, int y, int color);
    void blit(int x, int y, int sx, int sy, int w, int h);
 };
@@ -73,11 +73,6 @@
 #include "Common\UI\UIFontData.h"
 #include "DLCTexturePack.h"

-#ifdef _WINDOWS64
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "Windows64/stb_image_write.h"
-#endif
-
 #ifdef __ORBIS__
 #include "Orbis\Network\PsPlusUpsellWrapper_Orbis.h"
 #endif
@@ -1554,9 +1549,6 @@ void Minecraft::run_middle()
 							localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_RENDER_DEBUG;
 						}

-						if(g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_SCREENSHOT))
-							localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_SCREENSHOT;
-
 						// In flying mode, Shift held = sneak/descend
 						if(g_KBMInput.IsKBMActive() && g_KBMInput.IsKeyDown(KeyboardMouseInput::KEY_SNEAK))
 						{
@@ -3745,80 +3737,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
 			//options->thirdPersonView = !options->thirdPersonView;
 		}

-#ifdef _WINDOWS64
-		if(player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_SCREENSHOT))
-		{
-			extern ID3D11Device* g_pd3dDevice;
-			extern ID3D11DeviceContext* g_pImmediateContext;
-			extern IDXGISwapChain* g_pSwapChain;
-
-			ID3D11Texture2D* pBackBuffer = nullptr;
-			HRESULT hr = g_pSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (void**)&pBackBuffer);
-			if (SUCCEEDED(hr))
-			{
-				D3D11_TEXTURE2D_DESC desc;
-				pBackBuffer->GetDesc(&desc);
-				desc.Usage = D3D11_USAGE_STAGING;
-				desc.BindFlags = 0;
-				desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-				desc.MiscFlags = 0;
-
-				ID3D11Texture2D* pStaging = nullptr;
-				hr = g_pd3dDevice->CreateTexture2D(&desc, nullptr, &pStaging);
-				if (SUCCEEDED(hr))
-				{
-					g_pImmediateContext->CopyResource(pStaging, pBackBuffer);
-
-					// Build path next to the executable
-					wchar_t exePath[MAX_PATH];
-					GetModuleFileNameW(NULL, exePath, MAX_PATH);
-					wchar_t* lastSlash = wcsrchr(exePath, L'\\');
-					if (lastSlash) *(lastSlash + 1) = L'\0';
-					wstring screenshotDirPath = wstring(exePath) + L"screenshots";
-					CreateDirectoryW(screenshotDirPath.c_str(), NULL);
-
-					SYSTEMTIME st;
-					GetLocalTime(&st);
-					wchar_t filename[128];
-					swprintf_s(filename, L"%04d-%02d-%02d_%02d.%02d.%02d.png",
-						st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond);
-					wstring screenshotPath = screenshotDirPath + L"\\" + filename;
-
-					D3D11_MAPPED_SUBRESOURCE mapped;
-					hr = g_pImmediateContext->Map(pStaging, 0, D3D11_MAP_READ, 0, &mapped);
-					if (SUCCEEDED(hr))
-					{
-						// Copy rows and force alpha to fully opaque
-						unsigned char* rgba = new unsigned char[desc.Width * desc.Height * 4];
-						for (UINT row = 0; row < desc.Height; row++)
-						{
-							unsigned char* src = (unsigned char*)mapped.pData + row * mapped.RowPitch;
-							unsigned char* dst = rgba + row * desc.Width * 4;
-							memcpy(dst, src, desc.Width * 4);
-							for (UINT x = 0; x < desc.Width; x++)
-								dst[x * 4 + 3] = 0xFF;
-						}
-						g_pImmediateContext->Unmap(pStaging, 0);
-
-						// Save PNG via stb_image_write
-						string narrowPath(screenshotPath.begin(), screenshotPath.end());
-						int writeResult = stbi_write_png(narrowPath.c_str(), desc.Width, desc.Height, 4, rgba, desc.Width * 4);
-						delete[] rgba;
-
-						// Send local-only chat message on success
-						if (writeResult)
-						{
-							wstring msg = L"Saved screenshot to " + wstring(filename);
-							gui->addMessage(msg, iPad);
-						}
-					}
-					pStaging->Release();
-				}
-				pBackBuffer->Release();
-			}
-		}
-#endif
-
 		if((player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_GAME_INFO)) && gameMode->isInputAllowed(MINECRAFT_ACTION_GAME_INFO))
 		{
 			ui.NavigateToScene(iPad,eUIScene_InGameInfoMenu);
@@ -3828,7 +3746,10 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
 		if((player->ullButtonsPressed&(1LL<<MINECRAFT_ACTION_INVENTORY)) && gameMode->isInputAllowed(MINECRAFT_ACTION_INVENTORY))
 		{
 			shared_ptr<MultiplayerLocalPlayer> player = Minecraft::GetInstance()->player;
-			ui.PlayUISFX(eSFX_Press);
+			if (!player->isRiding())
+			{
+				ui.PlayUISFX(eSFX_Press);
+			}

 			if(gameMode->isServerControlledInventory())
 			{
@@ -561,7 +561,6 @@ MinecraftServer::MinecraftServer()
 	m_serverPausedEvent = new C4JThread::Event;

 	m_saveOnExit = false;
-	m_deleteWorldOnExit = false;
 	m_suspending = false;

 	m_ugcPlayersVersion = 0;
@@ -888,15 +887,6 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 	//    }
 	ProgressRenderer *mcprogress = Minecraft::GetInstance()->progressRenderer;

-	// 4J Added - store save folder name for potential hardcore world deletion
-	{
-		char szSaveFolder[MAX_SAVEFILENAME_LENGTH] = {};
-		StorageManager.GetSaveUniqueFilename(szSaveFolder);
-		wchar_t wSaveFolder[MAX_SAVEFILENAME_LENGTH] = {};
-		mbstowcs(wSaveFolder, szSaveFolder, MAX_SAVEFILENAME_LENGTH - 1);
-		m_saveFolderName = wSaveFolder;
-	}
-
 	// 4J TODO - free levels here if there are already some?
 	levels = ServerLevelArray(3);

@@ -1007,9 +997,6 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 #endif
 		levels[i]->getLevelData()->setGameType(gameType);

-		// Apply hardcore flag from host option to level data so loaded worlds respect server.properties
-		levels[i]->getLevelData()->setHardcore(isHardcore());
-
 		if(app.getLevelGenerationOptions() != nullptr)
 		{
 			LevelGenerationOptions *mapOptions = app.getLevelGenerationOptions();
@@ -1655,7 +1642,7 @@ bool MinecraftServer::isNetherEnabled()

 bool MinecraftServer::isHardcore()
 {
-	return app.GetGameHostOption(eGameHostOption_Hardcore) > 0;
+	return false;
 }

 int MinecraftServer::getOperatorUserPermissionLevel()
@@ -265,8 +265,6 @@ private:
 private:
 	// 4J Added
 	bool m_saveOnExit;
-	bool m_deleteWorldOnExit; // 4J Added - for hardcore mode world deletion
-	wstring m_saveFolderName; // 4J Added - stored for hardcore world deletion
 	bool m_suspending;

 public:
@@ -280,9 +278,6 @@ public:
 	void chunkPacketManagement_PostTick();

 	void setSaveOnExit(bool save) { m_saveOnExit = save; s_bSaveOnExitAnswered = true; }
-	void setDeleteWorldOnExit(bool del) { m_deleteWorldOnExit = del; }
-	bool getDeleteWorldOnExit() const { return m_deleteWorldOnExit; }
-	const wstring& getSaveFolderName() const { return m_saveFolderName; }
 	void Suspend();
 	bool IsSuspending();

@@ -170,6 +170,7 @@ void Options::init()
 	particles = 0;
 	fov = 0;
 	gamma = 0;
+	advancedTooltips = false;
 }

 Options::Options(Minecraft *minecraft, File workingDirectory)
@@ -451,8 +452,9 @@ void Options::load()
                if (cmds[0] == L"fancyGraphics") fancyGraphics = cmds[1]==L"true";
                if (cmds[0] == L"ao") ambientOcclusion = cmds[1]==L"true";
 				if (cmds[0] == L"clouds") renderClouds = cmds[1]==L"true";
-                if (cmds[0] == L"skin") skin = cmds[1];
-                if (cmds[0] == L"lastServer") lastMpIp = cmds[1];
+				if (cmds[0] == L"advancedTooltips") advancedTooltips = cmds[1]==L"false";
+				if (cmds[0] == L"skin") skin = cmds[1];
+				if (cmds[0] == L"lastServer") lastMpIp = cmds[1];

                for (int i = 0; i < keyMappings_length; i++)
 				{
@@ -508,7 +510,8 @@ void Options::save()
        dos.writeChars(L"fancyGraphics:" + wstring(fancyGraphics ? L"true" : L"false"));
        dos.writeChars(ambientOcclusion ? L"ao:true" : L"ao:false");
 		dos.writeChars(renderClouds ? L"clouds:true" : L"clouds:false");
-        dos.writeChars(L"skin:" + skin);
+		dos.writeChars(advancedTooltips ? L"advancedTooltips:true" : L"advancedTooltips:false");
+		dos.writeChars(L"skin:" + skin);
        dos.writeChars(L"lastServer:" + lastMpIp);

        for (int i = 0; i < keyMappings_length; i++)
@@ -110,6 +110,7 @@ public:
 	int particles; // 0 is all, 1 is decreased and 2 is minimal
 	float fov;
 	float gamma;
+	bool advancedTooltips;

 	void init();	// 4J added
    Options(Minecraft *minecraft, File workingDirectory);
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|PS3">
-      <Configuration>Debug</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|PS3">
-      <Configuration>Release</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\HookSample.cpp" />
-    <ClCompile Include="Main.cpp" />
-    <ClCompile Include="Wait.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F749F5D0-B972-4E99-8B4B-2B865D4A8BC9}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>GCC</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>GCC</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <OutDir>$(ProjectDir)$(Platform)_$(Configuration)_VS2010\</OutDir>
-    <IntDir>$(Platform)_$(Configuration)_VS2010\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <OutDir>$(ProjectDir)$(Platform)_$(Configuration)_VS2010\</OutDir>
-    <IntDir>$(Platform)_$(Configuration)_VS2010\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;__CELL_ASSERT__;%(PreprocessorDefinitions);;HEAPINSPECTOR_PS3=1</PreprocessorDefinitions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>"$(SCE_PS3_ROOT)\target\ppu\lib\libm.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libio_stub.a";"..\..\..\Server\PS3\Debug\libHeapInspectorServer.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libpthread.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libnet_stub.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libsysmodule_stub.a";%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>-Wl,--wrap=malloc,--wrap=free,--wrap=calloc,--wrap=memalign,--wrap=realloc,--wrap=reallocalign,--wrap=_malloc_init %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);;HEAPINSPECTOR_PS3=1</PreprocessorDefinitions>
-      <OptimizationLevel>Level2</OptimizationLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>"..\..\..\Server\PS3\Release\libHeapInspectorServer.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libpthread.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libnet_stub.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libsysmodule_stub.a";%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>-Wl,--wrap=malloc,--wrap=free,--wrap=calloc,--wrap=memalign,--wrap=realloc,--wrap=reallocalign,--wrap=_malloc_init %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Condition="'$(ConfigurationType)' == 'Makefile' and Exists('$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets')" Project="$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|PS3">
-      <Configuration>Debug</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|PS3">
-      <Configuration>Release</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\ManualSample.cpp" />
-    <ClCompile Include="Main.cpp" />
-    <ClCompile Include="Wait.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B6B851C9-DC76-4A5B-9AFE-6CF944BFB502}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>GCC</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>GCC</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <OutDir>$(ProjectDir)$(Platform)_$(Configuration)_VS2010\</OutDir>
-    <IntDir>$(Platform)_$(Configuration)_VS2010\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <OutDir>$(ProjectDir)$(Platform)_$(Configuration)_VS2010\</OutDir>
-    <IntDir>$(Platform)_$(Configuration)_VS2010\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;__CELL_ASSERT__;%(PreprocessorDefinitions);;HEAPINSPECTOR_PS3=1</PreprocessorDefinitions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>"$(SCE_PS3_ROOT)\target\ppu\lib\libm.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libio_stub.a";"..\..\..\Server\PS3\Debug\libHeapInspectorServer.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libpthread.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libnet_stub.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libsysmodule_stub.a";%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);;HEAPINSPECTOR_PS3=1</PreprocessorDefinitions>
-      <OptimizationLevel>Level2</OptimizationLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>"..\..\..\Server\PS3\Release\libHeapInspectorServer.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libpthread.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libnet_stub.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libsysmodule_stub.a";%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Condition="'$(ConfigurationType)' == 'Makefile' and Exists('$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets')" Project="$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|PS3">
-      <Configuration>Debug</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|PS3">
-      <Configuration>Release</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\IThread.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\MultiThreadedHookSample.cpp" />
-    <ClCompile Include="Main.cpp" />
-    <ClCompile Include="ThreadPS3.cpp" />
-    <ClCompile Include="Wait.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E9BC25AD-CFFD-43B6-ABEC-CA516CADD296}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>GCC</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>GCC</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <OutDir>$(ProjectDir)$(Platform)_$(Configuration)_VS2010\</OutDir>
-    <IntDir>$(Platform)_$(Configuration)_VS2010\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <OutDir>$(ProjectDir)$(Platform)_$(Configuration)_VS2010\</OutDir>
-    <IntDir>$(Platform)_$(Configuration)_VS2010\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;__CELL_ASSERT__;%(PreprocessorDefinitions);;HEAPINSPECTOR_PS3=1</PreprocessorDefinitions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>"$(SCE_PS3_ROOT)\target\ppu\lib\libm.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libio_stub.a";"..\..\..\Server\PS3\Debug\libHeapInspectorServer.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libpthread.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libnet_stub.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libsysmodule_stub.a";%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>-Wl,--wrap=malloc,--wrap=free,--wrap=calloc,--wrap=memalign,--wrap=realloc,--wrap=reallocalign,--wrap=_malloc_init %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);;HEAPINSPECTOR_PS3=1</PreprocessorDefinitions>
-      <OptimizationLevel>Level2</OptimizationLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>"..\..\..\Server\PS3\Release\libHeapInspectorServer.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libpthread.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libnet_stub.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libsysmodule_stub.a";%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>-Wl,--wrap=malloc,--wrap=free,--wrap=calloc,--wrap=memalign,--wrap=realloc,--wrap=reallocalign,--wrap=_malloc_init %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Condition="'$(ConfigurationType)' == 'Makefile' and Exists('$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets')" Project="$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|PS3">
-      <Configuration>Debug</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|PS3">
-      <Configuration>Release</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\ReplaceNewDeleteSample.cpp" />
-    <ClCompile Include="Main.cpp" />
-    <ClCompile Include="Wait.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B0416FCD-A32B-4F91-93D1-4EDFF99F740B}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>GCC</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>GCC</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <OutDir>$(ProjectDir)$(Platform)_$(Configuration)_VS2010\</OutDir>
-    <IntDir>$(Platform)_$(Configuration)_VS2010\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <OutDir>$(ProjectDir)$(Platform)_$(Configuration)_VS2010\</OutDir>
-    <IntDir>$(Platform)_$(Configuration)_VS2010\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;__CELL_ASSERT__;%(PreprocessorDefinitions);;HEAPINSPECTOR_PS3=1</PreprocessorDefinitions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>"$(SCE_PS3_ROOT)\target\ppu\lib\libm.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libio_stub.a";"..\..\..\Server\PS3\Debug\libHeapInspectorServer.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libpthread.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libnet_stub.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libsysmodule_stub.a";%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);;HEAPINSPECTOR_PS3=1</PreprocessorDefinitions>
-      <OptimizationLevel>Level2</OptimizationLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>"..\..\..\Server\PS3\Release\libHeapInspectorServer.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libpthread.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libnet_stub.a";"$(SCE_PS3_ROOT)\target\ppu\lib\libsysmodule_stub.a";%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Condition="'$(ConfigurationType)' == 'Makefile' and Exists('$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets')" Project="$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="ContentPackage|PS3">
-      <Configuration>ContentPackage</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|PS3">
-      <Configuration>Debug</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|PS3">
-      <Configuration>Release</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="AnvilTile_SPU.h" />
-    <ClInclude Include="BedTile_SPU.h" />
-    <ClInclude Include="BookshelfTile_SPU.h" />
-    <ClInclude Include="BrewingStandTile_SPU.h" />
-    <ClInclude Include="Bush_SPU.h" />
-    <ClInclude Include="ButtonTile_SPU.h" />
-    <ClInclude Include="CactusTile_SPU.h" />
-    <ClInclude Include="CakeTile_SPU.h" />
-    <ClInclude Include="CarrotTile_SPU.h" />
-    <ClInclude Include="CauldronTile_SPU.h" />
-    <ClInclude Include="ChestTile_SPU.h" />
-    <ClInclude Include="ChunkRebuildData.h" />
-    <ClInclude Include="ClothTile_SPU.h" />
-    <ClInclude Include="CocoaTile_SPU.h" />
-    <ClInclude Include="CropTile_SPU.h" />
-    <ClInclude Include="DetectorRailTile_SPU.h" />
-    <ClInclude Include="DiodeTile_SPU.h" />
-    <ClInclude Include="DirectionalTile_SPU.h" />
-    <ClInclude Include="Direction_SPU.h" />
-    <ClInclude Include="DirtTile_SPU.h" />
-    <ClInclude Include="DispenserTile_SPU.h" />
-    <ClInclude Include="DoorTile_SPU.h" />
-    <ClInclude Include="EggTile_SPU.h" />
-    <ClInclude Include="EnchantmentTableTile_SPU.h" />
-    <ClInclude Include="EnderChestTile_SPU.h" />
-    <ClInclude Include="EntityTile_SPU.h" />
-    <ClInclude Include="Facing_SPU.h" />
-    <ClInclude Include="FarmTile_SPU.h" />
-    <ClInclude Include="FenceGateTile_SPU.h" />
-    <ClInclude Include="FenceTile_SPU.h" />
-    <ClInclude Include="FireTile_SPU.h" />
-    <ClInclude Include="FlowerPotTile_SPU.h" />
-    <ClInclude Include="FurnaceTile_SPU.h" />
-    <ClInclude Include="GlassTile_SPU.h" />
-    <ClInclude Include="GrassTile_SPU.h" />
-    <ClInclude Include="HalfSlabTile_SPU.h" />
-    <ClInclude Include="HalfTransparentTile_SPU.h" />
-    <ClInclude Include="HugeMushroomTile_SPU.h" />
-    <ClInclude Include="IceTile_SPU.h" />
-    <ClInclude Include="Icon_SPU.h" />
-    <ClInclude Include="Item_SPU.h" />
-    <ClInclude Include="LadderTile_SPU.h" />
-    <ClInclude Include="LeafTile_SPU.h" />
-    <ClInclude Include="LeverTile_SPU.h" />
-    <ClInclude Include="LiquidTile_SPU.h" />
-    <ClInclude Include="Material_SPU.h" />
-    <ClInclude Include="MelonTile_SPU.h" />
-    <ClInclude Include="MobSpawnerTile_SPU.h" />
-    <ClInclude Include="Mushroom_SPU.h" />
-    <ClInclude Include="MycelTile_SPU.h" />
-    <ClInclude Include="NetherStalkTile_SPU.h" />
-    <ClInclude Include="PistonBaseTile_SPU.h" />
-    <ClInclude Include="PistonExtensionTile_SPU.h" />
-    <ClInclude Include="PistonMovingPiece_SPU.h" />
-    <ClInclude Include="PortalTile_SPU.h" />
-    <ClInclude Include="PotatoTile_SPU.h" />
-    <ClInclude Include="PressurePlateTile_SPU.h" />
-    <ClInclude Include="PumpkinTile_SPU.h" />
-    <ClInclude Include="QuartzBlockTile_SPU.h" />
-    <ClInclude Include="RailTile_SPU.h" />
-    <ClInclude Include="RecordPlayerTile_SPU.h" />
-    <ClInclude Include="RedlightTile_SPU.h" />
-    <ClInclude Include="RedStoneDustTile_SPU.h" />
-    <ClInclude Include="ReedTile_SPU.h" />
-    <ClInclude Include="SandStoneTile_SPU.h" />
-    <ClInclude Include="Sapling_SPU.h" />
-    <ClInclude Include="SignTile_SPU.h" />
-    <ClInclude Include="SkullTile_SPU.h" />
-    <ClInclude Include="SmoothStoneBrickTile_SPU.h" />
-    <ClInclude Include="StairTile_SPU.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="StemTile_SPU.h" />
-    <ClInclude Include="StoneMonsterTile_SPU.h" />
-    <ClInclude Include="StoneSlabTile_SPU.h" />
-    <ClInclude Include="stubs_SPU.h" />
-    <ClInclude Include="TallGrass_SPU.h" />
-    <ClInclude Include="Tesselator_SPU.h" />
-    <ClInclude Include="TheEndPortalFrameTile_SPU.h" />
-    <ClInclude Include="TheEndPortal_SPU.h" />
-    <ClInclude Include="ThinFenceTile_SPU.h" />
-    <ClInclude Include="TileItem_SPU.h" />
-    <ClInclude Include="TileRenderer_SPU.h" />
-    <ClInclude Include="Tile_SPU.h" />
-    <ClInclude Include="TntTile_SPU.h" />
-    <ClInclude Include="TopSnowTile_SPU.h" />
-    <ClInclude Include="TorchTile_SPU.h" />
-    <ClInclude Include="TrapDoorTile_SPU.h" />
-    <ClInclude Include="TreeTile_SPU.h" />
-    <ClInclude Include="TripWireSourceTile_SPU.h" />
-    <ClInclude Include="TripWireTile_SPU.h" />
-    <ClInclude Include="VineTile_SPU.h" />
-    <ClInclude Include="WallTile_SPU.h" />
-    <ClInclude Include="WaterLilyTile_SPU.h" />
-    <ClInclude Include="WebTile_SPU.h" />
-    <ClInclude Include="WoodSlabTile_SPU.h" />
-    <ClInclude Include="WoodTile_SPU.h" />
-    <ClInclude Include="WoolCarpetTile_SPU.h" />
-    <ClInclude Include="WorkbenchTile_SPU.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ChunkRebuildData.cpp" />
-    <ClCompile Include="DiodeTile_SPU.cpp" />
-    <ClCompile Include="Direction_SPU.cpp" />
-    <ClCompile Include="DoorTile_SPU.cpp" />
-    <ClCompile Include="Facing_SPU.cpp" />
-    <ClCompile Include="FenceTile_SPU.cpp" />
-    <ClCompile Include="GrassTile_SPU.cpp" />
-    <ClCompile Include="HalfSlabTile_SPU.cpp" />
-    <ClCompile Include="Icon_SPU.cpp" />
-    <ClCompile Include="LeafTile_SPU.cpp" />
-    <ClCompile Include="LiquidTile_SPU.cpp" />
-    <ClCompile Include="PressurePlateTile_SPU.cpp" />
-    <ClCompile Include="StairTile_SPU.cpp" />
-    <ClCompile Include="TallGrass_SPU.cpp" />
-    <ClCompile Include="task.cpp" />
-    <ClCompile Include="Tesselator_SPU.cpp" />
-    <ClCompile Include="ThinFenceTile_SPU.cpp" />
-    <ClCompile Include="TileRenderer_SPU.cpp" />
-    <ClCompile Include="Tile_SPU.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4B7786BE-4F10-4FAA-A75A-631DF39570DD}</ProjectGuid>
-    <ProjectName>ChunkUpdate</ProjectName>
-    <SccProjectName>SAK</SccProjectName>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccProvider>SAK</SccProvider>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</IntDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" />
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(ProjectName)</TargetName>
-    <SpursUsage>SpursInit</SpursUsage>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;_DEBUG;__GCC__;SPU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <OptimizationLevel>Level3</OptimizationLevel>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizationLevel>Level3</OptimizationLevel>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;NDEBUG;__GCC__;SPU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizationLevel>Level3</OptimizationLevel>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;NDEBUG;__GCC__;SPU;_CONTENT_PACKAGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
-      <StripMode>Hard</StripMode>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{881f28ee-ca74-4afc-94a6-2346cb88f86d}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;cc;s;asm</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="StemTile_SPU.h" />
-    <ClInclude Include="StoneMonsterTile_SPU.h" />
-    <ClInclude Include="stubs_SPU.h" />
-    <ClInclude Include="TallGrass_SPU.h" />
-    <ClInclude Include="Tesselator_SPU.h" />
-    <ClInclude Include="TheEndPortal_SPU.h" />
-    <ClInclude Include="TheEndPortalFrameTile_SPU.h" />
-    <ClInclude Include="ThinFenceTile_SPU.h" />
-    <ClInclude Include="Tile_SPU.h" />
-    <ClInclude Include="TileRenderer_SPU.h" />
-    <ClInclude Include="TntTile_SPU.h" />
-    <ClInclude Include="TopSnowTile_SPU.h" />
-    <ClInclude Include="TorchTile_SPU.h" />
-    <ClInclude Include="TrapDoorTile_SPU.h" />
-    <ClInclude Include="TreeTile_SPU.h" />
-    <ClInclude Include="VineTile_SPU.h" />
-    <ClInclude Include="WaterLilyTile_SPU.h" />
-    <ClInclude Include="WebTile_SPU.h" />
-    <ClInclude Include="WoodTile_SPU.h" />
-    <ClInclude Include="WorkbenchTile_SPU.h" />
-    <ClInclude Include="BedTile_SPU.h" />
-    <ClInclude Include="BookshelfTile_SPU.h" />
-    <ClInclude Include="BrewingStandTile_SPU.h" />
-    <ClInclude Include="Bush_SPU.h" />
-    <ClInclude Include="ButtonTile_SPU.h" />
-    <ClInclude Include="CactusTile_SPU.h" />
-    <ClInclude Include="CakeTile_SPU.h" />
-    <ClInclude Include="CauldronTile_SPU.h" />
-    <ClInclude Include="ChestTile_SPU.h" />
-    <ClInclude Include="ChunkRebuildData.h" />
-    <ClInclude Include="CocoaTile_SPU.h" />
-    <ClInclude Include="CropTile_SPU.h" />
-    <ClInclude Include="DetectorRailTile_SPU.h" />
-    <ClInclude Include="DiodeTile_SPU.h" />
-    <ClInclude Include="Direction_SPU.h" />
-    <ClInclude Include="DirectionalTile_SPU.h" />
-    <ClInclude Include="DirtTile_SPU.h" />
-    <ClInclude Include="DispenserTile_SPU.h" />
-    <ClInclude Include="DoorTile_SPU.h" />
-    <ClInclude Include="EggTile_SPU.h" />
-    <ClInclude Include="EnchantmentTableTile_SPU.h" />
-    <ClInclude Include="EntityTile_SPU.h" />
-    <ClInclude Include="Facing_SPU.h" />
-    <ClInclude Include="FarmTile_SPU.h" />
-    <ClInclude Include="FenceGateTile_SPU.h" />
-    <ClInclude Include="FenceTile_SPU.h" />
-    <ClInclude Include="FireTile_SPU.h" />
-    <ClInclude Include="FurnaceTile_SPU.h" />
-    <ClInclude Include="GlassTile_SPU.h" />
-    <ClInclude Include="GrassTile_SPU.h" />
-    <ClInclude Include="HalfSlabTile_SPU.h" />
-    <ClInclude Include="HalfTransparentTile_SPU.h" />
-    <ClInclude Include="HugeMushroomTile_SPU.h" />
-    <ClInclude Include="IceTile_SPU.h" />
-    <ClInclude Include="Icon_SPU.h" />
-    <ClInclude Include="LadderTile_SPU.h" />
-    <ClInclude Include="LeafTile_SPU.h" />
-    <ClInclude Include="LeverTile_SPU.h" />
-    <ClInclude Include="LiquidTile_SPU.h" />
-    <ClInclude Include="Material_SPU.h" />
-    <ClInclude Include="MelonTile_SPU.h" />
-    <ClInclude Include="Mushroom_SPU.h" />
-    <ClInclude Include="MycelTile_SPU.h" />
-    <ClInclude Include="NetherStalkTile_SPU.h" />
-    <ClInclude Include="PistonBaseTile_SPU.h" />
-    <ClInclude Include="PistonExtensionTile_SPU.h" />
-    <ClInclude Include="PistonMovingPiece_SPU.h" />
-    <ClInclude Include="PortalTile_SPU.h" />
-    <ClInclude Include="PressurePlateTile_SPU.h" />
-    <ClInclude Include="PumpkinTile_SPU.h" />
-    <ClInclude Include="RailTile_SPU.h" />
-    <ClInclude Include="RecordPlayerTile_SPU.h" />
-    <ClInclude Include="RedlightTile_SPU.h" />
-    <ClInclude Include="RedStoneDustTile_SPU.h" />
-    <ClInclude Include="ReedTile_SPU.h" />
-    <ClInclude Include="SandStoneTile_SPU.h" />
-    <ClInclude Include="Sapling_SPU.h" />
-    <ClInclude Include="SignTile_SPU.h" />
-    <ClInclude Include="SmoothStoneBrickTile_SPU.h" />
-    <ClInclude Include="StairTile_SPU.h" />
-    <ClInclude Include="TileItem_SPU.h" />
-    <ClInclude Include="Item_SPU.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ClothTile_SPU.h" />
-    <ClInclude Include="SkullTile_SPU.h" />
-    <ClInclude Include="WoodSlabTile_SPU.h" />
-    <ClInclude Include="StoneSlabTile_SPU.h" />
-    <ClInclude Include="MobSpawnerTile_SPU.h" />
-    <ClInclude Include="FlowerPotTile_SPU.h" />
-    <ClInclude Include="TripWireSourceTile_SPU.h" />
-    <ClInclude Include="TripWireTile_SPU.h" />
-    <ClInclude Include="WallTile_SPU.h" />
-    <ClInclude Include="QuartzBlockTile_SPU.h" />
-    <ClInclude Include="PotatoTile_SPU.h" />
-    <ClInclude Include="CarrotTile_SPU.h" />
-    <ClInclude Include="AnvilTile_SPU.h" />
-    <ClInclude Include="EnderChestTile_SPU.h" />
-    <ClInclude Include="WoolCarpetTile_SPU.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ChunkRebuildData.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DiodeTile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Direction_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DoorTile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Facing_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FenceTile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GrassTile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HalfSlabTile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Icon_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LeafTile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LiquidTile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PressurePlateTile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="StairTile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TallGrass_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="task.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Tesselator_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ThinFenceTile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Tile_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TileRenderer_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="ContentPackage|PS3">
-      <Configuration>ContentPackage</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|PS3">
-      <Configuration>Debug</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|PS3">
-      <Configuration>Release</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="CompressedTileStorage_SPU.h" />
-    <ClInclude Include="SparseDataStorage_SPU.h" />
-    <ClInclude Include="SparseLightStorage_SPU.h" />
-    <ClInclude Include="stdafx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="CompressedTileStorage_SPU.cpp" />
-    <ClCompile Include="CompressedTile_main.cpp" />
-    <ClCompile Include="SparseDataStorage_SPU.cpp" />
-    <ClCompile Include="SparseLightStorage_SPU.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\CompressedTileStorage_compress\CompressedTileStorage_compress.spu.vcxproj" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4B436D43-D35B-4E56-988A-A3543B70C8E5}</ProjectGuid>
-    <ProjectName>CompressedTile</ProjectName>
-    <SccProjectName>%24/StoriesPark/Minecraft/MinecraftConsoles-dev/Minecraft.Client/PS3/SPU_Tasks/CompressedTile</SccProjectName>
-    <SccAuxPath>https://tfs4jstudios.visualstudio.com/defaultcollection</SccAuxPath>
-    <SccLocalPath>.</SccLocalPath>
-    <SccProvider>{4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}</SccProvider>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</IntDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" />
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(ProjectName)</TargetName>
-    <SpursUsage>SpursInit</SpursUsage>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;_DEBUG;__GCC__;SPU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizationLevel>Level3</OptimizationLevel>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;NDEBUG;__GCC__;SPU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizationLevel>Level3</OptimizationLevel>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;NDEBUG;__GCC__;SPU;_CONTENT_PACKAGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
-      <StripMode>Hard</StripMode>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{881f28ee-ca74-4afc-94a6-2346cb88f86d}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;cc;s;asm</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="CompressedTileStorage_SPU.h" />
-    <ClInclude Include="SparseDataStorage_SPU.h" />
-    <ClInclude Include="SparseLightStorage_SPU.h" />
-    <ClInclude Include="stdafx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="CompressedTile_main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CompressedTileStorage_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SparseDataStorage_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SparseLightStorage_SPU.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\CompressedTileStorage_compress\CompressedTileStorage_compress.spu.vcxproj" />
-  </ItemGroup>
-</Project>
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="ContentPackage|PS3">
-      <Configuration>ContentPackage</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|PS3">
-      <Configuration>Debug</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|PS3">
-      <Configuration>Release</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="CompressedTileStorage_compress.h" />
-    <ClInclude Include="stdafx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="CompressedTileStorage_compress.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\LevelRenderer_FindNearestChunk\LevelRenderer_FindNearestChunk.spu.vcxproj" />
-    <None Include="..\Texture_blit\Texture_blit.spu.vcxproj" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{297888B4-8234-461B-9861-214988A95711}</ProjectGuid>
-    <ProjectName>CompressedTileStorage_compress</ProjectName>
-    <SccProjectName>SAK</SccProjectName>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccProvider>SAK</SccProvider>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_ContentPackage\</IntDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" />
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(ProjectName)</TargetName>
-    <SpursUsage>SpursInit</SpursUsage>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;_DEBUG;__GCC__;SPU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizationLevel>Level3</OptimizationLevel>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;NDEBUG;__GCC__;SPU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <OptimizationLevel>Level3</OptimizationLevel>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;NDEBUG;__GCC__;SPU;_CONTENT_PACKAGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
-      <StripMode>Hard</StripMode>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{881f28ee-ca74-4afc-94a6-2346cb88f86d}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;cc;s;asm</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="CompressedTileStorage_compress.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="CompressedTileStorage_compress.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\LevelRenderer_FindNearestChunk\LevelRenderer_FindNearestChunk.spu.vcxproj" />
-    <None Include="..\Texture_blit\Texture_blit.spu.vcxproj" />
-  </ItemGroup>
-</Project>
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="ContentPackage|PS3">
-      <Configuration>ContentPackage</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|PS3">
-      <Configuration>Debug</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|PS3">
-      <Configuration>Release</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="CompressedTileStorage_getData.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="CompressedTileStorage_getData.h" />
-    <ClInclude Include="stdafx.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{ED672663-B86E-436B-9530-A6589DE02366}</ProjectGuid>
-    <ProjectName>CompressedTileStorage_getData</ProjectName>
-    <SccProjectName>SAK</SccProjectName>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccProvider>SAK</SccProvider>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">PS3_Release\</IntDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'" />
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(ProjectName)</TargetName>
-    <SpursUsage>SpursInit</SpursUsage>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;_DEBUG;__GCC__;SPU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Debug\$(TargetName).ppu$(ObjectExt)</OutputFile>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizationLevel>Level3</OptimizationLevel>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;NDEBUG;__GCC__;SPU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\Release\$(TargetName).ppu$(ObjectExt)</OutputFile>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizationLevel>Level3</OptimizationLevel>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;NDEBUG;__GCC__;SPU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\ObjFiles\ContentPackage\$(TargetName).ppu$(ObjectExt)</OutputFile>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|PS3">
-      <Configuration>Debug</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|PS3">
-      <Configuration>Release</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="GameRenderer_updateLightTexture.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="GameRenderer_updateLightTexture.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1F6ECBFE-3089-457D-8A11-5CFDC0392439}</ProjectGuid>
-    <ProjectName>GameRenderer_updateLightTexture</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>SPU</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">PS3_Debug\</IntDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'" />
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">PS3_Release\</IntDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|PS3'" />
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(ProjectName)</TargetName>
-    <SpursUsage>SpursInit</SpursUsage>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;_DEBUG;__GCC__;SPU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <ClCompile>
-      <AdditionalOptions>-ffunction-sections -fdata-sections -fstack-check %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizationLevel>Level3</OptimizationLevel>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;NDEBUG;__GCC__;SPU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-    <Link>
-      <AdditionalOptions>-Wl,--gc-sections -g %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>-ldma;-lspurs_jq;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <EmbedFormat>JobBin2</EmbedFormat>
-      <OutputFile>..\$(TargetName).ppu$(ObjectExt)</OutputFile>
-    </SpuElfConversion>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{881f28ee-ca74-4afc-94a6-2346cb88f86d}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;cc;s;asm</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="GameRenderer_updateLightTexture.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="GameRenderer_updateLightTexture.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
itsRevela	071c11d1f7	Fix pistons permanently breaking server-wide on dedicated servers triggerEvent() set ignoreUpdate to true at the start but three early return paths skipped the reset at the end. Once any of these paths was hit, the TLS flag stayed true permanently, blocking all piston neighbor updates for the rest of the server session.	2026-03-26 10:56:33 -05:00
Sylvessa	c96a8ee524	fix splitscreen xuids (#1413 )	2026-03-26 10:19:20 -04:00
Sylvessa	1a50770647	Add asynchronous server joining (#1408 )	2026-03-26 10:15:11 -04:00
Loki Rautio	dee559bd16	Revert "Memory leak fix: Make chunks unload properly (#1406 )" This reverts commit `a24318eedc`. This fix introduces broken behavior for dedicated servers. It will be merged back in once the related issue is fixed	2026-03-26 01:37:23 -05:00
ModMaker101	a24318eedc	Memory leak fix: Make chunks unload properly (#1406 ) * Fix chunk unload and cleanup logic, fixes #1347 * Applying formatting to code I edited 😝	2026-03-24 23:25:18 -05:00
Sylvessa	993052409a	Fix XUID logging (#1395 ) * pass invalid_xuid to other players * actually more simple fix	2026-03-24 05:04:07 -04:00
Ayush Thoren	ed9cbae3f7	Fix initial cursor position for in-game UI elements (#1120 ) Signed-off-by: Ayush Thoren <ayushthoren@gmail.com>	2026-03-23 21:06:20 -05:00
Sylvessa	daed75b8a1	make handleParticleEvent actually parse the particle type instead of hardcoding hearts (#1399 )	2026-03-23 20:11:37 -05:00
rtm516	9e715cb3bc	Fix render order of F3 debug screen (#1239 )	2026-03-23 18:01:40 -05:00
Sylvessa	127465b0eb	add advanced tooltips, F3+H combo, and handle settings (#1389 )	2026-03-23 17:54:46 -05:00
Connor Beard	77433dbd86	Fix: CMP0057 policy was not set (#1367 )	2026-03-22 23:27:42 -05:00
Lord Cambion	9a6d126ae1	Stained Glass Survival Integration & Crafting UI Fix (#1195 ) * Added Stained Glass i found out that stained glass was not accessible in survival, then i saw they disabled it in the code * Grouping glass correctly in crafting table I removed the #if/endif from the ClothDyeRecipes.cpp and added a different one in StructureRecipies.cpp also changed the Tile definition giving it the same setBaseItemTypeAndMaterial of stained glass to group it correctly inside the crafting table UI. also aincremented the Vertical Slot for crafting table to include many more craftings in the same group	2026-03-22 21:15:02 -05:00
Revela	39e46751bf	Add clipboard paste support to UIControl_TextInput and UIScene_Keyboard (#1298 ) Previously paste only worked in the chat screen. Wire Screen::getClipboard() into the two remaining text input paths so Ctrl+V works for sign editing, seed entry, server IP/port, and world name fields.	2026-03-22 21:09:10 -05:00
Alezito2008	ebab3ec40f	Clicking outside container now drops items (#1306 ) Java Edition KBM input parity	2026-03-22 21:05:04 -05:00
Sylvessa	c1ce97f7be	allow displaying item lore (#1384 )	2026-03-22 20:50:06 -05:00
Iruka Wolf	603c6ba7cb	Fix missing trapped chest textures in Natural Texture Pack (#1381 ) Co-authored-by: Iruka-Wolf <17684713+Iruka-Wolf@users.noreply.github.com>	2026-03-22 20:49:14 -05:00
Sylvessa	b6e25415ca	Remove redundant buffer in UIScene_SettingsGraphicsMenu.cpp (#1348 ) (#1380 )	2026-03-22 18:37:59 -04:00
Sylvessa	dac073605f	add ifdef debug around handle debug options (#1382 )	2026-03-22 13:38:35 -04:00
Ayush Thoren	be7e2ca91d	Fix font rendering for color and formatting codes (#1017 ) * Fix "Colormatic" splash text rendering as single color Signed-off-by: Ayush Thoren <ayushthoren@gmail.com> * Use per-vertex coloring in a single batch Signed-off-by: Ayush Thoren <ayushthoren@gmail.com> * Fix font rendering for color and formatting codes Signed-off-by: Ayush Thoren <ayushthoren@gmail.com> --------- Signed-off-by: Ayush Thoren <ayushthoren@gmail.com>	2026-03-22 00:33:35 -04:00
GabsPuNs	250accd40b	Fix Sign (#1369 ) fix for the sign's interface. SignEntryMenu720 was being replaced by an older version of SkinWinHD. SignEntryMenu720 was is now replaced with it's original version.	2026-03-21 17:49:21 -04:00
Jazzitch	33b008c96a	Update maximum limits for game entities (#1355 ) * Update maximum limits for game entities Increased the maximum limits for Xbox boats, console minecarts, dispensable fireballs, and projectiles. * Update maximum limits for game entities Increased maximum limits for Xbox boats, console minecarts, dispensable fireballs, and projectiles.	2026-03-21 16:15:47 -04:00
Matthew Toro	ecb3f00bd6	Revert "Increase limits for boats, minecarts, fireballs, and height (#1325 )" (#1341 ) This reverts commit `baa9fc058d`.	2026-03-18 20:52:48 -04:00
Adem Kurt	71d6fba4b9	Fix: opening the horse's inventory plays sound effects twice (#1336 )	2026-03-18 20:11:07 -04:00
ButterSword	baa9fc058d	Increase limits for boats, minecarts, fireballs, and height (#1325 )	2026-03-18 20:10:24 -04:00
Xenovyy	ab80b34c45	Update banner.png to new logo (#1323 ) Update banner.png to new logo	2026-03-18 20:08:40 -04:00
Xenovyy	a94ee1ca22	Fixed the ear bleeding sound when using a slider with mouse controls (#1296 ) * Fixed the ear bleeding sound when using a slider with mouse controls Now only ticks every 9 "ticks" unless the slider has less than 18 possible values.. * cured rtm516's ocd title * rtm516 reaches enlightenment * rtm516 reaches total enlightenment	2026-03-17 22:44:12 +00:00
rtm516	b774d13806	Fix zip command when packaging release	2026-03-17 22:36:52 +00:00