From f205d9a6ac6ecbad42ed6a64f0509bbdc9bbd51e Mon Sep 17 00:00:00 2001
From: Tom Grobbe <31419184+TomGrobbe@users.noreply.github.com>
Date: Tue, 19 May 2020 18:10:49 +0200
Subject: [PATCH 01/37] Add info icon
---
MenuAPI/MenuController.cs | 1 +
MenuAPI/items/MenuItem.cs | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/MenuAPI/MenuController.cs b/MenuAPI/MenuController.cs
index 6ae6b96..d35e777 100644
--- a/MenuAPI/MenuController.cs
+++ b/MenuAPI/MenuController.cs
@@ -33,6 +33,7 @@ public class MenuController : BaseScript
"mprankbadge",
"mpcarhud",
"mpcarhud2",
+ "shared"
#endif
#if REDM
"menu_textures",
diff --git a/MenuAPI/items/MenuItem.cs b/MenuAPI/items/MenuItem.cs
index ac7b807..7f964e0 100644
--- a/MenuAPI/items/MenuItem.cs
+++ b/MenuAPI/items/MenuItem.cs
@@ -195,6 +195,7 @@ public enum Icon
BRAND_WESTERNMOTORCYCLE,
BRAND_WILLARD,
BRAND_ZIRCONIUM,
+ INFO
#endif
#if REDM
LOCK,
@@ -444,6 +445,8 @@ protected string GetSpriteDictionary(Icon icon)
case Icon.BRAND_PROGEN2:
case Icon.BRAND_RUNE:
return "mpcarhud2";
+ case Icon.INFO:
+ return "shared";
default:
return "commonmenu";
#endif
@@ -649,6 +652,7 @@ protected string GetSpriteName(Icon icon, bool selected)
case Icon.BRAND_LCC: return "lcc";
case Icon.BRAND_PROGEN2: return "progen";
case Icon.BRAND_RUNE: return "rune";
+ case Icon.INFO: return "info_icon_32";
default:
break;
#endif
From d18dff7caafd9324055348c9738fe1548e7c0a11 Mon Sep 17 00:00:00 2001
From: Tom Grobbe <31419184+TomGrobbe@users.noreply.github.com>
Date: Thu, 21 May 2020 13:31:02 +0200
Subject: [PATCH 02/37] Add debug constants for the correct configurations
---
MenuAPI/MenuAPI.csproj | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/MenuAPI/MenuAPI.csproj b/MenuAPI/MenuAPI.csproj
index 17febc4..30c1590 100644
--- a/MenuAPI/MenuAPI.csproj
+++ b/MenuAPI/MenuAPI.csproj
@@ -20,14 +20,22 @@
license.txt
-
+
FIVEM
+
+
+ FIVEM;DEBUG
+
-
+
REDM
+
+ REDM;DEBUG
+
+
From d8a71b513b9d219249a266c0c914a9c44e5b7e1f Mon Sep 17 00:00:00 2001
From: Tom Grobbe <31419184+TomGrobbe@users.noreply.github.com>
Date: Thu, 21 May 2020 13:31:39 +0200
Subject: [PATCH 03/37] Add null checks and debug logs for issue #28
---
MenuAPI/MenuController.cs | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/MenuAPI/MenuController.cs b/MenuAPI/MenuController.cs
index d35e777..bfcb4da 100644
--- a/MenuAPI/MenuController.cs
+++ b/MenuAPI/MenuController.cs
@@ -241,10 +241,22 @@ private static void UnloadAssets()
#if REDM
menuTextureAssets.ForEach(asset =>
{
- if (Call(HAS_STREAMED_TEXTURE_DICT_LOADED, asset))
+ if (!string.IsNullOrEmpty(asset))
{
- Call(SET_STREAMED_TEXTURE_DICT_AS_NO_LONGER_NEEDED, asset);
+ if (Call(HAS_STREAMED_TEXTURE_DICT_LOADED, asset))
+ {
+#if DEBUG
+ Debug.WriteLine($"[DEBUG] [{GetCurrentResourceName()}] [MenuAPI] Attempting to set asset as no longer needed: {asset}");
+#endif
+ Call(SET_STREAMED_TEXTURE_DICT_AS_NO_LONGER_NEEDED, asset);
+ }
}
+#if DEBUG
+ else
+ {
+ Debug.WriteLine($"[WARNING] [{GetCurrentResourceName()}] [MenuAPI] a menu asset is null somehow, can't set it as no longer needed.");
+ }
+#endif
});
#endif
}
@@ -528,7 +540,15 @@ private async Task ProcessToggleMenuButton()
Call(DISABLE_CONTROL_ACTION, 0, MenuToggleKey, true);
if (!Call(IS_PAUSE_MENU_ACTIVE) && Call(IS_SCREEN_FADED_IN) && !IsAnyMenuOpen() && !DisableMenuButtons && !Call(IS_ENTITY_DEAD, PlayerPedId()) && Call(IS_DISABLED_CONTROL_JUST_RELEASED, 0, MenuToggleKey))
{
- MainMenu.OpenMenu();
+ if (MainMenu != null)
+ {
+ MainMenu.OpenMenu();
+ }
+ else
+ {
+ Debug.WriteLine($"[ERROR] [{GetCurrentResourceName()}] [MenuAPI] MainMenu is null, so we can't open it! Make sure that MenuController.MainMenu is set to a valid Menu which is not null!");
+ }
+
}
#endif
await Task.FromResult(0);
From 9159cf9ffa359dde8b89a0a105352b591ca97c95 Mon Sep 17 00:00:00 2001
From: Carmine Giugliano
Date: Thu, 4 Jun 2020 21:59:05 +0200
Subject: [PATCH 04/37] Generic MenuItem will go back to parent when GoLeft is
invoked as duality with GoRight which navigates to child menu
Added NavigateMenuUsingArrows property to MenuController to enable/disable navigation using left/right arrows (enabled by default for backwards compatibility)
---
MenuAPI/Menu.cs | 12 +++++++-----
MenuAPI/MenuController.cs | 1 +
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/MenuAPI/Menu.cs b/MenuAPI/Menu.cs
index db62220..fef9b34 100644
--- a/MenuAPI/Menu.cs
+++ b/MenuAPI/Menu.cs
@@ -998,10 +998,11 @@ public void GoLeft()
SelectItem(checkbox);
}
#endif
- // If the item is enabled and it's not any of the above, just select it.
- else if (item.Enabled)
+ // If the item is not any of the above, return to parent menu.
+ else if (MenuController.NavigateMenuUsingArrows)
{
- SelectItem(item);
+ if (!MenuController.DisableBackButton && !(MenuController.PreventExitingMenu && ParentMenu == null))
+ GoBack();
}
}
}
@@ -1074,9 +1075,10 @@ public void GoRight()
}
#endif
// If the item is enabled and it's not any of the above, just select it.
- else if (item.Enabled)
+ else if (MenuController.NavigateMenuUsingArrows)
{
- SelectItem(item);
+ if(item.Enabled)
+ SelectItem(item);
}
}
}
diff --git a/MenuAPI/MenuController.cs b/MenuAPI/MenuController.cs
index bfcb4da..87495c0 100644
--- a/MenuAPI/MenuController.cs
+++ b/MenuAPI/MenuController.cs
@@ -63,6 +63,7 @@ public class MenuController : BaseScript
!Call(IS_ENTITY_DEAD, PlayerPedId());
#endif
+ public static bool NavigateMenuUsingArrows { get; set; } = true;
public static bool EnableManualGCs { get; set; } = true;
public static bool DontOpenAnyMenu { get; set; } = false;
public static bool PreventExitingMenu { get; set; } = false;
From 878a8d3fd0aee5b8f541afa7e8cf0e4c74abebd8 Mon Sep 17 00:00:00 2001
From: Tom Grobbe <31419184+TomGrobbe@users.noreply.github.com>
Date: Sun, 6 Sep 2020 21:28:03 +0200
Subject: [PATCH 05/37] Fix weapon stats panels when using negative component
values, and add vehicle stats panels
Also reduce code duplication by using for loops.
---
MenuAPI/Menu.cs | 284 ++++++++++++++++++--------------------
MenuAPI/MenuController.cs | 2 -
2 files changed, 134 insertions(+), 152 deletions(-)
diff --git a/MenuAPI/Menu.cs b/MenuAPI/Menu.cs
index fef9b34..82ba90a 100644
--- a/MenuAPI/Menu.cs
+++ b/MenuAPI/Menu.cs
@@ -391,9 +391,29 @@ private List