feat!: Implemented more typecode parsing, reading our test file now works fully!!!!!

Author: DexrnZacAttack

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION VERSION 3.30)
-project(JavaObjectStreams VERSION 1.2.1)
+project(JavaObjectStreams VERSION 1.3.0)
 
 set(CMAKE_CXX_STANDARD 20)
 
@@ -54,10 +54,6 @@ set(FILES
         include/JavaObject/type/object/types/AnnotationObject.h
         src/type/object/parsers/ClassDataParser.cpp
         include/JavaObject/type/object/parsers/ClassDataParser.h
-        src/type/object/types/descriptor/ClassDescriptorObject.cpp
-        include/JavaObject/type/object/types/descriptor/ClassDescriptorObject.h
-        src/type/object/parsers/descriptor/ClassDescriptorParser.cpp
-        include/JavaObject/type/object/parsers/descriptor/ClassDescriptorParser.h
         src/type/object/types/ReferenceObject.cpp
         include/JavaObject/type/object/types/ReferenceObject.h
         src/type/object/parsers/ReferenceParser.cpp
@@ -122,6 +118,21 @@ set(FILES
         include/JavaObject/type/primitive/parsers/PrimitiveJavaObjectParser.h
         src/type/primitive/parsers/PrimitiveArrayObjectParser.cpp
         include/JavaObject/type/primitive/parsers/PrimitiveArrayObjectParser.h
+        src/type/object/types/EndBlockDataObject.cpp
+        include/JavaObject/type/object/types/EndBlockDataObject.h
+        src/type/object/parsers/EndBlockDataObjectParser.cpp
+        include/JavaObject/type/object/parsers/EndBlockDataObjectParser.h
+        src/type/object/types/BlockDataObject.cpp
+        include/JavaObject/type/object/types/BlockDataObject.h
+        src/type/object/parsers/ShortBlockDataObjectParser.cpp
+        include/JavaObject/type/object/parsers/ShortBlockDataObjectParser.h
+        src/type/object/parsers/LongBlockDataObjectParser.cpp
+        include/JavaObject/type/object/parsers/LongBlockDataObjectParser.h
+        src/type/object/types/descriptor/NewClassDescriptorObject.cpp
+        src/type/object/types/descriptor/FieldDescriptorObject.cpp
+        src/type/object/types/NullObject.cpp
+        src/type/object/parsers/NullObjectParser.cpp
+        include/JavaObject/type/object/parsers/NullObjectParser.h
 )
 
 add_library(JavaObjectStreams SHARED ${FILES})

include/JavaObject/type/HandleContainer.h

@@ -28,7 +28,7 @@ namespace javaobject::type {
     private:
         /** Links handles to objects by pointer, these objects are expected to be stored already, otherwise it would leave a dangling/invalid pointer. */
         std::unordered_map<object::ReferenceObject::handle_t, std::shared_ptr<object::IObject>> m_handles;
-        object::ReferenceObject::handle_t m_nextHandle = 0x7E000000;
+        object::ReferenceObject::handle_t m_nextHandle = 0x007E0000;
     };
 } // namespace javaobject::type
 

include/JavaObject/type/object/parsers/ClassDataParser.h

@@ -11,11 +11,12 @@
 #ifndef JAVAOBJECTSTREAMS_CLASSDATAPARSER_H
 #define JAVAOBJECTSTREAMS_CLASSDATAPARSER_H
 #include "../types/ClassDataObject.h"
-#include "JavaObject/type/object/types/descriptor/ClassDescriptorObject.h"
 #include "JavaObject/type/object/parsers/IObjectParser.h"
 
 #include <functional>
 
