Merge pull request #631 from monkeyman192/update/17176007

Update for Worlds Part 2

Author: monkeyman192

Tools/auto_extract/extractor.py

@@ -156,12 +156,12 @@
 # methods.
 # TODO: If the GUID changes we need to raise an important message so that we may
 # fix it manually.
-DONT_OVERRIDE = [
-    'TkAnimNodeFrameData',
+DONT_OVERRIDE = {
+    'TkAnimNodeFrameData': 0xDD8A411B84D2D5DC,
     # 'TkAnimNodeFrameHalfData',
-    'TkGeometryData',
-    'TkMeshData',
-]
+    'TkGeometryData': 0xED9C2FCDA6D4B22F,
+    'TkMeshData': 0xA5E773D3424BA9FA,
+}
 
 SUMMARY_FILE = op.join(op.dirname(__file__), 'summary.txt')
 TEMPLATES_DIR = op.join(op.dirname(__file__), TEMPLATE_DIR)
@@ -304,7 +304,7 @@ def __init__(self, data: bytes, nms_mem):
         self._is_list_field = False
 
         # Get the name of the field.
-        self._field_name = nms_mem.read_string(
+        self._field_name: str = nms_mem.read_string(
             struct.unpack_from('<Q', data, offset=0x0)[0], byte=128
         )
         # Some field names are annoyingly duplicated in the exe. c# doesn't
@@ -327,15 +327,20 @@ def field_type(self):
             f'unknown ({self.raw_field_type:X})'
         )
 
+    @property
+    def has_space_in_name(self):
+        return " " in self._field_name
+
     @property
     def field_name(self):
-        if self._field_name[0].isdigit():
-            return '_' + self._field_name
+        field_name = self._field_name.replace(" ", "")
+        if field_name[0].isdigit():
+            return '_' + field_name
         if self._field_name_is_duplicate:
-            return self._field_name + '_' + self.field_type
-        if self._field_name[:2].lower() in {'gc', 'tk'}:
-            return self._field_name[2:]
-        return self._field_name
+            return field_name + '_' + self.field_type
+        if field_name[:2].lower() in {'gc', 'tk'}:
+            return field_name[2:]
+        return field_name
 
     @property
     def field_offset(self):
