From 09df16bd85cc4796b898abc4cea6ffd9fddaa294 Mon Sep 17 00:00:00 2001
From: Timathy <53098956+rubiksmaster02@users.noreply.github.com>
Date: Sat, 16 Nov 2019 20:47:51 -0800
Subject: [PATCH 01/13] better version

---
 .../TP_Puzzle.Managed.csproj                  | 42 +++----------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj
index 9cb6954..9b2b547 100644
--- a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj
+++ b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj
@@ -1,44 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(SolutionDir)\USharpProject.props" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{%USHARP_CSPROJ_GUID%}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>TP_Puzzle</RootNamespace>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <RootNamespace>Project</RootNamespace>
+    <TargetFramework>net452</TargetFramework>
+    <OutputPath>$(OutDir)</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>$(OutDir)</OutputPath>
-    <AssemblyName>TP_Puzzle.Managed</AssemblyName>
-    <ErrorReport>prompt</ErrorReport>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>$(OutDir)</OutputPath>
-    <AssemblyName>TP_Puzzle.Managed</AssemblyName>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="PuzzleBlock.cs" />
-    <Compile Include="PuzzleBlockGrid.cs" />
-    <Compile Include="PuzzlePlayerCharacter.cs" />
-    <Compile Include="PuzzlePlayerController.cs" />
-    <Compile Include="PuzzleGameMode.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(SolutionDir)\USharpProject.props" />
+</Project>

From 41c3681acf74a6bef80e8a7b108ef17e435b7ed1 Mon Sep 17 00:00:00 2001
From: Timathy <53098956+rubiksmaster02@users.noreply.github.com>
Date: Sat, 16 Nov 2019 20:49:11 -0800
Subject: [PATCH 02/13] Update PuzzleBlock.cs

---
 .../Managed/TP_Puzzle.Managed/PuzzleBlock.cs  | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlock.cs b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlock.cs
index 1fac0da..7b16f5f 100644
--- a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlock.cs
+++ b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlock.cs
@@ -1,21 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnrealEngine.Engine;
 using UnrealEngine.InputCore;
 using UnrealEngine.Runtime;
 
-namespace TP_Puzzle
+namespace Project
 {
     [UClass]
     class APuzzleBlock : AActor
     {
         // These are private fields. These aren't visible to UE4 in any way.
         // This may be undesirable; such as in cases where you may want to duplicate a block. These wouldn't get serialized.
-        private bool isActive;
-        private bool isHighlighted;
+        private bool _isActive;
+        private bool _isHighlighted;
 
         [UProperty, EditAnywhere, BlueprintReadWrite, ExposeOnSpawn]
         public APuzzleBlockGrid OwningGrid { get; set; }
@@ -61,15 +56,15 @@ public override void Initialize(FObjectInitializer initializer)
             }
         }
 
-        protected override void ReceiveActorOnClicked_Implementation(FKey ButtonPressed)
+        protected override void ReceiveActorOnClicked_Implementation(FKey buttonPressed)
         {
-            base.ReceiveActorOnClicked_Implementation(ButtonPressed);
+            base.ReceiveActorOnClicked_Implementation(buttonPressed);
             HandleControllerClick();
         }
 
-        protected override void ReceiveActorOnInputTouchBegin_Implementation(ETouchIndex FingerIndex)
+        protected override void ReceiveActorOnInputTouchBegin_Implementation(ETouchIndex fingerIndex)
         {
-            base.ReceiveActorOnInputTouchBegin_Implementation(FingerIndex);
+            base.ReceiveActorOnInputTouchBegin_Implementation(fingerIndex);
             HandleControllerClick();
         }
 
