From 9a4884ff0bc1577a4947d3c835ec144e195d5a53 Mon Sep 17 00:00:00 2001
From: Gene Walters <genewalt@amazon.com>
Date: Wed, 12 May 2021 14:19:18 -0700
Subject: [PATCH] Exposing Multiplayer integral types (just wrapped ints) to
 bevahior context so that Network Properties using these type can be Get/Set
 from Script Canvas

---
 .../Code/Include/MultiplayerTypes.h           | 11 ++++++++++
 .../Source/AutoGen/AutoComponent_Source.jinja | 20 +++++++++++++++++++
 .../Source/MultiplayerSystemComponent.cpp     | 11 ++++++++++
 3 files changed, 42 insertions(+)

diff --git a/Gems/Multiplayer/Code/Include/MultiplayerTypes.h b/Gems/Multiplayer/Code/Include/MultiplayerTypes.h
index 1bee9867e3..e9f3865563 100644
--- a/Gems/Multiplayer/Code/Include/MultiplayerTypes.h
+++ b/Gems/Multiplayer/Code/Include/MultiplayerTypes.h
@@ -130,3 +130,14 @@ AZ_TYPE_SAFE_INTEGRAL_SERIALIZEBINDING(Multiplayer::PropertyIndex);
 AZ_TYPE_SAFE_INTEGRAL_SERIALIZEBINDING(Multiplayer::RpcIndex);
 AZ_TYPE_SAFE_INTEGRAL_SERIALIZEBINDING(Multiplayer::ClientInputId);
 AZ_TYPE_SAFE_INTEGRAL_SERIALIZEBINDING(Multiplayer::HostFrameId);
+
+namespace AZ
+{
+    AZ_TYPE_INFO_SPECIALIZE(Multiplayer::HostId, "{D04B3363-8E1B-4193-8B2B-D2140389C9D5}");
+    AZ_TYPE_INFO_SPECIALIZE(Multiplayer::NetEntityId, "{05E4C08B-3A1B-4390-8144-3767D8E56A81}");
+    AZ_TYPE_INFO_SPECIALIZE(Multiplayer::NetComponentId, "{8AF3B382-F187-4323-9014-B380638767E3}");
+    AZ_TYPE_INFO_SPECIALIZE(Multiplayer::PropertyIndex, "{F4460210-024D-4B3B-A10A-04B669C34230}");
+    AZ_TYPE_INFO_SPECIALIZE(Multiplayer::RpcIndex, "{EBB1C475-FA03-4111-8C84-985377434B9B}");
+    AZ_TYPE_INFO_SPECIALIZE(Multiplayer::ClientInputId, "{35BF3504-CEC9-4406-A275-C633A17FBEFB}");
+    AZ_TYPE_INFO_SPECIALIZE(Multiplayer::HostFrameId, "{DF17F6F3-48C6-4B4A-BBD9-37DA03162864}");
+} // namespace AZ
diff --git a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
index 576978f75c..a3eef99b20 100644
--- a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
+++ b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
@@ -707,6 +707,26 @@ enum class NetworkProperties
 
         controller->Set{{ UpperFirst(Property.attrib['Name']) }}({{ LowerFirst(Property.attrib['Name']) }});
     })
+    ->Method("GetOn{{ UpperFirst(Property.attrib['Name']) }}ChangedEvent", [](AZ::EntityId id) -> AZ::Event<{{ Property.attrib['Type'] }}>*
+    {
+        AZ::Entity* entity = AZ::Interface<AZ::ComponentApplicationRequests>::Get()->FindEntity(id);
+        if (!entity)
+        {
+            AZ_Warning("Network Property", false, "{{ ClassName }} GetOn{{ UpperFirst(Property.attrib['Name']) }}ChangedEvent failed. The entity with id %s doesn't exist, please provide a valid entity id.", id.ToString().c_str())
+            return nullptr;
+        }
+
+        {{ ClassName }}* networkComponent = entity->FindComponent<{{ ClassName }}>();
+        if (!networkComponent)
+        {
+            AZ_Warning("Network Property", false, "{{ ClassName }} Get{{ UpperFirst(Property.attrib['Name']) }} failed. Entity '%s' (id: %s) is missing {{ ClassName }}, be sure to add {{ ClassName }} to this entity.", entity->GetName().c_str(), id.ToString().c_str())
+            return nullptr;
+        }
+
+        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']) }}"} })
+
 {% endif %}
 {% endcall -%}
 {% endmacro %}
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
index e6fb77eca7..9f45122c1d 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
@@ -78,6 +78,17 @@ namespace Multiplayer
                 ->Version(1);
         }
 
+        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");
+        }
+
         MultiplayerComponent::Reflect(context);
     }