@@ -736,6 +741,8 @@ def read_class(
         dir_ = 'Globals'
     else:
         dir_ = PREFIX_MAPPING.get(name[:3].lower(), "GameComponents")
+    if name in DONT_OVERRIDE and DONT_OVERRIDE[name] != guid:
+        print(f'The template {name} has been updated. Please check')
     if (config['general'].getboolean('replace_existing_files', fallback=False)
         and name[1:] not in DONT_OVERRIDE
     ):

Tools/auto_extract/templates/default/class_template.j2

@@ -13,10 +13,10 @@
 {%- endif %}
         public enum {{ field.field_name }}Enum : {{ field.enum_dtype }} {
 {%- for enum_val in field.enum_data %}
-            {{ enum_val[1] }}{% if field.requires_values %} = {{enum_val[0] }}{% endif %},
+            {{ enum_val[1] }}{% if field.requires_values %} = {{ enum_val[0] }}{% endif %},
 {%- endfor %}
         }
-        [NMS(Index = {{ field.field_index }})]
+        [NMS(Index = {{ field.field_index }}{% if field.has_space_in_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
         /* {{ field.field_offset }} */ public {{ field.field_name }}Enum {{ field.field_name }};
 {%- elif field._is_array_field %}{# End of enum chunk, start of array chunk #}
 {%- if field.local_enum %}
@@ -27,16 +27,16 @@
 {%- endfor %}
         }
 {%- endif %}
-        [NMS(Index = {{ field.field_index }}, Size = {{ field.array_size }}{% if field.array_enum_type is not none %}, EnumType = typeof({{ field.array_enum_type }}){% endif %})]
+        [NMS(Index = {{ field.field_index }}, Size = {{ field.array_size }}{% if field.array_enum_type is not none %}, EnumType = typeof({{ field.array_enum_type }}){% endif %}{% if field.has_space_in_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
         /* {{ field.field_offset }} */ public {{ field.field_type }}[] {{ field.field_name }};
 {%- elif field._is_list_field %}{# End of array chunk, start of list chunk #}
-        [NMS(Index = {{ field.field_index }})]
+        [NMS(Index = {{ field.field_index }}{% if field.has_space_in_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
         /* {{ field.field_offset }} */ public List<{{ field.field_type }}> {{ field.field_name }};
 {%- elif field._is_hash_map_field %}{# End of array chunk, start of HashMap chunk #}
-        [NMS(Index = {{ field.field_index }})]
+        [NMS(Index = {{ field.field_index }}{% if field.has_space_in_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
         /* {{ field.field_offset }} */ public HashMap<{{ field.field_type }}> {{ field.field_name }};
 {%- else %}{# End of array chunk, start of normal field chunk #}
-        [NMS(Index = {{ field.field_index }})]
+        [NMS(Index = {{ field.field_index }}{% if field.has_space_in_name %}, MxmlName = "{{ field._field_name }}"{% endif %})]
         /* {{ field.field_offset }} */ public {{ field.field_type }} {{ field.field_name }};
 {%- endif %}
 {%- endfor %}

Tools/auto_extract/templates/default/static_templates/TkAnimNodeFrameData.cs

@@ -7,15 +7,15 @@
 
 namespace libMBIN.NMS.Toolkit
 {
-    [NMS(GUID = 0xB2E78D75B9088DB6, NameHash = 0xADF5F9C3)]
+    [NMS(GUID = 0xDD8A411B84D2D5DC, NameHash = 0xADF5F9C3)]
     public class TkAnimNodeFrameData : NMSTemplate
     {
         [NMS(Index = 0)]
         /* 0x00 */ public List<Quaternion> Rotations;
         [NMS(Index = 2)]
-        /* 0x10 */ public List<Vector4f> Scales;
+        /* 0x10 */ public List<Vector3f> Scales;
         [NMS(Index = 1)]
-        /* 0x20 */ public List<Vector4f> Translations;
+        /* 0x20 */ public List<Vector3f> Translations;
 
         public override object CustomDeserialize(BinaryReader reader, Type field, NMSAttribute settings, FieldInfo fieldInfo) {
             var fieldName = fieldInfo.Name;

Tools/auto_extract/templates/default/static_templates/TkGeometryData.cs

@@ -6,7 +6,7 @@
 
 namespace libMBIN.NMS.Toolkit
 {
-    [NMS(GUID = 0x7148DB44E7586C99, NameHash = 0x819C3220)]
+    [NMS(GUID = 0xED9C2FCDA6D4B22F, NameHash = 0x819C3220)]
     public class TkGeometryData : NMSTemplate
     {
         [NMS(Index = 20)]

Tools/auto_extract/templates/default/static_templates/TkMeshData.cs

@@ -6,7 +6,7 @@
 
 namespace libMBIN.NMS.Toolkit
 {
-    [NMS(GUID = 0x70272DC777DDD6BD, NameHash = 0x18D05F06)]
+    [NMS(GUID = 0xA5E773D3424BA9FA, NameHash = 0x18D05F06)]
     public class TkMeshData : NMSTemplate
     {
         [NMS(Index = 0)]

libMBIN/Source/NMS/GameComponents/AxisSpecification.cs

@@ -1,6 +1,6 @@
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0xBE02DA7E4A80CDBA, NameHash = 0x297A9843)]
+    [NMS(GUID = 0x7D03FF5D22FE8495, NameHash = 0x297A9843)]
     public class AxisSpecification : NMSTemplate
     {
         [NMS(Index = 1)]

libMBIN/Source/NMS/GameComponents/DirectMesh.cs

@@ -1,6 +1,6 @@
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x89F8ED6A89A7E06A, NameHash = 0x1A55832)]
+    [NMS(GUID = 0x7CC2FBC562E1087, NameHash = 0x1A55832)]
     public class DirectMesh : NMSTemplate
     {
         [NMS(Index = 1)]

libMBIN/Source/NMS/GameComponents/GcAIShipDebugSpawnData.cs

@@ -1,6 +1,6 @@
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x3479C5490B000372, NameHash = 0xE69F2F79)]
+    [NMS(GUID = 0x4E6D8E397C8D606, NameHash = 0xE69F2F79)]
     public class GcAIShipDebugSpawnData : NMSTemplate
     {
         [NMS(Index = 1)]

libMBIN/Source/NMS/GameComponents/GcAIShipSpawnData.cs

@@ -4,7 +4,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0xAC1E79EB9FFB3722, NameHash = 0x466A95A0)]
+    [NMS(GUID = 0x1C2A29CB6EF85C1F, NameHash = 0x466A95A0)]
     public class GcAIShipSpawnData : NMSTemplate
     {
         [NMS(Index = 14)]

libMBIN/Source/NMS/GameComponents/GcAIShipSpawnMarkerData.cs

@@ -2,7 +2,7 @@
 
 namespace libMBIN.NMS.GameComponents
 {
-    [NMS(GUID = 0x21D5A3379472120A, NameHash = 0x5934F9B0)]
+    [NMS(GUID = 0xD0DE56998CFEEF, NameHash = 0x5934F9B0)]
     public class GcAIShipSpawnMarkerData : NMSTemplate
     {
         [NMS(Index = 1)]