+#include "JavaObject/type/object/types/descriptor/ClassDescriptorInfoObject.h"
+
 namespace javaobject::type::object::parsers {
     struct ClassDataParser : public IObjectParser {
         explicit ClassDataParser(const std::shared_ptr<object::descriptor::ClassDescriptorInfoObject> &classDescInfo);

include/JavaObject/type/object/parsers/EndBlockDataObjectParser.h

@@ -0,0 +1,21 @@
+/** @file EndBlockDataObjectParser.h
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/25/26
+ * 
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#ifndef JAVAOBJECTSTREAMS_ENDBLOCKDATAOBJECTPARSER_H
+#define JAVAOBJECTSTREAMS_ENDBLOCKDATAOBJECTPARSER_H
+#include "IObjectParser.h"
+
+namespace javaobject::type::object::parsers {
+    struct EndBlockDataObjectParser : IObjectParser {
+        std::shared_ptr<object::IObject> operator()(type::object::ObjectTypeCodeParser& parser) const override;
+    };
+}
+
+#endif //JAVAOBJECTSTREAMS_ENDBLOCKDATAOBJECTPARSER_H

include/JavaObject/type/object/parsers/LongBlockDataObjectParser.h

@@ -0,0 +1,21 @@
+/** @file LongBlockDataObjectParser.h
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/25/26
+ * 
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#ifndef JAVAOBJECTSTREAMS_LONGBLOCKDATAOBJECTPARSER_H
+#define JAVAOBJECTSTREAMS_LONGBLOCKDATAOBJECTPARSER_H
+#include "JavaObject/type/object/parsers/IObjectParser.h"
+
+namespace javaobject::type::object::parsers {
+    struct LongBlockDataObjectParser : IObjectParser {
+        std::shared_ptr<object::IObject> operator()(type::object::ObjectTypeCodeParser& parser) const override;
+    };
+}
+
+#endif //JAVAOBJECTSTREAMS_LONGBLOCKDATAOBJECTPARSER_H

include/JavaObject/type/object/parsers/NewClassParser.h

@@ -14,9 +14,7 @@
 namespace javaobject {
     namespace type {
         namespace parser {
-
             class NewClassParser {};
-
         } // namespace parser
     } // namespace type
 } // namespace javaobject

include/JavaObject/type/object/parsers/NullObjectParser.h

@@ -0,0 +1,21 @@
+/** @file NullObjectParser.h
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/25/26
+ * 
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#ifndef JAVAOBJECTSTREAMS_NULLOBJECTPARSER_H
+#define JAVAOBJECTSTREAMS_NULLOBJECTPARSER_H
+#include "IObjectParser.h"
+
+namespace javaobject::type::object::parsers {
+    struct NullObjectParser : IObjectParser {
+        std::shared_ptr<object::IObject> operator()(type::object::ObjectTypeCodeParser& parser) const override;
+    };
+}
+
+#endif //JAVAOBJECTSTREAMS_NULLOBJECTPARSER_H

include/JavaObject/type/object/parsers/ShortBlockDataObjectParser.h

@@ -0,0 +1,21 @@
+/** @file BlockDataObjectParser.h
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/25/26
+ * 
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#ifndef JAVAOBJECTSTREAMS_BLOCKDATAOBJECTPARSER_H
+#define JAVAOBJECTSTREAMS_BLOCKDATAOBJECTPARSER_H
+#include "IObjectParser.h"
+
+namespace javaobject::type::object::parsers {
+    struct ShortBlockDataObjectParser : IObjectParser {
+        std::shared_ptr<object::IObject> operator()(type::object::ObjectTypeCodeParser& parser) const override;
+    };
+}
+
+#endif //JAVAOBJECTSTREAMS_BLOCKDATAOBJECTPARSER_H

include/JavaObject/type/object/parsers/descriptor/ClassDescriptorParser.h

@@ -13,13 +13,13 @@
 #include "IObject.h"
 
 #include <memory>
+#include <vector>
 
 namespace javaobject::type::object {
-    struct AnnotationObject : public IObject {
-        AnnotationObject(std::shared_ptr<IObject> type, std::shared_ptr<IObject> value) : type(std::move(type)), value(std::move(value)) {}
+    struct AnnotationObject : IObject {
+        explicit AnnotationObject(const std::vector<std::shared_ptr<IObject>>& contents) : contents(contents) {}
 
-        std::shared_ptr<IObject> type;
-        std::shared_ptr<IObject> value; // only present if type != TC_ENDBLOCKDATA
+        std::vector<std::shared_ptr<IObject>> contents;
     };
 } // namespace javaobject::type::object