Trying to createnew menu

TAImatem · Jan 5, 2020 · 728bb0c · 728bb0c
1 parent b1bd5d0
commit 728bb0c
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 52 deletions.
diff --git a/ControllerFix/ControllerFix.cs b/ControllerFix/ControllerFix.cs
@@ -22,7 +22,7 @@ public static void SetUp_Postfix(GamePad_PC_XB1 __instance, ref uint ___m_xb1Ind
 			}
 			XboxControllerFix.occInds.Add(___m_xb1Index);
 			if (chck != ___m_xb1Index)
-				XboxControllerFix.print($"patch fixed index from {chck} to {___m_xb1Index}");
+				ModConsole.Instance.WriteLine($"patch fixed index from {chck} to {___m_xb1Index}");
 		}
 
 		public static void Destr_Prefix(GamePad_PC_XB1 __instance, ref uint ___m_xb1Index)
@@ -50,13 +50,13 @@ public static bool Prefix(ThrusterModel __instance, ref GamePad __result, int pa
 			}
 			if (result != null)
 			{
-				XboxControllerFix.print($"patched controller type: #{padIndex} \"{name}\"; resulting type = {result.GetPadType()}");
+				ModConsole.Instance.WriteLine($"patched controller type: #{padIndex} \"{name}\"; resulting type = {result.GetPadType()}");
 				__result = result;
 				return false;
 			}
 			else
 			{
-				XboxControllerFix.print($"normal controller type: #{padIndex} \"{name}\"");
+				ModConsole.Instance.WriteLine($"normal controller type: #{padIndex} \"{name}\"");
 				return true;
 			}
 		}

diff --git a/ControllerFix/ControllerFix.csproj b/ControllerFix/ControllerFix.csproj
@@ -46,25 +46,28 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="NAudio-Unity, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\NAudio-Unity.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\NAudio-Unity.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="OWML, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.dll</HintPath>
     </Reference>
     <Reference Include="OWML.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.Common.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.Common.dll</HintPath>
     </Reference>
     <Reference Include="OWML.ModHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.ModHelper.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.dll</HintPath>
     </Reference>
     <Reference Include="OWML.ModHelper.Assets, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.ModHelper.Assets.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Assets.dll</HintPath>
     </Reference>
     <Reference Include="OWML.ModHelper.Events, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.ModHelper.Events.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Events.dll</HintPath>
+    </Reference>
+    <Reference Include="OWML.ModHelper.Menus, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Menus.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="UnityEngine.CoreModule">

diff --git a/ControllerFix/manifest.json b/ControllerFix/manifest.json
@@ -3,7 +3,7 @@
 	"author": "TAImatem",
 	"name": "XBoxControllerFix",
 	"uniqueName": "TruAI.XBoxControllerFix",
-	"version": "1.0",
-	"owmlVersion": "0.2.1",
+	"version": "0.9",
+	"owmlVersion": "0.3.8",
 	"enabled": true
 }
diff --git a/ControllerFix/packages.config b/ControllerFix/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Json.Net.Unity3D" version="9.0.1" targetFramework="net35" />
   <package id="Lib.Harmony" version="1.2.0.1" targetFramework="net35" />
-  <package id="OWML" version="2019.12.30.13" targetFramework="net35" />
+  <package id="OWML" version="0.3.13" targetFramework="net35" />
 </packages>
