Release 1.0.0.R1

Added: - New icon support - Better asset loader - New mod
JMteam09 · Feb 28, 2018 · 86a746c · 86a746c
1 parent dc668f5
commit 86a746c
Show file tree

Hide file tree

Showing 23 changed files with 463 additions and 702 deletions.
diff --git a/Builds/Managed/Assembly-CSharp.dll b/Builds/Managed/Assembly-CSharp.dll
diff --git a/Mods/UserInterfaceExtension/README.md b/Mods/UserInterfaceExtension/README.md
@@ -0,0 +1,6 @@
+**WARNING**
+This is a priority mod.<br>
+Do not install it in the normal folder!<br><br>
+_Adds:_<br>
+1. A tight looking UI. [F9]<br>
+2. A better console. [F8]<br>
diff --git a/Mods/UserInterfaceExtension/UIE.dll b/Mods/UserInterfaceExtension/UIE.dll
diff --git a/Mods/UserInterfaceExtension/UIE/Assets/overlay.manifest b/Mods/UserInterfaceExtension/UIE/Assets/overlay.manifest
@@ -0,0 +1,69 @@
+ManifestFileVersion: 0
+CRC: 2730122152
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: d33cc3f5eb85c677f03ffd8473248191
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: ed21bb66c50636f066e6377bb2a622ca
+HashAppended: 0
+ClassTypes:
+- Class: 1
+  Script: {instanceID: 0}
+- Class: 4
+  Script: {instanceID: 0}
+- Class: 21
+  Script: {instanceID: 0}
+- Class: 28
+  Script: {instanceID: 0}
+- Class: 48
+  Script: {instanceID: 0}
+- Class: 114
+  Script: {instanceID: 0}
+- Class: 114
+  Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: -2061169968, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 114
+  Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+- Class: 115
+  Script: {instanceID: 0}
+- Class: 128
+  Script: {instanceID: 0}
+- Class: 213
+  Script: {instanceID: 0}
+- Class: 222
+  Script: {instanceID: 0}
+- Class: 223
+  Script: {instanceID: 0}
+- Class: 224
+  Script: {instanceID: 0}
+Assets:
+- Assets/F12Debug.prefab
+- Assets/UIE_Default.png
+- Assets/MyModIcon.png
+- Assets/Default.png
+Dependencies: []
diff --git a/Mods/UserInterfaceExtension/UIE/Assets/overlay.mlasset b/Mods/UserInterfaceExtension/UIE/Assets/overlay.mlasset
diff --git a/Source/Assembly-CSharp.csproj b/Source/Assembly-CSharp.csproj
diff --git a/Source/Assembly-CSharp.sln b/Source/Assembly-CSharp.sln
diff --git a/Source/MainMenu.cs b/Source/MainMenu.cs
@@ -1,6 +1,8 @@
+using SFSML;
 using Sirenix.OdinInspector;
 using System;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
 public class MainMenu : MonoBehaviour
@@ -17,6 +19,8 @@ public class MainMenu : MonoBehaviour
 
 	public CustomEvent openTutorial;
 
+    public static MainMenu main;
+
 	private void Start()
 	{
 		if (!MainMenu.CanResumeGame())
@@ -32,7 +36,12 @@ private void Start()
 		this.SetSoundToggleText();
 		this.SetFpsText();
 		this.SetAutoRotationText();
-	}
+        main = this;
+    }
+
+    public void FixedUpdate()
+    {
+    }
 
 	public void BuildNewRocket()
 	{

diff --git a/Source/Ref.cs b/Source/Ref.cs
@@ -10,6 +10,7 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using SFSML.GameManager.Hooks.UnityRelated;
+using SFSML.GameManager.Hooks.FrameRelated;
 
 public class Ref : MonoBehaviour
 {
@@ -98,6 +99,8 @@ public enum SceneType
 
     public static ModLoader myModLoader = null;
 
+    public static Ref r;
+
 	public AudioListener MainAudioListener;
 
 	public static AudioListener mainAudioListener;
@@ -286,6 +289,7 @@ public static string GetTimeString(double time)
 
     private void Awake()
     {
+        r = this;
         Ref.cam = this.Camera;
 		Ref.inputController = this.InputController;
 		Ref.saving = this.Saving;
@@ -305,7 +309,7 @@ private void Awake()
     }
 
     private static bool kd = false;
-    void FixedUpdate()
+    void Update()
     {
         if (Input.GetKey(KeyCode.F12) && !kd)
         {
@@ -373,6 +377,12 @@ public static CelestialBodyData GetPlanetByName(string adress)
 		return null;
 	}
 
+    private void OnGUI()
+    {
+        if (ModLoader.manager != null)
+        ModLoader.manager.castHook<MyGeneralOnGuiHook>(new MyGeneralOnGuiHook(this.CurrentScene));
+    }
+
 	public static float GetSizeOfWord(TextMesh text, string word)
 	{
 		float num = 0f;

diff --git a/Source/SFSML/GameManager/Hooks/FrameRelated/MyBuildMenuOnGuiHook.cs b/Source/SFSML/GameManager/Hooks/FrameRelated/MyBuildMenuOnGuiHook.cs
@@ -1,4 +1,5 @@
-using SFSML.HookSystem;
+using NewBuildSystem;
+using SFSML.HookSystem;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,6 +9,11 @@ namespace SFSML.GameManager.Hooks.FrameRelated
 {
     public class MyBuildMenuOnGuiHook : MyBaseHook<MyBuildMenuOnGuiHook>
     {
+        Build buildTarget;
+        public MyBuildMenuOnGuiHook(Build target)
+        {
+            this.buildTarget = target;
+        }
         public MyBuildMenuOnGuiHook() { }
     }
 }
diff --git a/Source/SFSML/GameManager/Hooks/FrameRelated/MyGeneralOnGuiHook.cs b/Source/SFSML/GameManager/Hooks/FrameRelated/MyGeneralOnGuiHook.cs
@@ -0,0 +1,18 @@
+using SFSML.HookSystem;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace SFSML.GameManager.Hooks.FrameRelated
+{
+    class MyGeneralOnGuiHook : MyBaseHook<MyGeneralOnGuiHook>
+    {
+        Ref.SceneType scene;
+        public MyGeneralOnGuiHook(Ref.SceneType targetScene)
+        {
+            this.scene = targetScene;
+        }
+        public MyGeneralOnGuiHook() { }
+    }
+}
diff --git a/Source/SFSML/GameManager/Hooks/InputRelated/MyKeyDownHook.cs b/Source/SFSML/GameManager/Hooks/InputRelated/MyKeyDownHook.cs
@@ -0,0 +1,25 @@
+using SFSML.HookSystem;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+
+namespace SFSML.GameManager.Hooks.InputRelated
+{
+    public class MyKeyDownHook : MyBaseHook<MyKeyDownHook>
+    {
+        public KeyCode keyDown;
+        public bool register;
+        public MyKeyDownHook(KeyCode key, bool registerKey)
+        {
+            this.keyDown = key;
+            this.register = registerKey;
+        }
+
+        /// <summary>
+        /// For event-listeners.
+        /// </summary>
+        public MyKeyDownHook() { }
+    }
+}