feat: super classes are included in classData parsing, now it properly reads a Minecraft Classic 0.30 world.

Author: DexrnZacAttack

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION VERSION 3.30)
-project(JavaObjectStreams VERSION 1.3.2)
+project(JavaObjectStreams VERSION 1.3.3)
 
 set(CMAKE_CXX_STANDARD 20)
 

src/type/object/parsers/ClassDataParser.cpp

@@ -16,9 +16,12 @@
 
 #include <assert.h>
 
+#include "JavaObject/type/object/types/AnnotationObject.h"
 #include "JavaObject/type/object/types/EndBlockDataObject.h"
+#include "JavaObject/type/object/types/descriptor/NewClassDescriptorObject.h"
 #include "JavaObject/type/primitive/PrimitiveTypeCodeParser.h"
-#include "JavaObject/type/object/types/AnnotationObject.h"
+
+#include <stack>
 
 namespace javaobject::type::object::parsers {
     ClassDataParser::ClassDataParser(const std::shared_ptr<object::descriptor::ClassDescriptorInfoObject> &classDescInfo) : m_classDescInfo(classDescInfo) {
@@ -52,17 +55,32 @@ namespace javaobject::type::object::parsers {
 
         auto primitiveParser = parser.parserStorage().primitiveParser;
 
-        // BUG WORKAROUND, REMOVE AFTER WE FIND THE FIX
-        // parser.stream().seekRelative(-2);
-        for (auto &[name, value] : this->m_classDescInfo->fields) {
-            const auto typeCode = value->primitiveDescriptor->typeCode;
+        std::deque<std::shared_ptr<descriptor::ClassDescriptorInfoObject>> tree;
 
-            //todo check this out since I can't easily see whats going on when using codewithme
-            std::shared_ptr<primitive::types::IPrimitiveObject> obj = primitiveParser->readUsingParser(*primitiveParser->getParser(typeCode));
+        std::shared_ptr<IObject> super = this->m_classDescInfo;
+        while (typeid(*super) != typeid(NullObject)) {
+            auto sp = std::static_pointer_cast<descriptor::ClassDescriptorInfoObject>(super);
+            tree.push_front(sp);
+
+            auto nsp = std::dynamic_pointer_cast<descriptor::NewClassDescriptorObject>(sp->superClassDescriptor);
+            if (nsp == nullptr) {
+                break;
+            }
 
-            d->values.emplace(name, obj);
+            super = nsp->info;
         }
 
+        std::ranges::for_each(tree, [primitiveParser, &d](const std::shared_ptr<descriptor::ClassDescriptorInfoObject> &c) {
+            for (auto &[name, value] : c->fields) {
+                const auto typeCode = value->primitiveDescriptor->typeCode;
+
+                //todo check this out since I can't easily see whats going on when using codewithme
+                std::shared_ptr<primitive::types::IPrimitiveObject> obj = primitiveParser->readUsingParser(*primitiveParser->getParser(typeCode));
+
+                d->values.emplace(name, obj);
+            }
+        });
+
         return d;
     }
 

tests/java/modules/Common/src/main/java/me/dexrn/jos/common/test/JOSEmptyClass.java

@@ -0,0 +1,9 @@
+package me.dexrn.jos.common.test;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+public class JOSEmptyClass implements Serializable {
+	@Serial
+	private static final long serialVersionUID = 0x1234567890123456L;
+}

tests/java/modules/Common/src/main/java/me/dexrn/jos/common/test/JOSTestClass.java

@@ -10,39 +10,43 @@
  */
 package me.dexrn.jos.common.test;
 
+import me.dexrn.jos.common.test.polymorphism.JOSPolymorphicClass;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 public class JOSTestClass implements Serializable {
-	public class Subclass implements Serializable {
-		boolean b = true;
-		char c = 'b';
-		byte bt = 7;
-		short s = 8;
-		int i = 9;
-		long l = 10;
-		float f = 11.0f;
-		double d = 12.0;
-	}
+//	public class Subclass implements Serializable {
+//		boolean b = true;
+//		char c = 'b';
+//		byte bt = 7;
+//		short s = 8;
+//		int i = 9;
+//		long l = 10;
+//		float f = 11.0f;
+//		double d = 12.0;
+//	}
 
-	Subclass sc = new Subclass();
-	JOSDataClass dc = new JOSDataClass();
-	JOSArrayClass ac = new JOSArrayClass();
-	JOSNestedArrayClass nac = new JOSNestedArrayClass();
-
-	boolean b = false;
-	char c = 'a';
-	byte bt = 1;
-	short s = 2;
-	int i = 3;
-	long l = 4;
-	float f = 5.0f;
-	double d = 6.0;
-	String str = "Hello, world!";
-
-	List<Character> carr = new ArrayList<Character>();
-	{
-		str.chars().forEach(c -> carr.add((char) c));
-	}
+//	Subclass sc = new Subclass();
+//	JOSDataClass dc = new JOSDataClass();
+//	JOSArrayClass ac = new JOSArrayClass();
+//	JOSNestedArrayClass nac = new JOSNestedArrayClass();
+//	JOSEmptyClass ec = new JOSEmptyClass();
+	JOSPolymorphicClass pc = new JOSPolymorphicClass();
+	
+//	boolean b = false;
+//	char c = 'a';
+//	byte bt = 1;
+//	short s = 2;
+//	int i = 3;
+//	long l = 4;
+//	float f = 5.0f;
+//	double d = 6.0;
+//	String str = "Hello, world!";
+//
+//	List<Character> carr = new ArrayList<Character>();
+//	{
+//		str.chars().forEach(c -> carr.add((char) c));
+//	}
 }

tests/java/modules/Common/src/main/java/me/dexrn/jos/common/test/polymorphism/JOSPolymorphicBase.java

@@ -0,0 +1,8 @@
+package me.dexrn.jos.common.test.polymorphism;
+
+import java.io.Serializable;
+
+public abstract class JOSPolymorphicBase implements Serializable {
+	int i = 0;
+	long hfdiukjhsdjfihsdkjihjukosfsfkjhbsjdhkfbsjhknfbhjuisdfbhjksdbfhjkisbdfhjbsdfhjkbsdfhshdjfghjsdfghjsdgfhjgsdhfjgsdhjfgshjdfhfdiukjhsdjfihsdkjihjukosfsfkjhbsjdhkfbsjhknfbhjuisdfbhjksdbfhjkisbdfhjbsdfhjkbsdfhshdjfghjsdfghjsdgfhjgsdhfjgsdhjfgshjdfhfdiukjhsdjfihsdkjihjukosfsfkjhbsjdhkfbsjhknfbhjuisdfbhjksdbfhjkisbdfhjbsdfhjkbsdfhshdjfghjsdfghjsdgfhjgsdhfjgsdhjfgshjdfhfdiukjhsdjfihsdkjihjukosfsfkjhbsjdhkfbsjhknfbhjuisdfbhjksdbfhjkisbdfhjbsdfhjkbsdfhshdjfghjsdfghjsdgfhjgsdhfjgsdhjfgshjdf = 5;
+}

tests/java/modules/Common/src/main/java/me/dexrn/jos/common/test/polymorphism/JOSPolymorphicClass.java

@@ -0,0 +1,6 @@
+package me.dexrn.jos.common.test.polymorphism;
+
+import java.io.Serializable;
+
+public class JOSPolymorphicClass extends JOSPolymorphicBase implements Serializable {
+}