From 355c529aa1ee2086ffe72cb0250bda0abc1597b6 Mon Sep 17 00:00:00 2001 From: LambdAurora Date: Fri, 2 Apr 2021 23:03:30 +0200 Subject: [PATCH] NBT refactor: step 3 (#2257) * Refactor NBT parameter names and a bit more. * Apply suggestions from code review. Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Apply more suggestions from code review. * MobEntity leashTag stuff -> leashNbt Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- .../block/entity/BlockEntity.mapping | 8 ++-- .../block/entity/CampfireBlockEntity.mapping | 2 +- .../LootableContainerBlockEntity.mapping | 4 +- .../entity/ShulkerBoxBlockEntity.mapping | 8 ++-- .../net/minecraft/client/Keyboard.mapping | 4 +- .../gui/screen/ingame/BookScreen.mapping | 4 +- .../ModelPredicateProviderRegistry.mapping | 2 +- .../client/network/DataQueryHandler.mapping | 2 +- .../client/option/GameOptions.mapping | 2 +- .../client/option/HotbarStorageEntry.mapping | 6 +-- .../particle/FireworksSparkParticle.mapping | 2 +- .../client/world/ClientChunkManager.mapping | 2 +- .../command/DataCommandObject.mapping | 9 ++-- .../command/DataCommandStorage.mapping | 6 ++- .../ItemPredicateArgumentType.mapping | 10 +++- .../argument/ItemStackArgument.mapping | 7 ++- .../command/argument/ItemStringReader.mapping | 4 +- .../NbtCompoundTagArgumentType.mapping | 2 +- .../argument/NbtElementArgumentType.mapping | 6 +++ .../argument/NbtPathArgumentType.mapping | 18 ++++---- .../argument/NbtTagArgumentType.mapping | 6 --- .../StructureValidatorProvider.mapping | 7 ++- .../datafixer/fix/ItemLoreToTextFix.mapping | 4 +- .../enchantment/EnchantmentHelper.mapping | 2 +- mappings/net/minecraft/entity/Entity.mapping | 20 ++++---- .../net/minecraft/entity/EntityType.mapping | 14 +++--- .../minecraft/entity/SaddledComponent.mapping | 4 +- .../attribute/AttributeContainer.mapping | 2 +- .../attribute/EntityAttributeInstance.mapping | 2 +- .../attribute/EntityAttributeModifier.mapping | 2 +- .../entity/boss/BossBarManager.mapping | 2 +- .../entity/boss/CommandBossBar.mapping | 2 +- .../boss/dragon/EnderDragonFight.mapping | 2 +- .../decoration/ArmorStandEntity.mapping | 4 +- .../effect/StatusEffectInstance.mapping | 10 ++-- .../minecraft/entity/mob/Angerable.mapping | 4 +- .../minecraft/entity/mob/MobEntity.mapping | 6 +-- .../entity/passive/VillagerEntity.mapping | 4 +- .../entity/player/HungerManager.mapping | 4 +- .../entity/player/PlayerAbilities.mapping | 8 ++-- .../entity/player/PlayerEntity.mapping | 8 ++-- .../entity/player/PlayerInventory.mapping | 8 ++-- .../minecraft/inventory/ContainerLock.mapping | 8 ++-- .../minecraft/inventory/Inventories.mapping | 6 +-- .../inventory/SimpleInventory.mapping | 6 +-- .../net/minecraft/item/CompassItem.mapping | 6 +-- .../minecraft/item/FireworkChargeItem.mapping | 2 +- mappings/net/minecraft/item/Item.mapping | 4 +- mappings/net/minecraft/item/ItemStack.mapping | 4 +- .../net/minecraft/item/SpawnEggItem.mapping | 4 +- .../minecraft/item/WritableBookItem.mapping | 2 +- .../minecraft/item/WrittenBookItem.mapping | 2 +- .../item/map/MapBannerMarker.mapping | 2 +- .../minecraft/item/map/MapFrameMarker.mapping | 2 +- .../net/minecraft/item/map/MapState.mapping | 4 +- .../loot/function/SetNbtLootFunction.mapping | 6 +-- .../minecraft/network/PacketByteBuf.mapping | 46 +++++++++---------- .../play/BlockEntityUpdateS2CPacket.mapping | 6 +-- ...ping => NbtQueryResponseS2CPacket.mapping} | 8 ++-- .../net/minecraft/potion/PotionUtil.mapping | 6 +-- .../minecraft/predicate/NbtPredicate.mapping | 6 +-- .../recipe/book/RecipeBookOptions.mapping | 4 +- .../scoreboard/ScoreboardState.mapping | 22 ++++----- .../server/command/DataCommand.mapping | 32 ++++++------- .../server/command/ExecuteCommand.mapping | 2 +- .../server/network/ServerPlayerEntity.mapping | 8 ++-- .../server/network/ServerRecipeBook.mapping | 2 +- .../structure/BuriedTreasureGenerator.mapping | 3 +- .../structure/DesertTempleGenerator.mapping | 3 +- .../structure/IglooGenerator.mapping | 3 +- .../structure/JungleTempleGenerator.mapping | 3 +- .../structure/NetherFossilGenerator.mapping | 3 +- .../structure/OceanMonumentGenerator.mapping | 3 +- .../structure/OceanRuinGenerator.mapping | 3 +- .../structure/PoolStructurePiece.mapping | 3 +- .../RuinedPortalStructurePiece.mapping | 7 ++- .../structure/ShipwreckGenerator.mapping | 3 +- .../net/minecraft/structure/Structure.mapping | 22 +++++---- .../structure/StructureManager.mapping | 2 +- .../structure/StructurePiece.mapping | 2 +- .../structure/StructurePieceType.mapping | 3 +- .../structure/pool/FeaturePoolElement.mapping | 2 +- .../processor/StructureProcessorRule.mapping | 6 +-- .../net/minecraft/text/HoverEvent.mapping | 4 +- .../net/minecraft/village/TradeOffer.mapping | 2 +- .../net/minecraft/village/raid/Raid.mapping | 4 +- .../minecraft/world/ChunkSerializer.mapping | 10 ++-- .../world/ChunkTickScheduler.mapping | 2 +- .../minecraft/world/ChunkUpdateState.mapping | 2 +- .../world/CommandBlockExecutor.mapping | 4 +- .../minecraft/world/FeatureUpdater.mapping | 4 +- .../minecraft/world/ForcedChunkState.mapping | 2 +- .../net/minecraft/world/IdCountsState.mapping | 2 +- .../minecraft/world/MobSpawnerEntry.mapping | 8 ++-- .../minecraft/world/MobSpawnerLogic.mapping | 2 +- .../minecraft/world/PersistentState.mapping | 2 +- .../minecraft/world/SaveProperties.mapping | 6 +-- mappings/net/minecraft/world/World.mapping | 2 +- .../world/border/WorldBorder.mapping | 2 +- .../world/chunk/BiMapPalette.mapping | 2 +- .../net/minecraft/world/chunk/Chunk.mapping | 2 +- .../net/minecraft/world/chunk/Palette.mapping | 2 +- .../world/chunk/PalettedContainer.mapping | 4 +- .../minecraft/world/chunk/ProtoChunk.mapping | 2 +- .../minecraft/world/chunk/UpgradeData.mapping | 2 +- .../minecraft/world/chunk/WorldChunk.mapping | 6 +-- .../world/dimension/DimensionType.mapping | 4 +- .../gen/feature/StructureFeature.mapping | 2 +- .../world/level/storage/AlphaChunkIo.mapping | 5 +- .../world/storage/RegionBasedStorage.mapping | 2 +- .../storage/VersionedChunkStorage.mapping | 8 ++-- .../net/minecraft/world/timer/Timer.mapping | 2 +- .../world/timer/TimerCallback.mapping | 4 +- .../timer/TimerCallbackSerializer.mapping | 2 +- 114 files changed, 324 insertions(+), 287 deletions(-) create mode 100644 mappings/net/minecraft/command/argument/NbtElementArgumentType.mapping delete mode 100644 mappings/net/minecraft/command/argument/NbtTagArgumentType.mapping rename mappings/net/minecraft/network/packet/s2c/play/{TagQueryResponseS2CPacket.mapping => NbtQueryResponseS2CPacket.mapping} (63%) diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index 5f96b53f17..a46e8eed04 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_10996 cancelRemoval ()V METHOD method_10997 getWorld ()Lnet/minecraft/class_1937; METHOD method_10999 writeIdentifyingData (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_11002 hasWorld ()Z METHOD method_11003 populateCrashReport (Lnet/minecraft/class_129;)V ARG 1 crashReportSection @@ -22,14 +22,14 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_11005 createFromNbt (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2586; ARG 0 pos ARG 1 state - ARG 2 tag + ARG 2 nbt METHOD method_11007 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_11010 getCachedState ()Lnet/minecraft/class_2680; METHOD method_11011 copyItemDataRequiresOperator ()Z METHOD method_11012 markRemoved ()V METHOD method_11014 readNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_11015 isRemoved ()Z METHOD method_11016 getPos ()Lnet/minecraft/class_2338; METHOD method_11017 getType ()Lnet/minecraft/class_2591; diff --git a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping index d6e5d998d5..4a84641794 100644 --- a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_3924 net/minecraft/block/entity/CampfireBlockEntity METHOD method_17505 getItemsBeingCooked ()Lnet/minecraft/class_2371; METHOD method_17506 spawnItemsBeingCooked ()V METHOD method_17507 saveInitialChunkData (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_17510 updateListeners ()V METHOD method_31666 litServerTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3924;)V ARG 0 world diff --git a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping index 4803adb0ee..b8cdbabbe6 100644 --- a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping @@ -7,12 +7,12 @@ CLASS net/minecraft/class_2621 net/minecraft/block/entity/LootableContainerBlock ARG 1 list METHOD method_11282 getInvStackList ()Lnet/minecraft/class_2371; METHOD method_11283 deserializeLootTable (Lnet/minecraft/class_2487;)Z - ARG 1 tag + ARG 1 nbt METHOD method_11285 setLootTable (Lnet/minecraft/class_2960;J)V ARG 1 id ARG 2 seed METHOD method_11286 serializeLootTable (Lnet/minecraft/class_2487;)Z - ARG 1 tag + ARG 1 nbt METHOD method_11287 setLootTable (Lnet/minecraft/class_1922;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)V ARG 0 world ARG 1 random diff --git a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping index 9d31084e72..e2077746e3 100644 --- a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping @@ -23,14 +23,14 @@ CLASS net/minecraft/class_2627 net/minecraft/block/entity/ShulkerBoxBlockEntity ARG 1 world ARG 2 pos ARG 3 state - METHOD method_11317 serializeInventory (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + METHOD method_11317 writeInventoryNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 nbt METHOD method_11318 updateAnimation (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 world ARG 2 pos ARG 3 state - METHOD method_11319 deserializeInventory (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_11319 readInventoryNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_11320 getColor ()Lnet/minecraft/class_1767; METHOD method_20047 updateNeighborStates (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 0 world diff --git a/mappings/net/minecraft/client/Keyboard.mapping b/mappings/net/minecraft/client/Keyboard.mapping index 1eba0df3e2..9ce070a11b 100644 --- a/mappings/net/minecraft/client/Keyboard.mapping +++ b/mappings/net/minecraft/client/Keyboard.mapping @@ -30,10 +30,10 @@ CLASS net/minecraft/class_309 net/minecraft/client/Keyboard METHOD method_1469 copyEntity (Lnet/minecraft/class_2960;Lnet/minecraft/class_243;Lnet/minecraft/class_2487;)V ARG 1 id ARG 2 pos - ARG 3 tag + ARG 3 nbt METHOD method_1472 setup (J)V METHOD method_1474 pollDebugCrash ()V METHOD method_1475 copyBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)V ARG 1 state ARG 2 pos - ARG 3 tag + ARG 3 nbt diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping index 71c2310e68..3666f21c73 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping @@ -24,13 +24,15 @@ CLASS net/minecraft/class_3872 net/minecraft/client/gui/screen/ingame/BookScreen METHOD method_17554 setPageProvider (Lnet/minecraft/class_3872$class_3931;)V ARG 1 pageProvider METHOD method_17555 readPages (Lnet/minecraft/class_2487;)Ljava/util/List; - ARG 0 tag + ARG 0 nbt METHOD method_17556 setPage (I)Z ARG 1 index METHOD method_17557 addCloseButton ()V METHOD method_17558 addPageButtons ()V METHOD method_17789 jumpToPage (I)Z ARG 1 page + METHOD method_33888 (Lnet/minecraft/class_2487;Ljava/util/function/Consumer;)V + ARG 0 nbt CLASS class_3931 Contents METHOD method_17560 getPageCount ()I METHOD method_17561 getPageUnchecked (I)Lnet/minecraft/class_5348; diff --git a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping index 4d6f9c2016..28b214e688 100644 --- a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping +++ b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping @@ -29,7 +29,7 @@ CLASS net/minecraft/class_5272 net/minecraft/client/item/ModelPredicateProviderR ARG 1 itemFrame METHOD method_27897 getLodestonePos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2338; ARG 1 world - ARG 2 tag + ARG 2 nbt METHOD method_27898 getAngleToPos (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)D ARG 1 pos ARG 2 entity diff --git a/mappings/net/minecraft/client/network/DataQueryHandler.mapping b/mappings/net/minecraft/client/network/DataQueryHandler.mapping index f0343bb0f7..b27e935299 100644 --- a/mappings/net/minecraft/client/network/DataQueryHandler.mapping +++ b/mappings/net/minecraft/client/network/DataQueryHandler.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_300 net/minecraft/client/network/DataQueryHandler ARG 2 callback METHOD method_1404 handleQueryResponse (ILnet/minecraft/class_2487;)Z ARG 1 transactionId - ARG 2 tag + ARG 2 nbt METHOD method_1405 queryEntityNbt (ILjava/util/function/Consumer;)V ARG 1 entityNetworkId ARG 2 callback diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index cd6b359077..9576df33ae 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -116,7 +116,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions ARG 1 category ARG 2 volume METHOD method_1626 update (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_1627 addResourcePackProfilesToManager (Lnet/minecraft/class_3283;)V ARG 1 manager METHOD method_1630 getSoundVolume (Lnet/minecraft/class_3419;)F diff --git a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping index d4285919c9..c5b3aaf75f 100644 --- a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping +++ b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_748 net/minecraft/client/option/HotbarStorageEntry FIELD field_3948 delegate Lnet/minecraft/class_2371; - METHOD method_3152 fromListTag (Lnet/minecraft/class_2499;)V - ARG 1 tag - METHOD method_3153 toListTag ()Lnet/minecraft/class_2499; + METHOD method_3152 readNbtList (Lnet/minecraft/class_2499;)V + ARG 1 list + METHOD method_3153 toNbtList ()Lnet/minecraft/class_2499; diff --git a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping index 4c764eb0b9..86c2065bae 100644 --- a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping +++ b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping @@ -41,7 +41,7 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkPartic ARG 10 velocityY ARG 12 velocityZ ARG 14 particleManager - ARG 15 tag + ARG 15 nbt METHOD method_3028 explodeStar (D[[D[I[IZZZ)V ARG 1 size ARG 3 pattern diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping index a04b18ddbd..9778470c36 100644 --- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager ARG 2 z ARG 3 biomes ARG 4 buf - ARG 5 tag + ARG 5 nbt METHOD method_20180 updateLoadDistance (I)V ARG 1 loadDistance METHOD method_20181 positionEquals (Lnet/minecraft/class_2818;II)Z diff --git a/mappings/net/minecraft/command/DataCommandObject.mapping b/mappings/net/minecraft/command/DataCommandObject.mapping index 42a78f5a80..b18582b5ae 100644 --- a/mappings/net/minecraft/command/DataCommandObject.mapping +++ b/mappings/net/minecraft/command/DataCommandObject.mapping @@ -1,10 +1,11 @@ CLASS net/minecraft/class_3162 net/minecraft/command/DataCommandObject METHOD method_13879 feedbackGet (Lnet/minecraft/class_2203$class_2209;DI)Lnet/minecraft/class_2561; + ARG 1 path ARG 2 scale ARG 4 result - METHOD method_13880 setTag (Lnet/minecraft/class_2487;)V - ARG 1 tag - METHOD method_13881 getTag ()Lnet/minecraft/class_2487; + METHOD method_13880 setNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt + METHOD method_13881 getNbt ()Lnet/minecraft/class_2487; METHOD method_13882 feedbackQuery (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2561; - ARG 1 tag + ARG 1 element METHOD method_13883 feedbackModify ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/command/DataCommandStorage.mapping b/mappings/net/minecraft/command/DataCommandStorage.mapping index e73fe45e2a..8b0fe7c3a8 100644 --- a/mappings/net/minecraft/command/DataCommandStorage.mapping +++ b/mappings/net/minecraft/command/DataCommandStorage.mapping @@ -12,13 +12,15 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage ARG 1 id METHOD method_22547 set (Lnet/minecraft/class_2960;Lnet/minecraft/class_2487;)V ARG 1 id - ARG 2 tag + ARG 2 nbt CLASS class_4566 PersistentState FIELD field_20749 map Ljava/util/Map; METHOD method_22550 get (Ljava/lang/String;)Lnet/minecraft/class_2487; ARG 1 name METHOD method_22552 set (Ljava/lang/String;Lnet/minecraft/class_2487;)V ARG 1 name - ARG 2 tag + ARG 2 nbt METHOD method_22554 getIds (Ljava/lang/String;)Ljava/util/stream/Stream; ARG 1 namespace + METHOD method_32383 (Lnet/minecraft/class_2487;)Lnet/minecraft/class_4565$class_4566; + ARG 1 nbt diff --git a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping index 19803ffd01..768f315b6d 100644 --- a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping @@ -10,10 +10,18 @@ CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgum ARG 1 name CLASS class_2294 ItemPredicate FIELD field_10813 item Lnet/minecraft/class_1792; - FIELD field_10814 compound Lnet/minecraft/class_2487; + FIELD field_10814 nbt Lnet/minecraft/class_2487; + METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_2487;)V + ARG 1 item + ARG 2 nbt + METHOD test (Ljava/lang/Object;)Z + ARG 1 context CLASS class_2295 ItemPredicateArgument CLASS class_2296 TagPredicate FIELD field_10815 tag Lnet/minecraft/class_3494; FIELD field_10816 compound Lnet/minecraft/class_2487; + METHOD (Lnet/minecraft/class_3494;Lnet/minecraft/class_2487;)V + ARG 1 tag + ARG 2 nbt METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/command/argument/ItemStackArgument.mapping b/mappings/net/minecraft/command/argument/ItemStackArgument.mapping index d180c257e4..316c921002 100644 --- a/mappings/net/minecraft/command/argument/ItemStackArgument.mapping +++ b/mappings/net/minecraft/command/argument/ItemStackArgument.mapping @@ -1,11 +1,14 @@ CLASS net/minecraft/class_2290 net/minecraft/command/argument/ItemStackArgument FIELD field_10796 item Lnet/minecraft/class_1792; FIELD field_10797 OVERSTACKED_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; - FIELD field_10798 tag Lnet/minecraft/class_2487; + FIELD field_10798 nbt Lnet/minecraft/class_2487; METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_2487;)V - ARG 2 tag + ARG 1 item + ARG 2 nbt METHOD method_9781 createStack (IZ)Lnet/minecraft/class_1799; ARG 1 amount ARG 2 checkOverstack METHOD method_9782 asString ()Ljava/lang/String; METHOD method_9785 getItem ()Lnet/minecraft/class_1792; + METHOD test (Ljava/lang/Object;)Z + ARG 1 stack diff --git a/mappings/net/minecraft/command/argument/ItemStringReader.mapping b/mappings/net/minecraft/command/argument/ItemStringReader.mapping index b837f3d46a..3230fb9dd0 100644 --- a/mappings/net/minecraft/command/argument/ItemStringReader.mapping +++ b/mappings/net/minecraft/command/argument/ItemStringReader.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader FIELD field_10804 allowTag Z FIELD field_10805 suggestions Ljava/util/function/BiFunction; FIELD field_10806 NBT_SUGGESTION_PROVIDER Ljava/util/function/BiFunction; - FIELD field_10807 tag Lnet/minecraft/class_2487; + FIELD field_10807 nbt Lnet/minecraft/class_2487; FIELD field_10808 id Lnet/minecraft/class_2960; FIELD field_10809 cursor I METHOD (Lcom/mojang/brigadier/StringReader;Z)V @@ -24,4 +24,4 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader METHOD method_9795 readItem ()V METHOD method_9796 suggestTag (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_5414;)Ljava/util/concurrent/CompletableFuture; ARG 1 suggestionsBuilder - METHOD method_9797 getTag ()Lnet/minecraft/class_2487; + METHOD method_9797 getNbt ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/command/argument/NbtCompoundTagArgumentType.mapping b/mappings/net/minecraft/command/argument/NbtCompoundTagArgumentType.mapping index 0c19bc43df..b1fc78cd65 100644 --- a/mappings/net/minecraft/command/argument/NbtCompoundTagArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/NbtCompoundTagArgumentType.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2179 net/minecraft/command/argument/NbtCompoundTagArgumentType FIELD field_9843 EXAMPLES Ljava/util/Collection; METHOD method_9284 nbtCompound ()Lnet/minecraft/class_2179; - METHOD method_9285 getCompoundTag (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2487; + METHOD method_9285 getNbtCompound (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2487; ARG 0 context ARG 1 name diff --git a/mappings/net/minecraft/command/argument/NbtElementArgumentType.mapping b/mappings/net/minecraft/command/argument/NbtElementArgumentType.mapping new file mode 100644 index 0000000000..859cb81209 --- /dev/null +++ b/mappings/net/minecraft/command/argument/NbtElementArgumentType.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_2212 net/minecraft/command/argument/NbtElementArgumentType + FIELD field_9918 EXAMPLES Ljava/util/Collection; + METHOD method_9389 nbtElement ()Lnet/minecraft/class_2212; + METHOD method_9390 getNbtElement (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2520; + ARG 0 context + ARG 1 name diff --git a/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping b/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping index 0283c6bb11..2ac9d07e60 100644 --- a/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping @@ -51,22 +51,22 @@ CLASS net/minecraft/class_2203 net/minecraft/command/argument/NbtPathArgumentTyp ARG 2 nodes ARG 3 nodeEndIndices METHOD method_9366 get (Lnet/minecraft/class_2520;)Ljava/util/List; - ARG 1 tag + ARG 1 element METHOD method_9367 getOrInit (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;)Ljava/util/List; - ARG 1 tag + ARG 1 element ARG 2 source METHOD method_9368 put (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;)I - ARG 1 tag + ARG 1 element ARG 2 source METHOD method_9369 getTerminals (Lnet/minecraft/class_2520;)Ljava/util/List; ARG 1 start METHOD method_9371 forEach (Ljava/util/List;Ljava/util/function/Function;)I - ARG 0 tags + ARG 0 elements ARG 1 operation METHOD method_9372 remove (Lnet/minecraft/class_2520;)I - ARG 1 tag + ARG 1 element METHOD method_9374 count (Lnet/minecraft/class_2520;)I - ARG 1 tag + ARG 1 element METHOD method_9375 createNothingFoundException (Lnet/minecraft/class_2203$class_2210;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; ARG 1 node CLASS class_2210 PathNode @@ -74,7 +74,7 @@ CLASS net/minecraft/class_2203 net/minecraft/command/argument/NbtPathArgumentTyp ARG 1 current ARG 2 source METHOD method_9377 getOrInit (Ljava/util/List;Ljava/util/function/Supplier;)Ljava/util/List; - ARG 1 tags + ARG 1 elements ARG 2 supplier METHOD method_9378 get (Lnet/minecraft/class_2520;Ljava/util/List;)V ARG 1 current @@ -87,12 +87,12 @@ CLASS net/minecraft/class_2203 net/minecraft/command/argument/NbtPathArgumentTyp ARG 2 source ARG 3 results METHOD method_9381 get (Ljava/util/List;)Ljava/util/List; - ARG 1 tags + ARG 1 elements METHOD method_9382 init ()Lnet/minecraft/class_2520; METHOD method_9383 clear (Lnet/minecraft/class_2520;)I ARG 1 current METHOD method_9384 process (Ljava/util/List;Ljava/util/function/BiConsumer;)Ljava/util/List; - ARG 1 tags + ARG 1 elements ARG 2 action CLASS class_3707 FilteredRootNode FIELD field_16319 matcher Ljava/util/function/Predicate; diff --git a/mappings/net/minecraft/command/argument/NbtTagArgumentType.mapping b/mappings/net/minecraft/command/argument/NbtTagArgumentType.mapping deleted file mode 100644 index a3d45a875e..0000000000 --- a/mappings/net/minecraft/command/argument/NbtTagArgumentType.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_2212 net/minecraft/command/argument/NbtTagArgumentType - FIELD field_9918 EXAMPLES Ljava/util/Collection; - METHOD method_9389 nbtTag ()Lnet/minecraft/class_2212; - METHOD method_9390 getTag (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2520; - ARG 0 context - ARG 1 name diff --git a/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping b/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping index 5efbd9bf14..2b0d4d4d66 100644 --- a/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping +++ b/mappings/net/minecraft/data/validate/StructureValidatorProvider.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_3843 net/minecraft/data/validate/StructureValidatorProvider FIELD field_24617 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_16878 update (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + METHOD method_16878 internalUpdate (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 0 name - ARG 1 tag + ARG 1 nbt METHOD method_16880 addDataVersion (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 0 nbt + METHOD method_32235 update (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 0 name + ARG 1 nbt diff --git a/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping index ebdc15c40a..e42bc2008f 100644 --- a/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ItemLoreToTextFix.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_1180 net/minecraft/datafixer/fix/ItemLoreToTextFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD method_5005 fixLoreTags (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; - ARG 0 tags + METHOD method_5005 fixLoreNbt (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; + ARG 0 nbt METHOD method_5012 componentize (Ljava/lang/String;)Ljava/lang/String; ARG 0 string diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index ae2094a263..59df394f29 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 2 enchantment METHOD method_22445 fromNbt (Lnet/minecraft/class_2499;)Ljava/util/Map; COMMENT Loads enchantments from an NBT list. - ARG 0 tag + ARG 0 list METHOD method_24365 chooseEquipmentWith (Lnet/minecraft/class_1887;Lnet/minecraft/class_1309;Ljava/util/function/Predicate;)Ljava/util/Map$Entry; COMMENT Returns a pair of an equipment slot and the item stack in the supplied COMMENT entity's slot, indicating the item stack has the enchantment supplied diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index dd5e35bce6..a95f3a6bd6 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -407,7 +407,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 team METHOD method_5646 extinguish ()V METHOD method_5647 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_5648 setInvisible (Z)V ARG 1 invisible METHOD method_5649 squaredDistanceTo (DDD)D @@ -417,9 +417,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5650 remove (Lnet/minecraft/class_1297$class_5529;)V ARG 1 reason METHOD method_5651 readNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_5652 writeCustomDataToNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_5653 getSavedEntityId ()Ljava/lang/String; METHOD method_5654 doesNotCollide (DDD)Z ARG 1 offsetX @@ -431,8 +431,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5660 setSneaking (Z)V ARG 1 sneaking METHOD method_5661 getArmorItems ()Ljava/lang/Iterable; - METHOD method_5662 saveToTag (Lnet/minecraft/class_2487;)Z - ARG 1 tag + METHOD method_5662 saveNbt (Lnet/minecraft/class_2487;)Z + ARG 1 nbt METHOD method_5663 getRotationVecClient ()Lnet/minecraft/class_243; METHOD method_5664 interactAt (Lnet/minecraft/class_1657;Lnet/minecraft/class_243;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269; ARG 1 player @@ -538,7 +538,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 pos ARG 2 yaw ARG 3 pitch - METHOD method_5726 toListTag ([F)Lnet/minecraft/class_2499; + METHOD method_5726 toNbtList ([F)Lnet/minecraft/class_2499; ARG 1 values METHOD method_5727 shouldRender (DDD)Z ARG 1 cameraX @@ -584,7 +584,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 damageSource METHOD method_5748 getMaxAir ()I METHOD method_5749 readCustomDataFromNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_5750 setVelocityClient (DDD)V ARG 1 x ARG 3 y @@ -648,8 +648,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 movementType ARG 2 movement METHOD method_5785 scheduleVelocityUpdate ()V - METHOD method_5786 saveSelfToTag (Lnet/minecraft/class_2487;)Z - ARG 1 tag + METHOD method_5786 saveSelfNbt (Lnet/minecraft/class_2487;)Z + ARG 1 nbt METHOD method_5787 isLogicalSideForUpdatingMovement ()Z METHOD method_5788 canBeRiddenInWater ()Z METHOD method_5790 updateSwimming ()V @@ -739,7 +739,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 state ARG 2 multiplier METHOD method_5845 getUuidAsString ()Ljava/lang/String; - METHOD method_5846 toListTag ([D)Lnet/minecraft/class_2499; + METHOD method_5846 toNbtList ([D)Lnet/minecraft/class_2499; ARG 1 values METHOD method_5847 setHeadYaw (F)V ARG 1 headYaw diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index dc12cf4e24..1896c0a920 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -31,15 +31,15 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 3 feetY ARG 5 feetZ METHOD method_17684 fromNbt (Lnet/minecraft/class_2487;)Ljava/util/Optional; - ARG 0 compoundTag + ARG 0 nbt METHOD method_17685 getWidth ()F METHOD method_17686 getHeight ()F METHOD method_17842 loadEntityWithPassengers (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;Ljava/util/function/Function;)Lnet/minecraft/class_1297; - ARG 0 compoundTag + ARG 0 nbt ARG 1 world ARG 2 entityProcessor METHOD method_17848 loadEntityFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;)Ljava/util/Optional; - ARG 0 compoundTag + ARG 0 nbt ARG 1 world METHOD method_18386 getDimensions ()Lnet/minecraft/class_4048; METHOD method_18387 getMaxTrackDistance ()I @@ -67,7 +67,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 0 world ARG 1 player ARG 2 entity - ARG 3 itemTag + ARG 3 itemNbt METHOD method_5882 getTranslationKey ()Ljava/lang/String; METHOD method_5883 create (Lnet/minecraft/class_1937;)Lnet/minecraft/class_1297; ARG 1 world @@ -81,7 +81,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 1 type METHOD method_5888 create (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_2561;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; ARG 1 world - ARG 2 itemTag + ARG 2 itemNbt ARG 3 name ARG 4 player ARG 5 pos @@ -95,7 +95,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 0 type METHOD method_5891 getSpawnGroup ()Lnet/minecraft/class_1311; METHOD method_5892 getEntityFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_1937;)Ljava/util/Optional; - ARG 0 tag + ARG 0 nbt ARG 1 world METHOD method_5893 isSaveable ()Z METHOD method_5894 spawnFromItemStack (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; @@ -115,7 +115,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 0 id METHOD method_5899 spawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_2561;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; ARG 1 world - ARG 2 itemTag + ARG 2 itemNbt ARG 3 name ARG 4 player ARG 5 pos diff --git a/mappings/net/minecraft/entity/SaddledComponent.mapping b/mappings/net/minecraft/entity/SaddledComponent.mapping index b7c46698f0..0171b8d1cc 100644 --- a/mappings/net/minecraft/entity/SaddledComponent.mapping +++ b/mappings/net/minecraft/entity/SaddledComponent.mapping @@ -12,9 +12,9 @@ CLASS net/minecraft/class_4980 net/minecraft/entity/SaddledComponent METHOD method_26308 boost (Ljava/util/Random;)Z ARG 1 random METHOD method_26309 writeNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_26310 setSaddled (Z)V ARG 1 saddled METHOD method_26311 isSaddled ()Z METHOD method_26312 readNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt diff --git a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping index 0a46e33907..fb8a70af95 100644 --- a/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping +++ b/mappings/net/minecraft/entity/attribute/AttributeContainer.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_5131 net/minecraft/entity/attribute/AttributeContainer METHOD method_26847 removeModifiers (Lcom/google/common/collect/Multimap;)V ARG 1 attributeModifiers METHOD method_26850 readNbt (Lnet/minecraft/class_2499;)V - ARG 1 tag + ARG 1 nbt METHOD method_26851 getAttributesToSend ()Ljava/util/Collection; METHOD method_26852 getValue (Lnet/minecraft/class_1320;)D ARG 1 attribute diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index 1b633e6716..13f964fd95 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns ARG 1 operation ARG 2 modifiers METHOD method_26833 readNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_26834 getModifiersByOperation (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Collection; ARG 1 operation METHOD method_26835 addTemporaryModifier (Lnet/minecraft/class_1322;)V diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index ba953d441e..f4d5592469 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -21,7 +21,7 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_26859 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1322; - ARG 0 tag + ARG 0 nbt METHOD method_26860 toNbt ()Lnet/minecraft/class_2487; METHOD method_6182 getOperation ()Lnet/minecraft/class_1322$class_1323; METHOD method_6185 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/boss/BossBarManager.mapping b/mappings/net/minecraft/entity/boss/BossBarManager.mapping index 1eb8bcb3b4..e0fd3391b9 100644 --- a/mappings/net/minecraft/entity/boss/BossBarManager.mapping +++ b/mappings/net/minecraft/entity/boss/BossBarManager.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_3004 net/minecraft/entity/boss/BossBarManager METHOD method_12971 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3002; ARG 1 id METHOD method_12972 readNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_12973 remove (Lnet/minecraft/class_3002;)V ARG 1 bossBar METHOD method_12974 toNbt ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping index 57ec313e93..96e261bd9b 100644 --- a/mappings/net/minecraft/entity/boss/CommandBossBar.mapping +++ b/mappings/net/minecraft/entity/boss/CommandBossBar.mapping @@ -26,5 +26,5 @@ CLASS net/minecraft/class_3002 net/minecraft/entity/boss/CommandBossBar ARG 1 uuid METHOD method_12965 toHoverableText ()Lnet/minecraft/class_2561; METHOD method_12966 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3002; - ARG 0 tag + ARG 0 nbt ARG 1 id diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping index 94cf08f181..cc7651b357 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_2881 net/minecraft/entity/boss/dragon/EnderDragonFight METHOD (Lnet/minecraft/class_3218;JLnet/minecraft/class_2487;)V ARG 1 world ARG 2 gatewaysSeed - ARG 4 tag + ARG 4 nbt METHOD method_12514 worldContainsEndPortal ()Z METHOD method_12515 convertFromLegacy ()V METHOD method_12516 generateEndGateway (Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping index a9145e07da..869d36794f 100644 --- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping @@ -86,7 +86,7 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity ARG 1 angle METHOD method_6927 setBodyRotation (Lnet/minecraft/class_2379;)V ARG 1 angle - METHOD method_6928 deserializePose (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_6928 readPoseNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_6929 shouldShowArms ()Z METHOD method_6930 getLeftArmRotation ()Lnet/minecraft/class_2379; diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 5dae370559..35e988ae81 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -51,20 +51,20 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 1 o METHOD method_24275 fromNbt (Lnet/minecraft/class_1291;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; ARG 0 type - ARG 1 tag + ARG 1 nbt METHOD method_24276 copyFrom (Lnet/minecraft/class_1293;)V ARG 1 that - METHOD method_24277 writeTypelessToNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_24277 writeTypelessNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_5578 getAmplifier ()I METHOD method_5579 getEffectType ()Lnet/minecraft/class_1291; METHOD method_5580 setPermanent (Z)V ARG 1 permanent METHOD method_5581 shouldShowParticles ()Z METHOD method_5582 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_5583 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; - ARG 0 tag + ARG 0 nbt METHOD method_5584 getDuration ()I METHOD method_5585 update (Lnet/minecraft/class_1309;Ljava/lang/Runnable;)Z ARG 1 entity diff --git a/mappings/net/minecraft/entity/mob/Angerable.mapping b/mappings/net/minecraft/entity/mob/Angerable.mapping index bcc2de4ab9..7b541927da 100644 --- a/mappings/net/minecraft/entity/mob/Angerable.mapping +++ b/mappings/net/minecraft/entity/mob/Angerable.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable METHOD method_29511 hasAngerTime ()Z METHOD method_29512 readAngerFromNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2487;)V ARG 1 world - ARG 2 tag + ARG 2 nbt METHOD method_29513 setAngryAt (Ljava/util/UUID;)V ARG 1 uuid METHOD method_29514 setAngerTime (I)V @@ -21,7 +21,7 @@ CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable METHOD method_29516 forgive (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_29517 writeAngerToNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_29921 universallyAnger ()V METHOD method_29922 stopAnger ()V METHOD method_29923 isUniversallyAngry (Lnet/minecraft/class_1937;)Z diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index db039ede68..920995d825 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity FIELD field_6189 navigation Lnet/minecraft/class_1408; FIELD field_6190 visibilityCache Lnet/minecraft/class_1413; FIELD field_6191 ambientSoundChance I - FIELD field_6192 leashTag Lnet/minecraft/class_2487; + FIELD field_6192 leashNbt Lnet/minecraft/class_2487; FIELD field_6193 MOB_FLAGS Lnet/minecraft/class_2940; FIELD field_6194 experiencePoints I FIELD field_6195 handItems Lnet/minecraft/class_2371; @@ -109,7 +109,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 1 sidewaysMovement METHOD method_5939 canPickupItem (Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_5940 deserializeLeashTag ()V + METHOD method_5940 readLeashNbt ()V METHOD method_5941 setPathfindingPenalty (Lnet/minecraft/class_7;F)V ARG 1 nodeType ARG 2 penalty @@ -119,7 +119,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 2 difficulty ARG 3 spawnReason ARG 4 entityData - ARG 5 entityTag + ARG 5 entityNbt METHOD method_5944 getPathfindingPenalty (Lnet/minecraft/class_7;)F ARG 1 nodeType METHOD method_5945 getLimitPerChunk ()I diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 4fbb80b8bb..c67401996d 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -75,8 +75,8 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity COMMENT COMMENT

Checks if at least one of its trade offers has been used. METHOD method_20824 canRestock ()Z - METHOD method_21650 setGossipDataFromNbt (Lnet/minecraft/class_2520;)V - ARG 1 tag + METHOD method_21650 readGossipDataNbt (Lnet/minecraft/class_2520;)V + ARG 1 nbt METHOD method_21651 getGossip ()Lnet/minecraft/class_4136; METHOD method_21723 restockAndUpdateDemandBonus ()V METHOD method_21724 updateDemandBonus ()V diff --git a/mappings/net/minecraft/entity/player/HungerManager.mapping b/mappings/net/minecraft/entity/player/HungerManager.mapping index 71edc91dd2..71ac0906ff 100644 --- a/mappings/net/minecraft/entity/player/HungerManager.mapping +++ b/mappings/net/minecraft/entity/player/HungerManager.mapping @@ -16,11 +16,11 @@ CLASS net/minecraft/class_1702 net/minecraft/entity/player/HungerManager METHOD method_7581 setSaturationLevelClient (F)V ARG 1 saturationLevel METHOD method_7582 writeNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_7583 addExhaustion (F)V ARG 1 exhaustion METHOD method_7584 readNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_7585 add (IF)V ARG 1 food ARG 2 saturationModifier diff --git a/mappings/net/minecraft/entity/player/PlayerAbilities.mapping b/mappings/net/minecraft/entity/player/PlayerAbilities.mapping index 9fcf393f62..2285a27dd7 100644 --- a/mappings/net/minecraft/entity/player/PlayerAbilities.mapping +++ b/mappings/net/minecraft/entity/player/PlayerAbilities.mapping @@ -8,11 +8,11 @@ CLASS net/minecraft/class_1656 net/minecraft/entity/player/PlayerAbilities FIELD field_7482 walkSpeed F METHOD method_7248 setFlySpeed (F)V ARG 1 flySpeed - METHOD method_7249 deserialize (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_7249 readNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_7250 setWalkSpeed (F)V ARG 1 walkSpeed - METHOD method_7251 serialize (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_7251 writeNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_7252 getFlySpeed ()F METHOD method_7253 getWalkSpeed ()F diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 08454ca9fb..830815b5f0 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -109,7 +109,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7266 resetStat (Lnet/minecraft/class_3445;)V ARG 1 stat METHOD method_7267 updateShoulderEntity (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 entityNbt METHOD method_7268 setReducedDebugInfo (Z)V ARG 1 reducedDebugInfo METHOD method_7269 trySleep (Lnet/minecraft/class_2338;)Lcom/mojang/datafixers/util/Either; @@ -120,7 +120,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 0 profile METHOD method_7272 getScore ()I METHOD method_7273 setShoulderEntityLeft (Lnet/minecraft/class_2487;)V - ARG 1 entityTag + ARG 1 entityNbt METHOD method_7274 getEnderChestInventory ()Lnet/minecraft/class_1730; METHOD method_7276 isSleepingLongEnough ()Z COMMENT Returns whether this player has been sleeping long enough to count towards @@ -160,7 +160,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 1 entityNbt METHOD method_7297 getSleepTimer ()I METHOD method_7298 addShoulderEntity (Lnet/minecraft/class_2487;)Z - ARG 1 tag + ARG 1 entityNbt METHOD method_7299 addTellClickEvent (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; ARG 1 component METHOD method_7302 hasReducedDebugInfo ()Z @@ -250,7 +250,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 3 stack METHOD method_7344 getHungerManager ()Lnet/minecraft/class_1702; METHOD method_7345 setShoulderEntityRight (Lnet/minecraft/class_2487;)V - ARG 1 entityTag + ARG 1 entityNbt METHOD method_7346 closeHandledScreen ()V METHOD method_7348 isPartVisible (Lnet/minecraft/class_1664;)Z ARG 1 modelPart diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index d979770177..9a6f7d2a7b 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -47,8 +47,8 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory METHOD method_7381 updateItems ()V METHOD method_7382 contains (Lnet/minecraft/class_3494;)Z ARG 1 tag - METHOD method_7384 serialize (Lnet/minecraft/class_2499;)Lnet/minecraft/class_2499; - ARG 1 tag + METHOD method_7384 writeNbt (Lnet/minecraft/class_2499;)Lnet/minecraft/class_2499; + ARG 1 nbtList METHOD method_7385 addStack (ILnet/minecraft/class_1799;)I ARG 1 slot ARG 2 stack @@ -66,7 +66,7 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory ARG 1 stack METHOD method_7395 getSlotWithStack (Lnet/minecraft/class_1799;)I ARG 1 stack - METHOD method_7397 deserialize (Lnet/minecraft/class_2499;)V - ARG 1 tag + METHOD method_7397 readNbt (Lnet/minecraft/class_2499;)V + ARG 1 nbtList METHOD method_7398 offerOrDrop (Lnet/minecraft/class_1799;)V ARG 1 stack diff --git a/mappings/net/minecraft/inventory/ContainerLock.mapping b/mappings/net/minecraft/inventory/ContainerLock.mapping index bea48672c4..7d12aa552d 100644 --- a/mappings/net/minecraft/inventory/ContainerLock.mapping +++ b/mappings/net/minecraft/inventory/ContainerLock.mapping @@ -13,10 +13,10 @@ CLASS net/minecraft/class_1273 net/minecraft/inventory/ContainerLock ARG 1 stack COMMENT the key item stack METHOD method_5473 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1273; - COMMENT Creates a new {@code ContainerLock} from the {@code Lock} key of the compound tag. + COMMENT Creates a new {@code ContainerLock} from the {@code Lock} key of the NBT compound. COMMENT

COMMENT If the {@code Lock} key is not present, returns an empty lock. - ARG 0 tag + ARG 0 nbt METHOD method_5474 writeNbt (Lnet/minecraft/class_2487;)V - COMMENT Inserts the key string of this lock into the {@code Lock} key of the compound tag. - ARG 1 tag + COMMENT Inserts the key string of this lock into the {@code Lock} key of the NBT compound. + ARG 1 nbt diff --git a/mappings/net/minecraft/inventory/Inventories.mapping b/mappings/net/minecraft/inventory/Inventories.mapping index b5675f1801..3f96df7d2c 100644 --- a/mappings/net/minecraft/inventory/Inventories.mapping +++ b/mappings/net/minecraft/inventory/Inventories.mapping @@ -16,17 +16,17 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories ARG 3 dryRun COMMENT whether to return the number of items which would have been removed without actually removing them METHOD method_5426 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;)Lnet/minecraft/class_2487; - ARG 0 tag + ARG 0 nbt ARG 1 stacks METHOD method_5427 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;Z)Lnet/minecraft/class_2487; - ARG 0 tag + ARG 0 nbt ARG 1 stacks ARG 2 setIfEmpty METHOD method_5428 removeStack (Ljava/util/List;I)Lnet/minecraft/class_1799; ARG 0 stacks ARG 1 slot METHOD method_5429 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;)V - ARG 0 tag + ARG 0 nbt ARG 1 stacks METHOD method_5430 splitStack (Ljava/util/List;II)Lnet/minecraft/class_1799; ARG 0 stacks diff --git a/mappings/net/minecraft/inventory/SimpleInventory.mapping b/mappings/net/minecraft/inventory/SimpleInventory.mapping index 080f9c07af..527ad856e6 100644 --- a/mappings/net/minecraft/inventory/SimpleInventory.mapping +++ b/mappings/net/minecraft/inventory/SimpleInventory.mapping @@ -33,6 +33,6 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/SimpleInventory ARG 1 listener METHOD method_5491 addStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 stack - METHOD method_7659 readTags (Lnet/minecraft/class_2499;)V - ARG 1 tags - METHOD method_7660 getTags ()Lnet/minecraft/class_2499; + METHOD method_7659 readNbtList (Lnet/minecraft/class_2499;)V + ARG 1 nbtList + METHOD method_7660 toNbtList ()Lnet/minecraft/class_2499; diff --git a/mappings/net/minecraft/item/CompassItem.mapping b/mappings/net/minecraft/item/CompassItem.mapping index 9d85ffcbcd..70f6888df5 100644 --- a/mappings/net/minecraft/item/CompassItem.mapping +++ b/mappings/net/minecraft/item/CompassItem.mapping @@ -4,10 +4,10 @@ CLASS net/minecraft/class_1759 net/minecraft/item/CompassItem FIELD field_30861 LODESTONE_DIMENSION_KEY Ljava/lang/String; FIELD field_30862 LODESTONE_TRACKED_KEY Ljava/lang/String; METHOD method_26364 getLodestoneDimension (Lnet/minecraft/class_2487;)Ljava/util/Optional; - ARG 0 tag + ARG 0 nbt METHOD method_26365 hasLodestone (Lnet/minecraft/class_1799;)Z ARG 0 stack - METHOD method_27315 writeToNbt (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)V + METHOD method_27315 writeNbt (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)V ARG 1 worldKey ARG 2 pos - ARG 3 tag + ARG 3 nbt diff --git a/mappings/net/minecraft/item/FireworkChargeItem.mapping b/mappings/net/minecraft/item/FireworkChargeItem.mapping index 8c1d6eb667..01a03fb1f9 100644 --- a/mappings/net/minecraft/item/FireworkChargeItem.mapping +++ b/mappings/net/minecraft/item/FireworkChargeItem.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1780 net/minecraft/item/FireworkChargeItem METHOD method_7809 appendFireworkTooltip (Lnet/minecraft/class_2487;Ljava/util/List;)V - ARG 0 tag + ARG 0 nbt ARG 1 tooltip METHOD method_7810 getColorText (I)Lnet/minecraft/class_2561; ARG 0 color diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index cae2889672..96cc50e2f4 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -122,8 +122,8 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item METHOD method_7858 getRecipeRemainder ()Lnet/minecraft/class_1792; COMMENT Gets the remainder item that should be left behind when this item is used as a crafting ingredient. METHOD method_7859 getGroup ()Lnet/minecraft/class_1761; - METHOD method_7860 postProcessTag (Lnet/minecraft/class_2487;)Z - ARG 1 tag + METHOD method_7860 postProcessNbt (Lnet/minecraft/class_2487;)Z + ARG 1 nbt METHOD method_7861 finishUsing (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1799; ARG 1 stack ARG 2 world diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 6d68d086ce..a5279ad074 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -102,7 +102,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 3 hand METHOD method_7914 getMaxCount ()I METHOD method_7915 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1799; - ARG 0 tag + ARG 0 nbt METHOD method_7916 addAttributeModifier (Lnet/minecraft/class_1320;Lnet/minecraft/class_1322;Lnet/minecraft/class_1304;)V ARG 1 attribute ARG 2 modifier @@ -184,7 +184,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 3 pos ARG 4 miner METHOD method_7953 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_7954 toHoverableText ()Lnet/minecraft/class_2561; METHOD method_7955 (Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; ARG 0 text diff --git a/mappings/net/minecraft/item/SpawnEggItem.mapping b/mappings/net/minecraft/item/SpawnEggItem.mapping index c9dc9b362b..fcf75b27c2 100644 --- a/mappings/net/minecraft/item/SpawnEggItem.mapping +++ b/mappings/net/minecraft/item/SpawnEggItem.mapping @@ -16,12 +16,12 @@ CLASS net/minecraft/class_1826 net/minecraft/item/SpawnEggItem ARG 5 pos ARG 6 stack METHOD method_8015 getEntityType (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1299; - ARG 1 tag + ARG 1 nbt METHOD method_8016 getColor (I)I ARG 1 num METHOD method_8017 getAll ()Ljava/lang/Iterable; METHOD method_8018 isOfSameEntityType (Lnet/minecraft/class_2487;Lnet/minecraft/class_1299;)Z - ARG 1 tag + ARG 1 nbt ARG 2 type METHOD method_8019 forEntity (Lnet/minecraft/class_1299;)Lnet/minecraft/class_1826; ARG 0 type diff --git a/mappings/net/minecraft/item/WritableBookItem.mapping b/mappings/net/minecraft/item/WritableBookItem.mapping index 09a2e8c3fc..0d09d0a111 100644 --- a/mappings/net/minecraft/item/WritableBookItem.mapping +++ b/mappings/net/minecraft/item/WritableBookItem.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_1840 net/minecraft/item/WritableBookItem METHOD method_8047 isValid (Lnet/minecraft/class_2487;)Z - ARG 0 tag + ARG 0 nbt diff --git a/mappings/net/minecraft/item/WrittenBookItem.mapping b/mappings/net/minecraft/item/WrittenBookItem.mapping index 6ade8c0d51..99b8e960a7 100644 --- a/mappings/net/minecraft/item/WrittenBookItem.mapping +++ b/mappings/net/minecraft/item/WrittenBookItem.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_1843 net/minecraft/item/WrittenBookItem METHOD method_8052 getGeneration (Lnet/minecraft/class_1799;)I ARG 0 stack METHOD method_8053 isValid (Lnet/minecraft/class_2487;)Z - ARG 0 tag + ARG 0 nbt METHOD method_8054 resolve (Lnet/minecraft/class_1799;Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;)Z ARG 0 book ARG 1 commandSource diff --git a/mappings/net/minecraft/item/map/MapBannerMarker.mapping b/mappings/net/minecraft/item/map/MapBannerMarker.mapping index 473af015bd..04ec2a794c 100644 --- a/mappings/net/minecraft/item/map/MapBannerMarker.mapping +++ b/mappings/net/minecraft/item/map/MapBannerMarker.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker ARG 1 o METHOD method_35502 getColor ()Lnet/minecraft/class_1767; METHOD method_67 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_17; - ARG 0 tag + ARG 0 nbt METHOD method_68 getName ()Lnet/minecraft/class_2561; METHOD method_70 getPos ()Lnet/minecraft/class_2338; METHOD method_71 getKey ()Ljava/lang/String; diff --git a/mappings/net/minecraft/item/map/MapFrameMarker.mapping b/mappings/net/minecraft/item/map/MapFrameMarker.mapping index 8ebc070d8a..cbfd18eae9 100644 --- a/mappings/net/minecraft/item/map/MapFrameMarker.mapping +++ b/mappings/net/minecraft/item/map/MapFrameMarker.mapping @@ -14,4 +14,4 @@ CLASS net/minecraft/class_19 net/minecraft/item/map/MapFrameMarker METHOD method_85 getEntityId ()I METHOD method_86 getPos ()Lnet/minecraft/class_2338; METHOD method_87 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_19; - ARG 0 tag + ARG 0 nbt diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index c4d37d89ec..165178ed93 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -58,7 +58,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 1 world ARG 2 x ARG 3 z - METHOD method_110 addDecorationsTag (Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;Ljava/lang/String;Lnet/minecraft/class_20$class_21;)V + METHOD method_110 addDecorationsNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;Ljava/lang/String;Lnet/minecraft/class_20$class_21;)V ARG 0 stack ARG 1 pos ARG 2 id @@ -104,7 +104,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 2 z ARG 3 color METHOD method_32371 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_22; - ARG 0 tag + ARG 0 nbt METHOD method_32372 hasMonumentIcon ()Z METHOD method_32373 getIcons ()Ljava/lang/Iterable; METHOD method_32374 markIconsDirty ()V diff --git a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping index 655c61409d..ad324e1c02 100644 --- a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_159 net/minecraft/loot/function/SetNbtLootFunction - FIELD field_1138 tag Lnet/minecraft/class_2487; + FIELD field_1138 nbt Lnet/minecraft/class_2487; METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2487;)V ARG 1 conditions - ARG 2 tag + ARG 2 nbt METHOD method_675 (Lnet/minecraft/class_2487;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_677 builder (Lnet/minecraft/class_2487;)Lnet/minecraft/class_120$class_121; - ARG 0 tag + ARG 0 nbt CLASS class_160 Serializer diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 9ef049b3de..20e4c896e1 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -51,7 +51,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@link UUID}{@link #readUuid()}{@link #writeUuid(UUID)} COMMENT COMMENT - COMMENT {@link NbtCompound}{@link #readCompound()}{@link #writeCompound(NbtCompound)} + COMMENT {@link NbtCompound}{@link #readNbt()}{@link #writeNbt(NbtCompound)} COMMENT COMMENT COMMENT {@link ItemStack}{@link #readItemStack()}{@link #writeItemStack(ItemStack)} @@ -148,17 +148,17 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readItemStack() ARG 1 stack COMMENT the stack to write - METHOD method_10794 writeCompound (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2540; + METHOD method_10794 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2540; COMMENT Writes an NBT compound to this buf. The binary representation of NBT is COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If {@code compound} is {@code - COMMENT null}, it is treated as an END tag. + COMMENT null}, it is treated as an NBT null. COMMENT COMMENT @return this buf, for chaining COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be COMMENT written - COMMENT @see #readCompound() - COMMENT @see #readUnlimitedCompound() - COMMENT @see #readCompound(NbtTagSizeTracker) + COMMENT @see #readNbt() + COMMENT @see #readUnlimitedNbt() + COMMENT @see #readNbt(NbtTagSizeTracker) ARG 1 compound COMMENT the compound to write METHOD method_10795 readByteArray ()[B @@ -185,18 +185,18 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readUuid() ARG 1 uuid COMMENT the UUID to write - METHOD method_10798 readCompound ()Lnet/minecraft/class_2487; + METHOD method_10798 readNbt ()Lnet/minecraft/class_2487; COMMENT Reads an NBT compound from this buf. The binary representation of NBT is - COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If an END tag is encountered, + COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If an Nbt null is encountered, COMMENT this method returns {@code null}. The compound can have a maximum size of COMMENT {@code 2097152} bytes. COMMENT COMMENT @return the read compound, may be {@code null} COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be read COMMENT @throws RuntimeException if the compound exceeds the allowed maximum size - COMMENT @see #writeCompound(NbtCompound) - COMMENT @see #readUnlimitedCompound() - COMMENT @see #readCompound(NbtTagSizeTracker) + COMMENT @see #writeNbt(NbtCompound) + COMMENT @see #readUnlimitedNbt() + COMMENT @see #readNbt(NbtTagSizeTracker) METHOD method_10799 readIntArray (I)[I COMMENT Reads an array of primitive ints from this buf. The array first has a COMMENT var int indicating its length, followed by the var int entries. The array @@ -450,7 +450,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @param the decoded object's type COMMENT @return the read object COMMENT @throws io.netty.handler.codec.EncoderException if the {@code codec} fails - COMMENT to decode the compound tag + COMMENT to decode the compound NBT COMMENT @see #encode(Codec, Object) ARG 1 codec COMMENT the codec to decode the object @@ -459,28 +459,28 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @param the encoded object's type COMMENT @throws io.netty.handler.codec.EncoderException if the {@code codec} fails - COMMENT to encode the compound tag + COMMENT to encode the compound NBT COMMENT @see #decode(Codec) ARG 1 codec COMMENT the codec to encode the object ARG 2 object COMMENT the object to write to this buf - METHOD method_30616 readCompound (Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; + METHOD method_30616 readNbt (Lnet/minecraft/class_2505;)Lnet/minecraft/class_2487; COMMENT Reads an NBT compound from this buf. The binary representation of NBT is - COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If an END tag is encountered, + COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If an NBT null is encountered, COMMENT this method returns {@code null}. The compound can have a maximum size COMMENT controlled by the {@code sizeTracker}. COMMENT COMMENT @return the read compound, may be {@code null} COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be read COMMENT @throws RuntimeException if the compound exceeds the allowed maximum size - COMMENT @see #writeCompound(NbtCompound) - COMMENT @see #readCompound() - COMMENT @see #readUnlimitedCompound() + COMMENT @see #writeNbt(NbtCompound) + COMMENT @see #readNbt() + COMMENT @see #readUnlimitedNbt() ARG 1 sizeTracker - METHOD method_30617 readUnlimitedCompound ()Lnet/minecraft/class_2487; + METHOD method_30617 readUnlimitedNbt ()Lnet/minecraft/class_2487; COMMENT Reads an NBT compound from this buf. The binary representation of NBT is - COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If an END tag is encountered, + COMMENT handled by {@link net.minecraft.nbt.NbtIo}. If an NBT null is encountered, COMMENT this method returns {@code null}. The compound does not have a size limit. COMMENT COMMENT @apiNote Since this version does not have a size limit, it may be @@ -488,9 +488,9 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT @return the read compound, may be {@code null} COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be read - COMMENT @see #writeCompound(NbtCompound) - COMMENT @see #readCompound() - COMMENT @see #readCompound(NbtTagSizeTracker) + COMMENT @see #writeNbt(NbtCompound) + COMMENT @see #readNbt() + COMMENT @see #readNbt(NbtTagSizeTracker) METHOD method_33134 readLongArray ()[J COMMENT Reads an array of primitive longs from this buf. The array first has a COMMENT var int indicating its length, followed by the regular long (not var diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping index 6808a365ac..0f3df7a02f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_2622 net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket FIELD field_12038 blockEntityType I - FIELD field_12039 tag Lnet/minecraft/class_2487; + FIELD field_12039 nbt Lnet/minecraft/class_2487; FIELD field_12040 pos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_2338;ILnet/minecraft/class_2487;)V ARG 1 pos ARG 2 blockEntityType - ARG 3 tag + ARG 3 nbt METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_11290 getCompoundTag ()Lnet/minecraft/class_2487; + METHOD method_11290 getNbt ()Lnet/minecraft/class_2487; METHOD method_11291 getBlockEntityType ()I METHOD method_11293 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/network/packet/s2c/play/TagQueryResponseS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping similarity index 63% rename from mappings/net/minecraft/network/packet/s2c/play/TagQueryResponseS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping index 85444dbf5c..4fdbe2335a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TagQueryResponseS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket.mapping @@ -1,10 +1,10 @@ -CLASS net/minecraft/class_2774 net/minecraft/network/packet/s2c/play/TagQueryResponseS2CPacket - FIELD field_12690 tag Lnet/minecraft/class_2487; +CLASS net/minecraft/class_2774 net/minecraft/network/packet/s2c/play/NbtQueryResponseS2CPacket + FIELD field_12690 nbt Lnet/minecraft/class_2487; FIELD field_12691 transactionId I METHOD (ILnet/minecraft/class_2487;)V ARG 1 transactionId - ARG 2 tag + ARG 2 nbt METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11910 getTransactionId ()I - METHOD method_11911 getTag ()Lnet/minecraft/class_2487; + METHOD method_11911 getNbt ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index 797a6dc799..d18d2e1e96 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -12,13 +12,13 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil METHOD method_8057 getPotion (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1842; ARG 0 compound METHOD method_8058 getCustomPotionEffects (Lnet/minecraft/class_2487;Ljava/util/List;)V - ARG 0 tag + ARG 0 nbt ARG 1 list METHOD method_8059 getPotionEffects (Lnet/minecraft/class_1842;Ljava/util/Collection;)Ljava/util/List; ARG 0 potion ARG 1 custom METHOD method_8060 getCustomPotionEffects (Lnet/minecraft/class_2487;)Ljava/util/List; - ARG 0 tag + ARG 0 nbt METHOD method_8061 setPotion (Lnet/minecraft/class_1799;Lnet/minecraft/class_1842;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 potion @@ -32,7 +32,7 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil ARG 0 stack ARG 1 list METHOD method_8066 getPotionEffects (Lnet/minecraft/class_2487;)Ljava/util/List; - ARG 0 tag + ARG 0 nbt METHOD method_8067 getPotionEffects (Lnet/minecraft/class_1799;)Ljava/util/List; ARG 0 stack METHOD method_8068 getCustomPotionEffects (Lnet/minecraft/class_1799;)Ljava/util/List; diff --git a/mappings/net/minecraft/predicate/NbtPredicate.mapping b/mappings/net/minecraft/predicate/NbtPredicate.mapping index 4e4b7909ce..5ead80183f 100644 --- a/mappings/net/minecraft/predicate/NbtPredicate.mapping +++ b/mappings/net/minecraft/predicate/NbtPredicate.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_2105 net/minecraft/predicate/NbtPredicate - FIELD field_9715 tag Lnet/minecraft/class_2487; + FIELD field_9715 nbt Lnet/minecraft/class_2487; FIELD field_9716 ANY Lnet/minecraft/class_2105; METHOD (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_9072 test (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_9073 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2105; @@ -13,4 +13,4 @@ CLASS net/minecraft/class_2105 net/minecraft/predicate/NbtPredicate METHOD method_9076 entityToNbt (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2487; ARG 0 entity METHOD method_9077 test (Lnet/minecraft/class_2520;)Z - ARG 1 tag + ARG 1 element diff --git a/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping b/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping index 2da154142d..510e11f871 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_5411 net/minecraft/recipe/book/RecipeBookOptions ARG 1 category ARG 2 open METHOD method_30183 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_5411; - ARG 0 tag + ARG 0 nbt METHOD method_30184 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5421;Lcom/mojang/datafixers/util/Pair;)V ARG 2 category METHOD method_30185 (Lnet/minecraft/class_2487;Ljava/util/Map;Lnet/minecraft/class_5421;Lcom/mojang/datafixers/util/Pair;)V @@ -25,7 +25,7 @@ CLASS net/minecraft/class_5411 net/minecraft/recipe/book/RecipeBookOptions ARG 1 category ARG 2 filtering METHOD method_30189 writeNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_30190 toPacket (Lnet/minecraft/class_2540;)V ARG 1 buf CLASS class_5412 CategoryOption diff --git a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping index b4df145ad9..7d99a4b26d 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping @@ -2,18 +2,18 @@ CLASS net/minecraft/class_273 net/minecraft/scoreboard/ScoreboardState FIELD field_27936 scoreboard Lnet/minecraft/class_269; METHOD (Lnet/minecraft/class_269;)V ARG 1 scoreboard - METHOD method_1215 readTeamPlayersFromNbt (Lnet/minecraft/class_268;Lnet/minecraft/class_2499;)V + METHOD method_1215 readTeamPlayersNbt (Lnet/minecraft/class_268;Lnet/minecraft/class_2499;)V ARG 1 team - ARG 2 tag + ARG 2 nbt METHOD method_1216 objectivesToNbt ()Lnet/minecraft/class_2499; METHOD method_1217 teamsToNbt ()Lnet/minecraft/class_2499; - METHOD method_1219 readTeamsFromNbt (Lnet/minecraft/class_2499;)V - ARG 1 tag - METHOD method_1220 readObjectivesFromNbt (Lnet/minecraft/class_2499;)V - ARG 1 tag - METHOD method_1221 readDisplaySlotsFromNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag - METHOD method_1222 writeDisplaySlotsToNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + METHOD method_1219 readTeamsNbt (Lnet/minecraft/class_2499;)V + ARG 1 nbt + METHOD method_1220 readObjectivesNbt (Lnet/minecraft/class_2499;)V + ARG 1 nbt + METHOD method_1221 readDisplaySlotsNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt + METHOD method_1222 writeDisplaySlotsNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_32481 readNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_273; - ARG 1 tag + ARG 1 nbt diff --git a/mappings/net/minecraft/server/command/DataCommand.mapping b/mappings/net/minecraft/server/command/DataCommand.mapping index fc526f24cc..628875b7c0 100644 --- a/mappings/net/minecraft/server/command/DataCommand.mapping +++ b/mappings/net/minecraft/server/command/DataCommand.mapping @@ -19,27 +19,27 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 1 context METHOD method_13888 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I ARG 0 context - ARG 1 sourceTag + ARG 1 sourceNbt ARG 2 path - ARG 3 tags + ARG 3 elements METHOD method_13889 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 1 builder METHOD method_13890 (Lnet/minecraft/class_2168;)Z ARG 0 source METHOD method_13891 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I ARG 0 context - ARG 1 sourceTag + ARG 1 sourceNbt ARG 2 path - ARG 3 tags + ARG 3 elements METHOD method_13892 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 path METHOD method_13893 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 3 builder METHOD method_13894 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I ARG 0 context - ARG 1 sourceTag + ARG 1 sourceNbt ARG 2 path - ARG 3 tags + ARG 3 elements METHOD method_13895 (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_3164$class_3166;)V ARG 0 builder ARG 1 modifier @@ -47,9 +47,9 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 1 builder METHOD method_13897 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I ARG 0 context - ARG 1 sourceTag + ARG 1 sourceNbt ARG 2 path - ARG 3 tags + ARG 3 elements METHOD method_13898 addModifyArgument (Ljava/util/function/BiConsumer;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 subArgumentAdder METHOD method_13899 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;)Lcom/mojang/brigadier/builder/ArgumentBuilder; @@ -59,7 +59,7 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand METHOD method_13901 executeMerge (Lnet/minecraft/class_2168;Lnet/minecraft/class_3162;Lnet/minecraft/class_2487;)I ARG 0 source ARG 1 object - ARG 2 tag + ARG 2 nbt METHOD method_13902 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 path METHOD method_13903 executeGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_3162;Lnet/minecraft/class_2203$class_2209;D)I @@ -82,9 +82,9 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 1 context METHOD method_13910 executeInsert (ILnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I ARG 0 integer - ARG 1 sourceTag + ARG 1 sourceNbt ARG 2 path - ARG 3 tags + ARG 3 elements METHOD method_13911 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 2 modifier METHOD method_13912 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I @@ -101,16 +101,16 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 3 context METHOD method_13918 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I ARG 0 context - ARG 1 sourceTag + ARG 1 sourceNbt ARG 2 path - ARG 3 tags + ARG 3 elements METHOD method_13919 (Ljava/util/function/Function;)Lnet/minecraft/class_3164$class_3167; ARG 0 factory METHOD method_13920 executeModify (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Ljava/util/List;)I ARG 0 context ARG 1 objectType ARG 2 modifier - ARG 3 tags + ARG 3 elements METHOD method_13921 getNbt (Lnet/minecraft/class_2203$class_2209;Lnet/minecraft/class_3162;)Lnet/minecraft/class_2520; ARG 0 path ARG 1 object @@ -123,9 +123,9 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand CLASS class_3165 ModifyOperation METHOD modify (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I ARG 1 context - ARG 2 sourceTag + ARG 2 sourceNbt ARG 3 path - ARG 4 tags + ARG 4 elements CLASS class_3166 ModifyArgumentCreator METHOD create (Lnet/minecraft/class_3164$class_3165;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 1 modifier diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 87c4d7aefe..7ccf5252a0 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -49,7 +49,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 0 source ARG 1 object ARG 2 path - ARG 3 tagSetter + ARG 3 nbtSetter ARG 4 requestResult METHOD method_13266 (Lcom/mojang/brigadier/context/CommandContext;)Z ARG 0 context diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 9fb7e61277..07146fd85a 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -172,7 +172,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_30631 getSpawnAngle ()F METHOD method_31273 getTextStream ()Lnet/minecraft/class_5513; METHOD method_32745 gameModeFromNbt (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_1934; - ARG 0 tag + ARG 0 nbt ARG 1 key METHOD method_32746 getServerGameMode (Lnet/minecraft/class_1934;)Lnet/minecraft/class_1934; COMMENT Returns the server game mode the player should be set to, namely the forced game mode. @@ -185,9 +185,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_32747 setWorld (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_32748 setGameMode (Lnet/minecraft/class_2487;)V - ARG 1 tag - METHOD method_32749 writeGameModeToNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt + METHOD method_32749 writeGameModeNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_33793 shouldFilterText ()Z METHOD method_33794 acceptsMessage (Lnet/minecraft/class_2556;)Z ARG 1 type diff --git a/mappings/net/minecraft/server/network/ServerRecipeBook.mapping b/mappings/net/minecraft/server/network/ServerRecipeBook.mapping index 3dea993903..446d148036 100644 --- a/mappings/net/minecraft/server/network/ServerRecipeBook.mapping +++ b/mappings/net/minecraft/server/network/ServerRecipeBook.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_3441 net/minecraft/server/network/ServerRecipeBook ARG 1 recipes ARG 2 player METHOD method_14901 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_1863;)V - ARG 1 tag + ARG 1 nbt ARG 2 recipeManager METHOD method_14902 toNbt ()Lnet/minecraft/class_2487; METHOD method_14903 unlockRecipes (Ljava/util/Collection;Lnet/minecraft/class_3222;)I diff --git a/mappings/net/minecraft/structure/BuriedTreasureGenerator.mapping b/mappings/net/minecraft/structure/BuriedTreasureGenerator.mapping index bdb83f4345..281243c0d0 100644 --- a/mappings/net/minecraft/structure/BuriedTreasureGenerator.mapping +++ b/mappings/net/minecraft/structure/BuriedTreasureGenerator.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3789 net/minecraft/structure/BuriedTreasureGenerator METHOD (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 2 tag + ARG 1 world + ARG 2 nbt METHOD method_14655 isLiquid (Lnet/minecraft/class_2680;)Z ARG 1 state diff --git a/mappings/net/minecraft/structure/DesertTempleGenerator.mapping b/mappings/net/minecraft/structure/DesertTempleGenerator.mapping index 161d52efde..0a05a5e098 100644 --- a/mappings/net/minecraft/structure/DesertTempleGenerator.mapping +++ b/mappings/net/minecraft/structure/DesertTempleGenerator.mapping @@ -5,4 +5,5 @@ CLASS net/minecraft/class_3346 net/minecraft/structure/DesertTempleGenerator ARG 2 x ARG 3 z METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 2 tag + ARG 1 world + ARG 2 nbt diff --git a/mappings/net/minecraft/structure/IglooGenerator.mapping b/mappings/net/minecraft/structure/IglooGenerator.mapping index 0066e4cac8..3ed8fe644e 100644 --- a/mappings/net/minecraft/structure/IglooGenerator.mapping +++ b/mappings/net/minecraft/structure/IglooGenerator.mapping @@ -9,7 +9,8 @@ CLASS net/minecraft/class_3351 net/minecraft/structure/IglooGenerator ARG 4 random CLASS class_3352 Piece METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 2 tag + ARG 1 world + ARG 2 nbt METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;I)V ARG 1 manager ARG 2 identifier diff --git a/mappings/net/minecraft/structure/JungleTempleGenerator.mapping b/mappings/net/minecraft/structure/JungleTempleGenerator.mapping index 55b3dfea01..f5741a7362 100644 --- a/mappings/net/minecraft/structure/JungleTempleGenerator.mapping +++ b/mappings/net/minecraft/structure/JungleTempleGenerator.mapping @@ -9,5 +9,6 @@ CLASS net/minecraft/class_3348 net/minecraft/structure/JungleTempleGenerator ARG 2 x ARG 3 z METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 2 tag + ARG 1 world + ARG 2 nbt CLASS class_3349 CobblestoneRandomizer diff --git a/mappings/net/minecraft/structure/NetherFossilGenerator.mapping b/mappings/net/minecraft/structure/NetherFossilGenerator.mapping index f4c1653c71..788c191092 100644 --- a/mappings/net/minecraft/structure/NetherFossilGenerator.mapping +++ b/mappings/net/minecraft/structure/NetherFossilGenerator.mapping @@ -6,7 +6,8 @@ CLASS net/minecraft/class_4787 net/minecraft/structure/NetherFossilGenerator ARG 3 pos CLASS class_4788 Piece METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 2 tag + ARG 1 world + ARG 2 nbt METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;)V ARG 1 manager ARG 2 template diff --git a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping index d1d6e0dd49..38d9eeb0ac 100644 --- a/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping +++ b/mappings/net/minecraft/structure/OceanMonumentGenerator.mapping @@ -116,7 +116,8 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator ARG 1 orientation ARG 2 box METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 2 tag + ARG 1 world + ARG 2 nbt CLASS class_3388 PieceSetting FIELD field_14482 neighborPresences [Z FIELD field_14485 used Z diff --git a/mappings/net/minecraft/structure/OceanRuinGenerator.mapping b/mappings/net/minecraft/structure/OceanRuinGenerator.mapping index 521ddf3b56..6377fbaf71 100644 --- a/mappings/net/minecraft/structure/OceanRuinGenerator.mapping +++ b/mappings/net/minecraft/structure/OceanRuinGenerator.mapping @@ -38,7 +38,8 @@ CLASS net/minecraft/class_3409 net/minecraft/structure/OceanRuinGenerator FIELD field_14525 large Z FIELD field_14527 biomeType Lnet/minecraft/class_3411$class_3413; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 2 tag + ARG 1 world + ARG 2 nbt METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;FLnet/minecraft/class_3411$class_3413;Z)V ARG 1 structureManager ARG 2 template diff --git a/mappings/net/minecraft/structure/PoolStructurePiece.mapping b/mappings/net/minecraft/structure/PoolStructurePiece.mapping index 5fd050a0f9..2bfe24bd92 100644 --- a/mappings/net/minecraft/structure/PoolStructurePiece.mapping +++ b/mappings/net/minecraft/structure/PoolStructurePiece.mapping @@ -7,7 +7,8 @@ CLASS net/minecraft/class_3790 net/minecraft/structure/PoolStructurePiece FIELD field_17660 structureManager Lnet/minecraft/class_3485; FIELD field_24991 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 2 tag + ARG 1 world + ARG 2 nbt METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_3784;Lnet/minecraft/class_2338;ILnet/minecraft/class_2470;Lnet/minecraft/class_3341;)V ARG 1 structureManager ARG 2 poolElement diff --git a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping index 0ec2296d60..960b87d2d0 100644 --- a/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping +++ b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping @@ -2,7 +2,8 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiec FIELD field_24021 verticalPlacement Lnet/minecraft/class_5189$class_5191; FIELD field_24022 properties Lnet/minecraft/class_5189$class_5190; METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 2 tag + ARG 1 world + ARG 2 nbt METHOD method_27237 getBaseHeight (Lnet/minecraft/class_1936;IILnet/minecraft/class_5189$class_5191;)I ARG 0 world ARG 1 x @@ -43,6 +44,10 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiec ARG 1 random ARG 2 world ARG 3 pos + METHOD method_35449 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3492; + ARG 0 world + ARG 1 nbt + ARG 2 id CLASS class_5190 Properties FIELD field_24023 cold Z FIELD field_24024 mossiness F diff --git a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping index 36221cd850..979cbdb863 100644 --- a/mappings/net/minecraft/structure/ShipwreckGenerator.mapping +++ b/mappings/net/minecraft/structure/ShipwreckGenerator.mapping @@ -11,7 +11,8 @@ CLASS net/minecraft/class_3415 net/minecraft/structure/ShipwreckGenerator CLASS class_3416 Piece FIELD field_14538 grounded Z METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V - ARG 2 tag + ARG 1 world + ARG 2 nbt METHOD (Lnet/minecraft/class_3485;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Z)V ARG 1 manager ARG 2 identifier diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index 5937b3790b..a30dc3625f 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -32,7 +32,8 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure ARG 1 mirror ARG 2 rotation ARG 3 pivot - METHOD method_15169 createIntListTag ([I)Lnet/minecraft/class_2499; + METHOD method_15169 createNbtIntList ([I)Lnet/minecraft/class_2499; + ARG 1 ints METHOD method_15171 transform (Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 0 placementData ARG 1 pos @@ -47,15 +48,15 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure ARG 4 includeEntities ARG 5 ignoredBlock METHOD method_15175 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_15176 transformAround (Lnet/minecraft/class_243;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243; ARG 0 point ARG 1 mirror ARG 2 rotation ARG 3 pivot METHOD method_15177 loadPalettedBlockInfo (Lnet/minecraft/class_2499;Lnet/minecraft/class_2499;)V - ARG 1 paletteTag - ARG 2 blocksTag + ARG 1 paletteNbt + ARG 2 blocksNbt METHOD method_15179 spawnEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3341;Z)V ARG 1 world ARG 2 pos @@ -70,8 +71,9 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure ARG 4 pos2 METHOD method_15181 getAuthor ()Ljava/lang/String; METHOD method_15183 readNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag - METHOD method_15184 createDoubleListTag ([D)Lnet/minecraft/class_2499; + ARG 1 nbt + METHOD method_15184 createNbtDoubleList ([D)Lnet/minecraft/class_2499; + ARG 1 doubles METHOD method_16187 calculateBoundingBox (Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3341; ARG 1 placementData ARG 2 pos @@ -108,21 +110,21 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure METHOD method_15187 getId (Lnet/minecraft/class_2680;)I ARG 1 state CLASS class_3501 StructureBlockInfo - FIELD field_15595 tag Lnet/minecraft/class_2487; + FIELD field_15595 nbt Lnet/minecraft/class_2487; FIELD field_15596 state Lnet/minecraft/class_2680; FIELD field_15597 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 tag + ARG 3 nbt CLASS class_3502 StructureEntityInfo - FIELD field_15598 tag Lnet/minecraft/class_2487; + FIELD field_15598 nbt Lnet/minecraft/class_2487; FIELD field_15599 pos Lnet/minecraft/class_243; FIELD field_15600 blockPos Lnet/minecraft/class_2338; METHOD (Lnet/minecraft/class_243;Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)V ARG 1 pos ARG 2 blockPos - ARG 3 tag + ARG 3 nbt CLASS class_5162 PalettedBlockInfoList FIELD field_23913 infos Ljava/util/List; FIELD field_23914 blockToInfos Ljava/util/Map; diff --git a/mappings/net/minecraft/structure/StructureManager.mapping b/mappings/net/minecraft/structure/StructureManager.mapping index 8e8cdbd5a2..73d5daddba 100644 --- a/mappings/net/minecraft/structure/StructureManager.mapping +++ b/mappings/net/minecraft/structure/StructureManager.mapping @@ -29,6 +29,6 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureManager METHOD method_15094 getStructure (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3499; ARG 1 id METHOD method_21891 createStructure (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3499; - ARG 1 tag + ARG 1 nbt METHOD method_29300 setResourceManager (Lnet/minecraft/class_3300;)V ARG 1 resourceManager diff --git a/mappings/net/minecraft/structure/StructurePiece.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping index 520cfecf3e..12041adbc0 100644 --- a/mappings/net/minecraft/structure/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece ARG 2 length METHOD (Lnet/minecraft/class_3773;Lnet/minecraft/class_2487;)V ARG 1 type - ARG 2 tag + ARG 2 nbt METHOD method_14915 addChest (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;IIILnet/minecraft/class_2960;)Z ARG 1 world ARG 2 boundingBox diff --git a/mappings/net/minecraft/structure/StructurePieceType.mapping b/mappings/net/minecraft/structure/StructurePieceType.mapping index 5363b416fc..9792873201 100644 --- a/mappings/net/minecraft/structure/StructurePieceType.mapping +++ b/mappings/net/minecraft/structure/StructurePieceType.mapping @@ -55,7 +55,8 @@ CLASS net/minecraft/class_3773 net/minecraft/structure/StructurePieceType FIELD field_22195 NETHER_FOSSIL Lnet/minecraft/class_3773; FIELD field_24010 RUINED_PORTAL Lnet/minecraft/class_3773; METHOD load (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3443; - ARG 2 tag + ARG 1 world + ARG 2 nbt METHOD method_16813 register (Lnet/minecraft/class_3773;Ljava/lang/String;)Lnet/minecraft/class_3773; ARG 0 pieceType ARG 1 id diff --git a/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping b/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping index 70fa93dc38..8d8dc72330 100644 --- a/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/FeaturePoolElement.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3776 net/minecraft/structure/pool/FeaturePoolElement FIELD field_16661 feature Ljava/util/function/Supplier; - FIELD field_16662 tag Lnet/minecraft/class_2487; + FIELD field_16662 nbt Lnet/minecraft/class_2487; FIELD field_24948 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/function/Supplier;Lnet/minecraft/class_3785$class_3786;)V ARG 1 feature diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping index c42ce56f20..9b474fc61d 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3821 net/minecraft/structure/processor/StructureProces FIELD field_16872 inputPredicate Lnet/minecraft/class_3825; FIELD field_16873 locationPredicate Lnet/minecraft/class_3825; FIELD field_16874 outputState Lnet/minecraft/class_2680; - FIELD field_16875 tag Lnet/minecraft/class_2487; + FIELD field_16875 outputNbt Lnet/minecraft/class_2487; FIELD field_23347 positionPredicate Lnet/minecraft/class_4995; FIELD field_25008 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_3825;Lnet/minecraft/class_3825;Lnet/minecraft/class_2680;)V @@ -19,8 +19,8 @@ CLASS net/minecraft/class_3821 net/minecraft/structure/processor/StructureProces ARG 2 locationPredicate ARG 3 positionPredicate ARG 4 outputState - ARG 5 tag - METHOD method_16760 getTag ()Lnet/minecraft/class_2487; + ARG 5 nbt + METHOD method_16760 getOutputNbt ()Lnet/minecraft/class_2487; METHOD method_16762 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 1 input ARG 2 location diff --git a/mappings/net/minecraft/text/HoverEvent.mapping b/mappings/net/minecraft/text/HoverEvent.mapping index 03a7f799fc..c8a096333d 100644 --- a/mappings/net/minecraft/text/HoverEvent.mapping +++ b/mappings/net/minecraft/text/HoverEvent.mapping @@ -56,12 +56,12 @@ CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent CLASS class_5249 ItemStackContent FIELD field_24355 item Lnet/minecraft/class_1792; FIELD field_24356 count I - FIELD field_24357 tag Lnet/minecraft/class_2487; + FIELD field_24357 nbt Lnet/minecraft/class_2487; FIELD field_24358 stack Lnet/minecraft/class_1799; METHOD (Lnet/minecraft/class_1792;ILnet/minecraft/class_2487;)V ARG 1 item ARG 2 count - ARG 3 tag + ARG 3 nbt METHOD (Lnet/minecraft/class_1799;)V ARG 1 stack METHOD method_27683 asStack ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index cee06239bd..9accfd74f5 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -40,7 +40,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 7 priceMultiplier ARG 8 demandBonus METHOD (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 first ARG 2 second diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping index 20467441cc..db1b1ce123 100644 --- a/mappings/net/minecraft/village/raid/Raid.mapping +++ b/mappings/net/minecraft/village/raid/Raid.mapping @@ -32,7 +32,7 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid ARG 3 pos METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V ARG 1 world - ARG 2 tag + ARG 2 nbt METHOD method_16487 addToWave (ILnet/minecraft/class_3763;Z)Z ARG 1 wave ARG 2 entity @@ -51,7 +51,7 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid ARG 1 wave METHOD method_16501 isInRaidDistance ()Ljava/util/function/Predicate; METHOD method_16502 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_16504 isActive ()Z METHOD method_16505 addToWave (ILnet/minecraft/class_3763;)Z ARG 1 wave diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index ea9fdab5ca..5f5218d375 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -3,19 +3,19 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer METHOD method_12376 (ILnet/minecraft/class_2826;)Z ARG 1 chunkSection METHOD method_12377 getChunkType (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2806$class_2808; - ARG 0 tag + ARG 0 nbt METHOD method_12385 writeStructures (Lnet/minecraft/class_3218;Lnet/minecraft/class_1923;Ljava/util/Map;Ljava/util/Map;)Lnet/minecraft/class_2487; METHOD method_12386 loadEntities (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_2818;)V ARG 0 world - ARG 1 tag + ARG 1 nbt ARG 2 chunk METHOD method_12387 readStructureReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/Map; ARG 0 pos - ARG 1 tag + ARG 1 nbt METHOD method_12391 (Lnet/minecraft/class_3611;)Z ARG 0 fluid METHOD method_12392 readStructureStarts (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;J)Ljava/util/Map; - ARG 1 tag + ARG 1 nbt ARG 2 worldSeed METHOD method_12393 toNbt ([Lit/unimi/dsi/fastutil/shorts/ShortList;)Lnet/minecraft/class_2499; ARG 0 lists @@ -24,7 +24,7 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer ARG 1 structureManager ARG 2 poiStorage ARG 3 pos - ARG 4 tag + ARG 4 nbt METHOD method_12396 (Lnet/minecraft/class_2248;)Z ARG 0 block METHOD method_12410 serialize (Lnet/minecraft/class_3218;Lnet/minecraft/class_2791;)Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/world/ChunkTickScheduler.mapping b/mappings/net/minecraft/world/ChunkTickScheduler.mapping index 6a8f985a79..9801a801d8 100644 --- a/mappings/net/minecraft/world/ChunkTickScheduler.mapping +++ b/mappings/net/minecraft/world/ChunkTickScheduler.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2850 net/minecraft/world/ChunkTickScheduler METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_1923;Lnet/minecraft/class_2499;Lnet/minecraft/class_5539;)V ARG 1 shouldExclude ARG 2 pos - ARG 3 tag + ARG 3 nbtList ARG 4 world METHOD (Ljava/util/function/Predicate;Lnet/minecraft/class_1923;Lnet/minecraft/class_5539;)V ARG 1 shouldExclude diff --git a/mappings/net/minecraft/world/ChunkUpdateState.mapping b/mappings/net/minecraft/world/ChunkUpdateState.mapping index 38ea2b01e1..d9351d1e59 100644 --- a/mappings/net/minecraft/world/ChunkUpdateState.mapping +++ b/mappings/net/minecraft/world/ChunkUpdateState.mapping @@ -10,4 +10,4 @@ CLASS net/minecraft/class_3440 net/minecraft/world/ChunkUpdateState METHOD method_14897 contains (J)Z METHOD method_14898 getAll ()Lit/unimi/dsi/fastutil/longs/LongSet; METHOD method_32358 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3440; - ARG 0 tag + ARG 0 nbt diff --git a/mappings/net/minecraft/world/CommandBlockExecutor.mapping b/mappings/net/minecraft/world/CommandBlockExecutor.mapping index 42be90c58c..ae52d3bcb0 100644 --- a/mappings/net/minecraft/world/CommandBlockExecutor.mapping +++ b/mappings/net/minecraft/world/CommandBlockExecutor.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor METHOD method_8295 markDirty ()V METHOD method_8296 isTrackingOutput ()Z METHOD method_8297 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_8298 setSuccessCount (I)V ARG 1 successCount METHOD method_8299 getCustomName ()Lnet/minecraft/class_2561; @@ -40,4 +40,4 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor METHOD method_8303 getSource ()Lnet/minecraft/class_2168; METHOD method_8304 getSuccessCount ()I METHOD method_8305 readNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt diff --git a/mappings/net/minecraft/world/FeatureUpdater.mapping b/mappings/net/minecraft/world/FeatureUpdater.mapping index f3ca9b5bdc..aca20bfc87 100644 --- a/mappings/net/minecraft/world/FeatureUpdater.mapping +++ b/mappings/net/minecraft/world/FeatureUpdater.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3360 net/minecraft/world/FeatureUpdater - FIELD field_14432 featureIdToChunkTag Ljava/util/Map; + FIELD field_14432 featureIdToChunkNbt Ljava/util/Map; FIELD field_14433 updateStates Ljava/util/Map; FIELD field_14434 needsUpdate Z FIELD field_14435 OLD_TO_NEW Ljava/util/Map; @@ -14,7 +14,7 @@ CLASS net/minecraft/class_3360 net/minecraft/world/FeatureUpdater ARG 2 chunkZ ARG 3 id METHOD method_14741 getUpdatedStarts (Lnet/minecraft/class_2487;Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt ARG 2 pos METHOD method_14744 markResolved (J)V METHOD method_14745 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_26;)Lnet/minecraft/class_3360; diff --git a/mappings/net/minecraft/world/ForcedChunkState.mapping b/mappings/net/minecraft/world/ForcedChunkState.mapping index 78b3802126..f619fe1e05 100644 --- a/mappings/net/minecraft/world/ForcedChunkState.mapping +++ b/mappings/net/minecraft/world/ForcedChunkState.mapping @@ -3,5 +3,5 @@ CLASS net/minecraft/class_1932 net/minecraft/world/ForcedChunkState METHOD (Lit/unimi/dsi/fastutil/longs/LongSet;)V ARG 1 chunks METHOD method_32350 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1932; - ARG 0 tag + ARG 0 nbt METHOD method_8375 getChunks ()Lit/unimi/dsi/fastutil/longs/LongSet; diff --git a/mappings/net/minecraft/world/IdCountsState.mapping b/mappings/net/minecraft/world/IdCountsState.mapping index 1b93c7d4c3..6840b041dd 100644 --- a/mappings/net/minecraft/world/IdCountsState.mapping +++ b/mappings/net/minecraft/world/IdCountsState.mapping @@ -2,4 +2,4 @@ CLASS net/minecraft/class_3978 net/minecraft/world/IdCountsState FIELD field_17662 idCounts Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD method_17920 getNextMapId ()I METHOD method_32360 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3978; - ARG 0 tag + ARG 0 nbt diff --git a/mappings/net/minecraft/world/MobSpawnerEntry.mapping b/mappings/net/minecraft/world/MobSpawnerEntry.mapping index d95cc231f1..ac47857d88 100644 --- a/mappings/net/minecraft/world/MobSpawnerEntry.mapping +++ b/mappings/net/minecraft/world/MobSpawnerEntry.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_1952 net/minecraft/world/MobSpawnerEntry FIELD field_30977 DEFAULT_ENTITY_ID Ljava/lang/String; - FIELD field_9307 entityTag Lnet/minecraft/class_2487; + FIELD field_9307 entityNbt Lnet/minecraft/class_2487; METHOD (ILnet/minecraft/class_2487;)V ARG 1 weight - ARG 2 entityTag + ARG 2 entityNbt METHOD (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_8678 getEntityNbt ()Lnet/minecraft/class_2487; - METHOD method_8679 serialize ()Lnet/minecraft/class_2487; + METHOD method_8679 toNbt ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/world/MobSpawnerLogic.mapping b/mappings/net/minecraft/world/MobSpawnerLogic.mapping index 35abca7cc9..f394bdaaf1 100644 --- a/mappings/net/minecraft/world/MobSpawnerLogic.mapping +++ b/mappings/net/minecraft/world/MobSpawnerLogic.mapping @@ -33,7 +33,7 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic METHOD method_8280 readNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)V ARG 1 world ARG 2 pos - ARG 3 tag + ARG 3 nbt METHOD method_8281 getEntityId (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2960; ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/world/PersistentState.mapping b/mappings/net/minecraft/world/PersistentState.mapping index 24adc4c277..6ad5802434 100644 --- a/mappings/net/minecraft/world/PersistentState.mapping +++ b/mappings/net/minecraft/world/PersistentState.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_18 net/minecraft/world/PersistentState FIELD field_72 dirty Z METHOD method_17919 save (Ljava/io/File;)V METHOD method_75 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 tag + ARG 1 nbt METHOD method_78 setDirty (Z)V ARG 1 dirty METHOD method_79 isDirty ()Z diff --git a/mappings/net/minecraft/world/SaveProperties.mapping b/mappings/net/minecraft/world/SaveProperties.mapping index 2087e59885..19e6204a42 100644 --- a/mappings/net/minecraft/world/SaveProperties.mapping +++ b/mappings/net/minecraft/world/SaveProperties.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties METHOD method_152 isHardcore ()Z METHOD method_163 cloneWorldNbt (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 registryManager - ARG 2 playerTag + ARG 2 playerNbt METHOD method_168 getVersion ()I METHOD method_186 setDifficultyLocked (Z)V ARG 1 locked @@ -18,7 +18,7 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties ARG 1 difficulty METHOD method_210 getGameMode ()Lnet/minecraft/class_1934; METHOD method_221 setCustomBossEvents (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_226 getPlayerData ()Lnet/minecraft/class_2487; METHOD method_228 getCustomBossEvents ()Lnet/minecraft/class_2487; METHOD method_24285 addServerBrand (Ljava/lang/String;Z)V @@ -33,7 +33,7 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties METHOD method_28057 getGeneratorOptions ()Lnet/minecraft/class_5285; METHOD method_29036 getDragonFight ()Lnet/minecraft/class_2487; METHOD method_29037 setDragonFight (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_29588 getLifecycle ()Lcom/mojang/serialization/Lifecycle; METHOD method_29589 getDataPackSettings ()Lnet/minecraft/class_5359; METHOD method_29590 updateLevelInfo (Lnet/minecraft/class_5359;)V diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index e65aad1928..34e4409bb2 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -275,6 +275,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 7 velocityX ARG 9 velocityY ARG 11 velocityZ - ARG 13 tag + ARG 13 nbt METHOD method_8558 isValidHorizontally (Lnet/minecraft/class_2338;)Z ARG 0 pos diff --git a/mappings/net/minecraft/world/border/WorldBorder.mapping b/mappings/net/minecraft/world/border/WorldBorder.mapping index 2c55f316a4..caf6b7ab2f 100644 --- a/mappings/net/minecraft/world/border/WorldBorder.mapping +++ b/mappings/net/minecraft/world/border/WorldBorder.mapping @@ -153,7 +153,7 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder ARG 1 worldBorder METHOD method_27356 getCenterX ()D METHOD method_27357 writeNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_27358 fromDynamic (Lcom/mojang/serialization/DynamicLike;Lnet/minecraft/class_2784$class_5200;)Lnet/minecraft/class_2784$class_5200; ARG 1 properties METHOD method_27359 getCenterZ ()D diff --git a/mappings/net/minecraft/world/chunk/BiMapPalette.mapping b/mappings/net/minecraft/world/chunk/BiMapPalette.mapping index 8358aea499..f9487b3617 100644 --- a/mappings/net/minecraft/world/chunk/BiMapPalette.mapping +++ b/mappings/net/minecraft/world/chunk/BiMapPalette.mapping @@ -12,4 +12,4 @@ CLASS net/minecraft/class_2814 net/minecraft/world/chunk/BiMapPalette ARG 4 elementDeserializer ARG 5 elementSerializer METHOD method_12196 writeNbt (Lnet/minecraft/class_2499;)V - ARG 1 tag + ARG 1 nbt diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 58cf6d43d3..9a016b26bf 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -54,7 +54,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12041 removeBlockEntity (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_12042 addPendingBlockEntityNbt (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_12044 needsSaving ()Z METHOD method_12228 areSectionsEmptyBetween (II)Z ARG 1 lowerHeight diff --git a/mappings/net/minecraft/world/chunk/Palette.mapping b/mappings/net/minecraft/world/chunk/Palette.mapping index a96b9adde7..604e3a5463 100644 --- a/mappings/net/minecraft/world/chunk/Palette.mapping +++ b/mappings/net/minecraft/world/chunk/Palette.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2837 net/minecraft/world/chunk/Palette METHOD method_12197 getIndexBits ()I METHOD method_12286 readNbt (Lnet/minecraft/class_2499;)V - ARG 1 tag + ARG 1 nbt METHOD method_12287 toPacket (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12288 getByIndex (I)Ljava/lang/Object; diff --git a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping index d4087a36a7..9b89cf0d45 100644 --- a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping +++ b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping @@ -38,10 +38,10 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer ARG 3 z ARG 4 value METHOD method_12329 read (Lnet/minecraft/class_2499;[J)V - ARG 1 paletteTag + ARG 1 paletteNbt ARG 2 data METHOD method_12330 write (Lnet/minecraft/class_2487;Ljava/lang/String;Ljava/lang/String;)V - ARG 1 tag + ARG 1 nbt ARG 2 paletteKey ARG 3 dataKey METHOD method_12331 get (I)Ljava/lang/Object; diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index fe7121a1c9..a56f9ba7fd 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -66,7 +66,7 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk ARG 2 chunkPos METHOD method_12315 addLightSource (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_12316 getBlockEntityTags ()Ljava/util/Map; + METHOD method_12316 getBlockEntityNbts ()Ljava/util/Map; METHOD method_17032 setLightingProvider (Lnet/minecraft/class_3568;)V ARG 1 lightingProvider METHOD method_22405 setBiomes (Lnet/minecraft/class_4548;)V diff --git a/mappings/net/minecraft/world/chunk/UpgradeData.mapping b/mappings/net/minecraft/world/chunk/UpgradeData.mapping index 8fcfd78e1f..3f09824e1b 100644 --- a/mappings/net/minecraft/world/chunk/UpgradeData.mapping +++ b/mappings/net/minecraft/world/chunk/UpgradeData.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_2843 net/minecraft/world/chunk/UpgradeData FIELD field_12955 centerIndicesToUpgrade [[I FIELD field_12956 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_2487;Lnet/minecraft/class_5539;)V - ARG 1 tag + ARG 1 nbt ARG 2 world METHOD (Lnet/minecraft/class_5539;)V ARG 1 world diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 9d0293085d..67ff6770e5 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk FIELD field_12841 blockTickScheduler Lnet/minecraft/class_1951; FIELD field_12843 inhabitedTime J FIELD field_12845 structureReferences Ljava/util/Map; - FIELD field_12846 pendingBlockEntityTags Ljava/util/Map; + FIELD field_12846 pendingBlockEntityNbts Ljava/util/Map; FIELD field_12847 lightOn Z FIELD field_12848 pos Lnet/minecraft/class_1923; FIELD field_12849 upgradeData Lnet/minecraft/class_2843; @@ -45,7 +45,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 2 creationType METHOD method_12204 loadBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2586; ARG 1 pos - ARG 2 tag + ARG 2 nbt METHOD method_12206 loadToWorld ()V METHOD method_12207 setLevelTypeProvider (Ljava/util/function/Supplier;)V ARG 1 levelTypeProvider @@ -66,7 +66,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12224 loadFromPacket (Lnet/minecraft/class_4548;Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;Ljava/util/BitSet;)V ARG 1 biomes ARG 2 buf - ARG 3 tag + ARG 3 nbt METHOD method_12225 getLevelType ()Lnet/minecraft/class_3193$class_3194; METHOD method_12226 setLoadedToWorld (Z)V ARG 1 loaded diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index 8864fb7a2b..a9eac2171c 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -89,8 +89,8 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType ARG 1 biomeRegistry ARG 2 chunkGeneratorSettingsRegistry ARG 3 seed - METHOD method_28521 worldFromDimensionTag (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult; - ARG 0 tag + METHOD method_28521 worldFromDimensionNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult; + ARG 0 nbt METHOD method_28523 addRegistryDefaults (Lnet/minecraft/class_5455$class_5457;)Lnet/minecraft/class_5455$class_5457; ARG 0 registryManager METHOD method_28528 getSkyAngle (J)F diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index 49aff318b5..626123e341 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -81,7 +81,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature ARG 1 config METHOD method_28660 readStructureStart (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;J)Lnet/minecraft/class_3449; ARG 0 world - ARG 1 tag + ARG 1 nbt ARG 2 worldSeed METHOD method_28661 register (Ljava/lang/String;Lnet/minecraft/class_3195;Lnet/minecraft/class_2893$class_2895;)Lnet/minecraft/class_3195; ARG 0 name diff --git a/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping b/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping index 88aceb1e02..7564e4f344 100644 --- a/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping +++ b/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping @@ -1,10 +1,11 @@ CLASS net/minecraft/class_2864 net/minecraft/world/level/storage/AlphaChunkIo FIELD field_28130 world Lnet/minecraft/class_5539; METHOD method_12432 convertAlphaChunk (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_2864$class_2865;Lnet/minecraft/class_2487;Lnet/minecraft/class_1966;)V - ARG 2 tag + ARG 1 alphaChunk + ARG 2 nbt ARG 3 biomeSource METHOD method_12433 readAlphaChunk (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2864$class_2865; - ARG 0 tag + ARG 0 nbt CLASS class_2865 AlphaChunk FIELD field_13037 entities Lnet/minecraft/class_2499; FIELD field_13038 blockLight Lnet/minecraft/class_2832; diff --git a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping index ce2154ea0d..128830ce0b 100644 --- a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping @@ -11,5 +11,5 @@ CLASS net/minecraft/class_2867 net/minecraft/world/storage/RegionBasedStorage ARG 1 pos METHOD method_23726 write (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)V ARG 1 pos - ARG 2 tag + ARG 2 nbt METHOD method_26982 sync ()V diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping index 0243f9f68d..cb115d2ba7 100644 --- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping @@ -9,12 +9,12 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage METHOD method_17907 updateChunkNbt (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 worldKey ARG 2 persistentStateManagerFactory - ARG 3 tag + ARG 3 nbt METHOD method_17908 getDataVersion (Lnet/minecraft/class_2487;)I - ARG 0 tag - METHOD method_17910 setTagAt (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)V + ARG 0 nbt + METHOD method_17910 setNbt (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)V ARG 1 chunkPos - ARG 2 tag + ARG 2 nbt METHOD method_23696 getNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; ARG 1 chunkPos METHOD method_23697 completeAll ()V diff --git a/mappings/net/minecraft/world/timer/Timer.mapping b/mappings/net/minecraft/world/timer/Timer.mapping index fc351cd140..f3fb8d28c5 100644 --- a/mappings/net/minecraft/world/timer/Timer.mapping +++ b/mappings/net/minecraft/world/timer/Timer.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_236 net/minecraft/world/timer/Timer ARG 2 triggerTime ARG 4 callback METHOD method_986 addEvent (Lnet/minecraft/class_2487;)V - ARG 1 tag + ARG 1 nbt METHOD method_987 createEventComparator ()Ljava/util/Comparator; METHOD method_988 processEvents (Ljava/lang/Object;J)V ARG 1 server diff --git a/mappings/net/minecraft/world/timer/TimerCallback.mapping b/mappings/net/minecraft/world/timer/TimerCallback.mapping index 71db44637c..1284e96c3c 100644 --- a/mappings/net/minecraft/world/timer/TimerCallback.mapping +++ b/mappings/net/minecraft/world/timer/TimerCallback.mapping @@ -10,9 +10,9 @@ CLASS net/minecraft/class_234 net/minecraft/world/timer/TimerCallback ARG 1 id ARG 2 callbackClass METHOD method_975 serialize (Lnet/minecraft/class_2487;Lnet/minecraft/class_234;)V - ARG 1 tag + ARG 1 nbt ARG 2 callback METHOD method_976 deserialize (Lnet/minecraft/class_2487;)Lnet/minecraft/class_234; - ARG 1 tag + ARG 1 nbt METHOD method_977 getId ()Lnet/minecraft/class_2960; METHOD method_978 getCallbackClass ()Ljava/lang/Class; diff --git a/mappings/net/minecraft/world/timer/TimerCallbackSerializer.mapping b/mappings/net/minecraft/world/timer/TimerCallbackSerializer.mapping index 60f5bc2a82..c9c097387f 100644 --- a/mappings/net/minecraft/world/timer/TimerCallbackSerializer.mapping +++ b/mappings/net/minecraft/world/timer/TimerCallbackSerializer.mapping @@ -7,6 +7,6 @@ CLASS net/minecraft/class_233 net/minecraft/world/timer/TimerCallbackSerializer METHOD method_971 registerSerializer (Lnet/minecraft/class_234$class_235;)Lnet/minecraft/class_233; ARG 1 serializer METHOD method_972 deserialize (Lnet/minecraft/class_2487;)Lnet/minecraft/class_234; - ARG 1 tag + ARG 1 nbt METHOD method_973 serialize (Lnet/minecraft/class_234;)Lnet/minecraft/class_2487; ARG 1 callback