From 214508ba1276713e717871c989958f57c1a6ded6 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Tue, 18 Jan 2022 06:21:38 +0900 Subject: [PATCH] Rename remaining Tag to Nbt (#2960) --- .../block/entity/BannerBlockEntity.mapping | 6 +++--- .../datafixer/fix/StriderGravityFix.mapping | 2 +- .../data/TrackedDataHandlerRegistry.mapping | 2 +- .../entity/mob/ZombieVillagerEntity.mapping | 4 ++-- mappings/net/minecraft/item/BlockItem.mapping | 4 ++-- .../loot/function/CopyNbtLootFunction.mapping | 16 ++++++++-------- .../server/command/CloneCommand.mapping | 4 ++-- .../net/minecraft/world/chunk/ProtoChunk.mapping | 2 +- .../world/storage/EntityChunkDataAccess.mapping | 8 ++++---- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping index abc6f51dee..b607a11009 100644 --- a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity FIELD field_11769 patterns Ljava/util/List; FIELD field_11772 customName Lnet/minecraft/class_2561; - FIELD field_11773 patternListTag Lnet/minecraft/class_2499; + FIELD field_11773 patternListNbt Lnet/minecraft/class_2499; FIELD field_11774 baseColor Lnet/minecraft/class_1767; FIELD field_31297 PATTERNS_KEY Ljava/lang/String; FIELD field_31298 PATTERN_KEY Ljava/lang/String; @@ -27,8 +27,8 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity ARG 1 customName METHOD method_24280 getPatternsFromNbt (Lnet/minecraft/class_1767;Lnet/minecraft/class_2499;)Ljava/util/List; ARG 0 baseColor - ARG 1 patternListTag - METHOD method_24281 getPatternListTag (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2499; + ARG 1 patternListNbt + METHOD method_24281 getPatternListNbt (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2499; ARG 0 stack METHOD method_38992 readFrom (Lnet/minecraft/class_1799;)V ARG 1 stack diff --git a/mappings/net/minecraft/datafixer/fix/StriderGravityFix.mapping b/mappings/net/minecraft/datafixer/fix/StriderGravityFix.mapping index 2875feacc5..b7b1f6d9ad 100644 --- a/mappings/net/minecraft/datafixer/fix/StriderGravityFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/StriderGravityFix.mapping @@ -2,4 +2,4 @@ CLASS net/minecraft/class_5256 net/minecraft/datafixer/fix/StriderGravityFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_27789 updateNoGravityTag (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_27789 updateNoGravityNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index c96dc02e2f..aaf1febbf0 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis FIELD field_13315 OPTIONAL_BLOCK_POS Lnet/minecraft/class_2941; FIELD field_13316 ROTATION Lnet/minecraft/class_2941; FIELD field_13317 TEXT_COMPONENT Lnet/minecraft/class_2941; - FIELD field_13318 TAG_COMPOUND Lnet/minecraft/class_2941; + FIELD field_13318 NBT_COMPOUND Lnet/minecraft/class_2941; FIELD field_13319 BYTE Lnet/minecraft/class_2941; FIELD field_13320 FLOAT Lnet/minecraft/class_2941; FIELD field_13321 FACING Lnet/minecraft/class_2941; diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping index e51cd43bb4..f6d41edb82 100644 --- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping @@ -7,11 +7,11 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity FIELD field_7422 conversionTimer I FIELD field_7423 CONVERTING Lnet/minecraft/class_2940; METHOD method_16916 setOfferData (Lnet/minecraft/class_2487;)V - ARG 1 offerTag + ARG 1 offerData METHOD method_19622 setXp (I)V ARG 1 xp METHOD method_21649 setGossipData (Lnet/minecraft/class_2520;)V - ARG 1 gossipTag + ARG 1 gossipData METHOD method_35194 getXp ()I METHOD method_7194 getConversionRate ()I METHOD method_7197 finishConversion (Lnet/minecraft/class_3218;)V diff --git a/mappings/net/minecraft/item/BlockItem.mapping b/mappings/net/minecraft/item/BlockItem.mapping index 9e2c0e2e22..5089c904b4 100644 --- a/mappings/net/minecraft/item/BlockItem.mapping +++ b/mappings/net/minecraft/item/BlockItem.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_1747 net/minecraft/item/BlockItem ARG 0 state ARG 1 property ARG 2 name - METHOD method_18084 placeFromTag (Lnet/minecraft/class_2338;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + METHOD method_18084 placeFromNbt (Lnet/minecraft/class_2338;Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 1 pos ARG 2 world ARG 3 stack @@ -49,7 +49,7 @@ CLASS net/minecraft/class_1747 net/minecraft/item/BlockItem METHOD method_7713 appendBlocks (Ljava/util/Map;Lnet/minecraft/class_1792;)V ARG 1 map ARG 2 item - METHOD method_7714 writeTagToBlockEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Z + METHOD method_7714 writeNbtToBlockEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Z ARG 0 world ARG 1 player ARG 2 pos diff --git a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping index 7b1d451e97..9f1e1649d9 100644 --- a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping @@ -39,26 +39,26 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction METHOD method_16859 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_3837$class_3839; ARG 0 json METHOD method_16860 execute (Ljava/util/function/Supplier;Lnet/minecraft/class_2520;)V - ARG 1 itemTagTagGetter - ARG 2 sourceEntityTag + ARG 1 itemNbtGetter + ARG 2 sourceEntityNbt CLASS class_3841 Operator FIELD field_17035 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name METHOD method_16864 merge (Lnet/minecraft/class_2520;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)V - ARG 1 itemTag + ARG 1 itemNbt ARG 2 targetPath - ARG 3 sourceTags + ARG 3 sourceNbts METHOD method_16865 get (Ljava/lang/String;)Lnet/minecraft/class_3837$class_3841; ARG 0 name CLASS 2 METHOD method_16866 (Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;)V - ARG 1 listTag + ARG 1 sourceNbt METHOD method_16867 (Ljava/util/List;Lnet/minecraft/class_2520;)V - ARG 1 foundTag + ARG 1 foundNbt CLASS 3 METHOD method_16868 (Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;)V - ARG 1 compoundTag + ARG 1 sourceNbt METHOD method_16869 (Ljava/util/List;Lnet/minecraft/class_2520;)V - ARG 1 foundTag + ARG 1 foundNbt CLASS class_3842 Serializer diff --git a/mappings/net/minecraft/server/command/CloneCommand.mapping b/mappings/net/minecraft/server/command/CloneCommand.mapping index db8f1c6e0b..73b81b026e 100644 --- a/mappings/net/minecraft/server/command/CloneCommand.mapping +++ b/mappings/net/minecraft/server/command/CloneCommand.mapping @@ -57,13 +57,13 @@ CLASS net/minecraft/class_3023 net/minecraft/server/command/CloneCommand METHOD method_13108 (Lnet/minecraft/class_2694;)Z ARG 0 pos CLASS class_3024 BlockInfo - FIELD field_13494 blockEntityTag Lnet/minecraft/class_2487; + FIELD field_13494 blockEntityNbt Lnet/minecraft/class_2487; FIELD field_13495 state Lnet/minecraft/class_2680; FIELD field_13496 pos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2487;)V ARG 1 pos ARG 2 state - ARG 3 blockEntityTag + ARG 3 blockEntityNbt CLASS class_3025 Mode FIELD field_13498 allowsOverlap Z METHOD (Ljava/lang/String;IZ)V diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index ab47172122..d9598c7cbc 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -29,7 +29,7 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk METHOD method_12300 getPackedSectionRelative (Lnet/minecraft/class_2338;)S ARG 0 pos METHOD method_12302 addEntity (Lnet/minecraft/class_2487;)V - ARG 1 entityTag + ARG 1 entityNbt METHOD method_12304 addLightSource (SI)V ARG 1 chunkSliceRel ARG 2 sectionY diff --git a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping index 57c3ad42f0..17b2bcf353 100644 --- a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping +++ b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping @@ -18,15 +18,15 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess METHOD method_31731 (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Lnet/minecraft/class_5566; ARG 2 compound METHOD method_31732 getChunkDataVersion (Lnet/minecraft/class_2487;)I - ARG 0 chunkTag + ARG 0 chunkNbt METHOD method_31733 putChunkPos (Lnet/minecraft/class_2487;Lnet/minecraft/class_1923;)V - ARG 0 chunkTag + ARG 0 chunkNbt ARG 1 pos METHOD method_31734 (Lnet/minecraft/class_2499;Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_31735 emptyDataList (Lnet/minecraft/class_1923;)Lnet/minecraft/class_5566; ARG 0 pos METHOD method_31736 getChunkPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1923; - ARG 0 chunkTag + ARG 0 chunkNbt METHOD method_31737 fixChunkData (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 chunkTag + ARG 1 chunkNbt