Update FishNet

2026-04-07 03:11:52 +07:00
parent 9675b7b31d
commit ba7513d478
869 changed files with 3675 additions and 2764 deletions
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/AttributeHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/CodegenSession.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/CreatedSyncVarGenerator.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -3,8 +3,67 @@ using System.Linq;

 namespace FishNet.CodeGenerating.Helping.Extension
 {
-    internal static class CustomAttributeExtensions
+   internal static class CustomAttributeExtensions
    {
+        private static IGenericParameterProvider GetSafeContext(CodegenSession session, IGenericParameterProvider context)
+        {
+            return (context != null && context.Module == session.Module) ? context : null;
+        }
+
+        /// <summary>
+        /// Clones an attribute into the current session module.
+        /// </summary>
+        internal static CustomAttribute CloneImported(this CustomAttribute customAttr, CodegenSession session, IGenericParameterProvider context = null)
+        {
+            IGenericParameterProvider safeContext = GetSafeContext(session, context);
+            MethodReference ctor = (safeContext == null) ? session.ImportReference(customAttr.Constructor) : session.ImportReference(customAttr.Constructor, safeContext);
+            CustomAttribute result = new(ctor);
+
+            foreach (CustomAttributeArgument item in customAttr.ConstructorArguments)
+                result.ConstructorArguments.Add(item.CloneImported(session, safeContext));
+
+            foreach (CustomAttributeNamedArgument item in customAttr.Fields)
+                result.Fields.Add(item.CloneImported(session, safeContext));
+
+            foreach (CustomAttributeNamedArgument item in customAttr.Properties)
+                result.Properties.Add(item.CloneImported(session, safeContext));
+
+            return result;
+        }
+
+        /// <summary>
+        /// Clones an attribute argument into the current session module.
+        /// </summary>
+        internal static CustomAttributeArgument CloneImported(this CustomAttributeArgument customAttrArg, CodegenSession session, IGenericParameterProvider context = null)
+        {
+            IGenericParameterProvider safeContext = GetSafeContext(session, context);
+            TypeReference typeRef = safeContext == null ? session.ImportReference(customAttrArg.Type) : session.ImportReference(customAttrArg.Type, safeContext);
+            object value = customAttrArg.Value;
+
+            if (value is TypeReference tr)
+            {
+                value = (safeContext == null) ? session.ImportReference(tr) : session.ImportReference(tr, safeContext);
+            }
+            else if (value is CustomAttributeArgument[] arguments)
+            {
+                CustomAttributeArgument[] clonedArguments = new CustomAttributeArgument[arguments.Length];
+                for (int i = 0; i < arguments.Length; i++)
+                    clonedArguments[i] = arguments[i].CloneImported(session, safeContext);
+
+                value = clonedArguments;
+            }
+
+            return new(typeRef, value);
+        }
+
+        /// <summary>
+        /// Clones a named attribute argument into the current session module.
+        /// </summary>
+        internal static CustomAttributeNamedArgument CloneImported(this CustomAttributeNamedArgument customAttrNamedArg, CodegenSession session, IGenericParameterProvider context = null)
+        {
+            return new(customAttrNamedArg.Name, customAttrNamedArg.Argument.CloneImported(session, context));
+        }
+        
        /// <summary>
        /// Finds a field within an attribute.
        /// </summary>
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/CustomAttributeExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/Diagnostics.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/GetConstructor.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/ILProcessorExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/InstructionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/MethodReferenceExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/ModuleDefinitionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -5,6 +5,11 @@ namespace FishNet.CodeGenerating.Helping.Extension
 {
    internal static class ParameterDefinitionExtensions
    {
+        private static IGenericParameterProvider GetSafeContext(CodegenSession session, IGenericParameterProvider context)
+        {
+            return context != null && context.Module == session.Module ? context : null;
+        }
+
        /// <summary>
        /// Returns if parameterDef is Type.
        /// </summary>
@@ -15,5 +20,34 @@ namespace FishNet.CodeGenerating.Helping.Extension
        {
            return parameterDef.ParameterType.FullName == type.FullName;
        }
+
+        /// <summary>
+        /// Clones a parameter into the current session module.
+        /// </summary>
+        public static ParameterDefinition CloneImported(this ParameterDefinition parameterDef, CodegenSession session, IGenericParameterProvider context = null, string nameOverride = null)
+        {
+            IGenericParameterProvider safeContext = GetSafeContext(session, context);
+            TypeReference parameterTypeRef = safeContext == null ? session.ImportReference(parameterDef.ParameterType) : session.ImportReference(parameterDef.ParameterType, safeContext);
+            ParameterDefinition result = new(nameOverride ?? parameterDef.Name, parameterDef.Attributes, parameterTypeRef)
+            {
+                Constant = parameterDef.Constant,
+                IsReturnValue = parameterDef.IsReturnValue,
+                IsOut = parameterDef.IsOut,
+                IsIn = parameterDef.IsIn,
+                IsLcid = parameterDef.IsLcid,
+                IsOptional = parameterDef.IsOptional,
+                HasConstant = parameterDef.HasConstant,
+                HasDefault = parameterDef.HasDefault,
+                HasFieldMarshal = parameterDef.HasFieldMarshal
+            };
+
+            if (parameterDef.HasMarshalInfo)
+                result.MarshalInfo = parameterDef.MarshalInfo;
+
+            foreach (CustomAttribute item in parameterDef.CustomAttributes)
+                result.CustomAttributes.Add(item.CloneImported(session, safeContext));
+
+            return result;
+        }
    }
 }
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/ParameterDefinitionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/TypeDefinitionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Extension/TypeReferenceExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/GeneralHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/NetworkBehaviourHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/NetworkConnectionImports.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/ObjectHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/PhysicsHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/PredictedObjectHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/ReaderImports.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/TimeManagerHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/TransportHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Typed/Comparers.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Typed/GeneratorHelper.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Typed/QOLAttributeType.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Typed/SerializatierType.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Typed/SyncIndexData.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/Typed/SyncType.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Helpers/WriterImports.cs
-  uploadId: 866910
+  uploadId: 892096