From b2574d0d5bdb57e08edaa3ca87c9e1740f993863 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 5 Apr 2023 15:27:08 +0200
Subject: [PATCH] Update diffs TODO: remove removed cooldown states from
 1.20->1.19.4

---
 mappings/diff/mapping-1.19.4to1.20.json    |  64 ++++++++++-----------
 mappings/diff/mapping-1.20to1.19.4.json    |  11 ++--
 output/backwards/mappings-1.20to1.19.4.nbt | Bin 3372 -> 3372 bytes
 output/mappings-1.19.4to1.20.nbt           | Bin 1105 -> 977 bytes
 4 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/mappings/diff/mapping-1.19.4to1.20.json b/mappings/diff/mapping-1.19.4to1.20.json
index f7f36f4..ba53d82 100644
--- a/mappings/diff/mapping-1.19.4to1.20.json
+++ b/mappings/diff/mapping-1.19.4to1.20.json
@@ -9,38 +9,38 @@
     "decorated_pot[facing=east,waterlogged=true]": "decorated_pot[cracked=false,facing=east,waterlogged=true]",
     "decorated_pot[facing=east,waterlogged=false]": "decorated_pot[cracked=false,facing=east,waterlogged=false]",
     "torchflower_crop[age=2]": "torchflower_crop[age=1]",
-    "sculk_sensor[power=0,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=0,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=1,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=1,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=2,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=2,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=3,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=3,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=4,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=4,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=5,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=5,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=6,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=6,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=7,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=7,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=8,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=8,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=9,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=9,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=10,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=10,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=11,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=11,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=12,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=12,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=13,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=13,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=14,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=14,sculk_sensor_phase=cooldown,waterlogged=false]": "",
-    "sculk_sensor[power=15,sculk_sensor_phase=cooldown,waterlogged=true]": "",
-    "sculk_sensor[power=15,sculk_sensor_phase=cooldown,waterlogged=false]": ""
+    "sculk_sensor[power=0,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=0,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=0,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=0,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=1,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=1,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=1,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=1,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=2,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=2,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=2,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=2,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=3,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=3,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=3,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=3,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=4,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=4,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=4,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=4,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=5,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=5,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=5,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=5,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=6,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=6,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=6,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=6,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=7,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=7,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=7,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=7,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=8,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=8,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=8,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=8,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=9,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=9,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=9,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=9,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=10,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=10,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=10,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=10,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=11,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=11,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=11,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=11,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=12,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=12,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=12,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=12,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=13,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=13,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=13,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=13,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=14,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=14,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=14,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=14,sculk_sensor_phase=inactive,waterlogged=false]",
+    "sculk_sensor[power=15,sculk_sensor_phase=cooldown,waterlogged=true]": "sculk_sensor[power=15,sculk_sensor_phase=inactive,waterlogged=true]",
+    "sculk_sensor[power=15,sculk_sensor_phase=cooldown,waterlogged=false]": "sculk_sensor[power=15,sculk_sensor_phase=inactive,waterlogged=false]"
   },
   "items": {
     "pottery_shard_archer": "archer_pottery_shard",
diff --git a/mappings/diff/mapping-1.20to1.19.4.json b/mappings/diff/mapping-1.20to1.19.4.json
index 1eb1398..705b399 100644
--- a/mappings/diff/mapping-1.20to1.19.4.json
+++ b/mappings/diff/mapping-1.20to1.19.4.json
@@ -13,9 +13,9 @@
     "pitcher_crop[age=4,half=lower]": "lilac[half=lower]",
     "pitcher_plant[half=upper]": "lilac[half=upper]",
     "pitcher_plant[half=lower]": "lilac[half=lower]",
-    "sniffer_egg[age=0]": "red_glazed_terracotta[facing=north]",
-    "sniffer_egg[age=1]": "red_glazed_terracotta[facing=north]",
-    "sniffer_egg[age=2]": "red_glazed_terracotta[facing=north]",
+    "sniffer_egg[hatch=0]": "red_glazed_terracotta[facing=north]",
+    "sniffer_egg[hatch=1]": "red_glazed_terracotta[facing=north]",
+    "sniffer_egg[hatch=2]": "red_glazed_terracotta[facing=north]",
     "calibrated_sculk_sensor[facing=north,power=0,sculk_sensor_phase=inactive,waterlogged=true]": "sculk_sensor[power=0,sculk_sensor_phase=inactive,waterlogged=true]",
     "calibrated_sculk_sensor[facing=north,power=0,sculk_sensor_phase=inactive,waterlogged=false]": "sculk_sensor[power=0,sculk_sensor_phase=inactive,waterlogged=false]",
     "calibrated_sculk_sensor[facing=north,power=0,sculk_sensor_phase=active,waterlogged=true]": "sculk_sensor[power=0,sculk_sensor_phase=active,waterlogged=true]",
@@ -415,10 +415,7 @@
     "decorated_pot[cracked=false,facing=west,waterlogged=true]": "decorated_pot[facing=west,waterlogged=true]",
     "decorated_pot[cracked=false,facing=west,waterlogged=false]": "decorated_pot[facing=west,waterlogged=false]",
     "decorated_pot[cracked=false,facing=east,waterlogged=true]": "decorated_pot[facing=east,waterlogged=true]",
-    "decorated_pot[cracked=false,facing=east,waterlogged=false]": "decorated_pot[facing=east,waterlogged=false]",
-    "sniffer_egg[hatch=0]": "",
-    "sniffer_egg[hatch=1]": "",
-    "sniffer_egg[hatch=2]": ""
+    "decorated_pot[cracked=false,facing=east,waterlogged=false]": "decorated_pot[facing=east,waterlogged=false]"
   },
   "items": {
     "suspicious_gravel": "gravel",
diff --git a/output/backwards/mappings-1.20to1.19.4.nbt b/output/backwards/mappings-1.20to1.19.4.nbt
index 4bb588c6a22b762f348fa0137ff623e5e49828d1..09b26b6b02388e52ed5844f77dd8f3bcdc0639b5 100644
GIT binary patch
delta 25
acmZ1@wMJ^gdqy4x215}T-u#=<kQ)G3kOlJq

