From 99c6c9f10b6a5e9502f2589b1900fdf0b56ce6c5 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Mon, 25 Apr 2022 14:16:30 +0200
Subject: [PATCH] fix crashes for older versions

---
 src/main/kotlin/de/bixilon/pixlyzer/PixLyzer.kt             | 2 +-
 .../generator/generators/variants/CatVariantGenerator.kt    | 2 +-
 .../generator/generators/variants/FrogVariantGenerator.kt   | 2 +-
 .../generator/generators/variants/VariantGenerator.kt       | 6 +++---
 ...s_metadata_mappings.json => entities_data_mappings.json} | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename src/main/resources/{entities_metadata_mappings.json => entities_data_mappings.json} (99%)

diff --git a/src/main/kotlin/de/bixilon/pixlyzer/PixLyzer.kt b/src/main/kotlin/de/bixilon/pixlyzer/PixLyzer.kt
index be65dbf..912b138 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/PixLyzer.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/PixLyzer.kt
@@ -18,7 +18,7 @@ import java.util.zip.GZIPOutputStream
 object PixLyzer {
     private val startTime = System.currentTimeMillis()
 
-    val ENTITY_META_DATA_MAPPING = Util.readJsonResource("entities_metadata_mappings.json")
+    val ENTITY_META_DATA_MAPPING = Util.readJsonResource("entities_data_mappings.json")
 
 
     @JvmStatic
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/variants/CatVariantGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/variants/CatVariantGenerator.kt
index 97bd7b7..d17d1c5 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/variants/CatVariantGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/variants/CatVariantGenerator.kt
@@ -7,5 +7,5 @@ import net.minecraft.util.registry.Registry
 object CatVariantGenerator : VariantGenerator(
     "cat",
     getClass("net.minecraft.entity.passive.CatVariant"),
-    getField(Registry::class.java, "CAT_VARIANT")!!.get(null) as Registry<Any>,
+    getField(Registry::class.java, "CAT_VARIANT")?.get(null) as Registry<Any>?,
 )
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/variants/FrogVariantGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/variants/FrogVariantGenerator.kt
index d43ba78..75dfe03 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/variants/FrogVariantGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/variants/FrogVariantGenerator.kt
@@ -7,5 +7,5 @@ import net.minecraft.util.registry.Registry
 object FrogVariantGenerator : VariantGenerator(
     "frog",
     getClass("net.minecraft.entity.passive.FrogVariant"),
-    getField(Registry::class.java, "FROG_VARIANT")!!.get(null) as Registry<Any>,
+    getField(Registry::class.java, "FROG_VARIANT")?.get(null) as Registry<Any>?,
 )
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/variants/VariantGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/variants/VariantGenerator.kt
index 6def9ea..c5bbdc4 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/variants/VariantGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/variants/VariantGenerator.kt
@@ -9,13 +9,13 @@ abstract class VariantGenerator(
     name: String,
     val clazz: Class<Any>?,
     val registry: Registry<Any>?,
-) : Generator("variant/$name", allowedFail = clazz == null) {
-    private val textureField = getField(clazz, "texture", "textureId")!!
+) : Generator("variant/$name", allowEmpty = clazz == null) {
+    private val textureField = if (clazz == null) null else getField(clazz, "texture", "textureId")!!
 
     open fun process(data: MutableMap<Any, Any>, item: Any) = Unit
 
     override fun generate() {
-        if (registry == null) {
+        if (registry == null || textureField == null) {
             return
         }
         for (item in registry) {
diff --git a/src/main/resources/entities_metadata_mappings.json b/src/main/resources/entities_data_mappings.json
similarity index 99%
rename from src/main/resources/entities_metadata_mappings.json
rename to src/main/resources/entities_data_mappings.json
index 4eed796..743aaee 100644
--- a/src/main/resources/entities_metadata_mappings.json
+++ b/src/main/resources/entities_data_mappings.json
@@ -55,8 +55,8 @@
       "TRACKER_BODY_ROTATION": "ARMOR_STAND_BODY_ROTATION",
       "TRACKER_LEFT_ARM_ROTATION": "ARMOR_STAND_LEFT_ARM_ROTATION",
       "TRACKER_RIGHT_ARM_ROTATION": "ARMOR_STAND_RIGHT_ARM_ROTATION",
-      "TRACKER_LEFT_LEG_ROTATION": "ARMOR_STAND_LEFT_LAG_ROTATION",
-      "TRACKER_RIGHT_LEG_ROTATION": "ARMOR_STAND_RIGHT_LAG_ROTATION"
+      "TRACKER_LEFT_LEG_ROTATION": "ARMOR_STAND_LEFT_LEG_ROTATION",
+      "TRACKER_RIGHT_LEG_ROTATION": "ARMOR_STAND_RIGHT_LEG_ROTATION"
     }
   },
   "ArrowEntity": {