diff --git a/MenuTries/MenuTries.cs b/MenuTries/MenuTries.cs
@@ -9,7 +9,7 @@
 
 namespace MenuTries
 {
-	class MenuPatch
+	/*class MenuPatch
 	{
 		public static void Menu_Prefix(TitleScreenManager __instance)
 		{
@@ -37,19 +37,29 @@ public static void Menu_Prefix(TitleScreenManager __instance)
 				}
 			}
 		}
-	}
+	}*/
 	public class MenuTries : ModBehaviour
 	{
 		public static IModConsole console;
-		public static GameObject extrabut, mainmenu, setbut;
+		public static GameObject extramenu, mainmenu, setbut;
+		public static Button menubutton;
+		public static Menu cusMenu;
 
 		private void Start()
 		{
 			console = ModHelper.Console;
-			ModHelper.HarmonyHelper.AddPrefix<TitleScreenManager>("SetUpMenu", typeof(MenuPatch), "Menu_Prefix");
+			//ModHelper.HarmonyHelper.AddPrefix<TitleScreenManager>("SetUpMenu", typeof(MenuPatch), "Menu_Prefix");
+			menubutton = ModHelper.Menus.MainMenu.AddButton("sample menu", 4);
+			menubutton.onClick.AddListener(OnEvent);
+			mainmenu = GameObject.Find("KeyboardRebindingCanvas");
+			mainmenu = mainmenu.transform.GetChild(0).gameObject;
+			extramenu = GameObject.Instantiate(mainmenu);
+			GameObject.Destroy(extramenu.transform.Find("HeaderPanel").GetComponentInChildren<LocalizedText>());
+			extramenu.transform.Find("HeaderPanel").GetComponentInChildren<Text>().text = "custom menu";
+			cusMenu = extramenu.GetComponent<Menu>();// this doesn't open :(
+			//cusMenu = mainmenu.GetComponent<Menu>(); // this opens
 			ModHelper.Console.WriteLine("MenuTry ready!");
-			ModHelper.Events.AddEvent<Menu>(Events.AfterAwake);
-			ModHelper.Events.OnEvent += OnEvent;
+
 			//mainmenu = GameObject.Find("MainMenuLayoutGroup");
 			/*GameObject setbut = GameObject.Find("Button-Options");
 			extrabut = Object.Instantiate(setbut);
@@ -59,12 +69,16 @@ private void Start()
 			ModHelper.Console.WriteLine("New button added!");*/
 
 		}
-		private void OnEvent(MonoBehaviour behaviour, Events ev)
+		private void OnEvent()
 		{
+			ModHelper.Console.WriteLine("trying to open menu");
+			cusMenu.EnableMenu(true);
+			ModHelper.Console.WriteLine("trying to open menu (end)");
+			/*
 			GameObject cobj = behaviour.gameObject;
 			if (cobj.name == "PauseMenuItems")
 				cobj = cobj.transform.GetChild(0).gameObject;
-			if (cobj.name == "MainMenuLayoutGroup"|| cobj.name == "PauseMenuItemsLayout")
+			if (cobj.name == "MainMenuLayoutGroup" || cobj.name == "PauseMenuItemsLayout")
 			{
 				mainmenu = cobj;
 				GameObject setbut = mainmenu.transform.Find("Button-Options").gameObject;
@@ -101,18 +115,11 @@ private void OnEvent(MonoBehaviour behaviour, Events ev)
 			{
 				ModHelper.Console.WriteLine("Flashlight has started!");
 			}
+			*/
 		}
 
 		private void OnGUI()
 		{
-			//foreach (Text text in mainmenu.transform.GetComponentsInChildren<Text>())
-			//	text.text = "newtext";
-			if (extrabut != null)
-				extrabut.GetComponentInChildren<Text>().text = "newtext";
-			if (setbut != null)
-				setbut.GetComponentInChildren<Text>().text = "newset";
-			if (extrabut != null && setbut != null)
-				extrabut.transform.position = setbut.transform.position;
 		}
 
 	}

diff --git a/MenuTries/MenuTries.csproj b/MenuTries/MenuTries.csproj
@@ -44,30 +44,34 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="NAudio-Unity, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\NAudio-Unity.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\NAudio-Unity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OWML, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.dll</HintPath>
     </Reference>
     <Reference Include="OWML.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.Common.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OWML.ModHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.ModHelper.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OWML.ModHelper.Assets, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.ModHelper.Assets.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Assets.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OWML.ModHelper.Events, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.ModHelper.Events.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Events.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="OWML.ModHelper.Menus, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Menus.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System">

diff --git a/MenuTries/manifest.json b/MenuTries/manifest.json
@@ -4,6 +4,6 @@
 	"name": "MenuTries",
 	"uniqueName": "TruAI.MenuTries",
 	"version": "1.0",
-	"owmlVersion": "0.2.1",
+	"owmlVersion": "0.3.8",
 	"enabled": true
 }
