Release v1.0.3 - yolo (#136)

Co-authored-by: samyyc <s1myyc@outlook.com>
Co-authored-by: 菠蘿包 <79680886+ELDment@users.noreply.github.com>
Co-authored-by: LynchMus <xubw@vip.qq.com>
Co-authored-by: K4ryuu <104531589+K4ryuu@users.noreply.github.com>

Author: 5 people

.github/workflows/build.yml

@@ -254,7 +254,9 @@ jobs:
         cp -r ./server.pdb/server.pdb ${{ env.WINDOWS_FOLDER }}/swiftlys2/bin/win64/
 
         mkdir -p ${{ env.LINUX_FOLDER }}/swiftlys2/plugins/
+        mkdir -p ${{ env.LINUX_FOLDER }}/swiftlys2/plugins/disabled
         mkdir -p ${{ env.WINDOWS_FOLDER }}/swiftlys2/plugins/
+        mkdir -p ${{ env.WINDOWS_FOLDER }}/swiftlys2/plugins/disabled
 
         cp -r ${{ env.LINUX_FOLDER }}/ ${{ env.LINUX_FOLDER }}-with-runtimes/
         cp -r ${{ env.WINDOWS_FOLDER }}/ ${{ env.WINDOWS_FOLDER }}-with-runtimes/

generator/docs_generator/generator.py

@@ -7,6 +7,17 @@
 
 os.makedirs(DEST_DIR, exist_ok=True)
 
+def get_namespace(yaml_data):
+    """Extract namespace from the YAML data."""
+    for item in yaml_data.get('body', []):
+        if 'facts' in item:
+            for fact in item['facts']:
+                if fact.get('name') == 'Namespace':
+                    if isinstance(fact.get('value'), dict):
+                        return fact['value'].get('text', '')
+                    return fact.get('value', '')
+    return ''
+
 def extract_metadata(yaml_data, is_index=False):
     """Extract front-matter metadata from DocFX ApiPage YAML."""
     title = yaml_data.get('title', '')
@@ -30,31 +41,84 @@ def convert_to_path(s):
     if s.lower().endswith(".html"):
         s = s[10:]
         s = s[:-5]
+    # Merge Core and Shared into the same path
+    s = s.replace("SwiftlyS2.Core.", "SwiftlyS2.").replace("SwiftlyS2.Shared.", "SwiftlyS2.")
     path = "/".join(s.split(".")).lower()
+    # Transform -NUMBER to t repeated NUMBER times
+    parts = path.split("/")
+    parts[-1] = transform_filename(parts[-1])
+    path = "/".join(parts)
     return path
 
 def transform_filename(base_name):
     """
-    If filename ends with -NUMBER, replace with NUMBER times 'T'.
-    Example: class-3 -> classTTT
+    If filename ends with -NUMBER, replace with NUMBER times 't'.
+    Example: class-3 -> classttt
     """
     match = re.match(r"^(.*?)-(\d+)$", base_name)
     if match:
         name, num = match.groups()
         num = int(num)
-        return name + ("T" * num)
+        return name + ("t" * num)
     return base_name
 
 def generate_markdown(yaml_data):
     """Generate Markdown content from DocFX ApiPage YAML."""
     md = ""
+    namespace = get_namespace(yaml_data)
+    
     for item in yaml_data.get('body', []):
+        if 'api1' in item:
+            api1_title = str(item.get('api1', ''))
+            api1_title = re.sub(r'<[^>]+>', '', api1_title)
+            md += f"# {api1_title}\n\n"
+            if 'src' in item:
+                src = item['src'].replace('/blob/main', '/blob/master')
+                md += f"[View Source]({src})\n\n"
+        if 'facts' in item:
+            for fact in item['facts']:
+                fact_name = fact.get('name', '')
+                fact_value = fact.get('value', '')
+                if isinstance(fact_value, dict):
+                    fact_text = fact_value.get('text', '')
+                    fact_url = fact_value.get('url', '')
+                    if fact_url and fact_url.endswith('.html'):
+                        fact_url = "/docs/api/" + convert_to_path(fact_url)
+                        md += f"**{fact_name}**: [{fact_text}]({fact_url})\n\n"
+                    else:
+                        md += f"**{fact_name}**: {fact_text}\n\n"
+                else:
+                    md += f"**{fact_name}**: {fact_value}\n\n"
+        if 'markdown' in item:
+            md += f"{item['markdown']}\n\n"
         if 'h2' in item:
             md += f"## {item['h2']}\n\n"
         if 'h4' in item:
             md += f"#### {item['h4']}\n\n"
         if 'code' in item:
             md += "```csharp\n" + item['code'] + "\n```\n\n"
+        if 'inheritance' in item:
+            for inherit in item['inheritance']:
+                inherit_text = inherit.get('text', '')
+                inherit_url = inherit.get('url', '')
+                if inherit_url:
+                    if inherit_url.endswith('.html'):
+                        inherit_url = "/docs/api/" + convert_to_path(inherit_url)
+                    md += f"- [{inherit_text}]({inherit_url})\n"
+                else:
+                    md += f"- {inherit_text}\n"
+            md += "\n"
+        if 'list' in item:
+            for list_item in item['list']:
+                list_text = list_item.get('text', '')
+                list_url = list_item.get('url', '')
+                if list_url:
+                    if list_url.endswith('.html'):
+                        list_url = "/docs/api/" + convert_to_path(list_url)
+                    md += f"- [{list_text}]({list_url})\n"
+                else:
+                    md += f"- {list_text}\n"
+            md += "\n"
         if 'parameters' in item:
             for param in item['parameters']:
                 param_name = param.get('name', '')
@@ -94,7 +158,8 @@ def generate_markdown(yaml_data):
             api3_title = re.sub(r'\[[^\]]+\]', '', api3_title)
             md += f"### {api3_title}\n\n"
             if src != '':
-                md += f"[Source Code]({src})\n\n"
+                src = src.replace('/blob/main', '/blob/master')
+                md += f"[View Source]({src})\n\n"
     return md
 
 def convert_yaml_file(src_path, dest_path):
@@ -136,11 +201,11 @@ def convert_yaml_file(src_path, dest_path):
 for root, dirs, files in os.walk(SOURCE_DIR):
     for file in files:
         if file.endswith(".yml") or file.endswith(".yaml"):
-            rel_path = os.path.relpath(root, SOURCE_DIR)
-            dest_folder = os.path.join(DEST_DIR, rel_path)
             raw_base = os.path.splitext(file)[0]
+            # Merge Core and Shared paths
+            raw_base = raw_base.replace("SwiftlyS2.Core.", "SwiftlyS2.").replace("SwiftlyS2.Shared.", "SwiftlyS2.")
             new_base = transform_filename(raw_base)
-            dest_file = os.path.join(dest_folder, convert_to_path(new_base) + ".md")
+            dest_file = os.path.join(DEST_DIR, convert_to_path(new_base) + ".md")
             convert_yaml_file(os.path.join(root, file), dest_file)
 
 print("Markdown generation complete!")

generator/gameevent_generator/generate.py

@@ -473,8 +473,7 @@ def render_class(event: GameEventDef) -> str:
   for fname, fdef in event.fields.items():
     ftype = fdef.type_name
 
-    # userid override: expand to controller, pawn (readonly) and raw int (readwrite)
-    if fname.lower() == 'userid':
+    if ftype == 'player_controller' or ftype == 'player_controller_and_pawn' or fname.lower() == 'userid':
       base_prop = to_property_name(fname)  # UserId
       # Controller
       prop_name_ctrl = f"{base_prop}Controller"

generator/schema_generator/templates/class_fixed_string_field_template.cs

@@ -1,9 +1,17 @@
-  private static readonly nint _$NAME$Offset = Schema.GetOffset($HASH$);
+  private static nint? _$NAME$Offset;
 
   public string $NAME$ {
     get {
-      var ptr = _Handle + _$NAME$Offset;
-      return Schema.GetString(ptr);
+        if (_$NAME$Offset == null) {
+            _$NAME$Offset = Schema.GetOffset($HASH$);
+        }
+        var ptr = _Handle + _$NAME$Offset!.Value;
+        return Schema.GetString(ptr);
+    }
+    set {
+        if (_$NAME$Offset == null) {
+            _$NAME$Offset = Schema.GetOffset($HASH$);
+        }
+        Schema.SetFixedString(_Handle, _$NAME$Offset!.Value, value, $ELEMENT_COUNT$);
     }
-    set => Schema.SetFixedString(_Handle, _$NAME$Offset, value, $ELEMENT_COUNT$);
   } 

generator/schema_generator/templates/class_ptr_field_template.cs

@@ -1,8 +1,11 @@
-  private static readonly nint _$NAME$Offset = Schema.GetOffset($HASH$);
+  private static nint? _$NAME$Offset;
 
   public $INTERFACE_TYPE$? $NAME$ {
     get {
-      var ptr = _Handle.Read<nint>(_$NAME$Offset);
+      if (_$NAME$Offset == null) {
+        _$NAME$Offset = Schema.GetOffset($HASH$);
+      }
+      var ptr = _Handle.Read<nint>(_$NAME$Offset!.Value);
       return ptr.IsValidPtr() ? new $IMPL_TYPE$(ptr) : null;
     }
   }

generator/schema_generator/templates/class_ref_field_template.cs

@@ -1,5 +1,10 @@
-  private static readonly nint _$NAME$Offset = Schema.GetOffset($HASH$);
+  private static nint? _$NAME$Offset;
 
   public $INTERFACE_TYPE$ $NAME$ {
-    get => new $IMPL_TYPE$(_Handle + _$NAME$Offset);
+    get {
+      if (_$NAME$Offset == null) {
+        _$NAME$Offset = Schema.GetOffset($HASH$);
+      }
+      return new $IMPL_TYPE$(_Handle + _$NAME$Offset!.Value);
+    }
   }

generator/schema_generator/templates/class_string_field_template.cs

@@ -1,9 +1,17 @@
-  private static readonly nint _$NAME$Offset = Schema.GetOffset($HASH$);
+  private static nint? _$NAME$Offset;
 
   public string $NAME$ {
     get {
-      var ptr = _Handle.Read<nint>(_$NAME$Offset);
+      if (_$NAME$Offset == null) {
+        _$NAME$Offset = Schema.GetOffset($HASH$);
+      }
+      var ptr = _Handle.Read<nint>(_$NAME$Offset!.Value);
       return Schema.GetString(ptr);
     }
-    set => Schema.SetString(_Handle, _$NAME$Offset, value);
+    set {
+      if (_$NAME$Offset == null) {
+        _$NAME$Offset = Schema.GetOffset($HASH$);
+      }
+      Schema.SetString(_Handle, _$NAME$Offset!.Value, value);
+    }
   } 

generator/schema_generator/templates/class_value_field_template.cs

@@ -1,5 +1,10 @@
-  private static readonly nint _$NAME$Offset = Schema.GetOffset($HASH$);
+  private static nint? _$NAME$Offset;
 
   public ref $IMPL_TYPE$ $NAME$ {
-    get => ref _Handle.$REF_METHOD$<$IMPL_TYPE$>(_$NAME$Offset);
+    get {
+      if (_$NAME$Offset == null) {
+        _$NAME$Offset = Schema.GetOffset($HASH$);
+      }
+      return ref _Handle.$REF_METHOD$<$IMPL_TYPE$>(_$NAME$Offset!.Value);
+    }
   }

managed/managed.csproj

@@ -63,6 +63,7 @@
   <ItemGroup>
     <Compile Remove="src\TestPlugin\**\*.cs" />
     <Compile Remove="SwiftlyS2.Benchmarks\**\*.cs" />
+    <Compile Remove="SwiftlyS2.PluginTemplate\**\*.cs" />
     <Compile Remove="**\obj\**\*.cs" />
     <Compile Remove="**\bin\**\*.cs" />
   </ItemGroup>

managed/src/SwiftlyS2.Core/AttributeParsers/CommandAttributeParser.cs

@@ -1,41 +1,42 @@
 using System.Reflection;
-using SwiftlyS2.Core.Commands;
 using SwiftlyS2.Shared.Commands;
 
 namespace SwiftlyS2.Core.AttributeParsers;
 
-internal static class CommandAttributeParser {
-  public static void ParseFromObject(this ICommandService self, object instance) {
-    var type = instance.GetType();
-    var methods = type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-    foreach (var method in methods)
+internal static class CommandAttributeParser
+{
+    public static void ParseFromObject( this ICommandService self, object instance )
     {
-      var commandAttribute = method.GetCustomAttribute<Command>();
-      var clientCommandHookHandlerAttribute = method.GetCustomAttribute<ClientCommandHookHandler>();
-      var clientChatHookHandlerAttribute = method.GetCustomAttribute<ClientChatHookHandler>();
-      if (commandAttribute != null)
-      {
-        var commandAliasAttributes = method.GetCustomAttributes<CommandAlias>();
-        var commandName = commandAttribute.Name;
-        var commandAlias = commandAliasAttributes.Select(a => a.Alias).ToArray();
-        var registerRaw = commandAttribute.RegisterRaw;
-        var permission = commandAttribute.Permission;
-        self.RegisterCommand(commandName, method.CreateDelegate<ICommandService.CommandListener>(instance), registerRaw, permission);
-        foreach (var alias in commandAlias)
+        var type = instance.GetType();
+        var methods = type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+        foreach (var method in methods)
         {
-          self.RegisterCommandAlias(commandName, alias, registerRaw);
-        }
-      }
+            var commandAttribute = method.GetCustomAttribute<Command>();
+            var clientCommandHookHandlerAttribute = method.GetCustomAttribute<ClientCommandHookHandler>();
+            var clientChatHookHandlerAttribute = method.GetCustomAttribute<ClientChatHookHandler>();
+            if (commandAttribute != null)
+            {
+                var commandAliasAttributes = method.GetCustomAttributes<CommandAlias>();
+                var commandName = commandAttribute.Name;
+                var registerRaw = commandAttribute.RegisterRaw;
+                var permission = commandAttribute.Permission;
+
+                var cmdGuid = self.RegisterCommand(commandName, method.CreateDelegate<ICommandService.CommandListener>(instance), registerRaw, permission);
+                foreach (var aliasAttr in commandAliasAttributes)
+                {
+                    self.RegisterCommandAlias(commandName, aliasAttr.Alias, aliasAttr.RegisterRaw);
+                }
+            }
 
-      if (clientCommandHookHandlerAttribute != null)
-      {
-        self.HookClientCommand(method.CreateDelegate<ICommandService.ClientCommandHandler>(instance));
-      }
+            if (clientCommandHookHandlerAttribute != null)
+            {
+                _ = self.HookClientCommand(method.CreateDelegate<ICommandService.ClientCommandHandler>(instance));
+            }
 
-      if (clientChatHookHandlerAttribute != null)
-      {
-        self.HookClientChat(method.CreateDelegate<ICommandService.ClientChatHandler>(instance));
-      }
+            if (clientChatHookHandlerAttribute != null)
+            {
+                _ = self.HookClientChat(method.CreateDelegate<ICommandService.ClientChatHandler>(instance));
+            }
+        }
     }
-  }
 }