delta 25
XcmZ1@wMJ^gdq$rBNMQ4CMni4@*j*7A

diff --git a/output/mappings-1.19.4to1.20.nbt b/output/mappings-1.19.4to1.20.nbt
index 2b4eab31cc48e8d1961fd50e941629a0e0dd3a61..cce6a1ea9a717e300bb0eadd4fd62e49e8ab9412 100644
GIT binary patch
delta 312
zcmXxeu?j(P6oB#LCd3_NkU=(^fj1zNjXTR^w}`=TU%^Xw0&gIL4021743cD!gh7&g
z=eqylS7$lrd|u3p4r^{+MEWAdGAbgawn$@wDQ1{sfhAU0V~ZX3IN*dcF1X^3Cti5t
zE8_6R2_u3yY$QcoC&iFP23h1pnxlkR-3}{SH=wMFI(0p+nG&tp1hmE!Y1J{HRi;eq
cZUL?H3kwXI`T6rRO{(U`0-9@&AEB1@1INin>i_@%

delta 441
zcmYk%F-}536h`4+f<k}-DUbr(0f`p&7%Mw?HL;?nfIva<w!kJ_0Xt9&wNOdW7^FZ#
zgaV0C3N%DGBO31{-@G%;%)9MSJKQ|>4<yy4y&Mju{gPBT!#OT+i7Q;=2Di9F2lseD
z7f<M+k7o?<f)U1;;1yH6;{!9vFU*NgeBm2Q$>X2AAU3gu2%?A~j%_56#12wOBZFP3
zcp6opTILovU4zMvkY~Eu@^|r2$EEK!4v+5Z7TsIdPxnm^O^;1aOuw0)nVy?o{I{2t
RIRs6IO~?MaRoOTRtN{Ar#;gDU