diff --git a/MenuTries/packages.config b/MenuTries/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Json.Net.Unity3D" version="9.0.1" targetFramework="net35" />
   <package id="Lib.Harmony" version="1.2.0.1" targetFramework="net35" />
-  <package id="OWML" version="2019.12.30.13" targetFramework="net35" />
+  <package id="OWML" version="0.3.13" targetFramework="net35" />
 </packages>
diff --git a/SmoothThrust/SmoothThrust.csproj b/SmoothThrust/SmoothThrust.csproj
@@ -45,25 +45,28 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="NAudio-Unity, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\NAudio-Unity.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\NAudio-Unity.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="OWML, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.dll</HintPath>
     </Reference>
     <Reference Include="OWML.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.Common.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.Common.dll</HintPath>
     </Reference>
     <Reference Include="OWML.ModHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.ModHelper.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.dll</HintPath>
     </Reference>
     <Reference Include="OWML.ModHelper.Assets, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.ModHelper.Assets.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Assets.dll</HintPath>
     </Reference>
     <Reference Include="OWML.ModHelper.Events, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.ModHelper.Events.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Events.dll</HintPath>
+    </Reference>
+    <Reference Include="OWML.ModHelper.Menus, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Menus.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="UnityEngine.CoreModule">

diff --git a/SmoothThrust/manifest.json b/SmoothThrust/manifest.json
@@ -4,6 +4,6 @@
 	"name": "SmoothThrust",
 	"uniqueName": "TruAI.SmoothThrust",
 	"version": "1.0",
-	"owmlVersion": "0.2.1",
+	"owmlVersion": "0.3.8",
 	"enabled": true
 }
diff --git a/SmoothThrust/packages.config b/SmoothThrust/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Json.Net.Unity3D" version="9.0.1" targetFramework="net35" />
   <package id="Lib.Harmony" version="1.2.0.1" targetFramework="net35" />
-  <package id="OWML" version="2019.12.30.13" targetFramework="net35" />
+  <package id="OWML" version="0.3.13" targetFramework="net35" />
 </packages>
diff --git a/TAIcheat/TAIcheat.csproj b/TAIcheat/TAIcheat.csproj
@@ -41,30 +41,34 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="NAudio-Unity, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\NAudio-Unity.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\NAudio-Unity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Json.Net.Unity3D.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OWML, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.dll</HintPath>
     </Reference>
     <Reference Include="OWML.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.Common.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OWML.ModHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.ModHelper.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OWML.ModHelper.Assets, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.ModHelper.Assets.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Assets.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OWML.ModHelper.Events, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OWML.2019.12.30.13\lib\net35\OWML.ModHelper.Events.dll</HintPath>
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Events.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="OWML.ModHelper.Menus, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OWML.0.3.13\lib\net35\OWML.ModHelper.Menus.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System">

diff --git a/TAIcheat/manifest.json b/TAIcheat/manifest.json
@@ -4,6 +4,6 @@
 	"name": "TAICheat",
 	"uniqueName": "TruAI.TAICheat",
 	"version": "1.0",
-	"owmlVersion": "0.2.1",
+	"owmlVersion": "0.3.8",
 	"enabled": true
 }
diff --git a/TAIcheat/packages.config b/TAIcheat/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Json.Net.Unity3D" version="9.0.1" targetFramework="net35" />
   <package id="Lib.Harmony" version="1.2.0.1" targetFramework="net35" />
-  <package id="OWML" version="2019.12.30.13" targetFramework="net35" />
+  <package id="OWML" version="0.3.13" targetFramework="net35" />
 </packages>