From d448d5568b9841e6b1a9939f8f92a85eb62f885b Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Sat, 2 Apr 2022 12:46:22 +0200
Subject: [PATCH] 22w13oneblockatatime

---
 .../generator/generators/EntityGenerator.kt   |  1 +
 .../resources/entities_metadata_mappings.json | 20 +++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt
index 19fdd64..d8f5c41 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt
@@ -169,6 +169,7 @@ object EntityGenerator : Generator(
             "AgableMob" -> "AgeableMob"
             "class_4985" -> "StriderEntity"
             "class_4836" -> "PiglinEntity"
+            "class_7102" -> "FrogEntity"
             else -> className
         }
     }
diff --git a/src/main/resources/entities_metadata_mappings.json b/src/main/resources/entities_metadata_mappings.json
index 54a8857..a6aa304 100644
--- a/src/main/resources/entities_metadata_mappings.json
+++ b/src/main/resources/entities_metadata_mappings.json
@@ -27,7 +27,8 @@
   },
   "MobEntity": {
     "data": {
-      "MOB_FLAGS": "MOB_FLAGS"
+      "MOB_FLAGS": "MOB_FLAGS",
+      "field_38511": "22W13A_MOB_CARRIED_BLOCK"
     }
   },
   "ZombieEntity": {
@@ -168,7 +169,8 @@
       "PLAYER_MODEL_BIT_MASK": "PLAYER_SKIN_PARTS_FLAGS",
       "MAIN_ARM": "PLAYER_SKIN_MAIN_HAND",
       "LEFT_SHOULDER_ENTITY": "PLAYER_LEFT_SHOULDER_DATA",
-      "RIGHT_SHOULDER_ENTITY": "PLAYER_RIGHT_SHOULDER_DATA"
+      "RIGHT_SHOULDER_ENTITY": "PLAYER_RIGHT_SHOULDER_DATA",
+      "field_38536": "22W13A_PLAYER_CARRIED_BLOCK"
     }
   },
   "BatEntity": {
@@ -435,7 +437,8 @@
   },
   "MerchantEntity": {
     "data": {
-      "HEAD_ROLLING_TIME_LEFT": "ABSTRACT_VILLAGER_UNHAPPY_TIMER"
+      "HEAD_ROLLING_TIME_LEFT": "ABSTRACT_VILLAGER_UNHAPPY_TIMER",
+      "field_38530": "22W13A_MERCHANT_MAGIC"
     }
   },
   "VillagerEntity": {
@@ -548,7 +551,8 @@
   "SkeletonEntity": {
     "data": {
       "field_28642": "SKELETON_STRAY_FREEZE_CONVERTING",
-      "CONVERTING": "SKELETON_STRAY_FREEZE_CONVERTING"
+      "CONVERTING": "SKELETON_STRAY_FREEZE_CONVERTING",
+      "field_38529": "22W13A_SKELETON_SPYGLASS_DROP"
     }
   },
   "IllagerEntity": {
@@ -567,14 +571,10 @@
       "SCREAMING": "GOAT_IS_SCREAMING"
     }
   },
-  "class_7102": {
-    "data": {
-      "field_37457": "FROG_TYPE",
-      "field_37458": "FROG_TARGET"
-    }
-  },
   "FrogEntity": {
     "data": {
+      "field_37457": "FROG_TYPE",
+      "field_37458": "FROG_TARGET",
       "VARIANT": "FROG_TYPE",
       "TARGET": "FROG_TARGET"
     }