From 6fc0747c1e75bb13857316cfd8d4c5ba49b4e324 Mon Sep 17 00:00:00 2001 From: enbrain <69905075+enbrain@users.noreply.github.com> Date: Sun, 27 Nov 2022 15:12:14 +0900 Subject: [PATCH] Map logger fields (#3436) --- mappings/net/minecraft/client/realms/task/DownloadTask.mapping | 1 + mappings/net/minecraft/client/realms/task/OpenServerTask.mapping | 1 + .../client/realms/task/RealmsGetServerDetailsTask.mapping | 1 + .../net/minecraft/client/realms/task/ResettingWorldTask.mapping | 1 + mappings/net/minecraft/client/realms/task/RestoreTask.mapping | 1 + .../net/minecraft/client/realms/task/SwitchMinigameTask.mapping | 1 + mappings/net/minecraft/client/realms/task/SwitchSlotTask.mapping | 1 + .../net/minecraft/client/realms/task/WorldCreationTask.mapping | 1 + mappings/net/minecraft/data/DataProvider.mapping | 1 + mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping | 1 + .../net/minecraft/datafixer/fix/PersistentStateUuidFix.mapping | 1 + mappings/net/minecraft/datafixer/fix/WorldUuidFix.mapping | 1 + mappings/net/minecraft/entity/FallingBlockEntity.mapping | 1 + mappings/net/minecraft/entity/LivingEntity.mapping | 1 + .../minecraft/entity/decoration/AbstractDecorationEntity.mapping | 1 + mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping | 1 + mappings/net/minecraft/entity/player/PlayerEntity.mapping | 1 + .../net/minecraft/entity/projectile/FishingBobberEntity.mapping | 1 + .../net/minecraft/network/message/MessageChainTaskQueue.mapping | 1 + mappings/net/minecraft/resource/ZipResourcePack.mapping | 1 + .../minecraft/server/dedicated/ServerPropertiesHandler.mapping | 1 + .../net/minecraft/structure/RuinedPortalStructurePiece.mapping | 1 + mappings/net/minecraft/world/chunk/Chunk.mapping | 1 + 23 files changed, 23 insertions(+) diff --git a/mappings/net/minecraft/client/realms/task/DownloadTask.mapping b/mappings/net/minecraft/client/realms/task/DownloadTask.mapping index 3f52a87e11..7ef5755552 100644 --- a/mappings/net/minecraft/client/realms/task/DownloadTask.mapping +++ b/mappings/net/minecraft/client/realms/task/DownloadTask.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_4436 net/minecraft/client/realms/task/DownloadTask FIELD field_20215 slot I FIELD field_20216 lastScreen Lnet/minecraft/class_437; FIELD field_20217 downloadName Ljava/lang/String; + FIELD field_36355 LOGGER Lorg/slf4j/Logger; METHOD (JILjava/lang/String;Lnet/minecraft/class_437;)V ARG 1 worldId ARG 3 slot diff --git a/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping b/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping index 003fd39e34..d1001112e3 100644 --- a/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping +++ b/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_4437 net/minecraft/client/realms/task/OpenServerTask FIELD field_20220 join Z FIELD field_20221 mainScreen Lnet/minecraft/class_4325; FIELD field_34016 client Lnet/minecraft/class_310; + FIELD field_36357 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;Lnet/minecraft/class_4325;ZLnet/minecraft/class_310;)V ARG 1 realmsServer ARG 2 returnScreen diff --git a/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping b/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping index e61a103de9..6a2198b658 100644 --- a/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsGetServerD FIELD field_20225 lastScreen Lnet/minecraft/class_437; FIELD field_20226 mainScreen Lnet/minecraft/class_4325; FIELD field_20227 connectLock Ljava/util/concurrent/locks/ReentrantLock; + FIELD field_36356 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Ljava/util/concurrent/locks/ReentrantLock;)V ARG 1 mainScreen ARG 2 lastScreen diff --git a/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping b/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping index c0bb9e5100..5af66e6c26 100644 --- a/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping +++ b/mappings/net/minecraft/client/realms/task/ResettingWorldTask.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4440 net/minecraft/client/realms/task/ResettingWorldTa FIELD field_20232 serverId J FIELD field_20235 title Lnet/minecraft/class_2561; FIELD field_22732 callback Ljava/lang/Runnable; + FIELD field_36358 LOGGER Lorg/slf4j/Logger; METHOD (JLnet/minecraft/class_2561;Ljava/lang/Runnable;)V ARG 1 serverId ARG 3 title diff --git a/mappings/net/minecraft/client/realms/task/RestoreTask.mapping b/mappings/net/minecraft/client/realms/task/RestoreTask.mapping index 436f3fc366..7b70848ce2 100644 --- a/mappings/net/minecraft/client/realms/task/RestoreTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RestoreTask.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4441 net/minecraft/client/realms/task/RestoreTask FIELD field_20236 backup Lnet/minecraft/class_4867; FIELD field_20237 worldId J FIELD field_20238 lastScreen Lnet/minecraft/class_4388; + FIELD field_36359 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_4867;JLnet/minecraft/class_4388;)V ARG 1 backup ARG 2 worldId diff --git a/mappings/net/minecraft/client/realms/task/SwitchMinigameTask.mapping b/mappings/net/minecraft/client/realms/task/SwitchMinigameTask.mapping index 32b65247db..8e16775970 100644 --- a/mappings/net/minecraft/client/realms/task/SwitchMinigameTask.mapping +++ b/mappings/net/minecraft/client/realms/task/SwitchMinigameTask.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4442 net/minecraft/client/realms/task/SwitchMinigameTa FIELD field_20239 worldId J FIELD field_20240 worldTemplate Lnet/minecraft/class_4890; FIELD field_20241 lastScreen Lnet/minecraft/class_4388; + FIELD field_36360 LOGGER Lorg/slf4j/Logger; METHOD (JLnet/minecraft/class_4890;Lnet/minecraft/class_4388;)V ARG 1 worldId ARG 3 worldTemplate diff --git a/mappings/net/minecraft/client/realms/task/SwitchSlotTask.mapping b/mappings/net/minecraft/client/realms/task/SwitchSlotTask.mapping index 0f6d465504..3334bf4a00 100644 --- a/mappings/net/minecraft/client/realms/task/SwitchSlotTask.mapping +++ b/mappings/net/minecraft/client/realms/task/SwitchSlotTask.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4443 net/minecraft/client/realms/task/SwitchSlotTask FIELD field_20242 worldId J FIELD field_20243 slot I FIELD field_22733 callback Ljava/lang/Runnable; + FIELD field_36361 LOGGER Lorg/slf4j/Logger; METHOD (JILjava/lang/Runnable;)V ARG 1 worldId ARG 3 slot diff --git a/mappings/net/minecraft/client/realms/task/WorldCreationTask.mapping b/mappings/net/minecraft/client/realms/task/WorldCreationTask.mapping index f8e8a9e415..94306ee4e5 100644 --- a/mappings/net/minecraft/client/realms/task/WorldCreationTask.mapping +++ b/mappings/net/minecraft/client/realms/task/WorldCreationTask.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_4445 net/minecraft/client/realms/task/WorldCreationTas FIELD field_20250 motd Ljava/lang/String; FIELD field_20251 worldId J FIELD field_20252 lastScreen Lnet/minecraft/class_437; + FIELD field_36362 LOGGER Lorg/slf4j/Logger; METHOD (JLjava/lang/String;Ljava/lang/String;Lnet/minecraft/class_437;)V ARG 1 worldId ARG 3 name diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index 24e31057ca..79b55d14c6 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider FIELD field_39212 JSON_KEY_SORT_ORDER Ljava/util/function/ToIntFunction; FIELD field_39213 JSON_KEY_SORTING_COMPARATOR Ljava/util/Comparator; + FIELD field_40831 LOGGER Lorg/slf4j/Logger; METHOD method_10319 run (Lnet/minecraft/class_7403;)Ljava/util/concurrent/CompletableFuture; ARG 1 writer METHOD method_10320 writeToPath (Lnet/minecraft/class_7403;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping index fc77182a84..8625fdfe47 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityUuidFix.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_4960 net/minecraft/datafixer/fix/EntityUuidFix FIELD field_23125 LEASHABLES Ljava/util/Set; FIELD field_23126 OTHER_LIVINGS Ljava/util/Set; FIELD field_23127 PROJECTILES Ljava/util/Set; + FIELD field_36328 LOGGER Lorg/slf4j/Logger; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema METHOD method_26022 updateAngryAtMemory (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/PersistentStateUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/PersistentStateUuidFix.mapping index f04f0ff681..b3755606ea 100644 --- a/mappings/net/minecraft/datafixer/fix/PersistentStateUuidFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/PersistentStateUuidFix.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_4964 net/minecraft/datafixer/fix/PersistentStateUuidFix + FIELD field_36330 LOGGER Lorg/slf4j/Logger; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/WorldUuidFix.mapping b/mappings/net/minecraft/datafixer/fix/WorldUuidFix.mapping index 4ea3b555c3..a6a41382fb 100644 --- a/mappings/net/minecraft/datafixer/fix/WorldUuidFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/WorldUuidFix.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_4962 net/minecraft/datafixer/fix/WorldUuidFix + FIELD field_36329 LOGGER Lorg/slf4j/Logger; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema METHOD method_26057 fixWanderingTraderId (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/entity/FallingBlockEntity.mapping b/mappings/net/minecraft/entity/FallingBlockEntity.mapping index 6561b34aa9..718d70c366 100644 --- a/mappings/net/minecraft/entity/FallingBlockEntity.mapping +++ b/mappings/net/minecraft/entity/FallingBlockEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1540 net/minecraft/entity/FallingBlockEntity + FIELD field_36333 LOGGER Lorg/slf4j/Logger; FIELD field_7187 fallHurtAmount F FIELD field_7188 block Lnet/minecraft/class_2680; FIELD field_7189 destroyedOnLanding Z diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 0ce2417d94..d65abce126 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_30079 FALL_FLYING_FLAG I FIELD field_30082 noDrag Z FIELD field_33908 MAX_ENTITY_VIEWING_DISTANCE D + FIELD field_36332 LOGGER Lorg/slf4j/Logger; FIELD field_37421 experienceDroppingDisabled Z FIELD field_6210 bodyTrackingIncrements I FIELD field_6211 lastLimbDistance F diff --git a/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping b/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping index 49233eea3d..3584fe73bd 100644 --- a/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1530 net/minecraft/entity/decoration/AbstractDecorationEntity + FIELD field_39455 LOGGER Lorg/slf4j/Logger; FIELD field_7097 obstructionCheckCounter I FIELD field_7098 PREDICATE Ljava/util/function/Predicate; FIELD field_7099 facing Lnet/minecraft/class_2350; diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping index 92352fff75..3abb10231e 100644 --- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity FIELD field_17047 offerData Lnet/minecraft/class_2487; FIELD field_18877 xp I FIELD field_20299 gossipData Lnet/minecraft/class_2520; + FIELD field_36334 LOGGER Lorg/slf4j/Logger; FIELD field_7420 VILLAGER_DATA Lnet/minecraft/class_2940; FIELD field_7421 converter Ljava/util/UUID; FIELD field_7422 conversionTimer I diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 2d745aa344..490afa24b0 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_18135 STANDING_DIMENSIONS Lnet/minecraft/class_4048; FIELD field_19428 shoulderEntityAddedTime J FIELD field_30651 DEFAULT_EYE_HEIGHT F + FIELD field_38197 LOGGER Lorg/slf4j/Logger; FIELD field_39445 lastDeathPos Ljava/util/Optional; FIELD field_7483 strideDistance F FIELD field_7484 itemCooldownManager Lnet/minecraft/class_1796; diff --git a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping index 49436d8c3a..7f5d1b44ee 100644 --- a/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/projectile/FishingBobberEnti FIELD field_23232 caughtFish Z FIELD field_23233 outOfOpenWaterTicks I FIELD field_23234 CAUGHT_FISH Lnet/minecraft/class_2940; + FIELD field_36336 LOGGER Lorg/slf4j/Logger; FIELD field_7165 hookedEntity Lnet/minecraft/class_1297; FIELD field_7167 removalTimer I FIELD field_7168 lureLevel I diff --git a/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping b/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping index e84ebbaff0..20703e8a53 100644 --- a/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping +++ b/mappings/net/minecraft/network/message/MessageChainTaskQueue.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_7619 net/minecraft/network/message/MessageChainTaskQueue COMMENT Queues a future that handles received messages on the server thread. + FIELD field_39828 LOGGER Lorg/slf4j/Logger; FIELD field_39829 current Ljava/util/concurrent/CompletableFuture; FIELD field_39830 executor Ljava/util/concurrent/Executor; FIELD field_40112 closed Z diff --git a/mappings/net/minecraft/resource/ZipResourcePack.mapping b/mappings/net/minecraft/resource/ZipResourcePack.mapping index 2e01d8a354..e92a9d1d3e 100644 --- a/mappings/net/minecraft/resource/ZipResourcePack.mapping +++ b/mappings/net/minecraft/resource/ZipResourcePack.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3258 net/minecraft/resource/ZipResourcePack FIELD field_14183 TYPE_NAMESPACE_SPLITTER Lcom/google/common/base/Splitter; FIELD field_14184 file Ljava/util/zip/ZipFile; + FIELD field_39096 LOGGER Lorg/slf4j/Logger; FIELD field_39998 backingZipFile Ljava/io/File; FIELD field_39999 failedToOpen Z METHOD (Ljava/lang/String;Ljava/io/File;Z)V diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index bd10637c75..27409416d0 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -46,6 +46,7 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa FIELD field_34883 simulationDistance I FIELD field_35564 hideOnlinePlayers Z FIELD field_37275 maxChainedNeighborUpdates I + FIELD field_37276 LOGGER Lorg/slf4j/Logger; FIELD field_39018 enforceSecureProfile Z FIELD field_39093 serverResourcePackProperties Ljava/util/Optional; FIELD field_39094 SHA1_PATTERN Ljava/util/regex/Pattern; diff --git a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping index f571e73368..c9b996bcc6 100644 --- a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping +++ b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiece FIELD field_24021 verticalPlacement Lnet/minecraft/class_5189$class_5191; FIELD field_24022 properties Lnet/minecraft/class_5189$class_5190; + FIELD field_24992 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_5189$class_5191;Lnet/minecraft/class_5189$class_5190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3499;Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_2338;)V ARG 1 manager ARG 2 pos diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 90da3cdb24..0e8248d4a1 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk FIELD field_34543 blockEntities Ljava/util/Map; FIELD field_34544 heightLimitView Lnet/minecraft/class_5539; FIELD field_34545 sectionArray [Lnet/minecraft/class_2826; + FIELD field_34548 LOGGER Lorg/slf4j/Logger; FIELD field_34549 lightOn Z FIELD field_34550 inhabitedTime J FIELD field_34552 structureStarts Ljava/util/Map;