From 586393ca6d18fa0ca70f748f80df8261f86ef8f1 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Thu, 23 Mar 2023 16:38:54 +0100
Subject: [PATCH] models: rename cullface to cull

---
 .../minosoft/gui/rendering/models/baked/BakedModelTest.kt   | 2 +-
 .../gui/rendering/models/block/element/face/ModelFace.kt    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/BakedModelTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/BakedModelTest.kt
index 3a7817688..7cf37da4f 100644
--- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/BakedModelTest.kt
+++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/BakedModelTest.kt
@@ -36,7 +36,7 @@ class BakedModelTest {
         val map: MutableMap<Directions, ModelFace> = mutableMapOf()
 
         for (direction in Directions) {
-            map[direction] = ModelFace(texture, FaceUV(Vec2(0), Vec2(1)), cullface = direction, rotation = 0)
+            map[direction] = ModelFace(texture, FaceUV(Vec2(0), Vec2(1)), cull = direction, rotation = 0)
         }
 
         return map
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/face/ModelFace.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/face/ModelFace.kt
index eb1d32e9b..5c8dc44cb 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/face/ModelFace.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/face/ModelFace.kt
@@ -27,7 +27,7 @@ data class ModelFace(
     val texture: String,
     val uv: FaceUV,
     val rotation: Int,
-    val cullface: Directions?,
+    val cull: Directions?,
     val tintIndex: Int = -1,
 ) {
 
@@ -50,10 +50,10 @@ data class ModelFace(
             val uv = data["uv"]?.listCast<Number>()?.let { FaceUV(start = Vec2(it[0], it[1]) / BLOCK_SIZE, end = Vec2(it[2], it[3]) / BLOCK_SIZE) } ?: fallbackUV(direction, from, to)
 
             val rotation = data["rotation"]?.toInt() ?: 0
-            val cullface = data["cullface"]?.toString()?.let { if (it == "none") null else Directions[it] }
+            val cull = data["cullface"]?.toString()?.let { if (it == "none") null else Directions[it] }
             val tintIndex = data["tintindex"]?.toInt() ?: TintManager.DEFAULT_TINT_INDEX
 
-            return ModelFace(texture, uv, rotation, cullface, tintIndex)
+            return ModelFace(texture, uv, rotation, cull, tintIndex)
         }
 
         fun deserialize(from: Vec3, to: Vec3, data: Map<String, JsonObject>): Map<Directions, ModelFace>? {