arkparse 0.4.0__tar.gz → 0.4.1__tar.gz

{arkparse-0.4.0 → arkparse-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arkparse
-Version: 0.4.0
+Version: 0.4.1
 Summary: A package to parse and modify ark save files
 Project-URL: Homepage, https://github.com/VincentHenauGithub/ark-save-parser
 Author-email: Vincent Henau <vincent.henau.github@gmail.com>

{arkparse-0.4.0 → arkparse-0.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "arkparse"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
     "rcon>=2.4.9",
     "numpy>=2.3.2",

{arkparse-0.4.0 → arkparse-0.4.1}/src/arkparse/object_model/ark_game_object.py

@@ -41,6 +41,7 @@ class ArkGameObject(ArkPropertyContainer):
         self.parser_type = ArkProperty if (isinstance(binary_reader, ArkBinaryParser) or binary_reader is None) else LegacyArkProperty
         self.uuid = uuid
         self.blueprint = blueprint
+        string_name = False
         super().__init__()
         if binary_reader:
             ArkSaveLogger.set_file(binary_reader, "debug.bin")
@@ -51,7 +52,8 @@ class ArkGameObject(ArkPropertyContainer):
                     self.uuid2: UUID = None
                     binary_reader.set_position(0)
 
-                    self.blueprint = binary_reader.read_name()
+                    self.blueprint, string_name = ArkGameObject.read_name(uuid, binary_reader)
+                    ArkSaveLogger.parser_log(f"Read Blueprint: {self.blueprint} (String name: {string_name})")
 
                     sContext : SaveContext = binary_reader.save_context
                     self.location = sContext.get_actor_transform(uuid) or None
@@ -60,11 +62,14 @@ class ArkGameObject(ArkPropertyContainer):
                     self.uuid = binary_reader.read_uuid()
                     self.blueprint = binary_reader.read_string()
                     ArkSaveLogger.parser_log(f"Read UUID: {self.uuid}, Blueprint: {self.blueprint}")
-
+                
                 binary_reader.validate_uint32(0)
+                if string_name:
+                    binary_reader.read_uint16()
 
             try:
-                if not no_header:
+                if not (no_header or string_name):
+                    ArkSaveLogger.parser_log(f"Reading names for object {self.blueprint} ({self.uuid})")
                     offsets = []
                     if not from_custom_bytes:
                         nr_names = binary_reader.read_int()
@@ -100,6 +105,7 @@ class ArkGameObject(ArkPropertyContainer):
                         binary_reader.validate_uint32(0)
 
                 if not from_custom_bytes:
+                    ArkSaveLogger.parser_log(f"Reading properties for object {self.blueprint} ({self.uuid})")
                     self.read_properties(binary_reader, self.parser_type, binary_reader.size())
                     
                     if  binary_reader.size() - binary_reader.position >= 20:
@@ -231,6 +237,33 @@ class ArkGameObject(ArkPropertyContainer):
         buffer.validate_uint32(0)
         return name
     
+    @staticmethod
+    def read_name(obj_uuid: UUID, reader: ArkBinaryParser) -> str:
+        reader.set_position(0)
+        string_name = False
+
+        try:
+            class_name = reader.read_name()
+        except Exception as e:
+            # Check for string name instead of name table reference, this sometimes happens since Lost Colony
+            # To be ivestigated why this happens
+            reader.set_position(0)
+            try:
+                unknow_id = reader.read_uint32()
+                reader.validate_uint64(0)
+                reader.validate_uint32(1)
+                class_name = reader.read_string()
+                # reader.validate_uint32(0)
+                string_name = True
+                ArkSaveLogger.parser_log(f"Object {obj_uuid} has string class name {class_name} instead of name table reference")
+            except Exception as e:
+                ArkSaveLogger.error_log(f"Error reading class name for object {obj_uuid}: {e}")
+                reader.structured_print(to_default_file=True)
+                input("Press Enter to continue...")
+                class_name = "UnknownClass"
+                
+        return class_name, string_name
+    
     def get_short_name(self) -> str:
         to_strip_end = [
             "_C",

{arkparse-0.4.0 → arkparse-0.4.1}/src/arkparse/parsing/struct/ark_custom_item_data.py

@@ -47,6 +47,8 @@ class ArkCustomItemData:
     skins: list[str] = None
 
     def __init__(self, ark_binary_data: "ArkBinaryParser"):
+        ark_binary_data.save_context.generate_unknown = True
+
         total_size = self.__read_header(ark_binary_data)
         data_start = ark_binary_data.position
         ArkSaveLogger.parser_log(f"Reading CustomItemData at position {data_start}, expected size: {total_size} bytes")
@@ -63,16 +65,20 @@ class ArkCustomItemData:
         self.strings = self.__read_custom_data_strings(ark_binary_data)
         self.floats = self._read_custom_data_floats(ark_binary_data)
         if ark_binary_data.peek_name() == "CustomDataObjects": # check if CustomDataObjects is present
+            ArkSaveLogger.parser_log("CustomDataObjects found, reading objects...")
             self.objects = self.__read_custom_data_objects(ark_binary_data)
         self.classes = self.__read_custom_data_classes(ark_binary_data)
         self.names = self.__read_custom_data_names(ark_binary_data)
         
         if ark_binary_data.peek_name() == "UniquePaintingIdMap":  # check if UniquePaintingIdMap is present
+            ArkSaveLogger.parser_log("UniquePaintingIdMap found, reading painting ID map...")
             self.painting_id_map = self.__read_painting_id_map(ark_binary_data)
         if ark_binary_data.peek_name() == "PaintingRevisionMap":  # check if PaintingRevisionMap is present
+            ArkSaveLogger.parser_log("PaintingRevisionMap found, reading painting revision map...")
             self.painting_revision_map = self.__read_painting_revision_map(ark_binary_data)
         self.custom_data_name = self.__read_custom_data_name(ark_binary_data)
         if ark_binary_data.peek_name() == "CustomDataSoftClasses":  # check if CustomDataSoftClasses is present
+            ArkSaveLogger.parser_log("CustomDataSoftClasses found, reading custom data soft classes...")
             self.custom_data_soft_classes = self.__read_custom_data_soft_classes(ark_binary_data)
 
         # Check for any extra strings
@@ -99,6 +105,8 @@ class ArkCustomItemData:
             ArkSaveLogger.parser_log(f"Float: {float_value}")
         for name in self.names:
             ArkSaveLogger.parser_log(f"Name: {name}")
+            
+        ark_binary_data.save_context.generate_unknown = False
 
     def to_json_obj(self, include_byte_arrays: bool = False):
         json_obj = { "doubles": self.doubles,
@@ -318,7 +326,7 @@ class ArkCustomItemData:
         ark_binary_data.validate_name("SoftObjectProperty")
         ark_binary_data.validate_uint32(0)
         data_size = ark_binary_data.read_uint32()
-        ark_binary_data.validate_byte(0)
+        ark_binary_data.validate_byte(0) 
 
         if data_size == 4:
             ark_binary_data.validate_uint32(0)

{arkparse-0.4.0 → arkparse-0.4.1}/src/arkparse/saves/save_connection.py

@@ -354,7 +354,10 @@ class SaveConnection:
             return self.parsed_objects[obj_uuid]
         bin = self.get_game_obj_binary(obj_uuid)
         reader = ArkBinaryParser(bin, self.save_context)
-        obj = SaveConnection.parse_as_predefined_object(obj_uuid, reader.read_name(), reader)
+
+        class_name, string_name = ArkGameObject.read_name(obj_uuid, reader)
+
+        obj = SaveConnection.parse_as_predefined_object(obj_uuid, class_name, reader)
 
         if obj:
             self.parsed_objects[obj_uuid] = obj
@@ -392,11 +395,7 @@ class SaveConnection:
 
                 byte_buffer = ArkBinaryParser(row[1], self.save_context)
                 ArkSaveLogger.set_file(byte_buffer, "game_object.bin")
-                try:
-                    class_name = byte_buffer.read_name()
-                except Exception as e:
-                    ArkSaveLogger.error_log(f"Error reading class name for object {obj_uuid}: {e}")
-                    class_name = "UnknownClass"
+                class_name, string_name =  ArkGameObject.read_name(obj_uuid, byte_buffer)
                 ArkSaveLogger.enter_struct(class_name)
 
                 if reader_config.blueprint_name_filter and not reader_config.blueprint_name_filter(class_name):