@@ -91,9 +86,9 @@ protected override void ReceiveActorEndCursorOver_Implementation()
         /// </summary>
         public void HandleControllerClick()
         {
-            if (!isActive)
+            if (!_isActive)
             {
-                isActive = true;
+                _isActive = true;
                 BlockMesh.SetMaterial(0, orangeMaterial.Value);
                 if (OwningGrid != null)
                 {
@@ -104,10 +99,10 @@ public void HandleControllerClick()
 
         public void DoHighlight(bool on)
         {
-            if (!isActive && isHighlighted != on)
+            if (!_isActive && _isHighlighted != on)
             {
-                isHighlighted = on;
-                BlockMesh.SetMaterial(0, isHighlighted ? baseMaterial.Value : blueMaterial.Value);
+                _isHighlighted = on;
+                BlockMesh.SetMaterial(0, _isHighlighted ? baseMaterial.Value : blueMaterial.Value);
             }
         }
     }

From 6026487dee4772a8a23f3820f572fb8765740fcc Mon Sep 17 00:00:00 2001
From: Timathy <53098956+rubiksmaster02@users.noreply.github.com>
Date: Sat, 16 Nov 2019 20:49:34 -0800
Subject: [PATCH 03/13] Update PuzzleBlockGrid.cs

---
 .../TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlockGrid.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlockGrid.cs b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlockGrid.cs
index 754859e..bbfd03f 100644
--- a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlockGrid.cs
+++ b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlockGrid.cs
@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnrealEngine.Engine;
 using UnrealEngine.Runtime;
 
-namespace TP_Puzzle
+namespace Project
 {
     [UClass]
     class APuzzleBlockGrid : AActor

From c83a9fb839cbdc56022556bdc42799783dd89e41 Mon Sep 17 00:00:00 2001
From: Timathy <53098956+rubiksmaster02@users.noreply.github.com>
Date: Sat, 16 Nov 2019 20:49:55 -0800
Subject: [PATCH 04/13] Update PuzzleGameMode.cs

---
 .../TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleGameMode.cs  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleGameMode.cs b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleGameMode.cs
index d23d640..25f9676 100644
--- a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleGameMode.cs
+++ b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleGameMode.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnrealEngine.Runtime;
 using UnrealEngine.Engine;
 
-namespace TP_Puzzle
+namespace Project
 {
     [UClass]
     class APuzzleGameMode : AGameMode

From 1783bd169b31ed649f9ebf65f202da97a709aec2 Mon Sep 17 00:00:00 2001
From: Timathy <53098956+rubiksmaster02@users.noreply.github.com>
Date: Sat, 16 Nov 2019 20:50:13 -0800
Subject: [PATCH 05/13] Update PuzzlePlayerCharacter.cs

---
 .../TP_Puzzle.Managed/PuzzlePlayerCharacter.cs        | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerCharacter.cs b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerCharacter.cs
index 7a2b1a5..6ac6de9 100644
--- a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerCharacter.cs
+++ b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerCharacter.cs
@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnrealEngine.Engine;
 using UnrealEngine.HeadMountedDisplay;
 using UnrealEngine.Runtime;
 
-namespace TP_Puzzle
+namespace Project
 {
     [UClass]
     class APuzzlePlayerCharacter : ACharacter
@@ -68,9 +63,9 @@ protected override void SetupPlayerInputComponent(UInputComponent playerInputCom
             playerInputComponent.BindAction("TriggerClick", EInputEvent.Pressed, OnTriggerClick);
         }
 
-        protected override void ReceiveTick_Implementation(float DeltaSeconds)
+        protected override void ReceiveTick_Implementation(float deltaSeconds)
         {
-            base.ReceiveTick_Implementation(DeltaSeconds);
+            base.ReceiveTick_Implementation(deltaSeconds);
 
             // Determine which Puzzle Block the player is looking at and highlight it.
             if (UHeadMountedDisplayFunctionLibrary.IsHeadMountedDisplayEnabled())

From 9d8c71e0f8ac9dd88cc4f5463f0c28ce8ffd5bd0 Mon Sep 17 00:00:00 2001
From: Timathy <53098956+rubiksmaster02@users.noreply.github.com>
Date: Sat, 16 Nov 2019 20:50:52 -0800
Subject: [PATCH 06/13] Update PuzzlePlayerController.cs

---
 .../Managed/TP_Puzzle.Managed/PuzzlePlayerController.cs   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerController.cs b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerController.cs
index efc02f2..e260440 100644
--- a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerController.cs
+++ b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerController.cs
@@ -1,13 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnrealEngine.Runtime;
 using UnrealEngine.Engine;
-using UnrealEngine.InputCore;
 
-namespace TP_Puzzle
+namespace Project
 {
     [UClass]
     class APuzzlePlayerController : APlayerController

From 8b6401d08f9d7671bda1e2ccfe8257e40f70ab58 Mon Sep 17 00:00:00 2001
From: Timathy <53098956+rubiksmaster02@users.noreply.github.com>
Date: Sat, 16 Nov 2019 20:54:12 -0800
Subject: [PATCH 07/13] Update TP_Puzzle.Managed.csproj

---
 .../Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj
index 9b2b547..823428b 100644
--- a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj
+++ b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <RootNamespace>Project</RootNamespace>
+    <RootNamespace>TP_Puzzle</RootNamespace>
     <TargetFramework>net452</TargetFramework>
     <OutputPath>$(OutDir)</OutputPath>
   </PropertyGroup>

From 212dc3e2eaf78f704bc5431060ae068d40d3d9ea Mon Sep 17 00:00:00 2001
From: Timathy <53098956+rubiksmaster02@users.noreply.github.com>
Date: Sat, 16 Nov 2019 20:54:45 -0800
Subject: [PATCH 08/13] Update PuzzlePlayerController.cs

---
 .../Managed/TP_Puzzle.Managed/PuzzlePlayerController.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerController.cs b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerController.cs
index e260440..a6a260b 100644
--- a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerController.cs
+++ b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerController.cs
@@ -1,7 +1,7 @@
 using UnrealEngine.Runtime;
 using UnrealEngine.Engine;
 
-namespace Project
+namespace TP_Puzzle
 {
     [UClass]
     class APuzzlePlayerController : APlayerController

From 64d50404742c32124c24c9388efab5d0682f084d Mon Sep 17 00:00:00 2001
From: Timathy <53098956+rubiksmaster02@users.noreply.github.com>
Date: Sat, 16 Nov 2019 20:55:01 -0800
Subject: [PATCH 09/13] Update PuzzlePlayerCharacter.cs

---
 .../Managed/TP_Puzzle.Managed/PuzzlePlayerCharacter.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerCharacter.cs b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerCharacter.cs
index 6ac6de9..edcd2d2 100644
--- a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerCharacter.cs
+++ b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzlePlayerCharacter.cs
@@ -2,7 +2,7 @@
 using UnrealEngine.HeadMountedDisplay;
 using UnrealEngine.Runtime;
 
-namespace Project
+namespace TP_Puzzle
 {
     [UClass]
     class APuzzlePlayerCharacter : ACharacter

From 5929eaf6c5548754801398f9012f9ecea47a714f Mon Sep 17 00:00:00 2001
From: Timathy <53098956+rubiksmaster02@users.noreply.github.com>
Date: Sat, 16 Nov 2019 20:55:19 -0800
Subject: [PATCH 10/13] Update PuzzleGameMode.cs

---
 Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleGameMode.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleGameMode.cs b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleGameMode.cs
index 25f9676..63a956c 100644
--- a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleGameMode.cs
+++ b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleGameMode.cs
@@ -1,7 +1,7 @@
 using UnrealEngine.Runtime;
 using UnrealEngine.Engine;
 
-namespace Project
+namespace TP_Puzzle
 {
     [UClass]
     class APuzzleGameMode : AGameMode

From 890a30c07c7fa4fe6a9c6ad94ab6c8332eb29605 Mon Sep 17 00:00:00 2001
From: Timathy <53098956+rubiksmaster02@users.noreply.github.com>
Date: Sat, 16 Nov 2019 20:55:36 -0800
Subject: [PATCH 11/13] Update PuzzleBlockGrid.cs

---
 .../TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlockGrid.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlockGrid.cs b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlockGrid.cs
index bbfd03f..f1b89bf 100644
--- a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlockGrid.cs
+++ b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlockGrid.cs
@@ -2,7 +2,7 @@
 using UnrealEngine.Engine;
 using UnrealEngine.Runtime;
 
-namespace Project
+namespace TP_Puzzle
 {
     [UClass]
     class APuzzleBlockGrid : AActor

From c521093145ea5521071b34ab9b5d5919305e2cbd Mon Sep 17 00:00:00 2001
From: Timathy <53098956+rubiksmaster02@users.noreply.github.com>
Date: Sat, 16 Nov 2019 20:55:53 -0800
Subject: [PATCH 12/13] Update PuzzleBlock.cs

---
 Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlock.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlock.cs b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlock.cs
index 7b16f5f..c70f5e1 100644
--- a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlock.cs
+++ b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/PuzzleBlock.cs
@@ -2,7 +2,7 @@
 using UnrealEngine.InputCore;
 using UnrealEngine.Runtime;
 
-namespace Project
+namespace TP_Puzzle
 {
     [UClass]
     class APuzzleBlock : AActor

From 390b48617b2fef92c7a9c608c103633dd81dd165 Mon Sep 17 00:00:00 2001
From: Timathy <53098956+rubiksmaster02@users.noreply.github.com>
Date: Sun, 17 Nov 2019 09:11:25 -0800
Subject: [PATCH 13/13] Update TP_Puzzle.Managed.csproj

---
 .../Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj
index 823428b..a73b49c 100644
--- a/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj
+++ b/Templates/TP_Puzzle/Managed/TP_Puzzle.Managed/TP_Puzzle.Managed.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>TP_Puzzle</RootNamespace>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputPath>$(OutDir)</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">