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
204 changed files with 9792 additions and 74595 deletions
@@ -1,31 +0,0 @@
-name: Build Minecraft Legacy Console Edition
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: windows-2022
-
-    strategy:
-      matrix:
-        configuration: [Release, Debug]
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v2
-
-      - name: Build Minecraft Legacy Console Edition
-        run: |
-          msbuild MinecraftConsoles.sln `
-            /p:Configuration=${{ matrix.configuration }} `
-            /p:Platform=Windows64 `
-            /m
-                  
-      - name: Upload Release + Debug Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: MinecraftClient-${{ matrix.configuration }}
-          path: x64/${{ matrix.configuration }}
@@ -1,32 +0,0 @@
-name: MSBuild Debug Test
-
-on:
-  workflow_dispatch: 
-  pull_request:
-    types: [opened, reopened, synchronize]
-    paths-ignore:
-      - '.gitignore'
-      - '*.md'
-      - '.github/*.md'
-  push:
-    branches:
-    - 'main'
-    paths-ignore:
-      - '.gitignore'
-      - '*.md'
-      - '.github/*.md'
-
-jobs:
-  build:
-    name: Build Windows64 (DEBUG)
-    runs-on: windows-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v6
-
-    - name: Setup msbuild
-      uses: microsoft/setup-msbuild@v2
-    
-    - name: Build
-      run: MSBuild.exe MinecraftConsoles.sln /p:Configuration=Debug /p:Platform="Windows64"
@@ -1,160 +0,0 @@
-name: Docker Nightly Dedicated Server
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-    - "main"
-    - 'feature/dedicated-server'
-    paths-ignore:
-      - ".gitignore"
-      - "*.md"
-      - ".github/*.md"
-
-permissions:
-  contents: read
-  packages: write
-
-concurrency:
-  group: docker-nightly-dedicated-server
-  cancel-in-progress: true
-
-jobs:
-  build-runtime:
-    name: Build Dedicated Server Runtime
-    runs-on: windows-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v6
-
-    - name: Setup msbuild
-      uses: microsoft/setup-msbuild@v2
-
-    - name: Build Dedicated Server Runtime Only
-      shell: pwsh
-      run: |
-        MSBuild.exe Minecraft.World\Minecraft.World.vcxproj /p:Configuration=Release /p:Platform=x64 /m
-        MSBuild.exe Minecraft.Server\Minecraft.Server.vcxproj /p:Configuration=Release /p:Platform=x64 /m
-
-    - name: Stage dedicated server runtime
-      shell: pwsh
-      run: |
-        $serverOut = "Minecraft.Server/x64/Minecraft.Server/Release"
-        $stage = ".artifacts/dedicated-server-runtime"
-
-        if (Test-Path $stage) {
-          Remove-Item -Path $stage -Recurse -Force
-        }
-
-        New-Item -ItemType Directory -Path (Join-Path $stage "Windows64") -Force | Out-Null
-
-        # Minimum required runtime files
-        $required = @(
-          "Minecraft.Server.exe",
-          "iggy_w64.dll",
-          "Common"
-        )
-
-        foreach ($entry in $required) {
-          $src = Join-Path $serverOut $entry
-          if (-not (Test-Path $src)) {
-            throw "Missing required runtime path: $src"
-          }
-        }
-
-        # Copy required files
-        Copy-Item -Path (Join-Path $serverOut "Minecraft.Server.exe") -Destination (Join-Path $stage "Minecraft.Server.exe") -Force
-        Copy-Item -Path (Join-Path $serverOut "iggy_w64.dll") -Destination (Join-Path $stage "iggy_w64.dll") -Force
-        Copy-Item -Path (Join-Path $serverOut "Common") -Destination (Join-Path $stage "Common") -Recurse -Force
-        if (Test-Path (Join-Path $serverOut "Windows64")) {
-          Copy-Item -Path (Join-Path $serverOut "Windows64/*") -Destination (Join-Path $stage "Windows64") -Recurse -Force
-        } else {
-          Write-Host "Windows64 directory is not present in build output; staging without it."
-        }
-
-        Get-ChildItem -Path $stage -Recurse -File | Select-Object -First 20 | ForEach-Object {
-          Write-Host "Staged: $($_.FullName)"
-        }
-
-    - name: Upload dedicated server runtime to artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: dedicated-server-runtime
-        if-no-files-found: error
-        path: |
-          .artifacts/dedicated-server-runtime/**
-
-  docker-publish:
-    name: Build and Push Docker Image
-    runs-on: ubuntu-latest
-    needs: build-runtime
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v6
-
-    - name: Download dedicated server runtime from artifacts
-      uses: actions/download-artifact@v4
-      with:
-        name: dedicated-server-runtime
-        path: .artifacts/runtime
-
-    - name: Prepare Docker runtime directory
-      shell: bash
-      run: |
-        set -euo pipefail
-
-        rm -rf runtime
-        mkdir -p runtime
-        cp .artifacts/runtime/Minecraft.Server.exe runtime/Minecraft.Server.exe
-        cp .artifacts/runtime/iggy_w64.dll runtime/iggy_w64.dll
-        cp -R .artifacts/runtime/Common runtime/Common
-        mkdir -p runtime/Windows64
-        if [[ -d ".artifacts/runtime/Windows64" ]]; then
-          cp -R .artifacts/runtime/Windows64/. runtime/Windows64/
-        fi
-
-        test -f runtime/Minecraft.Server.exe
-        test -f runtime/iggy_w64.dll
-        test -d runtime/Common
-        test -d runtime/Windows64
-
-    - name: Compute image name
-      id: image
-      shell: bash
-      run: |
-        owner="$(echo "${{ vars.CONTAINER_REGISTRY_OWNER || github.repository_owner }}" | tr '[:upper:]' '[:lower:]')"
-        image_tag="nightly"
-        # if [[ "${{ github.ref }}" != "refs/heads/main" ]]; then
-        #   image_tag="nightly-test"
-        # fi
-        echo "owner=$owner" >> "$GITHUB_OUTPUT"
-        echo "image=ghcr.io/$owner/minecraft-lce-dedicated-server" >> "$GITHUB_OUTPUT"
-        echo "image_tag=$image_tag" >> "$GITHUB_OUTPUT"
-
-    - name: Extract Docker metadata
-      id: meta
-      uses: docker/metadata-action@v5
-      with:
-        images: ${{ steps.image.outputs.image }}
-        tags: |
-          type=raw,value=${{ steps.image.outputs.image_tag }}
-
-    - name: Login to GHCR
-      uses: docker/login-action@v3
-      with:
-        registry: ghcr.io
-        username: ${{ secrets.GHCR_USERNAME || github.actor }}
-        password: ${{ secrets.GHCR_TOKEN || secrets.GITHUB_TOKEN }}
-
-    - name: Build and push image
-      uses: docker/build-push-action@v6
-      with:
-        context: .
-        file: docker/dedicated-server/Dockerfile
-        push: true
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
-        build-args: |
-          MC_RUNTIME_DIR=runtime
@@ -0,0 +1,167 @@
+name: Nightly Server Release
+
+on:
+  workflow_dispatch: 
+  push:
+    branches:
+    - 'main'
+    paths-ignore:
+      - '.gitignore'
+      - '*.md'
+      - '.github/**'
+      - '!.github/workflows/nightly-server.yml'
+
+permissions:
+  contents: write
+  packages: write
+
+concurrency:
+  group: nightly-server
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    strategy:
+      matrix:
+        platform: [Windows64]
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+
+    - name: Set platform lowercase
+      run: echo "MATRIX_PLATFORM=$('${{ matrix.platform }}'.ToLower())" >> $env:GITHUB_ENV
+
+    - 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.Server']"
+
+    - name: Zip Build
+      run: 7z a -r LCEServer${{ matrix.platform }}.zip ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Server/Release/* "-x!*.ipdb" "-x!*.iobj"
+
+    - name: Stage artifacts
+      run: |
+        New-Item -ItemType Directory -Force -Path staging
+        Copy-Item LCEServer${{ matrix.platform }}.zip staging/
+
+    - name: Stage exe and pdb
+      if: matrix.platform == 'Windows64'
+      run: |
+        Copy-Item ./build/${{ env.MATRIX_PLATFORM }}/Minecraft.Server/Release/Minecraft.Server.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 }}
+      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: |
+          artifacts/*
+
+  docker:
+    name: Build and Push Docker Image
+    runs-on: ubuntu-latest
+    needs: build
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+
+    - name: Download dedicated server runtime from artifacts
+      uses: actions/download-artifact@v4
+      with:
+        name: build-Windows64
+        path: .artifacts/
+
+    - name: Prepare Docker runtime directory
+      shell: bash
+      run: |
+        set -euo pipefail
+
+        rm -rf runtime
+        mkdir -p runtime
+        unzip .artifacts/LCEServerWindows64.zip -d runtime
+
+    - name: Compute image name
+      id: image
+      shell: bash
+      run: |
+        owner="$(echo "${{ vars.CONTAINER_REGISTRY_OWNER || github.repository_owner }}" | tr '[:upper:]' '[:lower:]')"
+        image_tag="nightly"
+        # if [[ "${{ github.ref }}" != "refs/heads/main" ]]; then
+        #   image_tag="nightly-test"
+        # fi
+        echo "owner=$owner" >> "$GITHUB_OUTPUT"
+        echo "image=ghcr.io/$owner/minecraft-lce-dedicated-server" >> "$GITHUB_OUTPUT"
+        echo "image_tag=$image_tag" >> "$GITHUB_OUTPUT"
+
+    - name: Extract Docker metadata
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        images: ${{ steps.image.outputs.image }}
+        tags: |
+          type=raw,value=${{ steps.image.outputs.image_tag }}
+
+    - name: Login to GHCR
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ secrets.GHCR_USERNAME || github.actor }}
+        password: ${{ secrets.GHCR_TOKEN || secrets.GITHUB_TOKEN }}
+
+    - name: Build and push image
+      uses: docker/build-push-action@v6
+      with:
+        context: .
+        file: docker/dedicated-server/Dockerfile
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+        build-args: |
+          MC_RUNTIME_DIR=runtime
+
+  cleanup:
+    needs: [build, release, docker]
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+    - name: Cleanup artifacts
+      uses: geekyeggo/delete-artifact@v5
+      with:
+        name: build-*
@@ -1,41 +1,84 @@
-name: Nightly Releases
+name: Nightly Release

 on:
  workflow_dispatch: 
  push:
    branches:
    - 'main'
-    - 'feature/dedicated-server'
    paths-ignore:
      - '.gitignore'
      - '*.md'
-      - '.github/*.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 }}
@@ -43,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-*
@@ -0,0 +1,32 @@
+name: Pull Request Build
+
+on:
+  workflow_dispatch: 
+  pull_request:
+    types: [opened, reopened, synchronize]
+    paths-ignore:
+      - '.gitignore'
+      - '*.md'
+      - '.github/*.md'
+
+jobs:
+  build:
+    runs-on: windows-latest
+    
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+
+    - 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: windows64
+        buildPreset: windows64-debug
@@ -407,39 +407,10 @@ enc_temp_folder/
 Minecraft.Client/Schematics/
 Minecraft.Client/Windows64/GameHDD/

-# Intermediate build files (per-project)
-Minecraft.Client/x64/
-Minecraft.Client/Debug/
-Minecraft.Client/x64_Debug/
-Minecraft.Client/Release/
-Minecraft.Client/x64_Release/
-
-Minecraft.World/x64/
-Minecraft.World/Debug/
-Minecraft.World/x64_Debug/
-Minecraft.World/Release/
-Minecraft.World/x64_Release/
-
-Minecraft.Server/x64/
-Minecraft.Server/Debug/
-Minecraft.Server/x64_Debug/
-Minecraft.Server/Release/
-Minecraft.Server/x64_Release/
-
-build/*
-
-# Existing build output files
-!x64/**/Effects.msscmp
-!x64/**/iggy_w64.dll
-!x64/**/mss64.dll
-!x64/**/redist64/
-
-# Local saves
-Minecraft.Client/Saves/
+# CMake build output
+build/

+# Server data
 tmp*/
 _server_asset_probe/
 server-data/
-# Visual Studio Per-User Config
-*.user
-/out
@@ -13,232 +13,101 @@ if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
  message(FATAL_ERROR "Use a 64-bit generator/toolchain (x64).")
 endif()

+set(CMAKE_CONFIGURATION_TYPES
+  "Debug"
+  "Release"
+  CACHE STRING "" FORCE
+)
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

-function(configure_msvc_target target)
-  target_compile_options(${target} PRIVATE
-    $<$<AND:$<NOT:$<CONFIG:Release>>,$<COMPILE_LANGUAGE:C,CXX>>:/W3>
-    $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:C,CXX>>:/W0>
-    $<$<COMPILE_LANGUAGE:C,CXX>:/MP>
-    $<$<COMPILE_LANGUAGE:C,CXX>:/FS>
-    $<$<COMPILE_LANGUAGE:CXX>:/EHsc>
-    $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:C,CXX>>:/GL /O2 /Oi /GT /GF>
-  )
+function(configure_compiler_target target)
+  # MSVC and compatible compilers (like Clang-cl)
+  if (MSVC)
+    target_compile_options(${target} PRIVATE
+      $<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:C,CXX>>:/W3>
+      $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:C,CXX>>:/W0>
+      $<$<COMPILE_LANGUAGE:C,CXX>:/MP>
+      $<$<COMPILE_LANGUAGE:C,CXX>:/FS>
+      $<$<COMPILE_LANGUAGE:C,CXX>:/GS>
+      $<$<COMPILE_LANGUAGE:CXX>:/EHsc>
+      $<$<COMPILE_LANGUAGE:CXX>:/GR>
+      $<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:C,CXX>>:/Od>
+      $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:C,CXX>>:/O2 /Oi /GT /GF>
+    )
+  endif()
+
+  # MSVC
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    target_compile_options(${target} PRIVATE
+      $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:C,CXX>>:/GL>
+    )
+    target_link_options(${target} PRIVATE
+      $<$<CONFIG:Release>:/LTCG:incremental>
+    )
+  endif()
+
+  # Clang
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    target_compile_options(${target} PRIVATE
+      $<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:C,CXX>>:-O0 -Wall>
+      $<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:C,CXX>>:-O2 -w -flto>
+    )
+    target_link_options(${target} PRIVATE
+      $<$<CONFIG:Release>:-flto>
+    )
+  endif()
 endfunction()

-include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/WorldSources.cmake")
-include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/ClientSources.cmake")

-list(TRANSFORM MINECRAFT_WORLD_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/")
-list(TRANSFORM MINECRAFT_CLIENT_SOURCES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/")
-list(APPEND MINECRAFT_CLIENT_SOURCES
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Xbox/MinecraftWindows.rc"
+# ---
+# Configuration
+# ---
+set(MINECRAFT_SHARED_DEFINES
+  _LARGE_WORLDS
+  _DEBUG_MENUS_ENABLED
+  $<$<CONFIG:Debug>:_DEBUG>
+  _CRT_NON_CONFORMING_SWPRINTFS
+  _CRT_SECURE_NO_WARNINGS
 )

-add_library(MinecraftWorld STATIC ${MINECRAFT_WORLD_SOURCES})
-target_include_directories(MinecraftWorld PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/x64headers"
-)
-target_compile_definitions(MinecraftWorld PRIVATE
-  $<$<CONFIG:Debug>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
-  $<$<NOT:$<CONFIG:Debug>>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_LIB;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
-)
-if(MSVC)
-  configure_msvc_target(MinecraftWorld)
+# Add platform-specific defines
+list(APPEND MINECRAFT_SHARED_DEFINES ${PLATFORM_DEFINES})
+
+# ---
+# Sources
+# ---
+add_subdirectory(Minecraft.World)
+add_subdirectory(Minecraft.Client)
+if(PLATFORM_NAME STREQUAL "Windows64") # Server is only supported on Windows for now
+  add_subdirectory(Minecraft.Server)
 endif()

-add_executable(MinecraftClient WIN32 ${MINECRAFT_CLIENT_SOURCES})
-target_include_directories(MinecraftClient PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/include"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Xbox/Sentient/Include"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/x64headers"
-  "${CMAKE_CURRENT_SOURCE_DIR}/include/"
-)
-target_compile_definitions(MinecraftClient PRIVATE
-  $<$<CONFIG:Debug>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
-  $<$<NOT:$<CONFIG:Debug>>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
-)
-if(MSVC)
-  configure_msvc_target(MinecraftClient)
-  target_link_options(MinecraftClient PRIVATE
-    $<$<CONFIG:Release>:/LTCG /INCREMENTAL:NO>
-  )
-endif()
+# ---
+# Build versioning
+# ---
+set(BUILDVER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/GenerateBuildVer.cmake")
+set(BUILDVER_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated/Common/BuildVer.h")

-set_target_properties(MinecraftClient PROPERTIES
-  VS_DEBUGGER_WORKING_DIRECTORY "$<TARGET_FILE_DIR:MinecraftClient>"
-)
-
-target_link_libraries(MinecraftClient PRIVATE
-  MinecraftWorld
-  d3d11
-  XInput9_1_0
-  wsock32
-  legacy_stdio_definitions
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/lib/iggy_w64.lib"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/lib/iggyperfmon_w64.lib"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/lib/iggyexpruntime_w64.lib"
-  $<$<CONFIG:Debug>:
-    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_d.lib"
-    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_d.lib"
-    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC_d.lib"
-  >
-  $<$<NOT:$<CONFIG:Debug>>:
-    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Input.lib"
-    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage.lib"
-    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib"
-  >
-)
-
-set(MINECRAFT_SERVER_SOURCES ${MINECRAFT_CLIENT_SOURCES})
-list(APPEND MINECRAFT_SERVER_SOURCES
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Windows64/ServerMain.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Access/Access.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Access/BanManager.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Access/WhitelistManager.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/ServerCli.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/ServerCliInput.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/ServerCliParser.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/ServerCliEngine.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/ServerCliRegistry.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/ban/CliCommandBan.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/help/CliCommandHelp.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/pardon/CliCommandPardon.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/stop/CliCommandStop.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/list/CliCommandList.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/tp/CliCommandTp.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/time/CliCommandTime.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/weather/CliCommandWeather.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/give/CliCommandGive.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/enchant/CliCommandEnchant.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/kill/CliCommandKill.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/defaultgamemode/CliCommandDefaultGamemode.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/experience/CliCommandExperience.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Common/FileUtils.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Common/StringUtils.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/ServerLogger.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/ServerLogManager.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/ServerProperties.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/vendor/linenoise/linenoise.c"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/WorldManager.cpp"
-)
-
-add_executable(MinecraftServer ${MINECRAFT_SERVER_SOURCES})
-target_include_directories(MinecraftServer PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/include"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Xbox/Sentient/Include"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/x64headers"
-  "${CMAKE_CURRENT_SOURCE_DIR}/include/"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Windows64"
-)
-target_compile_definitions(MinecraftServer PRIVATE
-  $<$<CONFIG:Debug>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;MINECRAFT_SERVER_BUILD>
-  $<$<NOT:$<CONFIG:Debug>>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;MINECRAFT_SERVER_BUILD>
-)
-if(MSVC)
-  configure_msvc_target(MinecraftServer)
-  target_link_options(MinecraftServer PRIVATE
-    $<$<CONFIG:Release>:/LTCG /INCREMENTAL:NO>
-  )
-endif()
-
-set_target_properties(MinecraftServer PROPERTIES
-  OUTPUT_NAME "Minecraft.Server"
-  VS_DEBUGGER_WORKING_DIRECTORY "$<TARGET_FILE_DIR:MinecraftServer>"
-  VS_DEBUGGER_COMMAND_ARGUMENTS "-port 25565 -bind 0.0.0.0 -name DedicatedServer"
-)
-
-target_link_libraries(MinecraftServer PRIVATE
-  MinecraftWorld
-  d3d11
-  XInput9_1_0
-  wsock32
-  legacy_stdio_definitions
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/lib/iggy_w64.lib"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/lib/iggyperfmon_w64.lib"
-  "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/lib/iggyexpruntime_w64.lib"
-  $<$<CONFIG:Debug>:
-    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Input_d.lib"
-    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage_d.lib"
-    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC_d.lib"
-  >
-  $<$<NOT:$<CONFIG:Debug>>:
-    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Input.lib"
-    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Storage.lib"
-    "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib"
-  >
-)
-
-if(CMAKE_HOST_WIN32)
-  message(STATUS "Starting redist copy...")
-  execute_process(
-    COMMAND robocopy.exe
-            "${CMAKE_CURRENT_SOURCE_DIR}/x64/Release"
-            "${CMAKE_CURRENT_BINARY_DIR}"
-            /S /MT /R:0 /W:0 /NP
-  )
-  message(STATUS "Starting asset copy...")
-  execute_process(
-    COMMAND robocopy.exe
-            "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client"
-            "${CMAKE_CURRENT_BINARY_DIR}"
-            /S /MT /R:0 /W:0 /NP
-            /XF "*.cpp" "*.c" "*.h" "*.hpp" "*.asm"
-                "*.xml" "*.lang" "*.vcxproj" "*.vcxproj.*" "*.sln"
-                "*.docx" "*.xls"
-                "*.bat" "*.cmd" "*.ps1" "*.py"
-                "*Test*"
-            /XD "Durango*" "Orbis*" "PS*" "Xbox"
-  )
-  message(STATUS "Patching Windows64Media...")
-  execute_process(
-    COMMAND robocopy.exe
-            "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/DurangoMedia"
-            "${CMAKE_CURRENT_BINARY_DIR}/Windows64Media"
-            /S /MT /R:0 /W:0 /NP
-            /XF "*.h" "*.xml" "*.lang" "*.bat"
-  )
-elseif(CMAKE_HOST_UNIX)
-  message(STATUS "Starting redist copy...")
-  execute_process(
-    COMMAND rsync -av "${CMAKE_CURRENT_SOURCE_DIR}/x64/Release/" "${CMAKE_CURRENT_BINARY_DIR}/"
-  )
-  message(STATUS "Starting asset copy...")
-  execute_process(
-    COMMAND rsync -av
-            "--exclude=*.cpp" "--exclude=*.c" "--exclude=*.h" "--exclude=*.hpp" "--exclude=*.asm"
-            "--exclude=*.xml" "--exclude=*.lang" "--exclude=*.vcxproj" "--exclude=*.vcxproj.*" "--exclude=*.sln"
-            "--exclude=*.docx" "--exclude=*.xls"
-            "--exclude=*.bat" "--exclude=*.cmd" "--exclude=*.ps1" "--exclude=*.py"
-            "--exclude=*Test*"
-            "--exclude=Durango*" "--exclude=Orbis*" "--exclude=PS*" "--exclude=Xbox"
-            "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/" "${CMAKE_CURRENT_BINARY_DIR}/"
-  )
-  message(STATUS "Patching Windows64Media...")
-  execute_process(
-    COMMAND rsync -av
-            "--exclude=*.h" "--exclude=*.xml" "--exclude=*.lang" "--exclude=*.bat"
-            "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/DurangoMedia/" "${CMAKE_CURRENT_BINARY_DIR}/Windows64Media/"
-  )
-else()
-  message(FATAL_ERROR "Redist and asset copying is only supported on Windows (Robocopy) and Unix systems (rsync).")
-endif()
-
-add_custom_command(TARGET MinecraftServer POST_BUILD
-  COMMAND "${CMAKE_COMMAND}"
-    -DPROJECT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
-    -DOUTPUT_DIR="$<TARGET_FILE_DIR:MinecraftServer>"
-    -DCONFIGURATION=$<CONFIG>
-    -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/CopyServerAssets.cmake"
+add_custom_target(GenerateBuildVer
+  COMMAND ${CMAKE_COMMAND}
+    "-DOUTPUT_FILE=${BUILDVER_OUTPUT}"
+    -P "${BUILDVER_SCRIPT}"
+  COMMENT "Generating BuildVer.h..."
  VERBATIM
 )

-set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MinecraftServer)
+add_dependencies(Minecraft.World GenerateBuildVer)
+add_dependencies(Minecraft.Client GenerateBuildVer)
+if(PLATFORM_NAME STREQUAL "Windows64")
+  add_dependencies(Minecraft.Server GenerateBuildVer)
+endif()
+
+# ---
+# Project organisation
+# ---
+# Set the startup project for Visual Studio
+set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT Minecraft.Client)
+
+# Setup folders for Visual Studio, just hides the build targets under a sub folder
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+set_property(TARGET GenerateBuildVer PROPERTY FOLDER "Build")
@@ -0,0 +1,94 @@
+{
+  "version": 5,
+  "configurePresets": [
+    {
+      "name": "base",
+      "generator": "Ninja Multi-Config",
+      "binaryDir": "${sourceDir}/build/${presetName}",
+      "hidden": true
+    },
+    {
+      "name": "windows64",
+      "displayName": "Windows64",
+      "inherits": "base",
+      "cacheVariables": {
+        "PLATFORM_DEFINES": "_WINDOWS64",
+        "PLATFORM_NAME": "Windows64",
+        "IGGY_LIBS": "iggy_w64.lib;iggyperfmon_w64.lib;iggyexpruntime_w64.lib"
+      }
+    },
+    {
+      "name": "durango",
+      "displayName": "Durango",
+      "inherits": "base",
+      "toolchainFile": "${sourceDir}/cmake/toolchains/durango.cmake",
+      "cacheVariables": {
+        "PLATFORM_DEFINES": "_DURANGO;_XBOX_ONE",
+        "PLATFORM_NAME": "Durango",
+        "IGGY_LIBS": "iggy_durango.lib;iggyperfmon_durango.lib"
+      }
+    },
+    {
+      "name": "orbis",
+      "displayName": "ORBIS",
+      "inherits": "base",
+      "toolchainFile": "${sourceDir}/cmake/toolchains/orbis.cmake",
+      "cacheVariables": {
+        "PLATFORM_DEFINES": "__ORBIS__",
+        "PLATFORM_NAME": "Orbis",
+        "IGGY_LIBS": "libiggy_orbis.a;libiggyperfmon_orbis.a"
+      }
+    },
+    {
+      "name": "ps3",
+      "displayName": "PS3",
+      "inherits": "base",
+      "toolchainFile": "${sourceDir}/cmake/toolchains/ps3.cmake",
+      "cacheVariables": {
+        "PLATFORM_DEFINES": "__PS3__",
+        "PLATFORM_NAME": "PS3",
+        "IGGY_LIBS": "libiggy_ps3.a;libiggyperfmon_ps3.a;libiggyexpruntime_ps3.a"
+      }
+    },
+    {
+      "name": "psvita",
+      "displayName": "PSVita",
+      "inherits": "base",
+      "toolchainFile": "${sourceDir}/cmake/toolchains/psvita.cmake",
+      "cacheVariables": {
+        "PLATFORM_DEFINES": "__PSVITA__",
+        "PLATFORM_NAME": "PSVita",
+        "IGGY_LIBS": "libiggy_psp2.a;libiggyperfmon_psp2.a"
+      }
+    },
+    {
+      "name": "xbox360",
+      "displayName": "Xbox 360",
+      "inherits": "base",
+      "toolchainFile": "${sourceDir}/cmake/toolchains/xbox360.cmake",
+      "cacheVariables": {
+        "PLATFORM_DEFINES": "_XBOX",
+        "PLATFORM_NAME": "Xbox"
+      }
+    }
+  ],
+  "buildPresets": [
+    { "name": "windows64-debug",   "displayName": "Windows64 - Debug",   "configurePreset": "windows64", "configuration": "Debug" },
+    { "name": "windows64-release", "displayName": "Windows64 - Release", "configurePreset": "windows64", "configuration": "Release" },
+
+    { "name": "durango-debug",     "displayName": "Durango - Debug",     "configurePreset": "durango",   "configuration": "Debug" },
+    { "name": "durango-release",   "displayName": "Durango - Release",   "configurePreset": "durango",   "configuration": "Release" },
+
+    { "name": "orbis-debug",       "displayName": "ORBIS - Debug",       "configurePreset": "orbis",     "configuration": "Debug" },
+    { "name": "orbis-release",     "displayName": "ORBIS - Release",     "configurePreset": "orbis",     "configuration": "Release" },
+
+    { "name": "ps3-debug",         "displayName": "PS3 - Debug",         "configurePreset": "ps3",       "configuration": "Debug" },
+    { "name": "ps3-release",       "displayName": "PS3 - Release",       "configurePreset": "ps3",       "configuration": "Release" },
+
+    { "name": "psvita-debug",      "displayName": "PSVita - Debug",      "configurePreset": "psvita",    "configuration": "Debug" },
+    { "name": "psvita-release",    "displayName": "PSVita - Release",    "configurePreset": "psvita",    "configuration": "Release" },
+
+    { "name": "xbox360-debug",     "displayName": "Xbox 360 - Debug",    "configurePreset": "xbox360",   "configuration": "Debug" },
+    { "name": "xbox360-release",   "displayName": "Xbox 360 - Release",  "configurePreset": "xbox360",   "configuration": "Release" }
+  ]
+}
@@ -1,16 +1,14 @@
 # Compile Instructions

-## Visual Studio (`.sln`)
+## Visual Studio

-1. Open `MinecraftConsoles.sln` in Visual Studio 2022.
-2. Set Startup Project:
-   - Client: `Minecraft.Client`
-   - Dedicated server: `Minecraft.Server`
-3. Select configuration:
-   - `Debug` (recommended), or
-   - `Release`
-4. Select platform: `Windows64`.
-5. Build and run:
+1. Clone or download the repository
+1. Open the repo folder in Visual Studio 2022+.
+2. Wait for cmake to configure the project and load all assets (this may take a few minutes on the first run).
+3. Right click a folder in the solution explorer and switch to the 'CMake Targets View'
+4. Select platform and configuration from the dropdown. EG: `Windows64 - Debug` or `Windows64 - Release`
+5. Pick the startup project `Minecraft.Client.exe` or `Minecraft.Server.exe` using the debug targets dropdown
+6. Build and run the project:
   - `Build > Build Solution` (or `Ctrl+Shift+B`)
   - Start debugging with `F5`.

@@ -29,50 +27,52 @@

 Configure (use your VS Community instance explicitly):

+Open `Developer PowerShell for VS` and run:
+
 ```powershell
