optimize extractors

Snowiiii · Dec 1, 2024 · ffd6bda · ffd6bda
1 parent e0ac3fb
commit ffd6bda
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/extractor/src/main/kotlin/de/snowii/extractor/extractors/BlockCollisionShapes.kt b/extractor/src/main/kotlin/de/snowii/extractor/extractors/BlockCollisionShapes.kt
@@ -30,12 +30,12 @@ class BlockCollisionShapes : Extractor.Extractor {
         val shapesJson = JsonArray()
         for (shape in shapes.keys) {
             val shapeJson = JsonObject()
-            shapeJson.addProperty("min_x", shape.minX)
-            shapeJson.addProperty("min_y", shape.minY)
-            shapeJson.addProperty("min_z", shape.minZ)
-            shapeJson.addProperty("max_x", shape.maxX)
-            shapeJson.addProperty("max_y", shape.maxY)
-            shapeJson.addProperty("max_z", shape.maxZ)
+            shapeJson.addProperty("x1", shape.minX)
+            shapeJson.addProperty("y1", shape.minY)
+            shapeJson.addProperty("z1", shape.minZ)
+            shapeJson.addProperty("x2", shape.maxX)
+            shapeJson.addProperty("y2", shape.maxY)
+            shapeJson.addProperty("z2", shape.maxZ)
             shapesJson.add(shapeJson)
         }
 

diff --git a/extractor/src/main/kotlin/de/snowii/extractor/extractors/BlockEntities.kt b/extractor/src/main/kotlin/de/snowii/extractor/extractors/BlockEntities.kt
@@ -1,6 +1,5 @@
 package de.snowii.extractor.extractors
 
-import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import de.snowii.extractor.Extractor
@@ -13,15 +12,11 @@ class BlockEntities : Extractor.Extractor {
     }
 
     override fun extract(server: MinecraftServer): JsonElement {
-        val blockEntitiesJson = JsonArray()
+        val blockEntitiesJson = JsonObject()
         for (blockEntity in Registries.BLOCK_ENTITY_TYPE) {
-            val blockEntityJson = JsonObject()
-
-            blockEntityJson.addProperty("id", Registries.BLOCK_ENTITY_TYPE.getRawId(blockEntity))
-            blockEntityJson.addProperty("ident", Registries.BLOCK_ENTITY_TYPE.getId(blockEntity).toString())
-            blockEntityJson.addProperty("name", Registries.BLOCK_ENTITY_TYPE.getId(blockEntity)!!.path)
-
-            blockEntitiesJson.add(blockEntityJson)
+            val identifier = Registries.BLOCK_ENTITY_TYPE.getId(blockEntity)!!.toString()
+            val id = Registries.BLOCK_ENTITY_TYPE.getRawId(blockEntity)
+            blockEntitiesJson.addProperty(identifier, id)
         }
         return blockEntitiesJson
     }