Merge pull request #2 from linyuzhe210/main

RideableComponent fix
EaseCation · Feb 27, 2024 · 749a301 · 749a301
2 parents 6d5a038 + 6107cbc
commit 749a301
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 18 deletions.
diff --git a/src/main/kotlin/net/easecation/bedrockloader/bedrock/entity/components/ComponentRideable.kt b/src/main/kotlin/net/easecation/bedrockloader/bedrock/entity/components/ComponentRideable.kt
@@ -1,24 +1,58 @@
 package net.easecation.bedrockloader.bedrock.entity.components
 
-data class ComponentRideable(
-        val controlling_seat: Int?,
-        val crouching_skip_interact: Boolean?,
-        val family_types: List<Any>?, // Replace 'Any' with the appropriate type if known
-        val interact_text: String?,
-        val passenger_max_width: Double?,
-        val priority: Int?,
-        val pull_in_entities: Boolean?,
-        val rider_can_interact: Boolean?,
-        val seat_count: Int,
-        val seats: List<Seat>
+import com.google.gson.*
+import com.google.gson.reflect.TypeToken
+import java.lang.reflect.Type
+
+sealed class ComponentRideable(
+
 ) : IEntityComponent {
+        data class Seat(
+                val lock_rider_rotation: Int?,
+                val max_rider_count: Int?,
+                val min_rider_count: Int?,
+                val position: List<Double>?,
+                val rotate_rider_by: Any?
+        )
+
+        data class ComponentRideableWithSeat (
+                val controlling_seat: Int?,
+                val crouching_skip_interact: Boolean?,
+                val family_types: List<Any>?, // Replace 'Any' with the appropriate type if known
+                val interact_text: String?,
+                val passenger_max_width: Double?,
+                val priority: Int?,
+                val pull_in_entities: Boolean?,
+                val rider_can_interact: Boolean?,
+                val seat_count: Int,
+                val seats: Seat
+        ): ComponentRideable()
 
-    data class Seat(
-            val lock_rider_rotation: Int?,
-            val max_rider_count: Int?,
-            val min_rider_count: Int?,
-            val position: List<Double>?,
-            val rotate_rider_by: Any?
-    )
+        data class ComponentRideableWithSeats (
+                val controlling_seat: Int?,
+                val crouching_skip_interact: Boolean?,
+                val family_types: List<Any>?, // Replace 'Any' with the appropriate type if known
+                val interact_text: String?,
+                val passenger_max_width: Double?,
+                val priority: Int?,
+                val pull_in_entities: Boolean?,
+                val rider_can_interact: Boolean?,
+                val seat_count: Int,
+                val seats: List<Seat>
+        ): ComponentRideable()
 
+        class Deserializer : JsonDeserializer<ComponentRideable> {
+                override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): ComponentRideable {
+                        val seats = json.asJsonObject["seats"]
+                        return if (seats.isJsonArray) {
+                                val type = object :TypeToken<ComponentRideableWithSeats?>() {}.type
+                                context.deserialize<ComponentRideableWithSeats>(json, type)
+                        } else if (seats.isJsonObject){
+                                val type = object :TypeToken<ComponentRideableWithSeat?>() {}.type
+                                context.deserialize<ComponentRideableWithSeat>(json, type)
+                        } else {
+                                throw JsonParseException("Unexpected JSON type for ComponentRideable")
+                        }
+                }
+        }
 }
diff --git a/src/main/kotlin/net/easecation/bedrockloader/util/GsonUtil.kt b/src/main/kotlin/net/easecation/bedrockloader/util/GsonUtil.kt
@@ -8,6 +8,7 @@ import net.easecation.bedrockloader.bedrock.block.component.ComponentSelectionBo
 import net.easecation.bedrockloader.bedrock.pack.SemVersion
 import net.easecation.bedrockloader.bedrock.definition.BlockResourceDefinition
 import net.easecation.bedrockloader.bedrock.definition.GeometryDefinition
+import net.easecation.bedrockloader.bedrock.entity.components.ComponentRideable
 import net.minecraft.util.Identifier
 import java.lang.reflect.Type
 import java.util.UUID
@@ -28,6 +29,8 @@ object GsonUtil {
             .registerTypeAdapter(ComponentSelectionBox::class.java, ComponentSelectionBox.Deserializer())
             .registerTypeAdapter(ComponentCollisionBox::class.java, ComponentCollisionBox.Deserializer())
             .registerTypeAdapter(ComponentPlacementFilter::class.java, ComponentPlacementFilter.Deserializer())
+            // entity component
+            .registerTypeAdapter(ComponentRideable::class.java, ComponentRideable.Deserializer())
             // geometry
             .registerTypeAdapter(GeometryDefinition.Uv::class.java, GeometryDefinition.Uv.Deserializer())
             .create()