-cmake -S . -B build -G "Visual Studio 17 2022" -A x64 -DCMAKE_GENERATOR_INSTANCE="C:/Program Files/Microsoft Visual Studio/2022/Community"
+cmake --preset windows64
 ```

 Build Debug:

 ```powershell
-cmake --build build --config Debug --target MinecraftClient
+cmake --build --preset windows64-debug --target Minecraft.Client
 ```

 Build Release:

 ```powershell
-cmake --build build --config Release --target MinecraftClient
+cmake --build --preset windows64-release --target Minecraft.Client
 ```

 Build Dedicated Server (Debug):

 ```powershell
-cmake --build build --config Debug --target MinecraftServer
+cmake --build --preset windows64-debug --target Minecraft.Server
 ```

 Build Dedicated Server (Release):

 ```powershell
-cmake --build build --config Release --target MinecraftServer
+cmake --build --preset windows64-release --target Minecraft.Server
 ```

 Run executable:

 ```powershell
-cd .\build\Debug
-.\MinecraftClient.exe
+cd .\build\windows64\Minecraft.Client\Debug
+.\Minecraft.Client.exe
 ```

 Run dedicated server:

 ```powershell
-cd .\build\Debug
+cd .\build\windows64\Minecraft.Server\Debug
 .\Minecraft.Server.exe -port 25565 -bind 0.0.0.0 -name DedicatedServer
 ```

 Notes:
 - The CMake build is Windows-only and x64-only.
 - Contributors on macOS or Linux need a Windows machine or VM to build the project. Running the game via Wine is separate from having a supported build environment.
- Post-build asset copy is automatic for `MinecraftClient` in CMake (Debug and Release variants).
+- Post-build asset copy is automatic for `Minecraft.Client` in CMake (Debug and Release variants).
 - The game relies on relative paths (for example `Common\Media\...`), so launching from the output directory is required.
@@ -0,0 +1,96 @@
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/Common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/Durango.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/ORBIS.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/PS3.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/PSVita.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/Windows.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/Xbox360.cmake")
+
+include("${CMAKE_SOURCE_DIR}/cmake/CommonSources.cmake")
+
+include("${CMAKE_SOURCE_DIR}/cmake/Utils.cmake")
+
+# Combine all source files into a single variable for the target
+# We cant use CMAKE_CONFIGURE_PRESET here as VS doesn't set it, so just rely on the folder
+set(MINECRAFT_CLIENT_SOURCES
+  ${MINECRAFT_CLIENT_COMMON}
+  $<$<STREQUAL:${PLATFORM_NAME},Durango>:${MINECRAFT_CLIENT_DURANGO}>
+  $<$<STREQUAL:${PLATFORM_NAME},Orbis>:${MINECRAFT_CLIENT_ORBIS}>
+  $<$<STREQUAL:${PLATFORM_NAME},PS3>:${MINECRAFT_CLIENT_PS3}>
+  $<$<STREQUAL:${PLATFORM_NAME},PSVita>:${MINECRAFT_CLIENT_PSVITA}>
+  $<$<STREQUAL:${PLATFORM_NAME},Windows64>:${MINECRAFT_CLIENT_WINDOWS}>
+  $<$<STREQUAL:${PLATFORM_NAME},Xbox>:${MINECRAFT_CLIENT_XBOX360}>
+  ${SOURCES_COMMON}
+)
+
+add_executable(Minecraft.Client ${MINECRAFT_CLIENT_SOURCES})
+
+# Only define executable on windows
+if(PLATFORM_NAME STREQUAL "Windows64")
+  set_target_properties(Minecraft.Client PROPERTIES WIN32_EXECUTABLE TRUE)
+endif()
+
+target_include_directories(Minecraft.Client PRIVATE
+  "${CMAKE_BINARY_DIR}/generated/" # This is for the generated BuildVer.h
+  "${CMAKE_CURRENT_SOURCE_DIR}"
+  "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/Iggy/include"
+  "${CMAKE_SOURCE_DIR}/include/"
+)
+target_compile_definitions(Minecraft.Client PRIVATE
+  ${MINECRAFT_SHARED_DEFINES}
+)
+target_precompile_headers(Minecraft.Client PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:stdafx.h>")
+set_source_files_properties(compat_shims.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON) # This redefines internal MSVC CRT symbols which will cause an issue with PCH
+
+configure_compiler_target(Minecraft.Client)
+
+set_target_properties(Minecraft.Client PROPERTIES
+  OUTPUT_NAME "Minecraft.Client"
+  VS_DEBUGGER_WORKING_DIRECTORY "$<TARGET_FILE_DIR:Minecraft.Client>"
+)
+
+target_link_libraries(Minecraft.Client PRIVATE
+  Minecraft.World
+  d3d11
+  d3dcompiler
+  XInput9_1_0
+  wsock32
+  legacy_stdio_definitions
+  $<$<CONFIG:Debug>: # Debug 4J libraries
+    "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Input_d.lib"
+    "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Storage_d.lib"
+    "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Render_PC_d.lib"
+  >
+  $<$<NOT:$<CONFIG:Debug>>: # Release 4J libraries
+    "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Input.lib"
+    "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Storage.lib"
+    "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/4JLibs/libs/4J_Render_PC.lib"
+  >
+)
+
+# Iggy libs
+foreach(lib IN LISTS IGGY_LIBS)
+  target_link_libraries(Minecraft.Client PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}/Iggy/lib/${lib}")
+endforeach()
+
+# ---
+# Asset / redist copy
+# ---
+include("${CMAKE_SOURCE_DIR}/cmake/CopyAssets.cmake")
+set(ASSET_FOLDER_PAIRS
+  "${CMAKE_CURRENT_SOURCE_DIR}/music"                  "music"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/Media"           "Common/Media"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/res"             "Common/res"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/Trial"           "Common/Trial"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Common/Tutorial"        "Common/Tutorial"
+  "${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM_NAME}Media"  "${PLATFORM_NAME}Media"
+)
+setup_asset_folder_copy(Minecraft.Client "${ASSET_FOLDER_PAIRS}")
+
+# Copy redist files
+add_copyredist_target(Minecraft.Client)
+
+# Make sure GameHDD exists on Windows
+if(PLATFORM_NAME STREQUAL "Windows64")
+  add_gamehdd_target(Minecraft.Client)
+endif()
@@ -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 )
@@ -4036,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();
@@ -4045,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);
 	}
 }
@@ -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
@@ -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];

@@ -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)
@@ -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())
 		{
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_TextInput.h"
+#include "..\..\Screen.h"

 UIControl_TextInput::UIControl_TextInput()
 {
@@ -211,6 +212,31 @@ UIControl_TextInput::EDirectEditResult UIControl_TextInput::tickDirectEdit()
 		}
 	}

+	// Paste from clipboard
+	if (g_KBMInput.IsKeyPressed('V') && g_KBMInput.IsKeyDown(VK_CONTROL))
+	{
+		wstring pasted = Screen::getClipboard();
+		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())
+		{
+			m_editBuffer.insert(m_iCursorPos, sanitized);
+			m_iCursorPos += (int)sanitized.length();
+			changed = true;
+		}
+	}
+
 	// Arrow keys, Home, End, Delete for cursor movement
 	if (g_KBMInput.IsKeyPressed(VK_LEFT) && m_iCursorPos > 0)
 	{
@@ -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);

@@ -480,14 +480,6 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] =
 	{ L"Copyright (C) 2009-2013 by RAD Game Tools, Inc.",	NO_TRANSLATED_STRING,			NO_TRANSLATED_STRING,eSmallText },	// extra blank line
 #else
 	{ L"Copyright (C) 2009-2014 by RAD Game Tools, Inc.",	NO_TRANSLATED_STRING,			NO_TRANSLATED_STRING,eSmallText },	// extra blank line
-#endif
-	{ L"",													NO_TRANSLATED_STRING,			NO_TRANSLATED_STRING,eSmallText },	// extra blank line
-	{ L"",													CREDIT_ICON,					eCreditIcon_Miles,eSmallText },	// extra blank line
-	{ L"Uses Miles Sound System.",							NO_TRANSLATED_STRING,			NO_TRANSLATED_STRING,eSmallText },	// extra blank line
-#ifdef __PS3__
-	{ L"Copyright (C) 1991-2013 by RAD Game Tools, Inc.",	NO_TRANSLATED_STRING,			NO_TRANSLATED_STRING,eSmallText },	// extra blank line
-#else
-	{ L"Copyright (C) 1991-2014 by RAD Game Tools, Inc.",	NO_TRANSLATED_STRING,			NO_TRANSLATED_STRING,eSmallText },	// extra blank line
 #endif
 #ifdef __PS3__
 	{ L"",													NO_TRANSLATED_STRING,			NO_TRANSLATED_STRING,eSmallText },	// extra blank line
@@ -496,6 +488,24 @@ SCreditTextItemDef UIScene_Credits::gs_aCreditDefs[MAX_CREDIT_STRINGS] =
 	{ L"are trademarks of Dolby Laboratories.",				NO_TRANSLATED_STRING,			NO_TRANSLATED_STRING,eSmallText },	// extra blank line
 #endif
 #endif
+    {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText},
+    {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText},
+    {L"MinecraftConsoles", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eExtraLargeText},
+    {L"Project Maintainers", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eLargeText},
+    {L"smartcmd", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText},
+    {L"codeHusky", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText},
+    {L"Patoke", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText},
+    {L"rtm516", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText},
+    {L"mattsumi", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText},
+    {L"dxf", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText},
+    {L"la", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText},
+    {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText},
+    {L"Thank you to our 100+ contributors on GitHub!", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eLargeText},
+    {L"github.com/smartcmd/MinecraftConsoles", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText},
+    {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText},
+    {L"", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText},
+    {L"Additional Thanks", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eLargeText},
+    {L"notpies - Security Fixes", NO_TRANSLATED_STRING, NO_TRANSLATED_STRING, eSmallText}
 };

 UIScene_Credits::UIScene_Credits(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
@@ -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;
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_Keyboard.h"
+#include "..\..\Screen.h"

 #ifdef _WINDOWS64
 // Global buffer that stores the text entered in the native keyboard scene.
@@ -224,6 +225,38 @@ void UIScene_Keyboard::tick()
 		}
 	}

+	// Paste from clipboard
+	if (g_KBMInput.IsKeyPressed('V') && g_KBMInput.IsKeyDown(VK_CONTROL))
+	{
+		wstring pasted = Screen::getClipboard();
+		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())
+		{
+			if (m_bPCMode)
+			{
+				m_win64TextBuffer.insert(m_iCursorPos, sanitized);
+				m_iCursorPos += (int)sanitized.length();
+			}
+			else
+			{
+				m_win64TextBuffer += sanitized;
+			}
+			changed = true;
+		}
+	}
+
 	if (m_bPCMode)
 	{
 		// Arrow keys, Home, End, Delete for cursor movement
@@ -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.
@@ -259,30 +257,6 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 			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'\\');
@@ -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;
                        }
                    }
@@ -210,6 +206,8 @@ int UIScene_LoadOrJoinMenu::LoadSaveCallback(LPVOID lpParam,bool bRes)

 UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
+    constexpr uint64_t MAXIMUM_SAVE_STORAGE = 4LL * 1024LL * 1024LL * 1024LL;
+
    // Setup all the Iggy references we need for this scene
    initialiseMovie();
    app.SetLiveLinkRequired( true );
@@ -234,8 +232,8 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
    m_controlJoinTimer.setVisible( true );


-#if defined(_XBOX_ONE) || defined(__ORBIS__)
-    m_spaceIndicatorSaves.init(L"",eControl_SpaceIndicator,0, (4LL *1024LL * 1024LL * 1024LL) );
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
+    m_spaceIndicatorSaves.init(L"",eControl_SpaceIndicator,0, MAXIMUM_SAVE_STORAGE);
 #endif
    m_bUpdateSaveSize = false;

@@ -699,7 +697,7 @@ void UIScene_LoadOrJoinMenu::tick()
 		if(m_eSaveTransferState == eSaveTransfer_Idle)
 			m_bSaveTransferRunning = false;
 #endif
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
        if(m_bUpdateSaveSize)
        {
            if((m_iDefaultButtonsC > 0) && (m_iSaveListIndex >= m_iDefaultButtonsC))
@@ -720,7 +718,7 @@ void UIScene_LoadOrJoinMenu::tick()
            if(m_pSaveDetails!=nullptr)
            {
                //CD - Fix - Adding define for ORBIS/XBOXONE
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
                m_spaceIndicatorSaves.reset();
 #endif

@@ -762,6 +760,22 @@ void UIScene_LoadOrJoinMenu::tick()
                {
 #if defined(_XBOX_ONE)
                    m_spaceIndicatorSaves.addSave(m_pSaveDetails->SaveInfoA[i].totalSize);
+#elif defined(_WINDOWS64)
+                    int origIdx = sortedIdx[i];
+                    wchar_t wFilename[MAX_SAVEFILENAME_LENGTH];
+                    ZeroMemory(wFilename, sizeof(wFilename));
+                    mbstowcs(wFilename, m_pSaveDetails->SaveInfoA[origIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
+                    wstring filePath = wstring(L"Windows64\\GameHDD\\") + wstring(wFilename) + wstring(L"\\saveData.ms");
+
+                    HANDLE hFile = CreateFileW(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, nullptr);
+                    DWORD fileSize = 0;
+
+                    if (hFile != INVALID_HANDLE_VALUE) {
+                        fileSize = GetFileSize(hFile, nullptr);
+                        if (fileSize < 12 || fileSize == INVALID_FILE_SIZE) fileSize = 0;
+                        CloseHandle(hFile);
+                    }
+                    m_spaceIndicatorSaves.addSave(fileSize);
 #elif defined(__ORBIS__)
                    m_spaceIndicatorSaves.addSave(m_pSaveDetails->SaveInfoA[i].blocksUsed * (32 * 1024) );
 #endif
@@ -774,14 +788,8 @@ void UIScene_LoadOrJoinMenu::tick()
 #else
 #ifdef _WINDOWS64
                    {
-                        int origIdx = sortedIdx[i];
-                        wchar_t wFilename[MAX_SAVEFILENAME_LENGTH];
-                        ZeroMemory(wFilename, sizeof(wFilename));
-                        mbstowcs(wFilename, m_pSaveDetails->SaveInfoA[origIdx].UTF8SaveFilename, MAX_SAVEFILENAME_LENGTH - 1);
-                        wstring filePath = wstring(L"Windows64\\GameHDD\\") + wstring(wFilename) + wstring(L"\\saveData.ms");
-                        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""));
@@ -20,7 +20,7 @@ private:
 	{
 		eControl_SavesList,
 		eControl_GamesList,
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 		eControl_SpaceIndicator,
 #endif
 	};
@@ -52,7 +52,7 @@ protected:
 	UIControl_SaveList m_buttonListGames;
 	UIControl_Label m_labelSavesListTitle, m_labelJoinListTitle, m_labelNoGames;
 	UIControl m_controlSavesTimer, m_controlJoinTimer;
-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 	UIControl_SpaceIndicatorBar m_spaceIndicatorSaves;
 #endif

@@ -68,7 +68,7 @@ private:
 		UI_MAP_ELEMENT( m_controlSavesTimer, "SavesTimer")
 		UI_MAP_ELEMENT( m_controlJoinTimer, "JoinTimer")

-#if defined(_XBOX_ONE) || defined(__ORBIS__)
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(_WINDOWS64)
 		UI_MAP_ELEMENT( m_spaceIndicatorSaves, "SaveSizeBar")
 #endif
 	UI_END_MAP_ELEMENTS_AND_NAMES()
@@ -368,7 +368,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
 			UINT uiIDA[2];
 			uiIDA[0]=IDS_CANCEL;
 			uiIDA[1]=IDS_OK;
-			ui.RequestErrorMessage(IDS_WARNING_ARCADE_TITLE, IDS_WARNING_ARCADE_TEXT, uiIDA, 2, XUSER_INDEX_ANY,&UIScene_MainMenu::ExitGameReturned,this);
+			ui.RequestErrorMessage(IDS_WINDOWS_EXIT, IDS_WARNING_ARCADE_TEXT, uiIDA, 2, XUSER_INDEX_ANY,&UIScene_MainMenu::ExitGameReturned,this);
 		}
 		else
 		{
@@ -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);
@@ -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);
 		}
@@ -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,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
@@ -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,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
@@ -45,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;

@@ -130,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();
@@ -146,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
@@ -180,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);

@@ -240,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)
@@ -289,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);
@@ -297,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)
 	{
@@ -310,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;
 			}
@@ -329,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
@@ -337,8 +350,8 @@ 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;
@@ -371,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);
 	}
 }

@@ -422,9 +435,9 @@ wstring Font::sanitize(const wstring& 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]);
 		}
@@ -433,8 +446,8 @@ wstring Font::sanitize(const wstring& str)
 			// 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)
@@ -487,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;

 }

@@ -38,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();
@@ -48,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:
@@ -65,7 +67,7 @@ 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
@@ -359,14 +359,17 @@ void GameRenderer::pick(float a)
 	}
 }

+// Toru - wrapping these methods for backwards compatibility,
+// no longer setting m_fov as its use doesn't respect applyEffects param in GameRenderer::getFov
 void GameRenderer::SetFovVal(float fov)
 {
-	m_fov=fov;
+	//m_fov=fov;
+	mc->options->set(Options::Option::FOV, (fov - 70) / 40);
 }

 float GameRenderer::GetFovVal()
 {
-	return m_fov;
+	return 70 + mc->options->fov * 40;//m_fov;
 }

 void GameRenderer::tickFov()
@@ -390,6 +393,8 @@ float GameRenderer::getFov(float a, bool applyEffects)
 	shared_ptr<LocalPlayer> player = dynamic_pointer_cast<LocalPlayer>(mc->cameraTargetPlayer);
 	int playerIdx = player ? player->GetXboxPad() : 0;
 	float fov = m_fov;//70;
+	if (fov < 1) fov = 1; // Crash fix
+	
 	if (applyEffects)
 	{
 		fov += mc->options->fov * 40;
@@ -854,210 +854,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
 	//            font.draw(str, x + 1, y, 0xffffff);
 	//        }

-#ifndef _FINAL_BUILD
-	MemSect(31);
-
-	// temporarily render overlay at all times so version is more obvious in bug reports
-	// we can turn this off once things stabilize
-    if (true)// minecraft->options->renderDebug && minecraft->player != nullptr && minecraft->level != nullptr)
-	{
-		const int debugLeft = 1;
-		const int debugTop = 1;
-		const float maxContentWidth = 1200.f;
-		const float maxContentHeight = 420.f;
-		float scale = static_cast<float>(screenWidth - debugLeft - 8) / maxContentWidth;
-		float scaleV = static_cast<float>(screenHeight - debugTop - 80) / maxContentHeight;
-		if (scaleV < scale) scale = scaleV;
-		if (scale > 1.f) scale = 1.f;
-		if (scale < 0.5f) scale = 0.5f;
-        glPushMatrix();
-		glTranslatef(static_cast<float>(debugLeft), static_cast<float>(debugTop), 0.f);
-		glScalef(scale, scale, 1.f);
-		glTranslatef(static_cast<float>(-debugLeft), static_cast<float>(-debugTop), 0.f);
-
-		vector<wstring> lines;
-
-		// Only add version/branch lines if the watermark toggle is enabled
-		if (ClientConstants::SHOW_VERSION_WATERMARK) {
-			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())); // Could maybe use entity::shouldRender to work out how many are rendered but thats like expensive
-                                                                                                      // TODO Add server information with packet counts - once multiplayer is more stable
-            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()); // Chunk Cache
-
-            // 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;
-            }
-            lines.push_back(dimension);
-
-            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;
-
-            // 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(static_cast<int>(xBlockPos)) + L" " + std::to_wstring(static_cast<int>(yBlockPos)) + L" " + std::to_wstring(static_cast<int>(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;
-            wstring cardinalDirection;
-            switch (direction)
-            {
-            case 0:
-                cardinalDirection = L"south";
-                break;
-            case 1:
-                cardinalDirection = L"west";
-                break;
-            case 2:
-                cardinalDirection = L"north";
-                break;
-            case 3:
-                cardinalDirection = L"east";
-                break;
-            }
-
-            lines.push_back(L"Facing: " + cardinalDirection + 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 blockLight = chunkAt->getBrightness(LightLayer::Block, xChunkOffset, yChunkOffset, zChunkOffset);
-                    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")");
-                }
-            }
-
-            // 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()); // Time to autosave
-            lines.push_back(minecraft->gatherStats2()); // Empty currently - CPlatformNetworkManagerStub::GatherStats()
-            lines.push_back(minecraft->gatherStats3()); // RTT
-        }
-
-#ifdef _DEBUG // Only show terrain features in debug builds not release
-        // TERRAIN FEATURES
-        if (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: ";
-
-            float maxW = static_cast<float>(screenWidth - debugLeft - 8) / scale;
-            float maxWForContent = maxW - static_cast<float>(font->width(L"..."));
-            bool truncated[eTerrainFeature_Count] = {};
-
-            for (size_t i = 0; i < app.m_vTerrainFeatures.size(); i++)
-            {
-                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""); // Add a spacer line
-            for (int i = eTerrainFeature_Stronghold; i <= static_cast<int>(eTerrainFeature_Ravine); i++)
-            {
-                lines.push_back(wfeature[i]);
-            }
-            lines.push_back(L"");
-        }
-#endif
-
-		// Loop through the lines and draw them all on screen
-		int yPos = debugTop;
-        for (const auto &line : lines)
-        {
-            drawString(font, line, debugLeft, yPos, 0xffffff);
-            yPos += 10;
-        }
-
-        glPopMatrix();
-    }
-	MemSect(0);
-#endif
-
 	lastTickA = a;
 	// 4J Stu - This is now displayed in a xui scene
 #if 0
@@ -1274,111 +1070,146 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
            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)
        {
@@ -1386,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);
@@ -1,11 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "1"
-"EXCLUDED_FILE0" = "Durango\\Autogenerated.appxmanifest"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
@@ -3746,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;
@@ -658,7 +657,7 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData *initData, DW
 	setFlightAllowed(GetDedicatedServerBool(settings, L"allow-flight", true));

 	// 4J Stu - Enabling flight to stop it kicking us when we use it
-#ifdef _DEBUG_MENUS_ENABLED
+#if (defined _DEBUG_MENUS_ENABLED && defined _DEBUG)
 	setFlightAllowed(true);
 #endif

@@ -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);

@@ -1652,7 +1642,7 @@ bool MinecraftServer::isNetherEnabled()

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

 int MinecraftServer::getOperatorUserPermissionLevel()
@@ -1725,330 +1715,345 @@ void MinecraftServer::setPlayerIdleTimeout(int playerIdleTimeout)
 extern int c0a, c0b, c1a, c1b, c1c, c2a, c2b;
 void MinecraftServer::run(int64_t seed, void *lpParameter)
 {
-	NetworkGameInitData *initData = nullptr;
-	DWORD initSettings = 0;
-	bool findSeed = false;
+    NetworkGameInitData *initData = nullptr;
+    DWORD initSettings = 0;
+    bool findSeed = false;
 	if(lpParameter != nullptr)
-	{
-		initData = static_cast<NetworkGameInitData *>(lpParameter);
-		initSettings = app.GetGameHostOption(eGameHostOption_All);
-		findSeed = initData->findSeed;
-		m_texturePackId = initData->texturePackId;
-	}
-	//    try {		// 4J - removed try/catch/finally
-	bool didInit = false;
+    {
+        initData = static_cast<NetworkGameInitData *>(lpParameter);
+        initSettings = app.GetGameHostOption(eGameHostOption_All);
+        findSeed = initData->findSeed;
+        m_texturePackId = initData->texturePackId;
+    }
+    //    try {		// 4J - removed try/catch/finally
+    bool didInit = false;
 	if (initServer(seed, initData, initSettings,findSeed))
-	{
-		didInit = true;
-		ServerLevel *levelNormalDimension = levels[0];
-		// 4J-PB - Set the Stronghold position in the leveldata if there isn't one in there
-		Minecraft *pMinecraft = Minecraft::GetInstance();
+    {
+        didInit = true;
+        ServerLevel *levelNormalDimension = levels[0];
+        // 4J-PB - Set the Stronghold position in the leveldata if there isn't one in there
+        Minecraft *pMinecraft = Minecraft::GetInstance();
 		LevelData *pLevelData=levelNormalDimension->getLevelData();

 		if(pLevelData && pLevelData->getHasStronghold()==false)
-		{
+        {
 			int x,z;
 			if(app.GetTerrainFeaturePosition(eTerrainFeature_Stronghold,&x,&z))
-			{
-				pLevelData->setXStronghold(x);
-				pLevelData->setZStronghold(z);
-				pLevelData->setHasStronghold();
-			}
-		}
+            {
+                pLevelData->setXStronghold(x);
+                pLevelData->setZStronghold(z);
+                pLevelData->setHasStronghold();
+            }
+        }

-		int64_t lastTime = getCurrentTimeMillis();
-		int64_t unprocessedTime = 0;
-		while (running && !s_bServerHalted)
-		{
-			int64_t now = getCurrentTimeMillis();
+        int64_t lastTime = getCurrentTimeMillis();
+        int64_t unprocessedTime = 0;
+        while (running && !s_bServerHalted)
+        {
+            int64_t now = getCurrentTimeMillis();

-			// 4J Stu - When we pause the server, we don't want to count that as time passed
-			// 4J Stu - TU-1 hotifx - Remove this line. We want to make sure that we tick connections at the proper rate when paused
+            // 4J Stu - When we pause the server, we don't want to count that as time passed
+            // 4J Stu - TU-1 hotifx - Remove this line. We want to make sure that we tick connections at the proper rate when paused
 			//Fix for #13191 - The host of a game can get a message informing them that the connection to the server has been lost
 			//if(m_isServerPaused) lastTime = now;

-			int64_t passedTime = now - lastTime;
-			if (passedTime > MS_PER_TICK * 40)
-			{
-				//                logger.warning("Can't keep up! Did the system time change, or is the server overloaded?");
-				passedTime = MS_PER_TICK * 40;
-			}
-			if (passedTime < 0)
-			{
-				//                logger.warning("Time ran backwards! Did the system time change?");
-				passedTime = 0;
-			}
-			unprocessedTime += passedTime;
-			lastTime = now;
+            int64_t passedTime = now - lastTime;
+            if (passedTime > MS_PER_TICK * 40)
+            {
+                //                logger.warning("Can't keep up! Did the system time change, or is the server overloaded?");
+                passedTime = MS_PER_TICK * 40;
+            }
+            if (passedTime < 0)
+            {
+                //                logger.warning("Time ran backwards! Did the system time change?");
+                passedTime = 0;
+            }
+            unprocessedTime += passedTime;
+            lastTime = now;

-			// 4J Added ability to pause the server
+            // 4J Added ability to pause the server
 			if( !m_isServerPaused )
-			{
-				bool didTick = false;
-				if (levels[0]->allPlayersAreSleeping())
-				{
-					tick();
-					unprocessedTime = 0;
-				}
-				else
-				{
-					//					int tickcount = 0;
-					//					int64_t beforeall = System::currentTimeMillis();
-					while (unprocessedTime > MS_PER_TICK)
-					{
-						unprocessedTime -= MS_PER_TICK;
-						chunkPacketManagement_PreTick();
-//						int64_t before = System::currentTimeMillis();
-						tick();
-//						int64_t after = System::currentTimeMillis();
-//						PIXReportCounter(L"Server time",(float)(after-before));
+            {
+                bool didTick = false;
+                if (levels[0]->allPlayersAreSleeping())
+                {
+                    tick();
+                    unprocessedTime = 0;
+                }
+                else
+                {
+                    //					int tickcount = 0;
+                    //					int64_t beforeall = System::currentTimeMillis();
+                    while (unprocessedTime > MS_PER_TICK)
+                    {
+                        unprocessedTime -= MS_PER_TICK;
+                        chunkPacketManagement_PreTick();
+                        //						int64_t before = System::currentTimeMillis();
+                        tick();
+                        //						int64_t after = System::currentTimeMillis();
+                        //						PIXReportCounter(L"Server time",(float)(after-before));

-						chunkPacketManagement_PostTick();
-					}
-//					int64_t afterall = System::currentTimeMillis();
-//					PIXReportCounter(L"Server time all",(float)(afterall-beforeall));
-//					PIXReportCounter(L"Server ticks",(float)tickcount);
-				}
-			}
-			else
-			{
-				// 4J Stu - TU1-hotfix
+                        chunkPacketManagement_PostTick();
+                    }
+                    //					int64_t afterall = System::currentTimeMillis();
+                    //					PIXReportCounter(L"Server time all",(float)(afterall-beforeall));
+                    //					PIXReportCounter(L"Server ticks",(float)tickcount);
+                }
+            }
+            else
+            {
+                // 4J Stu - TU1-hotfix
 				//Fix for #13191 - The host of a game can get a message informing them that the connection to the server has been lost
-				// The connections should tick at the same frequency even when paused
-				while (unprocessedTime > MS_PER_TICK)
-				{
-					unprocessedTime -= MS_PER_TICK;
-					// Keep ticking the connections to stop them timing out
-					connection->tick();
-				}
-			}
+                // The connections should tick at the same frequency even when paused
+                while (unprocessedTime > MS_PER_TICK)
+                {
+                    unprocessedTime -= MS_PER_TICK;
+                    // Keep ticking the connections to stop them timing out
+                    connection->tick();
+                }
+            }
 			if(MinecraftServer::setTimeAtEndOfTick)
-			{
-				MinecraftServer::setTimeAtEndOfTick = false;
-				for (unsigned int i = 0; i < levels.length; i++)
-				{
-					//					if (i == 0 || settings->getBoolean(L"allow-nether", true))		// 4J removed - we always have nether
-					{
-						ServerLevel *level = levels[i];
+            {
+                MinecraftServer::setTimeAtEndOfTick = false;
+                for (unsigned int i = 0; i < levels.length; i++)
+                {
+                    //					if (i == 0 || settings->getBoolean(L"allow-nether", true))		// 4J removed - we always have nether
+                    {
+                        ServerLevel *level = levels[i];
 						level->setGameTime( MinecraftServer::setTime );
-					}
-				}
-			}
+                    }
+                }
+            }
 			if(MinecraftServer::setTimeOfDayAtEndOfTick)
-			{
-				MinecraftServer::setTimeOfDayAtEndOfTick = false;
-				for (unsigned int i = 0; i < levels.length; i++)
-				{
-					if (i == 0 || GetDedicatedServerBool(settings, L"allow-nether", true))
-					{
-						ServerLevel *level = levels[i];
+            {
+                MinecraftServer::setTimeOfDayAtEndOfTick = false;
+                for (unsigned int i = 0; i < levels.length; i++)
+                {
+                    if (i == 0 || GetDedicatedServerBool(settings, L"allow-nether", true))
+                    {
+                        ServerLevel *level = levels[i];
 						level->setDayTime( MinecraftServer::setTimeOfDay );
-					}
-				}
-			}
+                    }
+                }
+            }

-			// Process delayed actions
-			eXuiServerAction eAction;
-			LPVOID param;
+            // Process delayed actions
+            eXuiServerAction eAction;
+            LPVOID param;
 			for(int i=0;i<XUSER_MAX_COUNT;i++)
-			{
-				eAction = app.GetXuiServerAction(i);
-				param = app.GetXuiServerActionParam(i);
+            {
+                eAction = app.GetXuiServerAction(i);
+                param = app.GetXuiServerActionParam(i);

 				switch(eAction)
-				{
-				case eXuiServerAction_AutoSaveGame:
+                {
+                case eXuiServerAction_AutoSaveGame:
+#if defined(_XBOX_ONE) || defined(__ORBIS__) || defined(MINECRAFT_SERVER_BUILD)
+                    {
 #if defined(_XBOX_ONE) || defined(__ORBIS__)
-					{
-						PIXBeginNamedEvent(0,"Autosave");
+                        PIXBeginNamedEvent(0, "Autosave");

-						// Get the frequency of the timer
-						LARGE_INTEGER qwTicksPerSec, qwTime, qwNewTime, qwDeltaTime;
-						float fElapsedTime = 0.0f;
-						QueryPerformanceFrequency( &qwTicksPerSec );
-						float fSecsPerTick = 1.0f / (float)qwTicksPerSec.QuadPart;
+                        // Get the frequency of the timer
+                        LARGE_INTEGER qwTicksPerSec, qwTime, qwNewTime, qwDeltaTime;
+                        float fElapsedTime = 0.0f;
+                        QueryPerformanceFrequency(&qwTicksPerSec);
+                        float fSecsPerTick = 1.0f / (float)qwTicksPerSec.QuadPart;

-						// Save the start time
-						QueryPerformanceCounter( &qwTime );
-
-						if (players != nullptr)
-						{
-							players->saveAll(nullptr);
-						}
-
-						for (unsigned int j = 0; j < levels.length; j++)
-						{
-							if( s_bServerHalted ) break;
-							// 4J Stu - Save the levels in reverse order so we don't overwrite the level.dat
-							// with the data from the nethers leveldata.
-							// Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
-							ServerLevel *level = levels[levels.length - 1 - j];
-							PIXBeginNamedEvent(0, "Saving level %d",levels.length - 1 - j);
-							level->save(false, nullptr, true);
-							PIXEndNamedEvent();
-						}
-						if( !s_bServerHalted )
-						{
-							PIXBeginNamedEvent(0,"Saving game rules");
-							saveGameRules();
-							PIXEndNamedEvent();
-
-							PIXBeginNamedEvent(0,"Save to disc");
-							levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, true);
-							PIXEndNamedEvent();
-						}
-						PIXEndNamedEvent();
-
-						QueryPerformanceCounter( &qwNewTime );
-						qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart;
-						fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart));
-						app.DebugPrintf("Autosave: Elapsed time %f\n", fElapsedTime);
-					}
-					break;
+                        // Save the start time
+                        QueryPerformanceCounter(&qwTime);
 #endif
-				case eXuiServerAction_SaveGame:
-					app.EnterSaveNotificationSection();
-					if (players != nullptr)
-					{
-						players->saveAll(Minecraft::GetInstance()->progressRenderer);
-					}

-					players->broadcastAll(std::make_shared<UpdateProgressPacket>(20));
+                        if (players != nullptr)
+                        {
+                            players->saveAll(nullptr);
+                        }

-					for (unsigned int j = 0; j < levels.length; j++)
-					{
+                        for (unsigned int j = 0; j < levels.length; j++)
+                        {
+							if( s_bServerHalted ) break;
+                            // 4J Stu - Save the levels in reverse order so we don't overwrite the level.dat
+                            // with the data from the nethers leveldata.
+                            // Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
+                            ServerLevel *level = levels[levels.length - 1 - j];
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
+                            PIXBeginNamedEvent(0, "Saving level %d", levels.length - 1 - j);
+#endif
+                            level->save(false, nullptr, true);
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
+                            PIXEndNamedEvent();
+#endif
+                        }
+                        if (!s_bServerHalted)
+                        {
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
+                            PIXBeginNamedEvent(0, "Saving game rules");
+#endif
+                            saveGameRules();
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
+                            PIXEndNamedEvent();
+
+                            PIXBeginNamedEvent(0, "Save to disc");
+#endif
+                            levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, true);
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
+                            PIXEndNamedEvent();
+#endif
+                        }
+
+#if defined(_XBOX_ONE) || defined(__ORBIS__)
+                        PIXEndNamedEvent();
+
+                        QueryPerformanceCounter(&qwNewTime);
+                        qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart;
+                        fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart));
+                        app.DebugPrintf("Autosave: Elapsed time %f\n", fElapsedTime);
+#endif
+                    }
+                    break;
+#endif
+                case eXuiServerAction_SaveGame:
+                    app.EnterSaveNotificationSection();
+                    if (players != nullptr)
+                    {
+                        players->saveAll(Minecraft::GetInstance()->progressRenderer);
+                    }
+
+                    players->broadcastAll(std::make_shared<UpdateProgressPacket>(20));
+
+                    for (unsigned int j = 0; j < levels.length; j++)
+                    {
 						if( s_bServerHalted ) break;
-						// 4J Stu - Save the levels in reverse order so we don't overwrite the level.dat
-						// with the data from the nethers leveldata.
-						// Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
-						ServerLevel *level = levels[levels.length - 1 - j];
+                        // 4J Stu - Save the levels in reverse order so we don't overwrite the level.dat
+                        // with the data from the nethers leveldata.
+                        // Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
+                        ServerLevel *level = levels[levels.length - 1 - j];
 						level->save(true, Minecraft::GetInstance()->progressRenderer, (eAction==eXuiServerAction_AutoSaveGame));

-						players->broadcastAll(std::make_shared<UpdateProgressPacket>(33 + (j * 33)));
-					}
+                        players->broadcastAll(std::make_shared<UpdateProgressPacket>(33 + (j * 33)));
+                    }
 					if( !s_bServerHalted )
-					{
-						saveGameRules();
+                    {
+                        saveGameRules();

 						levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, (eAction==eXuiServerAction_AutoSaveGame));
-					}
-					app.LeaveSaveNotificationSection();
-					break;
-				case eXuiServerAction_DropItem:
-					// Find the player, and drop the id at their feet
-					{
-						shared_ptr<ServerPlayer> player = players->players.at(0);
+                    }
+                    app.LeaveSaveNotificationSection();
+                    break;
+                case eXuiServerAction_DropItem:
+                    // Find the player, and drop the id at their feet
+                    {
+                        shared_ptr<ServerPlayer> player = players->players.at(0);
 						size_t id = (size_t) param;
-						player->drop(std::make_shared<ItemInstance>(id, 1, 0));
-					}
-					break;
-				case eXuiServerAction_SpawnMob:
-					{
-						shared_ptr<ServerPlayer> player = players->players.at(0);
-						eINSTANCEOF factory = static_cast<eINSTANCEOF>((size_t)param);
+                        player->drop(std::make_shared<ItemInstance>(id, 1, 0));
+                    }
+                    break;
+                case eXuiServerAction_SpawnMob:
+                    {
+                        shared_ptr<ServerPlayer> player = players->players.at(0);
+                        eINSTANCEOF factory = static_cast<eINSTANCEOF>((size_t)param);
 						shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>(EntityIO::newByEnumType(factory,player->level ));
 						mob->moveTo(player->x+1, player->y, player->z+1, player->level->random->nextFloat() * 360, 0);
 						mob->setDespawnProtected();		// 4J added, default to being protected against despawning (has to be done after initial position is set)
-						player->level->addEntity(mob);
-					}
-					break;
-				case eXuiServerAction_PauseServer:
+                        player->level->addEntity(mob);
+                    }
+                    break;
+                case eXuiServerAction_PauseServer:
 					m_isServerPaused = ( (size_t) param == TRUE );
 					if( m_isServerPaused )
-					{
-						m_serverPausedEvent->Set();
-					}
-					break;
-				case eXuiServerAction_ToggleRain:
-					{
-						bool isRaining = levels[0]->getLevelData()->isRaining();
-						levels[0]->getLevelData()->setRaining(!isRaining);
-						levels[0]->getLevelData()->setRainTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
-					}
-					break;
-				case eXuiServerAction_ToggleThunder:
-					{
-						bool isThundering = levels[0]->getLevelData()->isThundering();
-						levels[0]->getLevelData()->setThundering(!isThundering);
-						levels[0]->getLevelData()->setThunderTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
-					}
-					break;
-				case eXuiServerAction_ServerSettingChanged_Gamertags:
-					players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_OPTIONS, app.GetGameHostOption(eGameHostOption_Gamertags)));
-					break;
-				case eXuiServerAction_ServerSettingChanged_BedrockFog:
-					players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, app.GetGameHostOption(eGameHostOption_All)));
-					break;
+                    {
+                        m_serverPausedEvent->Set();
+                    }
+                    break;
+                case eXuiServerAction_ToggleRain:
+                    {
+                        bool isRaining = levels[0]->getLevelData()->isRaining();
+                        levels[0]->getLevelData()->setRaining(!isRaining);
+                        levels[0]->getLevelData()->setRainTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
+                    }
+                    break;
+                case eXuiServerAction_ToggleThunder:
+                    {
+                        bool isThundering = levels[0]->getLevelData()->isThundering();
+                        levels[0]->getLevelData()->setThundering(!isThundering);
+                        levels[0]->getLevelData()->setThunderTime(levels[0]->random->nextInt(Level::TICKS_PER_DAY * 7) + Level::TICKS_PER_DAY / 2);
+                    }
+                    break;
+                case eXuiServerAction_ServerSettingChanged_Gamertags:
+                    players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_OPTIONS, app.GetGameHostOption(eGameHostOption_Gamertags)));
+                    break;
+                case eXuiServerAction_ServerSettingChanged_BedrockFog:
+                    players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, app.GetGameHostOption(eGameHostOption_All)));
+                    break;

-				case eXuiServerAction_ServerSettingChanged_Difficulty:
-					players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_DIFFICULTY, Minecraft::GetInstance()->options->difficulty));
-					break;
-				case eXuiServerAction_ExportSchematic:
+                case eXuiServerAction_ServerSettingChanged_Difficulty:
+                    players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_DIFFICULTY, Minecraft::GetInstance()->options->difficulty));
+                    break;
+                case eXuiServerAction_ExportSchematic:
 #ifndef _CONTENT_PACKAGE
-					app.EnterSaveNotificationSection();
+                    app.EnterSaveNotificationSection();

 					//players->broadcastAll( shared_ptr<UpdateProgressPacket>( new UpdateProgressPacket(20) ) );

 					if( !s_bServerHalted )
-					{
-						ConsoleSchematicFile::XboxSchematicInitParam *initData = static_cast<ConsoleSchematicFile::XboxSchematicInitParam *>(param);
+                    {
+                        ConsoleSchematicFile::XboxSchematicInitParam *initData = static_cast<ConsoleSchematicFile::XboxSchematicInitParam *>(param);
 #ifdef _XBOX
-						File targetFileDir(File::pathRoot + File::pathSeparator + L"Schematics");
+                        File targetFileDir(File::pathRoot + File::pathSeparator + L"Schematics");
 #else
-						File targetFileDir(L"Schematics");
+                        File targetFileDir(L"Schematics");
 #endif
 						if(!targetFileDir.exists())	targetFileDir.mkdir();

-						wchar_t filename[128];
+                        wchar_t filename[128];
 						swprintf(filename,128,L"%ls%dx%dx%d.sch",initData->name,(initData->endX - initData->startX + 1), (initData->endY - initData->startY + 1), (initData->endZ - initData->startZ + 1));

 						File dataFile = File( targetFileDir, wstring(filename) );
 						if(dataFile.exists()) dataFile._delete();
-						FileOutputStream fos = FileOutputStream(dataFile);
-						DataOutputStream dos = DataOutputStream(&fos);
-						ConsoleSchematicFile::generateSchematicFile(&dos, levels[0], initData->startX, initData->startY, initData->startZ, initData->endX, initData->endY, initData->endZ, initData->bSaveMobs, initData->compressionType);
-						dos.close();
+                        FileOutputStream fos = FileOutputStream(dataFile);
+                        DataOutputStream dos = DataOutputStream(&fos);
+                        ConsoleSchematicFile::generateSchematicFile(&dos, levels[0], initData->startX, initData->startY, initData->startZ, initData->endX, initData->endY, initData->endZ, initData->bSaveMobs, initData->compressionType);
+                        dos.close();

-						delete initData;
-					}
-					app.LeaveSaveNotificationSection();
+                        delete initData;
+                    }
+                    app.LeaveSaveNotificationSection();
 #endif
-					break;
-				case eXuiServerAction_SetCameraLocation:
+                    break;
+                case eXuiServerAction_SetCameraLocation:
 #ifndef _CONTENT_PACKAGE
-					{
-						DebugSetCameraPosition *pos = static_cast<DebugSetCameraPosition *>(param);
+                    {
+                        DebugSetCameraPosition *pos = static_cast<DebugSetCameraPosition *>(param);

 						app.DebugPrintf(	"DEBUG: Player=%i\n", pos->player );
 						app.DebugPrintf(	"DEBUG: Teleporting to pos=(%f.2, %f.2, %f.2), looking at=(%f.2,%f.2)\n",
-							pos->m_camX, pos->m_camY, pos->m_camZ,
+                                        pos->m_camX, pos->m_camY, pos->m_camZ,
 							pos->m_yRot, pos->m_elev
 							);

-						shared_ptr<ServerPlayer> player = players->players.at(pos->player);
+                        shared_ptr<ServerPlayer> player = players->players.at(pos->player);
 						player->debug_setPosition(	pos->m_camX, pos->m_camY, pos->m_camZ,
 							pos->m_yRot, pos->m_elev	);

-						// Doesn't work
+                        // Doesn't work
 						//player->setYHeadRot(pos->m_yRot);
 						//player->absMoveTo(pos->m_camX, pos->m_camY, pos->m_camZ, pos->m_yRot, pos->m_elev);
-					}
+                    }
 #endif
-					break;
-				}
+                    break;
+                }

 				app.SetXuiServerAction(i,eXuiServerAction_Idle);
-			}
+            }

-			Sleep(1);
-		}
-	}
+            Sleep(1);
+        }
+    }
 	//else
-	//{
+    //{
 	//     while (running)
-	//	{
+    //	{
 	//        handleConsoleInputs();
-	//		Sleep(10);
+    //		Sleep(10);
 	//    }
 	//}
 #if 0
@@ -2075,9 +2080,9 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
 }
 #endif

-	// 4J Stu - Stop the server when the loops complete, as the finally would do
-	stopServer(didInit);
-	stopped = true;
+    // 4J Stu - Stop the server when the loops complete, as the finally would do
+    stopServer(didInit);
+    stopped = true;
 }

 void MinecraftServer::broadcastStartSavingPacket()
@@ -2385,6 +2390,9 @@ bool MinecraftServer::chunkPacketManagement_CanSendTo(INetworkPlayer *player)
 {
 	if( player == nullptr ) return false;

+#ifdef MINECRAFT_SERVER_BUILD
+	return true;
+#else
 	int time = GetTickCount();
 	DWORD currentPlayerCount = g_NetworkManager.GetPlayerCount();
 	if( currentPlayerCount == 0 ) return false;
@@ -2396,6 +2404,7 @@ bool MinecraftServer::chunkPacketManagement_CanSendTo(INetworkPlayer *player)
 	}

 	return false;
+#endif
 }

 void MinecraftServer::chunkPacketManagement_DidSendTo(INetworkPlayer *player)
@@ -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,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
@@ -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,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
@@ -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,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
@@ -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,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
@@ -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>
@@ -1,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
@@ -1,94 +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>
-    <ClCompile Include="LevelRenderChunks_main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="LevelRenderChunks.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{47EBEE93-F9E1-4AD3-B746-0D7D7ADCB0DA}</ProjectGuid>
-    <RootNamespace>task_hello.spu</RootNamespace>
-    <ProjectName>LevelRenderChunks</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)'=='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'">$(SolutionDir)$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(Configuration)\</IntDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(SolutionDir)$(Platform)_$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(Configuration)\</IntDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">*.obj;*.d;*.map;*.lst;*.pch;$(TargetPath);undefined;$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">
-    <ClCompile>
-      <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>Levels</OptimizationLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>-mspurs-task %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>$(SCE_PS3_ROOT)\target\spu\lib\libspurs.a;$(SCE_PS3_ROOT)\target\spu\lib\libdma.a;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SN_PS3_PATH)\spu\include\sn;$(SCE_PS3_ROOT)\target\spu\include;$(SCE_PS3_ROOT)\target\common\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OptimizationLevel>Levels</OptimizationLevel>
-      <PreprocessorDefinitions>SN_TARGET_PS3_SPU;NDEBUG;__GCC__;SPU;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions>-mspurs-task %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>$(SCE_PS3_ROOT)\target\spu\lib\libspurs.a;$(SCE_PS3_ROOT)\target\spu\lib\libdma.a;$(SCE_PS3_ROOT)\target\spu\lib\libgcm_spu.a;%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <SpuElfConversion>
-      <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>
-    <ClCompile Include="LevelRenderChunks_main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="LevelRenderChunks.h" />
-  </ItemGroup>
-</Project>
@@ -1,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
@@ -1,153 +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="LevelRenderer_FindNearestChunk.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="LevelRenderer_FindNearestChunk.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E26485AE-71A5-4785-A14D-6456FF7C4FB0}</ProjectGuid>
-    <ProjectName>LevelRenderer_FindNearestChunk</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>
-      <UnrollLoops>true</UnrollLoops>
-    </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>
-      <UnrollLoops>true</UnrollLoops>
-    </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,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
@@ -1,153 +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>
-    <ClCompile Include="LevelRenderer_cull.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="LevelRenderer_cull.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0FC6FCFB-7793-4EEE-8356-2C129621C67A}</ProjectGuid>
-    <ProjectName>LevelRenderer_cull</ProjectName>
-    <SccProjectName>%24/StoriesPark/Minecraft/MinecraftConsoles-dev/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull</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>
-      <UnrollLoops>true</UnrollLoops>
-    </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>
-      <UnrollLoops>true</UnrollLoops>
-    </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,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
@@ -1,153 +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>
-    <ClCompile Include="LevelRenderer_zSort.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="LevelRenderer_zSort.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BE7A14B2-1761-4FDF-82C0-B50F8BC9633A}</ProjectGuid>
-    <ProjectName>LevelRenderer_zSort</ProjectName>
-    <SccProjectName>%24/StoriesPark/Minecraft/MinecraftConsoles-dev/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort</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>
-      <UnrollLoops>true</UnrollLoops>
-    </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>
-      <UnrollLoops>true</UnrollLoops>
-    </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,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
@@ -1,159 +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>
-    <ClCompile Include="ImprovedNoise_SPU.cpp" />
-    <ClCompile Include="PerlinNoiseJob.cpp" />
-    <ClCompile Include="PerlinNoise_SPU.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ImprovedNoise_SPU.h" />
-    <ClInclude Include="PerlinNoiseJob.h" />
-    <ClInclude Include="PerlinNoise_SPU.h" />
-    <ClInclude Include="stdafx.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4CDF5745-FCF3-474D-941B-ABBEA788E8DA}</ProjectGuid>
-    <ProjectName>PerlinNoise</ProjectName>
-    <SccProjectName>%24/StoriesPark/Minecraft/MinecraftConsoles-dev/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise</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>
-      <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>
-      <UnrollLoops>true</UnrollLoops>
-    </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>
-      <UnrollLoops>true</UnrollLoops>
-    </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,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROJECT"
-}
@@ -1,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROJECT"
-}
@@ -1,153 +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="Renderer_TextureUpdate.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Renderer_TextureUpdate.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AEC81E5C-04B5-4F77-91A0-D94065F885B7}</ProjectGuid>
-    <ProjectName>Renderer_TextureUpdate</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>
-      <UnrollLoops>true</UnrollLoops>
-    </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>
-      <UnrollLoops>true</UnrollLoops>
-    </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>
--- 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
Matthew Toro	6df8089003	Merge pull request #669 from qwasdrizzel/main Fix crash when FOV is equal to zero	2026-03-17 18:03:57 -04:00
rtm516	76f4832a6b	Fix actions and sort docker nightly	2026-03-17 22:02:24 +00:00
rtm516	02a5961f39	Move project to CMake (#781 ) * Move to cmake * Move sources to source_groups and ditch more old VS files * Add BuildVer.h generation * Break out cmake source lists to platforms * Don't copy swf files * Revert audio changes from merge * Add platform defines * Match MSBuild flags * Move BuildVer.h to common include and fix rebuild issue * Seperate projects properly * Exclude more files and make sure GameHDD exists * Missing line * Remove remaining VS project files * Update readme and actions * Use incremental LTCG * Update workflows * Update build workflows and output folder * Disable vcpkg checks * Force MSVC * Use precompiled headers * Only use PCH for cpp * Exclude compat_shims from PCH * Handle per-platform source includes * Copy only current platform media * Define Iggy libs per platform * Fix EnsureGameHDD check * Only set WIN32_EXECUTABLE on Windows * Correct Iggy libs path * Remove include of terrain_MipmapLevel * Correct path to xsb/xwb * Implement copilot suggestions * Add clang flags (untested) * Fix robocopy error checking * Update documentation * Drop CMakePresets.json version as we dont use v6 features * Always cleanup artifacts in nightly even if some builds fail * Re-work compiler target options * Move newer iggy dll into redist and cleanup * Fix typos * Remove 'Source Files' from all source groups * Remove old ps1 build scripts	2026-03-17 16:39:22 -05:00
Loki Rautio	1a3fcb5b20	Remove Miles Sound System from credits we don't use it anymore!	2026-03-17 16:22:49 -05:00
Loki Rautio	a3ca23fdf6	Cleanup project credits and README	2026-03-17 16:15:26 -05:00
Toru the Red Fox	c98153bf07	Fix FOV modification so it respects applyEffects (#1297 )	2026-03-17 19:47:34 +00:00
Matthew Toro	a5f5595c63	Merge pull request #1315 from dognews/main LoadJoinMenu UI Bug Fix: Properly display space indicator, remove label placeholder [BUG: #1004]	2026-03-17 15:45:22 -04:00
Matthew Toro	dc8af13b45	Merge pull request #1321 from rtm516/fix/host-settings Change KEY_HOST_SETTINGS back to to VK_TAB	2026-03-17 15:41:26 -04:00
rtm516	ab16f3bf45	Change KEY_HOST_SETTINGS back to to VK_TAB	2026-03-17 19:22:24 +00:00
Alex	994a23f96b	Fix save space indicator display Include space indicator UI element in windows build, logic to handle getting save file sizes on windows	2026-03-17 07:44:52 -07:00
qwasdrizzel	d359957727	fix	2026-03-16 21:54:29 -05:00
qwasdrizzel	ce739f6045	Merge branch 'smartcmd:main' into main	2026-03-16 21:44:26 -05:00
GabsPuNs	5a59f5d146	Update to more accurate logo (#1305 ) * Updated Logo * Updated two old files.	2026-03-16 19:00:51 -05:00
ZorpLemon	43d520f692	Comment out FOV modification line, since the FOV is stored and doesn't need to be adjusted. (#1248 ) I guess this line was just the games way of applying modifications the player made to the FOV. But since whenever ago someone changed the way the FOV stuff is saved, so this line just adds the difference again causing issues when the FOV is set above 70. Setting your FOV to 80 actually sets it to 90, and setting it to 110 actually sets it to 150.	2026-03-15 18:14:15 -05:00
Ananasloll3	0b0d74a638	Fix audio volume levels for cows and bats (#1225 ) Cow volume 0.4f to 1.f Bat volume 0.1f to 0.8f	2026-03-15 18:13:11 -05:00
iris	b27cb536a5	Fix game crashing when crafting fireworks (#1230 ) (#1240 )	2026-03-15 18:13:03 -05:00
Xenovyy	15ea3dc85c	Adjusted Exit Game title (#1277 ) * Adjusted Exit Game title Replaced "Return to Xbox Dashboard" with "Exit Minecraft" on the exit game screen. * Fixed Blending on Intro Sequence Fixed Blocky, Crappy blending on the ESRB and Mojang Logos in the Intro Sequence.	2026-03-15 18:12:53 -05:00
retucio	9fde19eca0	organized keybinds a lil bit (#1279 )	2026-03-15 18:11:55 -05:00
kuwa	e9f5b4b6f0	Fix server DedicatedServer issues (#1266 ) * add: Dedicated Server implementation - Introduced `ServerMain.cpp` for the dedicated server logic, handling command-line arguments, server initialization, and network management. - Created `postbuild_server.ps1` script for post-build tasks, including copying necessary resources and DLLs for the dedicated server. - Added `CopyServerAssets.cmake` to manage the copying of server assets during the build process, ensuring required files are available for the dedicated server. - Defined project filters in `Minecraft.Server.vcxproj.filters` for better organization of server-related files. * add: refactor world loader & add server properties - Introduced ServerLogger for logging startup steps and world I/O operations. - Implemented ServerProperties for loading and saving server configuration from `server.properties`. - Added WorldManager to handle world loading and creation based on server properties. - Updated ServerMain to integrate server properties loading and world management. - Enhanced project files to include new source and header files for the server components. * update: implement enhanced logging functionality with configurable log levels * update: update keyboard and mouse input initialization `1dc8a005ed` * fix: change virtual screen resolution to 1920x1080(HD) Since 31881af56936aeef38ff322b975fd0 , `skinHud.swf` for 720 is not included in `MediaWindows64.arc`, the app crashes unless the virtual screen is set to HD. * fix: dedicated server build settings for miniaudio migration and missing sources - remove stale Windows64 Miles (mss64) link/copy references from server build - add Common/Filesystem/Filesystem.cpp to Minecraft.Server.vcxproj - add Windows64/PostProcesser.cpp to Minecraft.Server.vcxproj - fix unresolved externals (PostProcesser::, FileExists) in dedicated server build update: changed the virtual screen to 720p Since the crash caused by the 720p `skinHud.swf` not being included in `MediaWindows64.arc` has been resolved, switching back to 720p to reduce resource usage. * add: add Docker support for Dedicated Server add with entrypoint and build scripts * fix: add initial save for newly created worlds in dedicated server on the server side, I fixed the behavior introduced after commit `aadb511`, where newly created worlds are intentionally not saved to disk immediately. * update: add basically all configuration options that are implemented in the classes to `server.properties` * update: add LAN advertising configuration for server.properties LAN-Discovery, which isn’t needed in server mode and could potentially be a security risk, has also been disabled(only server mode). * add: add implementing interactive command line using linenoise - Integrated linenoise library for line editing and completion in the server console. - Updated ServerLogger to handle external writes safely during logging. - Modified ServerMain to initialize and manage the ServerCli for command input. - The implementation is separate from everything else, so it doesn't affect anything else. - The command input section and execution section are separated into threads. * update: enhance command line completion with predictive hints Like most command line tools, it highlights predictions in gray. * add: implement `StringUtils` for string manipulation and refactor usages Unified the scattered utility functions. * fix: send DisconnectPacket on shutdown and fix Win64 recv-thread teardown race Before this change, server/host shutdown closed sockets directly in ServerConnection::stop(), which bypassed the normal disconnect flow. As a result, clients could be dropped without receiving a proper DisconnectPacket during stop/kill/world-close paths. Also, WinsockNetLayer::Shutdown() could destroy synchronization objects while host-side recv threads were still exiting, causing a crash in RecvThreadProc (access violation on world close in host mode). * fix: return client to menus when Win64 host connection drops - Add client-side host disconnect handling in CPlatformNetworkManagerStub::DoWork() for _WINDOWS64. - When in QNET_STATE_GAME_PLAY as a non-host and WinsockNetLayer::IsConnected() becomes false, trigger g_NetworkManager.HandleDisconnect(false) to enter the normal disconnect/UI flow. - Use m_bLeaveGameOnTick as a one-shot guard to prevent repeated disconnect handling while the link remains down. - Reset m_bLeaveGameOnTick on LeaveGame(), HostGame(), and JoinGame() to avoid stale state across sessions. * update: converted Japanese comments to English * add: create `Minecraft.Server` developer guide in English and Japanese * update: add note about issue * add: add `nlohmann/json` json lib * add: add FileUtils Moved file operations to `utils`. * add: Dedicated Server BAN access manager with persistent player and IP bans - add Access frontend that publishes thread-safe ban manager snapshots for dedicated server use - add BanManager storage for banned-players.json and banned-ips.json with load/save/update flows - add persistent player and IP ban checks during dedicated server connection handling - add UTF-8 BOM-safe JSON parsing and shared file helpers backed by nlohmann/json - add Unicode-safe ban file read/write and safer atomic replacement behavior on Windows - add active-ban snapshot APIs and expiry-aware filtering for expires metadata - add RAII-based dedicated access shutdown handling during server startup and teardown * update: changed file read/write operations to use `FileUtils`. - As a side effect, saving has become faster! * fix: Re-added the source that had somehow disappeared. * add: significantly improved the dedicated server logging system - add ServerLogManager to Minecraft.Server as the single entry point for dedicated-server log output - forward CMinecraftApp logger output to the server logger when running with g_Win64DedicatedServer - add named network logs for incoming, accepted, rejected, and disconnected connections - cache connection metadata by smallId so player name and remote IP remain available for disconnect logs - keep Minecraft.Client changes minimal by using lightweight hook points and handling log orchestration on the server side * fix: added the updated library source * add: add `ban` and `pardon` commands for Player and IP * fix: fix stop command shutdown process add dedicated server shutdown request handling * fix: fixed the save logic during server shutdown Removed redundant repeated saves and eliminated the risks of async writes. * update: added new sever files to Docker entrypoint * fix: replace shutdown flag with atomic variable for thread safety * update: update Dedicated Server developer guide English is machine translated. Please forgive me. * update: check for the existence of `GameHDD` and create * add: add Whitelist to Dedicated Server * refactor: clean up and refactor the code - unify duplicated implementations that were copied repeatedly - update outdated patterns to more modern ones * fix: include UI header (new update fix) * fix: fix the detection range for excessive logging `getHighestNonEmptyY()` returning `-1` occurs normally when the chunk is entirely air. The caller (`Minecraft.World/LevelChunk.cpp:2400`) normalizes `-1` to `0`. * update: add world size config to dedicated server properties * update: update README add explanation of `server.properties` & launch arguments * update: add nightly release workflow for dedicated server and client builds to Actions * fix: update name for workflow * add random seed generation * add: add Docker nightly workflow for Dedicated Server publish to GitHub Container Registry * fix: ghost player when clients disconnect out of order #4 * fix: fix 7zip option * fix: fix Docker workflow for Dedicated Server artifact handling * add: add no build Dedicated Server startup scripts and Docker Compose * update: add README for Docker Dedicated Server setup with no local build * refactor: refactor command path structure As the number of commands has increased and become harder to navigate, each command has been organized into separate folders. * update: support stream(file stdin) input mode for server CLI Support for the stream (file stdin) required when attaching a tty to a Docker container on Linux. * add: add new CLI Console Commands for Dedicated Server Most of these commands are executed using the command dispatcher implemented on the `Minecraft.World` side. When registering them with the dispatcher, the sender uses a permission-enabled configuration that treats the CLI as a player. - default game. - enchant - experience. - give - kill(currently, getting a permission error for some reason) - time - weather. - update tp & gamemode command * fix: change player map icon to random select * update: increase the player limit * add: restore the basic anti-cheat implementation and add spawn protection Added the following anti-cheat measures and add spawn protection to `server.properties`. - instant break - speed - reach * fix: fix Docker image tag * make chunks delay less for dedi * fix: prevent overwriting allow-flight value on server startup * fix: mitigate entity id overflow and crash for max chunk updates * remove autosave prompt for dedicated server * fix: fix `Failed to create window instance.` Wait for Xvfb to be fully ready before starting. * Revert wrong readme order --------- Co-authored-by: sylvessa <225480449+sylvessa@users.noreply.github.com> Co-authored-by: Loki Rautio <lokirautio@gmail.com>	2026-03-15 15:50:12 -05:00
Matthew Toro	7b643cdd75	fix: removed headlesss server logic in favor of the new server exe. (#1265 )	2026-03-15 15:43:27 -05:00
qwasdrizzel	255a18fe8e	Fix crash by ensuring FOV is not less than 1	2026-03-05 22:20:39 -06:00
qwasdrizzel	cffe636e35	Merge branch 'smartcmd:main' into main	2026-03-05 22:18:36 -06:00
qwasdrizzel	d1eb09a4b9	Merge branch 'smartcmd:main' into main	2026-03-05 18:01:32 -06:00
qwasdrizzel	4b13b3345e	Fix the angle problem with flying Removed checks that limit flying to a 90 degree angle, which caused the problem.	2026-03-05 18:01:13 -06:00
qwasdrizzel	0666959d31	Merge branch 'smartcmd:main' into main	2026-03-05 17:17:45 -06:00
qwasdrizzel	9370cbc7d8	Modify dispense behavior to set outcome as LEFT_ITEM	2026-03-05 00:02:17 -06:00