Merge branch 'master' into developer

Author: dani0105

ModLoader/Helper.cs

@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace ModLoader
+{
+    public class Helper : MonoBehaviour
+    {
+        public static Helper instance;
+
+        // Events
+        /// <summary>
+        /// Fired every frame in the Base Scene
+        /// </summary>
+        public static event EventHandler OnUpdateBaseScene;
+        /// <summary>
+        /// Fired every frame in the Home Scene
+        /// </summary>
+        public static event EventHandler OnUpdateHomeScene;
+        /// <summary>
+        /// Fired every frame in the Build Scene
+        /// </summary>
+        public static event EventHandler OnUpdateBuildScene;
+        /// <summary>
+        /// Fired every frame in the World Scene
+        /// </summary>
+        public static event EventHandler OnUpdateWorldScene;
+
+        /// <summary>
+        /// Fired when the Base Scene (the first scene when game loads) is loaded
+        /// </summary>
+        public static event EventHandler OnBaseSceneLoaded;
+        /// <summary>
+        /// Fired when the start menu scene loaded -> After player has gone to another scene and come back
+        /// </summary>
+        public static event EventHandler OnHomeSceneLoaded;
+        /// <summary>
+        /// Fired when the Build Scene is loaded
+        /// </summary>
+        public static event EventHandler OnBuildSceneLoaded;
+        /// <summary>
+        /// Fired when the World Scene is Loaded
+        /// </summary>
+        public static event EventHandler OnWorldSceneLoaded;
+
+
+        // Variables
+        public static scene currentScene;
+
+        private void Awake()
+        {
+            instance = this;
+            SceneManager.sceneLoaded += OnSceneLoaded;
+        }
+
+        /// <summary>
+        /// Fire all of the OnUpdate Events
+        /// </summary>
+        private void Update()
+        {
+            switch (currentScene)
+            {
+                case scene.Base:
+                    OnUpdateBaseScene?.Invoke(this, EventArgs.Empty);
+                    break;
+
+                case scene.Home:
+                    OnUpdateHomeScene?.Invoke(this, EventArgs.Empty);
+                    break;
+
+                case scene.Build:
+                    OnUpdateBuildScene?.Invoke(this, EventArgs.Empty);
+                    break;
+
+                case scene.World:
+                    OnUpdateWorldScene?.Invoke(this, EventArgs.Empty);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Fire all of the OnSceneLoaded Events
+        /// </summary>
+        private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
+        {
+            switch (scene.name)
+            {
+                case "Base_PC":
+                    currentScene = ModLoader.scene.Base;
+                    OnBaseSceneLoaded?.Invoke(this, EventArgs.Empty);
+                    break;
+
+                case "Home_PC":
+                    currentScene = ModLoader.scene.Home;
+                    OnHomeSceneLoaded?.Invoke(this, EventArgs.Empty);
+                    break;
+
+                case "Build_PC":
+                    currentScene = ModLoader.scene.Build;
+                    OnBuildSceneLoaded?.Invoke(this, EventArgs.Empty);
+                    break;
+
+                case "World_PC":
+                    currentScene = ModLoader.scene.World;
+                    OnWorldSceneLoaded?.Invoke(this, EventArgs.Empty);
+                    break;
+            }
+        }
+    }
+
+    public enum scene
+    {
+        Base,
+        Home,
+        Build,
+        World
+    }
+}

ModLoader/Loader.cs

@@ -12,7 +12,7 @@
 namespace ModLoader
 {
     /// <summary>
-    /// This is the main class of ModLoader. this class is injected into the game whit Unity Doorstop injector.
+    /// This is the main class of ModLoader. this class is injected into the game with Unity Doorstop injector.
     /// </summary>
     public class Loader : MonoBehaviour
     {

ModLoader/ModLoader.csproj

@@ -10,11 +10,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ModLoader</RootNamespace>
     <AssemblyName>ModLoader</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -79,9 +80,22 @@
     <Reference Include="UnityEngine.UIModule">
       <HintPath>..\Dependencies\UnityEngine.UIModule.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.IMGUIModule">
+      <HintPath>..\..\..\My Mods\References\Assemby-CSharp\UnityEngine.IMGUIModule.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.TextRenderingModule">
+      <HintPath>..\..\..\My Mods\References\Assemby-CSharp\UnityEngine.TextRenderingModule.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>..\..\..\My Mods\References\Assemby-CSharp\UnityEngine.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.UIModule">
+      <HintPath>..\..\..\My Mods\References\Assemby-CSharp\UnityEngine.UIModule.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ConsoleGUI.cs" />
+    <Compile Include="Helper.cs" />
     <Compile Include="Loader.cs" />
     <Compile Include="Console.cs" />
     <Compile Include="Patcher.cs" />