From 77899c5d96c4119d6b855648282752ee0e05e342 Mon Sep 17 00:00:00 2001
From: Gene Walters <genewalt@amazon.com>
Date: Wed, 12 May 2021 20:45:58 -0700
Subject: [PATCH] Updated network property behavior context category so they
 are grouped nicer in the Script Canvas palette

---
 .../Code/Source/AutoGen/AutoComponent_Source.jinja |  4 +++-
 .../Code/Source/MultiplayerSystemComponent.cpp     | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
index a3eef99b20..5b53145024 100644
--- a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
+++ b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
@@ -725,7 +725,7 @@ enum class NetworkProperties
 
         return &networkComponent->m_{{ LowerFirst(Property.attrib['Name']) }}Event;
     })
-        ->Attribute(AZ::Script::Attributes::AzEventDescription, AZ::BehaviorAzEventDescription{ "On {{ UpperFirst(Property.attrib['Name']) }} Changed Event", {"New {{ UpperFirst(Property.attrib['Name']) }}"} })
+        ->Attribute(AZ::Script::Attributes::AzEventDescription, AZ::BehaviorAzEventDescription{ "On {{ UpperFirst(Property.attrib['Name']) }} Changed Event", {"New {{ Property.attrib['Type'] }}"} })
 
 {% endif %}
 {% endcall -%}
@@ -1217,6 +1217,8 @@ namespace {{ Component.attrib['Namespace'] }}
         if (behaviorContext)
         {
             behaviorContext->Class<{{ ComponentName }}>("{{ ComponentName }}")
+                ->Attribute(AZ::Script::Attributes::Module, "{{ LowerFirst(Component.attrib['Namespace']) }}")
+                ->Attribute(AZ::Script::Attributes::Category, "{{ UpperFirst(Component.attrib['Namespace']) }}")
                 {{ DefineNetworkPropertyBehaviorReflection(Component, 'Authority', 'Authority', ComponentName)|indent(16) -}}
 {{ DefineNetworkPropertyBehaviorReflection(Component, 'Authority', 'Server', ComponentName)|indent(16) -}}
 {{ DefineNetworkPropertyBehaviorReflection(Component, 'Authority', 'Client', ComponentName)|indent(16) -}}
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
index 9f45122c1d..7d74f5e071 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
@@ -80,13 +80,13 @@ namespace Multiplayer
 
         if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
         {
-            behaviorContext->Class<HostId>("HostId");
-            behaviorContext->Class<NetEntityId>("NetEntityId");
-            behaviorContext->Class<NetComponentId>("NetComponentId");
-            behaviorContext->Class<PropertyIndex>("PropertyIndex");
-            behaviorContext->Class<RpcIndex> ("RpcIndex");
-            behaviorContext->Class<ClientInputId> ("ClientInputId");
-            behaviorContext->Class<HostFrameId> ("HostFrameId");
+            behaviorContext->Class<HostId>();
+            behaviorContext->Class<NetEntityId>();
+            behaviorContext->Class<NetComponentId>();
+            behaviorContext->Class<PropertyIndex>();
+            behaviorContext->Class<RpcIndex>();
+            behaviorContext->Class<ClientInputId>();
+            behaviorContext->Class<HostFrameId>();
         }
 
         MultiplayerComponent::Reflect(context);