From 0babaa8c33f598b4ceb6b3baf67e4d6ba19e6831 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 31 Jan 2024 17:12:25 +0000 Subject: [PATCH] 24w05a --- build.gradle | 2 +- .../blaze3d/systems/RenderSystem.mapping | 2 - mappings/net/minecraft/block/Block.mapping | 2 +- .../minecraft/block/ShulkerBoxBlock.mapping | 2 - .../block/entity/BlockEntity.mapping | 18 ++-- .../block/spawner/EntityDetector.mapping | 15 +--- .../block/spawner/TrialSpawnerData.mapping | 4 +- .../block/spawner/TrialSpawnerLogic.mapping | 4 +- mappings/net/minecraft/class_8181.mapping | 3 + .../minecraft/client/MinecraftClient.mapping | 2 +- .../minecraft/client/gl/ShaderProgram.mapping | 3 - .../minecraft/client/gui/hud/DebugHud.mapping | 16 ++-- .../client/gui/hud/debug/DebugChart.mapping | 4 +- .../client/gui/hud/debug/TickChart.mapping | 2 +- .../ingame/CartographyTableScreen.mapping | 6 +- .../screen/world/OptimizeWorldScreen.mapping | 3 +- .../network/ClientPlayNetworkHandler.mapping | 2 +- .../client/network/PingMeasurer.mapping | 4 +- .../client/option/HotbarStorageEntry.mapping | 4 - .../client/particle/ParticleManager.mapping | 7 +- .../client/render/DiffuseLighting.mapping | 6 +- .../client/render/GameRenderer.mapping | 16 +--- .../client/render/MapRenderer.mapping | 9 +- .../render/OverlayVertexConsumer.mapping | 5 +- .../client/render/VertexConsumer.mapping | 6 +- .../client/render/WorldRenderer.mapping | 33 ++----- .../entity/BeaconBlockEntityRenderer.mapping | 35 +------- .../DragonFireballEntityRenderer.mapping | 9 +- .../ExperienceOrbEntityRenderer.mapping | 12 +-- .../FishingBobberEntityRenderer.mapping | 9 +- .../entity/GuardianEntityRenderer.mapping | 12 +-- .../render/entity/ItemEntityRenderer.mapping | 6 -- .../entity/PaintingEntityRenderer.mapping | 14 +-- .../entity/ProjectileEntityRenderer.mapping | 14 +-- .../feature/ArmorFeatureRenderer.mapping | 16 +--- .../StuckStingersFeatureRenderer.mapping | 9 +- .../client/util/math/MatrixStack.mapping | 1 - .../client/world/ClientWorld.mapping | 3 +- .../command/CommandRegistryAccess.mapping | 20 ----- .../command/DataCommandStorage.mapping | 2 +- .../ItemPredicateArgumentType.mapping | 16 +--- .../argument/ItemStackArgumentType.mapping | 1 - .../command/argument/ItemStringReader.mapping | 49 +---------- .../ParticleEffectArgumentType.mapping | 6 +- .../argument/StyleArgumentType.mapping | 2 +- .../command/argument/TextArgumentType.mapping | 2 +- .../net/minecraft/data/DataProvider.mapping | 5 +- .../data/client/ItemModelGenerator.mapping | 6 +- .../advancement/AdvancementProvider.mapping | 2 - .../loottable/LootTableProvider.mapping | 4 +- .../OneTwentyOneLootTableProviders.mapping | 2 +- .../TradeRebalanceLootTableProviders.mapping | 2 +- .../vanilla/VanillaLootTableProviders.mapping | 2 +- .../data/server/recipe/RecipeProvider.mapping | 5 +- .../data/server/tag/TagProvider.mapping | 2 - .../BlockEntitySignTextStrictJsonFix.mapping | 6 -- mappings/net/minecraft/entity/Entity.mapping | 22 ----- .../net/minecraft/entity/EntityType.mapping | 16 +--- .../minecraft/entity/EyeOfEnderEntity.mapping | 2 - .../net/minecraft/entity/ItemEntity.mapping | 2 - .../net/minecraft/entity/LivingEntity.mapping | 3 + .../entity/decoration/ItemFrameEntity.mapping | 2 +- .../effect/StatusEffectInstance.mapping | 17 +--- .../minecraft/entity/mob/MobEntity.mapping | 5 +- .../entity/mob/ZombieVillagerEntity.mapping | 5 +- .../passive/AbstractHorseEntity.mapping | 27 ------ .../entity/passive/HorseEntity.mapping | 6 -- .../entity/passive/LlamaEntity.mapping | 3 - .../entity/passive/WolfEntity.mapping | 4 - .../entity/player/PlayerInventory.mapping | 1 - .../projectile/AbstractFireballEntity.mapping | 2 - .../thrown/ThrownItemEntity.mapping | 2 - .../inventory/SingleStackInventory.mapping | 1 - .../minecraft/item/AnimalArmorItem.mapping | 11 +-- mappings/net/minecraft/item/ArmorItem.mapping | 13 +-- .../net/minecraft/item/ArmorMaterial.mapping | 88 +++++++------------ .../net/minecraft/item/ArmorMaterials.mapping | 21 +---- .../item/DyeableAnimalArmorItem.mapping | 1 - .../minecraft/item/DyeableArmorItem.mapping | 1 - .../net/minecraft/item/DyeableItem.mapping | 5 -- mappings/net/minecraft/item/Equipment.mapping | 2 +- .../net/minecraft/item/FilledMapItem.mapping | 15 ++-- .../item/map/MapBannerMarker.mapping | 18 ++-- .../net/minecraft/item/map/MapIcon.mapping | 17 +--- .../net/minecraft/item/map/MapState.mapping | 25 +++--- .../net/minecraft/item/trim/ArmorTrim.mapping | 13 +-- .../net/minecraft/loot/LootDataType.mapping | 3 +- .../net/minecraft/loot/LootManager.mapping | 10 +-- .../loot/condition/LootConditionTypes.mapping | 16 ---- .../SetEnchantmentsLootFunction.mapping | 3 - .../network/ClientConnection.mapping | 4 +- .../minecraft/network/PacketByteBuf.mapping | 26 ------ .../network/codec/PacketCodecs.mapping | 6 +- .../network/handler/PacketSizeLogger.mapping | 4 +- .../common/CookieResponseC2SPacket.mapping | 2 - .../c2s/play/BookUpdateC2SPacket.mapping | 30 ++----- .../s2c/common/DisconnectS2CPacket.mapping | 10 +-- .../common/ResourcePackSendS2CPacket.mapping | 4 - .../play/BlockEntityUpdateS2CPacket.mapping | 3 +- .../packet/s2c/play/BossBarS2CPacket.mapping | 30 ++----- .../play/CommandSuggestionsS2CPacket.mapping | 19 +--- .../s2c/play/DeathMessageS2CPacket.mapping | 15 +--- .../s2c/play/GameMessageS2CPacket.mapping | 4 - .../network/packet/s2c/play/LightData.mapping | 4 - .../s2c/play/MapUpdateS2CPacket.mapping | 35 +++----- .../s2c/play/OverlayMessageS2CPacket.mapping | 10 +-- .../play/PlayerListHeaderS2CPacket.mapping | 15 +--- .../s2c/play/PlayerListS2CPacket.mapping | 47 ++++------ .../ScoreboardScoreUpdateS2CPacket.mapping | 4 - .../s2c/play/ServerMetadataS2CPacket.mapping | 15 +--- .../packet/s2c/play/SubtitleS2CPacket.mapping | 10 +-- .../packet/s2c/play/TeamS2CPacket.mapping | 10 +-- .../packet/s2c/play/TitleS2CPacket.mapping | 10 +-- .../minecraft/particle/ParticleEffect.mapping | 4 +- .../minecraft/recipe/RecipeManager.mapping | 4 +- .../minecraft/recipe/RepairItemRecipe.mapping | 2 +- .../registry/RegistryWrapper.mapping | 18 ++-- .../scoreboard/ServerScoreboard.mapping | 2 +- .../minecraft/server/DataPackContents.mapping | 15 +++- mappings/net/minecraft/server/Main.mapping | 3 +- .../server/ServerAdvancementLoader.mapping | 5 -- .../server/command/BossBarCommand.mapping | 2 +- .../server/command/RaidCommand.mapping | 2 +- .../server/command/ScoreboardCommand.mapping | 6 +- .../server/command/TeamCommand.mapping | 2 +- .../server/command/TellRawCommand.mapping | 2 +- .../server/command/TitleCommand.mapping | 2 +- .../structure/StructureTemplate.mapping | 2 - .../net/minecraft/test/TestContext.mapping | 7 +- .../packageinfo/PackageInfo9208.mapping | 1 + .../minecraft/util/JsonReaderUtils.mapping | 4 +- .../math/random/RandomSequencesState.mapping | 2 +- .../util/profiler/PerformanceLog.mapping | 16 ---- .../net/minecraft/village/TradeOffer.mapping | 13 +-- .../minecraft/village/TradeOfferList.mapping | 3 - .../village/raid/RaidManager.mapping | 2 +- .../minecraft/world/ChunkUpdateState.mapping | 2 +- .../minecraft/world/ForcedChunkState.mapping | 2 +- .../net/minecraft/world/IdCountsState.mapping | 4 +- .../minecraft/world/PersistentState.mapping | 4 +- .../world/PersistentStateManager.mapping | 5 +- mappings/net/minecraft/world/World.mapping | 8 +- .../net/minecraft/world/chunk/Chunk.mapping | 2 +- .../world/level/storage/LevelStorage.mapping | 3 - .../world/updater/WorldUpdater.mapping | 3 +- 145 files changed, 288 insertions(+), 1017 deletions(-) create mode 100644 mappings/net/minecraft/class_8181.mapping delete mode 100644 mappings/net/minecraft/item/DyeableAnimalArmorItem.mapping delete mode 100644 mappings/net/minecraft/item/DyeableArmorItem.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo9208.mapping diff --git a/build.gradle b/build.gradle index 880261474a..dd4dcdbb75 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "24w04a" +def minecraft_version = "24w05a" filament { minecraftVersion = minecraft_version diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping index f918bdf8e5..91c35469b9 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping @@ -184,8 +184,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 0 runnable METHOD setErrorCallback (Lorg/lwjgl/glfw/GLFWErrorCallbackI;)V ARG 0 callback - METHOD setInverseViewRotationMatrix (Lorg/joml/Matrix3f;)V - ARG 0 inverseViewRotationMatrix METHOD setProjectionMatrix (Lorg/joml/Matrix4f;Lnet/minecraft/class_8251;)V ARG 0 projectionMatrix ARG 1 vertexSorting diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index c12a3f9dcb..f3e2bb9cb5 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -265,7 +265,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 3 state ARG 4 placer ARG 5 itemStack - METHOD method_9568 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_1922;Ljava/util/List;Lnet/minecraft/class_1836;)V + METHOD method_9568 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_1922;Ljava/util/List;Lnet/minecraft/class_1836;Lnet/minecraft/class_5455;)V COMMENT Appends tooltips to a stack of this block's corresponding {@linkplain COMMENT net.minecraft.item.BlockItem block item}. Used by shulker boxes. COMMENT diff --git a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping index 6a62a53a98..d29257b39a 100644 --- a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping +++ b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping @@ -29,8 +29,6 @@ CLASS net/minecraft/class_2480 net/minecraft/block/ShulkerBoxBlock ARG 1 world ARG 2 pos ARG 3 entity - METHOD method_38234 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2627;)V - ARG 1 blockEntity METHOD method_47378 (Ljava/util/EnumMap;)V ARG 0 map METHOD method_54040 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index 51a9053b86..2e1281b55f 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -67,7 +67,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT @see net.minecraft.block.AbstractBlock#onSyncedBlockEvent ARG 1 type ARG 2 data - METHOD method_11005 createFromNbt (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2586; + METHOD method_11005 createFromNbt (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2586; COMMENT {@return the new block entity loaded from {@code nbt}, or {@code null} if it fails} COMMENT COMMENT

This is used during chunk loading. This can fail if {@code nbt} has an improper or @@ -76,7 +76,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity ARG 0 pos ARG 1 state ARG 2 nbt - METHOD method_11007 writeNbt (Lnet/minecraft/class_2487;)V + METHOD method_11007 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V COMMENT Writes data to {@code nbt}. Subclasses should override this if they COMMENT store a persistent data. COMMENT @@ -99,7 +99,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT COMMENT @see net.minecraft.entity.player.PlayerEntity#isCreativeLevelTwoOp METHOD method_11012 markRemoved ()V - METHOD method_11014 readNbt (Lnet/minecraft/class_2487;)V + METHOD method_11014 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V COMMENT Reads data from {@code nbt}. Subclasses should override this if they COMMENT store a persistent data. COMMENT @@ -118,7 +118,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity METHOD method_11016 getPos ()Lnet/minecraft/class_2338; COMMENT {@return the block entity's position} METHOD method_11017 getType ()Lnet/minecraft/class_2591; - METHOD method_16887 toInitialChunkDataNbt ()Lnet/minecraft/class_2487; + METHOD method_16887 toInitialChunkDataNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; COMMENT {@return the serialized state of this block entity that is observable by clients} COMMENT COMMENT

This is sent alongside the initial chunk data, as well as when the block @@ -133,8 +133,6 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT

To send all NBT data of this block entity saved to disk, return {@link #createNbt}. COMMENT COMMENT @see #toUpdatePacket - METHOD method_17897 (Lnet/minecraft/class_2487;Ljava/lang/String;Lnet/minecraft/class_2586;)Lnet/minecraft/class_2586; - ARG 2 blockEntity METHOD method_17899 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/lang/String;Lnet/minecraft/class_2591;)Lnet/minecraft/class_2586; ARG 3 type METHOD method_31662 setWorld (Lnet/minecraft/class_1937;)V @@ -178,7 +176,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT keys to store the position. This is incompatible with {@link COMMENT net.minecraft.nbt.NbtHelper#fromBlockPos} that use uppercase keys. ARG 0 nbt - METHOD method_38240 setStackNbt (Lnet/minecraft/class_1799;)V + METHOD method_38240 setStackNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_7225$class_7874;)V COMMENT Sets {@code stack}'s {@code net.minecraft.item.BlockItem#BLOCK_ENTITY_TAG_KEY} COMMENT NBT value to {@linkplain #createNbt the block entity's NBT data}. ARG 1 stack @@ -188,7 +186,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT @throws RuntimeException if the block entity type is not registered in COMMENT the registry ARG 1 nbt - METHOD method_38242 createNbtWithIdentifyingData ()Lnet/minecraft/class_2487; + METHOD method_38242 createNbtWithIdentifyingData (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; COMMENT {@return the block entity's NBT data with identifying data} COMMENT COMMENT

In addition to data written at {@link #writeNbt}, this also @@ -197,7 +195,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT COMMENT @see #createNbt COMMENT @see #createNbtWithId - METHOD method_38243 createNbtWithId ()Lnet/minecraft/class_2487; + METHOD method_38243 createNbtWithId (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; COMMENT {@return the block entity's NBT data with block entity type ID} COMMENT COMMENT

In addition to data written at {@link #writeNbt}, this also @@ -205,7 +203,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT COMMENT @see #createNbt COMMENT @see #createNbtWithIdentifyingData - METHOD method_38244 createNbt ()Lnet/minecraft/class_2487; + METHOD method_38244 createNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; COMMENT {@return the block entity's NBT data} COMMENT COMMENT

Internally, this calls {@link #writeNbt} with a new {@link NbtCompound} diff --git a/mappings/net/minecraft/block/spawner/EntityDetector.mapping b/mappings/net/minecraft/block/spawner/EntityDetector.mapping index 90a14f20d6..7817d62b01 100644 --- a/mappings/net/minecraft/block/spawner/EntityDetector.mapping +++ b/mappings/net/minecraft/block/spawner/EntityDetector.mapping @@ -1,17 +1,4 @@ CLASS net/minecraft/class_8962 net/minecraft/block/spawner/EntityDetector - FIELD field_47356 SURVIVAL_PLAYER Lnet/minecraft/class_8962; FIELD field_47357 SHEEP Lnet/minecraft/class_8962; - METHOD detect (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;I)Ljava/util/List; + METHOD detect (Lnet/minecraft/class_3218;Lnet/minecraft/class_8962$class_9198;Lnet/minecraft/class_2338;D)Ljava/util/List; ARG 1 world - ARG 2 center - ARG 3 radius - METHOD method_55153 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;I)Ljava/util/List; - ARG 0 world - ARG 1 center - ARG 2 radius - METHOD method_55154 (Lnet/minecraft/class_2338;ILnet/minecraft/class_3222;)Z - ARG 2 player - METHOD method_55155 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;I)Ljava/util/List; - ARG 0 world - ARG 1 center - ARG 2 radius diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping index 2c1d6b22e9..0517c2d532 100644 --- a/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping +++ b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping @@ -32,11 +32,9 @@ CLASS net/minecraft/class_8966 net/minecraft/block/spawner/TrialSpawnerData ARG 1 world ARG 2 config ARG 3 additionalPlayers - METHOD method_55186 updatePlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_8962;I)V + METHOD method_55186 updatePlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;I)V ARG 1 world - ARG 2 pos ARG 3 entityDetector - ARG 4 range METHOD method_55187 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_55188 getSpawnData (Lnet/minecraft/class_8963;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1952; diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping index 0617f6a322..90afc7e638 100644 --- a/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping +++ b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping @@ -6,10 +6,10 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic FIELD field_47364 trialSpawner Lnet/minecraft/class_8963$class_8964; FIELD field_47365 entityDetector Lnet/minecraft/class_8962; FIELD field_47366 forceActivate Z - METHOD (Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;)V + METHOD (Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;)V ARG 1 trialSpawner ARG 2 entityDetector - METHOD (Lnet/minecraft/class_8965;Lnet/minecraft/class_8966;Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;)V + METHOD (Lnet/minecraft/class_8965;Lnet/minecraft/class_8966;Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;)V ARG 1 config ARG 2 data ARG 3 trialSpawner diff --git a/mappings/net/minecraft/class_8181.mapping b/mappings/net/minecraft/class_8181.mapping new file mode 100644 index 0000000000..16ba0e32ef --- /dev/null +++ b/mappings/net/minecraft/class_8181.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_8181 + CLASS class_9210 + METHOD method_54080 asBlockEntity ()Lnet/minecraft/class_2586; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 71dc3cca4f..6a57987799 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -212,7 +212,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1495 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD method_1496 isIntegratedServerRunning ()Z METHOD method_1498 isHudEnabled ()Z - METHOD method_1499 addBlockEntityNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2586;)V + METHOD method_1499 addBlockEntityNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2586;Lnet/minecraft/class_5455;)V ARG 1 stack ARG 2 blockEntity METHOD method_1502 (Lnet/minecraft/class_1799;)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/client/gl/ShaderProgram.mapping b/mappings/net/minecraft/client/gl/ShaderProgram.mapping index 735f6c8f5a..0bd6dbc9c4 100644 --- a/mappings/net/minecraft/client/gl/ShaderProgram.mapping +++ b/mappings/net/minecraft/client/gl/ShaderProgram.mapping @@ -10,8 +10,6 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram COMMENT @see COMMENT GLSL Object - OpenGL Wiki (Program objects) FIELD field_29464 blendState Lnet/minecraft/class_277; - FIELD field_29465 loadedAttributeIds Ljava/util/List; - FIELD field_29466 attributeNames Ljava/util/List; FIELD field_29467 vertexShader Lnet/minecraft/class_281; FIELD field_29468 fragmentShader Lnet/minecraft/class_281; FIELD field_29469 format Lnet/minecraft/class_293; @@ -43,7 +41,6 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram FIELD field_29495 dirty Z FIELD field_32778 SHADERS_DIRECTORY Ljava/lang/String; FIELD field_32779 INCLUDE_DIRECTORY Ljava/lang/String; - FIELD field_36323 viewRotationMat Lnet/minecraft/class_284; FIELD field_36373 fogShape Lnet/minecraft/class_284; FIELD field_40512 CORE_DIRECTORY Ljava/lang/String; FIELD field_42231 glintAlpha Lnet/minecraft/class_284; diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index acf56bb19c..95accffe48 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -17,12 +17,10 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud FIELD field_45989 renderingChartVisible Z FIELD field_45990 renderingAndTickChartsVisible Z FIELD field_45991 packetSizeAndPingChartsVisible Z - FIELD field_45992 frameNanosLog Lnet/minecraft/class_8743; - FIELD field_45993 tickNanosLog Lnet/minecraft/class_8743; - FIELD field_45994 pingLog Lnet/minecraft/class_8743; - FIELD field_45995 packetSizeLog Lnet/minecraft/class_8743; - METHOD (Lnet/minecraft/class_310;)V - ARG 1 client + FIELD field_45992 frameNanosLog Lnet/minecraft/class_9191; + FIELD field_45993 tickNanosLog Lnet/minecraft/class_9191; + FIELD field_45994 pingLog Lnet/minecraft/class_9191; + FIELD field_45995 packetSizeLog Lnet/minecraft/class_9191; METHOD method_1834 getChunk ()Lnet/minecraft/class_2818; METHOD method_1835 getLeftText ()Ljava/util/List; METHOD method_1836 getClientChunk ()Lnet/minecraft/class_2818; @@ -76,10 +74,10 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud METHOD method_53540 togglePacketSizeAndPingCharts ()V METHOD method_53541 toggleRenderingAndTickCharts ()V METHOD method_53542 toggleRenderingChart ()V - METHOD method_53543 getPingLog ()Lnet/minecraft/class_8743; - METHOD method_53544 getPacketSizeLog ()Lnet/minecraft/class_8743; + METHOD method_53543 getPingLog ()Lnet/minecraft/class_9191; + METHOD method_53544 getPacketSizeLog ()Lnet/minecraft/class_9191; METHOD method_53545 clear ()V - METHOD method_56577 getTickNanosLog ()Lnet/minecraft/class_8743; + METHOD method_56577 getTickNanosLog ()Lnet/minecraft/class_9191; CLASS class_7412 AllocationRateCalculator FIELD field_38986 INTERVAL I FIELD field_38987 GARBAGE_COLLECTORS Ljava/util/List; diff --git a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping index da5855da96..f866c73f69 100644 --- a/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping +++ b/mappings/net/minecraft/client/gui/hud/debug/DebugChart.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_8755 net/minecraft/client/gui/hud/debug/DebugChart FIELD field_45915 TEXT_COLOR I FIELD field_45918 textRenderer Lnet/minecraft/class_327; - FIELD field_45919 log Lnet/minecraft/class_8743; - METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_8743;)V + FIELD field_45919 log Lnet/minecraft/class_9194; + METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_9194;)V ARG 1 textRenderer ARG 2 log METHOD method_53468 format (D)Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/hud/debug/TickChart.mapping b/mappings/net/minecraft/client/gui/hud/debug/TickChart.mapping index cc58c42122..a231b7f5cd 100644 --- a/mappings/net/minecraft/client/gui/hud/debug/TickChart.mapping +++ b/mappings/net/minecraft/client/gui/hud/debug/TickChart.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_8759 net/minecraft/client/gui/hud/debug/TickChart FIELD field_47117 millisPerTickSupplier Ljava/util/function/Supplier; - METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_8743;Ljava/util/function/Supplier;)V + METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_9194;Ljava/util/function/Supplier;)V ARG 1 textRenderer ARG 2 log ARG 3 millisPerTickSupplier diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping index 0268931ce7..fee57d27db 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping @@ -9,16 +9,14 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/Cartograph ARG 1 handler ARG 2 inventory ARG 3 title - METHOD method_17566 drawMap (Lnet/minecraft/class_332;Ljava/lang/Integer;Lnet/minecraft/class_22;IIF)V + METHOD method_17566 drawMap (Lnet/minecraft/class_332;Lnet/minecraft/class_9209;Lnet/minecraft/class_22;IIF)V ARG 1 context - ARG 2 mapId ARG 3 mapState ARG 4 x ARG 5 y ARG 6 scale - METHOD method_17567 drawMap (Lnet/minecraft/class_332;Ljava/lang/Integer;Lnet/minecraft/class_22;ZZZZ)V + METHOD method_17567 drawMap (Lnet/minecraft/class_332;Lnet/minecraft/class_9209;Lnet/minecraft/class_22;ZZZZ)V ARG 1 context - ARG 2 mapId ARG 3 mapState ARG 4 cloneMode ARG 5 expandMode diff --git a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping index b55f9159ab..6d389b98a0 100644 --- a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping @@ -3,13 +3,12 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorl FIELD field_3232 DIMENSION_COLORS Ljava/util/function/ToIntFunction; FIELD field_3233 callback Lit/unimi/dsi/fastutil/booleans/BooleanConsumer; FIELD field_3234 updater Lnet/minecraft/class_1257; - METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_1940;ZLnet/minecraft/class_2378;)V + METHOD (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_1940;ZLnet/minecraft/class_5455;)V ARG 1 callback ARG 2 dataFixer ARG 3 storageSession ARG 4 levelInfo ARG 5 eraseCache - ARG 6 dimensionOptionsRegistry METHOD method_19938 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_27031 create (Lnet/minecraft/class_310;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Z)Lnet/minecraft/class_527; diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 0f8345a2dd..e4f35894f2 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -65,7 +65,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_34007 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_34008 (Lnet/minecraft/class_1297;Lcom/mojang/datafixers/util/Pair;)V + METHOD method_34008 (Lnet/minecraft/class_1309;Lcom/mojang/datafixers/util/Pair;)V ARG 1 pair METHOD method_34009 (Lnet/minecraft/class_1703;Lnet/minecraft/class_8786;)V ARG 2 recipe diff --git a/mappings/net/minecraft/client/network/PingMeasurer.mapping b/mappings/net/minecraft/client/network/PingMeasurer.mapping index 676d51f5f3..26610d45fa 100644 --- a/mappings/net/minecraft/client/network/PingMeasurer.mapping +++ b/mappings/net/minecraft/client/network/PingMeasurer.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_8761 net/minecraft/client/network/PingMeasurer FIELD field_45948 handler Lnet/minecraft/class_634; - FIELD field_45949 log Lnet/minecraft/class_8743; - METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_8743;)V + FIELD field_45949 log Lnet/minecraft/class_9191; + METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_9191;)V ARG 1 handler ARG 2 log METHOD method_53486 ping ()V diff --git a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping index c5b3aaf75f..880134a8e3 100644 --- a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping +++ b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping @@ -1,5 +1 @@ CLASS net/minecraft/class_748 net/minecraft/client/option/HotbarStorageEntry - FIELD field_3948 delegate Lnet/minecraft/class_2371; - 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/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index 2a10708b27..49b88bbbb9 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -41,12 +41,7 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager COMMENT Ticks all particles belonging to the same texture sheet. ARG 1 particles COMMENT a collection of particles from the same sheet - METHOD method_3049 renderParticles (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_765;Lnet/minecraft/class_4184;F)V - ARG 1 matrices - ARG 2 vertexConsumers - ARG 3 lightmapTextureManager - ARG 4 camera - ARG 5 tickDelta + METHOD method_3049 renderParticles (Lnet/minecraft/class_765;Lnet/minecraft/class_4184;F)V METHOD method_3051 addEmitter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2394;I)V ARG 1 entity ARG 2 parameters diff --git a/mappings/net/minecraft/client/render/DiffuseLighting.mapping b/mappings/net/minecraft/client/render/DiffuseLighting.mapping index 03f8f5a375..ade47cc874 100644 --- a/mappings/net/minecraft/client/render/DiffuseLighting.mapping +++ b/mappings/net/minecraft/client/render/DiffuseLighting.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_308 net/minecraft/client/render/DiffuseLighting - METHOD method_1452 enableForLevel (Lorg/joml/Matrix4f;)V - ARG 0 positionMatrix + METHOD method_1452 enableForLevel ()V METHOD method_24210 disableGuiDepthLighting ()V METHOD method_24211 enableGuiDepthLighting ()V - METHOD method_27869 disableForLevel (Lorg/joml/Matrix4f;)V - ARG 0 positionMatrix + METHOD method_27869 disableForLevel ()V diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index c5f78e4f2c..a49fd71184 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_29358 particleProgram Lnet/minecraft/class_5944; FIELD field_29359 positionColorLightmapProgram Lnet/minecraft/class_5944; FIELD field_29360 positionColorTexLightmapProgram Lnet/minecraft/class_5944; - FIELD field_29361 positionTexColorNormalProgram Lnet/minecraft/class_5944; - FIELD field_29362 positionTexLightmapColorProgram Lnet/minecraft/class_5944; FIELD field_29363 renderTypeSolidProgram Lnet/minecraft/class_5944; FIELD field_29364 renderTypeCutoutMippedProgram Lnet/minecraft/class_5944; FIELD field_29365 renderTypeCutoutProgram Lnet/minecraft/class_5944; @@ -128,10 +126,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 1 scaledWidth ARG 2 scaledHeight ARG 3 tickDelta - METHOD method_3172 renderHand (Lnet/minecraft/class_4587;Lnet/minecraft/class_4184;F)V - ARG 1 matrices - ARG 2 camera - ARG 3 tickDelta + METHOD method_3172 renderHand (Lnet/minecraft/class_4184;F)V METHOD method_3174 getNightVisionStrength (Lnet/minecraft/class_1309;F)F ARG 0 entity ARG 1 tickDelta @@ -143,10 +138,9 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3186 bobView (Lnet/minecraft/class_4587;F)V ARG 1 matrices ARG 2 tickDelta - METHOD method_3188 renderWorld (FJLnet/minecraft/class_4587;)V + METHOD method_3188 renderWorld (FJ)V ARG 1 tickDelta ARG 2 limitTime - ARG 4 matrices METHOD method_3189 showFloatingItem (Lnet/minecraft/class_1799;)V ARG 1 floatingItem METHOD method_3190 updateCrosshairTarget (F)V @@ -245,8 +239,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_34546 getParticleProgram ()Lnet/minecraft/class_5944; METHOD method_34547 getPositionColorLightmapProgram ()Lnet/minecraft/class_5944; METHOD method_34548 getPositionColorTexLightmapProgram ()Lnet/minecraft/class_5944; - METHOD method_34549 getPositionTexColorNormalProgram ()Lnet/minecraft/class_5944; - METHOD method_35764 getPositionTexLightmapColorProgram ()Lnet/minecraft/class_5944; METHOD method_35765 isRenderingPanorama ()Z METHOD method_35766 renderWithZoom (FFF)V ARG 1 zoom @@ -290,12 +282,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 0 program METHOD method_36500 (Lnet/minecraft/class_5944;)V ARG 0 program - METHOD method_36501 (Lnet/minecraft/class_5944;)V - ARG 0 program METHOD method_36502 (Lnet/minecraft/class_5944;)V ARG 0 program - METHOD method_36503 (Lnet/minecraft/class_5944;)V - ARG 0 program METHOD method_36504 (Lnet/minecraft/class_5944;)V ARG 0 program METHOD method_36505 (Lnet/minecraft/class_5944;)V diff --git a/mappings/net/minecraft/client/render/MapRenderer.mapping b/mappings/net/minecraft/client/render/MapRenderer.mapping index 0a7df24f26..f688d3752c 100644 --- a/mappings/net/minecraft/client/render/MapRenderer.mapping +++ b/mappings/net/minecraft/client/render/MapRenderer.mapping @@ -7,22 +7,19 @@ CLASS net/minecraft/class_330 net/minecraft/client/render/MapRenderer FIELD field_32174 DEFAULT_IMAGE_HEIGHT I METHOD (Lnet/minecraft/class_1060;)V ARG 1 textureManager - METHOD method_1769 updateTexture (ILnet/minecraft/class_22;)V - ARG 1 id + METHOD method_1769 updateTexture (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V ARG 2 state METHOD method_1771 clearStateTextures ()V - METHOD method_1773 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_22;ZI)V + METHOD method_1773 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_9209;Lnet/minecraft/class_22;ZI)V ARG 1 matrices ARG 2 vertexConsumers - ARG 3 id ARG 4 state ARG 5 hidePlayerIcons ARG 6 light METHOD method_32600 (Lnet/minecraft/class_22;Ljava/lang/Integer;Lnet/minecraft/class_330$class_331;)Lnet/minecraft/class_330$class_331; ARG 2 id2 ARG 3 texture - METHOD method_32601 getMapTexture (ILnet/minecraft/class_22;)Lnet/minecraft/class_330$class_331; - ARG 1 id + METHOD method_32601 getMapTexture (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)Lnet/minecraft/class_330$class_331; ARG 2 state CLASS class_331 MapTexture FIELD field_2046 state Lnet/minecraft/class_22; diff --git a/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping b/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping index 94cdc72f60..1d842d08cd 100644 --- a/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping @@ -12,9 +12,6 @@ CLASS net/minecraft/class_4583 net/minecraft/client/render/OverlayVertexConsumer FIELD field_21053 inverseTextureMatrix Lorg/joml/Matrix4f; FIELD field_21054 inverseNormalMatrix Lorg/joml/Matrix3f; FIELD field_41091 textureScale F - METHOD (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;F)V + METHOD (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;F)V ARG 1 delegate - ARG 2 textureMatrix - ARG 3 normalMatrix - ARG 4 textureScale METHOD method_22891 init ()V diff --git a/mappings/net/minecraft/client/render/VertexConsumer.mapping b/mappings/net/minecraft/client/render/VertexConsumer.mapping index 5102d0dbf9..3a148ac11b 100644 --- a/mappings/net/minecraft/client/render/VertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumer.mapping @@ -160,7 +160,7 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer COMMENT COMMENT @return this consumer, for chaining ARG 1 uv - METHOD method_23763 normal (Lorg/joml/Matrix3f;FFF)Lnet/minecraft/class_4588; + METHOD method_23763 normal (Lnet/minecraft/class_4587$class_4665;FFF)Lnet/minecraft/class_4588; COMMENT Specifies the {@linkplain VertexFormats#NORMAL_ELEMENT COMMENT normal element} of the current vertex. COMMENT @@ -168,10 +168,6 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer COMMENT accepting a normal element. COMMENT COMMENT @return this consumer, for chaining - ARG 1 matrix - COMMENT the matrix that will be applied to the normal vector, typically {@link - COMMENT net.minecraft.client.util.math.MatrixStack.Entry#getNormalMatrix - COMMENT MatrixStack.Entry#getNormalMatrix} ARG 2 x ARG 3 y ARG 4 z diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 3cd347e178..ce33bd8419 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -88,15 +88,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 pos ARG 2 old ARG 3 updated - METHOD method_22710 render (Lnet/minecraft/class_4587;FJZLnet/minecraft/class_4184;Lnet/minecraft/class_757;Lnet/minecraft/class_765;Lorg/joml/Matrix4f;)V - ARG 1 matrices - ARG 2 tickDelta - ARG 3 limitTime - ARG 5 renderBlockOutline - ARG 6 camera - ARG 7 gameRenderer - ARG 8 lightmapTextureManager - ARG 9 projectionMatrix + METHOD method_22710 render (FJZLnet/minecraft/class_4184;Lnet/minecraft/class_757;Lnet/minecraft/class_765;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V METHOD method_22712 drawBlockOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;DDDLnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 matrices ARG 2 vertexConsumer @@ -218,10 +210,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_29364 getCloudsFramebuffer ()Lnet/minecraft/class_276; METHOD method_29365 loadTransparencyPostProcessor ()V METHOD method_29701 resetTransparencyPostProcessor ()V - METHOD method_32133 setupFrustum (Lnet/minecraft/class_4587;Lnet/minecraft/class_243;Lorg/joml/Matrix4f;)V - ARG 1 matrices - ARG 2 pos - ARG 3 projectionMatrix + METHOD method_32133 setupFrustum (Lnet/minecraft/class_243;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V METHOD method_3239 renderClouds (Lnet/minecraft/class_287;DDDLnet/minecraft/class_243;)Lnet/minecraft/class_287$class_7433; ARG 1 builder ARG 2 x @@ -245,19 +234,14 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 3 playing METHOD method_3250 renderEndSky (Lnet/minecraft/class_4587;)V ARG 1 matrices - METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;Lnet/minecraft/class_4587;DDDLorg/joml/Matrix4f;)V + METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;DDDLorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V ARG 1 renderLayer - ARG 2 matrices - ARG 3 cameraX - ARG 5 cameraY - ARG 7 cameraZ ARG 9 positionMatrix METHOD method_3252 tick ()V METHOD method_3254 drawEntityOutlinesFramebuffer ()V METHOD method_3255 renderStars (Lnet/minecraft/class_287;)Lnet/minecraft/class_287$class_7433; ARG 1 buffer - METHOD method_3257 renderSky (Lnet/minecraft/class_4587;Lorg/joml/Matrix4f;FLnet/minecraft/class_4184;ZLjava/lang/Runnable;)V - ARG 1 matrices + METHOD method_3257 renderSky (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FLnet/minecraft/class_4184;ZLjava/lang/Runnable;)V ARG 2 projectionMatrix ARG 3 tickDelta ARG 4 camera @@ -276,13 +260,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 15 green ARG 16 blue ARG 17 alpha - METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;Lorg/joml/Matrix4f;FDDD)V - ARG 1 matrices - ARG 2 projectionMatrix - ARG 3 tickDelta - ARG 4 cameraX - ARG 6 cameraY - ARG 8 cameraZ + METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FDDD)V METHOD method_3265 renderDarkSky ()V METHOD method_3267 cleanUp ()V METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066; @@ -418,7 +396,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 song ARG 2 songPosition METHOD method_8563 addParticle (Lnet/minecraft/class_2394;ZZDDDDDD)V - ARG 1 parameters ARG 2 shouldAlwaysSpawn ARG 3 important ARG 4 x diff --git a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping index 19f42be3f2..65e6941250 100644 --- a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping @@ -3,24 +3,7 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlo FIELD field_4338 BEAM_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_5614$class_5615;)V ARG 1 ctx - METHOD method_22740 renderBeamFace (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;Lnet/minecraft/class_4588;FFFFIIFFFFFFFF)V - ARG 0 positionMatrix - ARG 1 normalMatrix - ARG 2 vertices - ARG 3 red - ARG 4 green - ARG 5 blue - ARG 6 alpha - ARG 7 yOffset - ARG 8 height - ARG 9 x1 - ARG 10 z1 - ARG 11 x2 - ARG 12 z2 - ARG 13 u1 - ARG 14 u2 - ARG 15 v1 - ARG 16 v2 + METHOD method_22740 renderBeamFace (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFIIFFFFFFFF)V METHOD method_22741 renderBeamLayer (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;FFFFIIFFFFFFFFFFFF)V ARG 0 matrices ARG 1 vertices @@ -42,21 +25,7 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlo ARG 17 u2 ARG 18 v1 ARG 19 v2 - METHOD method_23076 renderBeamVertex (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;Lnet/minecraft/class_4588;FFFFIFFFF)V - ARG 0 positionMatrix - ARG 1 normalMatrix - ARG 2 vertices - ARG 3 red - ARG 4 green - ARG 5 blue - ARG 6 alpha - ARG 7 y - ARG 8 x - ARG 9 z - ARG 10 u - COMMENT the left-most coordinate of the texture region - ARG 11 v - COMMENT the top-most coordinate of the texture region + METHOD method_23076 renderBeamVertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFIFFFF)V METHOD method_3543 renderBeam (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;FJII[F)V ARG 0 matrices ARG 1 vertexConsumers diff --git a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping index bb226a828a..790defba6d 100644 --- a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping @@ -1,12 +1,5 @@ CLASS net/minecraft/class_891 net/minecraft/client/render/entity/DragonFireballEntityRenderer FIELD field_21735 LAYER Lnet/minecraft/class_1921; FIELD field_4661 TEXTURE Lnet/minecraft/class_2960; - METHOD method_23837 produceVertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;IFIII)V + METHOD method_23837 produceVertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;IFIII)V ARG 0 vertexConsumer - ARG 1 positionMatrix - ARG 2 normalMatrix - ARG 3 light - ARG 4 x - ARG 5 y - ARG 6 textureU - ARG 7 textureV diff --git a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping index ec58ba269d..d12a7cff4c 100644 --- a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping @@ -1,15 +1,5 @@ CLASS net/minecraft/class_902 net/minecraft/client/render/entity/ExperienceOrbEntityRenderer FIELD field_21741 LAYER Lnet/minecraft/class_1921; FIELD field_4701 TEXTURE Lnet/minecraft/class_2960; - METHOD method_23171 vertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;FFIIIFFI)V + METHOD method_23171 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;FFIIIFFI)V ARG 0 vertexConsumer - ARG 1 positionMatrix - ARG 2 normalMatrix - ARG 3 x - ARG 4 y - ARG 5 red - ARG 6 green - ARG 7 blue - ARG 8 u - ARG 9 v - ARG 10 light diff --git a/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping index 85381d8c41..62ebbd16e3 100644 --- a/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping @@ -9,15 +9,8 @@ CLASS net/minecraft/class_906 net/minecraft/client/render/entity/FishingBobberEn ARG 4 matrices ARG 5 segmentStart ARG 6 segmentEnd - METHOD method_23840 vertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;IFIII)V + METHOD method_23840 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;IFIII)V ARG 0 buffer - ARG 1 matrix - ARG 2 normalMatrix - ARG 3 light - ARG 4 x - ARG 5 y - ARG 6 u - ARG 7 v METHOD method_23954 percentage (II)F ARG 0 value ARG 1 max diff --git a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping index 1a8ad96706..99d112477b 100644 --- a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping @@ -6,18 +6,8 @@ CLASS net/minecraft/class_907 net/minecraft/client/render/entity/GuardianEntityR ARG 1 ctx ARG 2 shadowRadius ARG 3 layer - METHOD method_23173 vertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;FFFIIIFF)V + METHOD method_23173 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;FFFIIIFF)V ARG 0 vertexConsumer - ARG 1 positionMatrix - ARG 2 normalMatrix - ARG 3 x - ARG 4 y - ARG 5 z - ARG 6 red - ARG 7 green - ARG 8 blue - ARG 9 u - ARG 10 v METHOD method_3979 fromLerpedPosition (Lnet/minecraft/class_1309;DF)Lnet/minecraft/class_243; ARG 1 entity ARG 2 yOffset diff --git a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping index e8de96a571..af0a2ab5b1 100644 --- a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping @@ -1,9 +1,3 @@ CLASS net/minecraft/class_916 net/minecraft/client/render/entity/ItemEntityRenderer - FIELD field_32925 MAX_COUNT_FOR_4_ITEMS_RENDERED I - FIELD field_32926 MAX_COUNT_FOR_3_ITEMS_RENDERED I - FIELD field_32927 MAX_COUNT_FOR_2_ITEMS_RENDERED I - FIELD field_32928 MAX_COUNT_FOR_1_ITEM_RENDERED I FIELD field_4725 random Lnet/minecraft/class_5819; FIELD field_4726 itemRenderer Lnet/minecraft/class_918; - METHOD method_3998 getRenderedAmount (Lnet/minecraft/class_1799;)I - ARG 1 stack diff --git a/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping index f93b186df9..f5869a3ace 100644 --- a/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping @@ -1,17 +1,5 @@ CLASS net/minecraft/class_928 net/minecraft/client/render/entity/PaintingEntityRenderer - METHOD method_23188 vertex (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;Lnet/minecraft/class_4588;FFFFFIIII)V - ARG 1 positionMatrix - ARG 2 normalMatrix - ARG 3 vertexConsumer - ARG 4 x - ARG 5 y - ARG 6 u - ARG 7 v - ARG 8 z - ARG 9 normalX - ARG 10 normalY - ARG 11 normalZ - ARG 12 light + METHOD method_23188 vertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFFIIII)V METHOD method_4074 renderPainting (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1534;IILnet/minecraft/class_1058;Lnet/minecraft/class_1058;)V ARG 1 matrices ARG 2 vertexConsumer diff --git a/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping index 2a0610b70e..e220f0a4c2 100644 --- a/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping @@ -1,14 +1,2 @@ CLASS net/minecraft/class_876 net/minecraft/client/render/entity/ProjectileEntityRenderer - METHOD method_23153 vertex (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;Lnet/minecraft/class_4588;IIIFFIIII)V - ARG 1 positionMatrix - ARG 2 normalMatrix - ARG 3 vertexConsumer - ARG 4 x - ARG 5 y - ARG 6 z - ARG 7 u - ARG 8 v - ARG 9 normalX - ARG 10 normalZ - ARG 11 normalY - ARG 12 light + METHOD method_23153 vertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;IIIFFIIII)V diff --git a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping index afbad9b3b9..66f2820c27 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping @@ -8,17 +8,10 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe ARG 2 innerModel ARG 3 outerModel ARG 4 bakery - METHOD method_23192 renderArmorParts (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1738;Lnet/minecraft/class_572;ZFFFLjava/lang/String;)V + METHOD method_23192 renderArmorParts (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_572;FFFLnet/minecraft/class_2960;)V ARG 1 matrices ARG 2 vertexConsumers ARG 3 light - ARG 4 item - ARG 5 model - ARG 6 secondTextureLayer - ARG 7 red - ARG 8 green - ARG 9 blue - ARG 10 overlay METHOD method_4169 renderArmor (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1309;Lnet/minecraft/class_1304;ILnet/minecraft/class_572;)V ARG 1 matrices ARG 2 vertexConsumers @@ -33,12 +26,7 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe ARG 1 slot METHOD method_4173 usesInnerModel (Lnet/minecraft/class_1304;)Z ARG 1 slot - METHOD method_4174 getArmorTexture (Lnet/minecraft/class_1738;ZLjava/lang/String;)Lnet/minecraft/class_2960; - ARG 1 item - ARG 2 secondLayer - ARG 3 overlay - METHOD method_48482 renderTrim (Lnet/minecraft/class_1741;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_8053;Lnet/minecraft/class_572;Z)V - ARG 1 material + METHOD method_48482 renderTrim (Lnet/minecraft/class_6880;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_8053;Lnet/minecraft/class_572;Z)V ARG 2 matrices ARG 3 vertexConsumers ARG 4 light diff --git a/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping index ae2da9dfd8..9b68dd3a04 100644 --- a/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping @@ -1,11 +1,4 @@ CLASS net/minecraft/class_4506 net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer FIELD field_20529 TEXTURE Lnet/minecraft/class_2960; - METHOD method_23295 produceVertex (Lnet/minecraft/class_4588;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;FIFFI)V + METHOD method_23295 produceVertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;FIFFI)V ARG 0 vertexConsumer - ARG 1 vertexTransform - ARG 2 normalTransform - ARG 3 x - ARG 4 y - ARG 5 u - ARG 6 v - ARG 7 light diff --git a/mappings/net/minecraft/client/util/math/MatrixStack.mapping b/mappings/net/minecraft/client/util/math/MatrixStack.mapping index f70a4b987d..ab5608e83f 100644 --- a/mappings/net/minecraft/client/util/math/MatrixStack.mapping +++ b/mappings/net/minecraft/client/util/math/MatrixStack.mapping @@ -61,7 +61,6 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack FIELD field_21327 positionMatrix Lorg/joml/Matrix4f; FIELD field_21328 normalMatrix Lorg/joml/Matrix3f; METHOD (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;)V - ARG 1 positionMatrix ARG 2 normalMatrix METHOD method_23761 getPositionMatrix ()Lorg/joml/Matrix4f; COMMENT {@return the matrix used to transform positions} diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 1d8264b013..eda21d4775 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -151,8 +151,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 10 pitch ARG 11 useDistance ARG 12 seed - METHOD method_47437 putClientsideMapState (Ljava/lang/String;Lnet/minecraft/class_22;)V - ARG 1 id + METHOD method_47437 putClientsideMapState (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V ARG 2 state METHOD method_53875 addEntity (Lnet/minecraft/class_1297;)V ARG 1 entity diff --git a/mappings/net/minecraft/command/CommandRegistryAccess.mapping b/mappings/net/minecraft/command/CommandRegistryAccess.mapping index 9582724362..26757a456b 100644 --- a/mappings/net/minecraft/command/CommandRegistryAccess.mapping +++ b/mappings/net/minecraft/command/CommandRegistryAccess.mapping @@ -5,26 +5,6 @@ CLASS net/minecraft/class_7157 net/minecraft/command/CommandRegistryAccess COMMENT @apiNote You usually do not need to create your own instance; the command registration COMMENT callbacks (such as {@link net.minecraft.server.command.CommandManager} constructor) COMMENT provides an instance with proper configurations. - METHOD method_41699 createWrapper (Lnet/minecraft/class_5321;)Lnet/minecraft/class_7225; - COMMENT Creates a registry wrapper that follows the entry list creation policy. - ARG 1 registryRef - COMMENT the registry key of the registry to wrap METHOD method_46722 of (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_7699;)Lnet/minecraft/class_7157; ARG 0 wrapperLookup ARG 1 enabledFeatures - METHOD method_46723 of (Lnet/minecraft/class_5455;Lnet/minecraft/class_7699;)Lnet/minecraft/class_7157$class_7870; - ARG 0 registryManager - ARG 1 enabledFeatures - CLASS 2 - FIELD field_40912 entryListCreationPolicy Lnet/minecraft/class_7157$class_7158; - CLASS class_7158 EntryListCreationPolicy - COMMENT A policy on how to handle a {@link net.minecraft.registry.tag.TagKey} that does not resolve - COMMENT to an existing tag (unrecognized tag) in {@link - COMMENT net.minecraft.registry.RegistryWrapper#getOptional(net.minecraft.registry.tag.TagKey)}. - FIELD field_37824 Lnet/minecraft/class_7157$class_7158; - COMMENT Creates a new {@link net.minecraft.registry.entry.RegistryEntryList}, stores it and returns it. - FIELD field_37826 Lnet/minecraft/class_7157$class_7158; - COMMENT Throws an exception. - CLASS class_7870 EntryListCreationPolicySettable - METHOD method_46724 setEntryListCreationPolicy (Lnet/minecraft/class_7157$class_7158;)V - ARG 1 entryListCreationPolicy diff --git a/mappings/net/minecraft/command/DataCommandStorage.mapping b/mappings/net/minecraft/command/DataCommandStorage.mapping index f49f6cdcab..4d170c6a35 100644 --- a/mappings/net/minecraft/command/DataCommandStorage.mapping +++ b/mappings/net/minecraft/command/DataCommandStorage.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_4565 net/minecraft/command/DataCommandStorage METHOD method_22547 set (Lnet/minecraft/class_2960;Lnet/minecraft/class_2487;)V ARG 1 id ARG 2 nbt - METHOD method_52613 (Ljava/lang/String;Lnet/minecraft/class_2487;)Lnet/minecraft/class_4565$class_4566; + METHOD method_52613 (Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_4565$class_4566; ARG 2 nbt METHOD method_52614 getPersistentStateType (Ljava/lang/String;)Lnet/minecraft/class_18$class_8645; ARG 1 namespace diff --git a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping index 4ac0f89410..69fd10f438 100644 --- a/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ItemPredicateArgumentType.mapping @@ -1,27 +1,13 @@ CLASS net/minecraft/class_2293 net/minecraft/command/argument/ItemPredicateArgumentType FIELD field_10812 EXAMPLES Ljava/util/Collection; - FIELD field_37974 registryWrapper Lnet/minecraft/class_7225; METHOD (Lnet/minecraft/class_7157;)V ARG 1 commandRegistryAccess METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder - METHOD method_41977 (Lnet/minecraft/class_2291$class_7215;)Lnet/minecraft/class_2293$class_2295; - ARG 0 item - METHOD method_41978 (Lnet/minecraft/class_2291$class_7215;Lnet/minecraft/class_6880;)Z - ARG 1 item2 - METHOD method_41979 (Lnet/minecraft/class_2291$class_7216;)Lnet/minecraft/class_2293$class_2295; - ARG 0 tag - METHOD method_41980 (Ljava/util/function/Predicate;Lnet/minecraft/class_1799;)Z - ARG 1 stack - METHOD method_41981 getItemStackPredicate (Ljava/util/function/Predicate;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2293$class_2295; - ARG 0 predicate - ARG 1 nbt - METHOD method_41982 (Ljava/util/function/Predicate;Lnet/minecraft/class_2487;Lnet/minecraft/class_1799;)Z - ARG 2 stack METHOD method_9801 itemPredicate (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2293; ARG 0 commandRegistryAccess - METHOD method_9804 getItemStackPredicate (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/function/Predicate; + METHOD method_9804 getItemStackPredicate (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2293$class_2295; ARG 0 context ARG 1 name METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping index 1143a2b000..d77f7a9e94 100644 --- a/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ItemStackArgumentType.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_2287 net/minecraft/command/argument/ItemStackArgumentType FIELD field_10790 EXAMPLES Ljava/util/Collection; - FIELD field_37970 registryWrapper Lnet/minecraft/class_7225; METHOD (Lnet/minecraft/class_7157;)V ARG 1 commandRegistryAccess METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/command/argument/ItemStringReader.mapping b/mappings/net/minecraft/command/argument/ItemStringReader.mapping index da73ca988b..fe677f619a 100644 --- a/mappings/net/minecraft/command/argument/ItemStringReader.mapping +++ b/mappings/net/minecraft/command/argument/ItemStringReader.mapping @@ -1,49 +1,4 @@ CLASS net/minecraft/class_2291 net/minecraft/command/argument/ItemStringReader - FIELD field_10799 ID_INVALID_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD field_10800 TAG_DISALLOWED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_10802 reader Lcom/mojang/brigadier/StringReader; - FIELD field_10804 allowTag Z - FIELD field_10805 suggestions Ljava/util/function/Function; - FIELD field_10806 NBT_SUGGESTION_PROVIDER Ljava/util/function/Function; - FIELD field_10807 nbt Lnet/minecraft/class_2487; - FIELD field_33066 LEFT_CURLY_BRACKET C - FIELD field_33067 HASH_SIGN C - FIELD field_37971 UNKNOWN_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; - FIELD field_37972 registryWrapper Lnet/minecraft/class_7225; - FIELD field_37973 result Lcom/mojang/datafixers/util/Either; - METHOD (Lnet/minecraft/class_7225;Lcom/mojang/brigadier/StringReader;Z)V - ARG 1 registryWrapper - ARG 2 reader - ARG 3 allowTag - METHOD method_41970 (Lnet/minecraft/class_2291;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2291$class_7215; - ARG 1 item - METHOD method_41971 (Lnet/minecraft/class_2291;Lnet/minecraft/class_6885;)Lnet/minecraft/class_2291$class_7216; - ARG 1 tag - METHOD method_41972 item (Lnet/minecraft/class_7225;Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2291$class_7215; - ARG 0 registryWrapper - ARG 1 reader - METHOD method_41973 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 tag - METHOD method_41974 itemOrTag (Lnet/minecraft/class_7225;Lcom/mojang/brigadier/StringReader;)Lcom/mojang/datafixers/util/Either; - ARG 0 registryWrapper - ARG 1 reader - METHOD method_41975 suggestItemId (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 1 builder - METHOD method_9787 readTag ()V - METHOD method_9788 readNbt ()V - METHOD method_9789 consume ()V - METHOD method_9791 suggestItemOrTagId (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 1 builder - METHOD method_9792 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 id - METHOD method_9793 getSuggestions (Lnet/minecraft/class_7225;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Z)Ljava/util/concurrent/CompletableFuture; - ARG 0 registryWrapper - ARG 1 builder - ARG 2 allowTag - METHOD method_9794 suggestItem (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 1 builder - METHOD method_9795 readItem ()V - METHOD method_9796 suggestTag (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 1 builder + METHOD method_9789 consume (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2291$class_7215; + METHOD method_9793 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; CLASS class_7215 ItemResult - CLASS class_7216 TagResult diff --git a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping index c1f7e860a3..7eb7de6ab6 100644 --- a/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ParticleEffectArgumentType.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgumentType - FIELD field_40383 registryWrapper Lnet/minecraft/class_7225; FIELD field_9935 EXAMPLES Ljava/util/Collection; FIELD field_9936 UNKNOWN_PARTICLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD (Lnet/minecraft/class_7157;)V @@ -12,12 +11,11 @@ CLASS net/minecraft/class_2223 net/minecraft/command/argument/ParticleEffectArgu ARG 1 registryWrapper METHOD method_9417 particleEffect (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2223; ARG 0 registryAccess - METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225;)Lnet/minecraft/class_2394; + METHOD method_9418 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394; ARG 0 reader - ARG 1 registryWrapper METHOD method_9419 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 id - METHOD method_9420 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394; + METHOD method_9420 readParameters (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2396;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394; ARG 0 reader ARG 1 type METHOD method_9421 getParticle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2394; diff --git a/mappings/net/minecraft/command/argument/StyleArgumentType.mapping b/mappings/net/minecraft/command/argument/StyleArgumentType.mapping index 74f47f8b58..da68dcdbf7 100644 --- a/mappings/net/minecraft/command/argument/StyleArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/StyleArgumentType.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_9019 net/minecraft/command/argument/StyleArgumentType FIELD field_47553 INVALID_STYLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_47554 EXAMPLES Ljava/util/Collection; - METHOD method_55446 style ()Lnet/minecraft/class_9019; + METHOD method_55446 style (Lnet/minecraft/class_7157;)Lnet/minecraft/class_9019; METHOD method_55448 getStyle (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2583; ARG 0 context ARG 1 style diff --git a/mappings/net/minecraft/command/argument/TextArgumentType.mapping b/mappings/net/minecraft/command/argument/TextArgumentType.mapping index 7d6e3e9853..8873354a7b 100644 --- a/mappings/net/minecraft/command/argument/TextArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/TextArgumentType.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_2178 net/minecraft/command/argument/TextArgumentType METHOD method_9280 getTextArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 0 context ARG 1 name - METHOD method_9281 text ()Lnet/minecraft/class_2178; + METHOD method_9281 text (Lnet/minecraft/class_7157;)Lnet/minecraft/class_2178; METHOD method_9282 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 text METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index 4bfb438dd4..91ad0cb909 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -13,11 +13,8 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider ARG 0 map METHOD method_43809 (Ljava/lang/String;)Ljava/lang/String; ARG 0 key - METHOD method_53496 writeCodecToPath (Lnet/minecraft/class_7403;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; + METHOD method_53496 writeCodecToPath (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; ARG 0 writer - ARG 1 codec - ARG 2 value - ARG 3 path CLASS class_7857 Factory METHOD create (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2405; ARG 1 output diff --git a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping index 9a6f3938f1..72dbe3480e 100644 --- a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping @@ -27,10 +27,9 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator METHOD method_48518 suffixTrim (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_2960; ARG 1 id ARG 2 trimMaterialName - METHOD method_48519 createArmorJson (Lnet/minecraft/class_2960;Ljava/util/Map;Lnet/minecraft/class_1741;)Lcom/google/gson/JsonObject; + METHOD method_48519 createArmorJson (Lnet/minecraft/class_2960;Ljava/util/Map;Lnet/minecraft/class_6880;)Lcom/google/gson/JsonObject; ARG 1 id ARG 2 textures - ARG 3 armorMaterial METHOD method_48522 (Lnet/minecraft/class_1738;Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; ARG 2 id ARG 3 textures @@ -45,5 +44,4 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator ARG 2 id ARG 3 textures CLASS class_8072 TrimMaterial - METHOD method_48744 getAppliedName (Lnet/minecraft/class_1741;)Ljava/lang/String; - ARG 1 armorMaterial + METHOD method_48744 getAppliedName (Lnet/minecraft/class_6880;)Ljava/lang/String; diff --git a/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping b/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping index 89bf3fd0a3..9d46f24aa4 100644 --- a/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping +++ b/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping @@ -6,7 +6,5 @@ CLASS net/minecraft/class_2409 net/minecraft/data/server/advancement/Advancement ARG 1 output ARG 2 registryLookupFuture ARG 3 tabGenerators - METHOD method_10333 (Ljava/util/Set;Ljava/util/List;Lnet/minecraft/class_7403;Lnet/minecraft/class_8779;)V - ARG 4 advancement METHOD method_46809 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; ARG 2 lookup diff --git a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping index 6f3822115c..bf752d50a2 100644 --- a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping +++ b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping @@ -3,15 +3,13 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProv FIELD field_11355 LOGGER Lorg/slf4j/Logger; FIELD field_39374 pathResolver Lnet/minecraft/class_7784$class_7489; FIELD field_40617 lootTableIds Ljava/util/Set; - METHOD (Lnet/minecraft/class_7784;Ljava/util/Set;Ljava/util/List;)V + METHOD (Lnet/minecraft/class_7784;Ljava/util/Set;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 lootTableIds ARG 3 lootTypeGenerators METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V ARG 0 name ARG 1 message - METHOD method_10408 (Lnet/minecraft/class_7403;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture; - ARG 2 entry METHOD method_10410 (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;)V ARG 2 generator METHOD method_10411 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V diff --git a/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping index 147da0934c..9ea2245edc 100644 --- a/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping +++ b/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_8903 net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders - METHOD method_54653 createOneTwentyOneProvider (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2438; + METHOD method_54653 createOneTwentyOneProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2438; ARG 0 output diff --git a/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping index 57094bc8a8..05e2a647c8 100644 --- a/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping +++ b/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_8795 net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders - METHOD method_53853 createTradeRebalanceProvider (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2438; + METHOD method_53853 createTradeRebalanceProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2438; ARG 0 output diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping index 251fb1c5bf..e4fa640edb 100644 --- a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_7794 net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders - METHOD method_46184 createVanillaProvider (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2438; + METHOD method_46184 createVanillaProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2438; ARG 0 output diff --git a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping index 748dcb7ab0..b30d728673 100644 --- a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping +++ b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider FIELD field_28555 VARIANT_FACTORIES Ljava/util/Map; FIELD field_39378 recipesPathResolver Lnet/minecraft/class_7784$class_7489; FIELD field_39379 advancementsPathResolver Lnet/minecraft/class_7784$class_7489; - METHOD (Lnet/minecraft/class_7784;)V + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output METHOD method_10419 generate (Lnet/minecraft/class_8790;)V ARG 1 exporter @@ -335,9 +335,8 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider ARG 0 exporter ARG 1 output ARG 2 input - METHOD method_46206 saveRecipeAdvancement (Lnet/minecraft/class_7403;Lnet/minecraft/class_8779;)Ljava/util/concurrent/CompletableFuture; + METHOD method_46206 saveRecipeAdvancement (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_8779;)Ljava/util/concurrent/CompletableFuture; ARG 1 cache - ARG 2 advancement METHOD method_46207 generateFamilies (Lnet/minecraft/class_8790;Lnet/minecraft/class_7699;)V ARG 0 exporter ARG 1 enabledFeatures diff --git a/mappings/net/minecraft/data/server/tag/TagProvider.mapping b/mappings/net/minecraft/data/server/tag/TagProvider.mapping index daaf448999..afd493d8d1 100644 --- a/mappings/net/minecraft/data/server/tag/TagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/TagProvider.mapping @@ -19,8 +19,6 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/tag/TagProvider ARG 1 tag METHOD method_10514 configure (Lnet/minecraft/class_7225$class_7874;)V ARG 1 lookup - METHOD method_27046 (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_7403;Ljava/util/Map$Entry;)Ljava/util/concurrent/CompletableFuture; - ARG 4 entry METHOD method_27169 getTagBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_3495; ARG 1 tag METHOD method_27170 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3495; diff --git a/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping b/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping index 41b1245dd0..aca85403b0 100644 --- a/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix.mapping @@ -1,12 +1,6 @@ CLASS net/minecraft/class_3577 net/minecraft/datafixer/fix/BlockEntitySignTextStrictJsonFix - FIELD field_15827 GSON Lcom/google/gson/Gson; METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType METHOD method_15582 fix (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; ARG 2 lineName - CLASS 1 - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 functionJson - ARG 2 unused - ARG 3 context diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index c452567813..0c771c83de 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -209,7 +209,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6025 NULL_BOX Lnet/minecraft/class_238; FIELD field_6027 CUSTOM_NAME Lnet/minecraft/class_2940; FIELD field_6029 commandTags Ljava/util/Set; - FIELD field_6030 EMPTY_STACK_LIST Ljava/util/List; FIELD field_6031 yaw F FIELD field_6032 AIR Lnet/minecraft/class_2940; FIELD field_6034 vehicle Lnet/minecraft/class_1297; @@ -1224,11 +1223,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @see #isSneaking COMMENT @see #isInSneakingPose ARG 1 sneaking - METHOD method_5661 getArmorItems ()Ljava/lang/Iterable; - COMMENT {@return an iterable of item stacks equipped as armor} - COMMENT - COMMENT @see #getHandItems - COMMENT @see #getItemsEquipped METHOD method_5662 saveNbt (Lnet/minecraft/class_2487;)Z ARG 1 nbt METHOD method_5663 getRotationVecClient ()Lnet/minecraft/class_243; @@ -1269,12 +1263,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5671 getCommandSource ()Lnet/minecraft/class_2168; COMMENT {@return a command source which represents this entity} METHOD method_5672 getHighSpeedSplashSound ()Lnet/minecraft/class_3414; - METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V - COMMENT Equips {@code stack} at {@code slot}.This is also used to set an entity's - COMMENT mainhand or offhand stack. This overwrites any stacks present in that slot - COMMENT without dropping them. - ARG 1 slot - ARG 2 stack METHOD method_5674 onTrackedDataSet (Lnet/minecraft/class_2940;)V COMMENT Called on the client when the tracked data is set. COMMENT @@ -1621,11 +1609,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT

Entities with boss bars like {@link net.minecraft.entity.boss.WitherEntity} COMMENT should override this to remove the player from the boss bar. ARG 1 player - METHOD method_5743 getItemsEquipped ()Ljava/lang/Iterable; - COMMENT {@return an iterable of item stacks held in the hands or equipped as armor} - COMMENT - COMMENT @see #getHandItems - COMMENT @see #getArmorItems METHOD method_5745 raycast (DFZ)Lnet/minecraft/class_239; ARG 1 maxDistance ARG 3 tickDelta @@ -2279,11 +2262,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT no gravity. This is saved under the {@code NoGravity} NBT key. ARG 1 noGravity METHOD method_5876 updateWaterState ()Z - METHOD method_5877 getHandItems ()Ljava/lang/Iterable; - COMMENT {@return an iterable of item stacks held in the hands} - COMMENT - COMMENT @see #getArmorItems - COMMENT @see #getItemsEquipped METHOD method_5878 copyFrom (Lnet/minecraft/class_1297;)V COMMENT Copies serializable data and nether portal data from {@code original}. COMMENT diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index fc069ec9b8..469e601773 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -118,14 +118,8 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 1 pos ARG 2 invertY ARG 3 boundingBox - METHOD method_5888 create (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; + METHOD method_5888 create (Lnet/minecraft/class_3218;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; ARG 1 world - ARG 2 itemNbt - ARG 3 afterConsumer - ARG 4 pos - ARG 5 reason - ARG 6 alignPosition - ARG 7 invertY METHOD method_5890 getId (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2960; ARG 0 type METHOD method_5891 getSpawnGroup ()Lnet/minecraft/class_1311; @@ -148,14 +142,8 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD method_5897 getName ()Lnet/minecraft/class_2561; METHOD method_5898 get (Ljava/lang/String;)Ljava/util/Optional; ARG 0 id - METHOD method_5899 spawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; + METHOD method_5899 spawn (Lnet/minecraft/class_3218;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; ARG 1 world - ARG 2 itemNbt - ARG 3 afterConsumer - ARG 4 pos - ARG 5 reason - ARG 6 alignPosition - ARG 7 invertY CLASS 1 METHOD method_31490 (Lnet/minecraft/class_1937;Ljava/util/function/Consumer;Lnet/minecraft/class_2520;)V ARG 2 nbt diff --git a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping index f8b2220379..e051af3a08 100644 --- a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping +++ b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping @@ -11,8 +11,6 @@ CLASS net/minecraft/class_1672 net/minecraft/entity/EyeOfEnderEntity ARG 4 y ARG 6 z METHOD method_16933 setItem (Lnet/minecraft/class_1799;)V - ARG 1 stack - METHOD method_16935 getTrackedItem ()Lnet/minecraft/class_1799; METHOD method_7478 initTargetPos (Lnet/minecraft/class_2338;)V COMMENT Sets where the eye will fly towards. COMMENT If close enough, it will fly directly towards it, otherwise, it will fly upwards, in the direction of the BlockPos. diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index 536de073bb..f92bc766f7 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -44,8 +44,6 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity ARG 1 stack1 ARG 2 stack2 METHOD method_24017 canMerge (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z - ARG 0 stack1 - ARG 1 stack2 METHOD method_24018 merge (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1799; ARG 0 stack1 ARG 1 stack2 diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 598f1f4cdd..a8e0e03b81 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -368,6 +368,9 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 sound METHOD method_56079 getSlotForHand (Lnet/minecraft/class_1268;)Lnet/minecraft/class_1304; ARG 0 hand + METHOD method_5661 getArmorItems ()Ljava/lang/Iterable; + METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V + METHOD method_5877 getHandItems ()Ljava/lang/Iterable; METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_5989 getLootTable ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping index 7c13dacb2e..1628ede296 100644 --- a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping @@ -21,7 +21,7 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity METHOD method_34244 getRotateItemSound ()Lnet/minecraft/class_3414; METHOD method_43271 setAsStackHolder (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_43272 getMapId ()Ljava/util/OptionalInt; + METHOD method_43272 getMapId ()Lnet/minecraft/class_9209; METHOD method_43273 containsMap ()Z METHOD method_6933 setHeldItemStack (Lnet/minecraft/class_1799;Z)V ARG 1 value diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index f2c3e7470b..01d1be6124 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -6,13 +6,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance COMMENT

This exists so that long-duration low-amplifier effects reappears COMMENT after short-duration high-amplifier effects run out. FIELD field_42106 INFINITE I - FIELD field_45730 ID_NBT_KEY Ljava/lang/String; - FIELD field_45731 AMBIENT_NBT_KEY Ljava/lang/String; - FIELD field_45732 HIDDEN_EFFECT_NBT_KEY Ljava/lang/String; - FIELD field_45733 AMPLIFIER_NBT_KEY Ljava/lang/String; - FIELD field_45734 DURATION_NBT_KEY Ljava/lang/String; - FIELD field_45735 SHOW_PARTICLES_NBT_KEY Ljava/lang/String; - FIELD field_45736 SHOW_ICON_NBT_KEY Ljava/lang/String; FIELD field_47739 fading Lnet/minecraft/class_1293$class_9063; FIELD field_5889 showIcon Z FIELD field_5890 showParticles Z @@ -57,13 +50,8 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 1 that METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_24275 fromNbt (Lnet/minecraft/class_6880;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; - ARG 0 effect - ARG 1 nbt METHOD method_24276 copyFrom (Lnet/minecraft/class_1293;)V ARG 1 that - METHOD method_24277 writeTypelessNbt (Lnet/minecraft/class_2487;)V - ARG 1 nbt METHOD method_48557 isDurationBelow (I)Z ARG 1 duration METHOD method_48558 mapDuration (Lit/unimi/dsi/fastutil/ints/Int2IntFunction;)I @@ -87,8 +75,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 2 tickDelta METHOD method_55654 equals (Lnet/minecraft/class_6880;)Z ARG 1 effect - METHOD method_55655 (Lnet/minecraft/class_2487;Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_1293; - ARG 1 effect METHOD method_55656 copyFadingFrom (Lnet/minecraft/class_1293;)V ARG 1 effect METHOD method_55657 skipFading ()V @@ -98,8 +84,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_5578 getAmplifier ()I METHOD method_5579 getEffectType ()Lnet/minecraft/class_6880; METHOD method_5581 shouldShowParticles ()Z - METHOD method_5582 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 nbt + METHOD method_5582 writeNbt ()Lnet/minecraft/class_2520; METHOD method_5583 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; ARG 0 nbt METHOD method_5584 getDuration ()I diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 01bf1f438f..6c18a6cd7d 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -173,12 +173,11 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 1 nodeType ARG 2 penalty METHOD method_5942 getNavigation ()Lnet/minecraft/class_1408; - METHOD method_5943 initialize (Lnet/minecraft/class_5425;Lnet/minecraft/class_1266;Lnet/minecraft/class_3730;Lnet/minecraft/class_1315;Lnet/minecraft/class_2487;)Lnet/minecraft/class_1315; + METHOD method_5943 initialize (Lnet/minecraft/class_5425;Lnet/minecraft/class_1266;Lnet/minecraft/class_3730;Lnet/minecraft/class_1315;)Lnet/minecraft/class_1315; ARG 1 world ARG 2 difficulty ARG 3 spawnReason ARG 4 entityData - ARG 5 entityNbt METHOD method_5944 getPathfindingPenalty (Lnet/minecraft/class_7;)F ARG 1 nodeType METHOD method_5945 getLimitPerChunk ()I @@ -273,5 +272,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_5994 getAmbientSound ()Lnet/minecraft/class_3414; METHOD method_5995 updateLeash ()V METHOD method_6510 isAttacking ()Z + METHOD method_6735 hasArmorSlot ()Z + METHOD method_6773 isHorseArmor (Lnet/minecraft/class_1799;)Z METHOD method_7217 setBaby (Z)V ARG 1 baby diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping index 3957e219a0..d65c27a96c 100644 --- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity - FIELD field_17047 offerData Lnet/minecraft/class_2487; + FIELD field_17047 offerData Lnet/minecraft/class_1916; FIELD field_18877 xp I FIELD field_20299 gossipData Lnet/minecraft/class_2520; FIELD field_30523 BASE_CONVERSION_DELAY I @@ -8,8 +8,7 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity FIELD field_7421 converter Ljava/util/UUID; FIELD field_7422 conversionTimer I FIELD field_7423 CONVERTING Lnet/minecraft/class_2940; - METHOD method_16916 setOfferData (Lnet/minecraft/class_2487;)V - ARG 1 offerData + METHOD method_16916 setOfferData (Lnet/minecraft/class_1916;)V METHOD method_19622 setXp (I)V ARG 1 xp METHOD method_21649 setGossipData (Lnet/minecraft/class_2520;)V diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index d5e3c0ac99..7e5ea42b8b 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -41,13 +41,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity METHOD method_30009 interactHorse (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; ARG 1 player ARG 2 stack - METHOD method_32335 createInventoryStackReference (ILjava/util/function/Predicate;)Lnet/minecraft/class_5630; - ARG 1 slot - ARG 2 predicate - METHOD method_32336 (Lnet/minecraft/class_1799;)Z - ARG 1 stack - METHOD method_32337 (Lnet/minecraft/class_1799;)Z - ARG 0 stack METHOD method_33338 areInventoriesDifferent (Lnet/minecraft/class_1263;)Z ARG 1 inventory METHOD method_45343 jump (FLnet/minecraft/class_243;)V @@ -94,21 +87,10 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity METHOD method_6729 getTemper ()I METHOD method_6730 getHorseFlag (I)Z ARG 1 bitmask - METHOD method_6731 updateSaddle ()V METHOD method_6732 setOwnerUuid (Ljava/util/UUID;)V ARG 1 ownerUuid METHOD method_6733 playEatingAnimation ()V METHOD method_6734 canBreed ()Z - METHOD method_6735 hasArmorSlot ()Z - COMMENT Whether this horse has a slot for custom equipment besides a saddle. - COMMENT - COMMENT

In the item slot argument type, the slot is referred to as - COMMENT horse.armor. In this horse's screen, it appears in the middle of - COMMENT the left side, and right below the saddle slot if this horse has a saddle - COMMENT slot. - COMMENT - COMMENT

This is used by horse armors and llama carpets, but can be - COMMENT refitted to any purpose. METHOD method_6736 isAngry ()Z METHOD method_6737 setAngry (Z)V ARG 1 angry @@ -138,10 +120,6 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 1 bred METHOD method_6752 bondWithPlayer (Lnet/minecraft/class_1657;)Z ARG 1 player - METHOD method_6753 hasArmorInSlot ()Z - COMMENT Whether this horse already has an item stack in its horse armor slot. - COMMENT - COMMENT @see #hasArmorSlot() METHOD method_6754 getChildHealthBonus (Ljava/util/function/IntUnaryOperator;)F ARG 0 randomIntGetter METHOD method_6755 getMaxTemper ()I @@ -166,10 +144,5 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity METHOD method_6771 getJumpStrength ()D METHOD method_6772 getEatingAnimationProgress (F)F ARG 1 tickDelta - METHOD method_6773 isHorseArmor (Lnet/minecraft/class_1799;)Z - COMMENT Whether the given item stack is valid for this horse's armor slot. - COMMENT - COMMENT @see #hasArmorSlot() - ARG 1 item METHOD method_6774 getChildJumpStrengthBonus (Ljava/util/function/DoubleSupplier;)D ARG 0 randomDoubleGetter diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping index 852e3c51cb..5c49548330 100644 --- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping @@ -1,19 +1,13 @@ CLASS net/minecraft/class_1498 net/minecraft/entity/passive/HorseEntity FIELD field_47807 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; - FIELD field_6985 HORSE_ARMOR_BONUS_ID Ljava/util/UUID; FIELD field_6990 VARIANT Lnet/minecraft/class_2940; - METHOD method_18445 equipArmor (Lnet/minecraft/class_1799;)V - ARG 1 stack METHOD method_27076 setHorseVariant (Lnet/minecraft/class_5149;Lnet/minecraft/class_5148;)V ARG 1 color ARG 2 marking METHOD method_27078 getMarking ()Lnet/minecraft/class_5148; METHOD method_6783 setHorseVariant (I)V ARG 1 variant - METHOD method_6786 getArmorType ()Lnet/minecraft/class_1799; METHOD method_6788 getHorseVariant ()I - METHOD method_6790 setArmorTypeFromStack (Lnet/minecraft/class_1799;)V - ARG 1 stack CLASS class_1499 HorseData FIELD field_6994 color Lnet/minecraft/class_5149; METHOD (Lnet/minecraft/class_5149;)V diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index 006daf1416..9e6dc37a69 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity FIELD field_25375 TAMING_INGREDIENT Lnet/minecraft/class_1856; FIELD field_30425 MAX_STRENGTH I FIELD field_47808 BABY_BASE_DIMENSIONS Lnet/minecraft/class_4048; - FIELD field_6995 CARPET_COLOR Lnet/minecraft/class_2940; FIELD field_6996 VARIANT Lnet/minecraft/class_2940; FIELD field_6997 follower Lnet/minecraft/class_1501; FIELD field_6998 STRENGTH Lnet/minecraft/class_2940; @@ -20,8 +19,6 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity METHOD method_6796 initializeStrength (Lnet/minecraft/class_5819;)V ARG 1 random METHOD method_6797 stopFollowing ()V - METHOD method_6799 setCarpetColor (Lnet/minecraft/class_1767;)V - ARG 1 color METHOD method_6800 getCarpetColor ()Lnet/minecraft/class_1767; METHOD method_6802 setStrength (I)V ARG 1 strength diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 83e9088941..0bb1667bf8 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity FIELD field_25373 ANGER_TIME Lnet/minecraft/class_2940; FIELD field_30386 WILD_MAX_HEALTH F FIELD field_30387 TAMED_MAX_HEALTH F - FIELD field_47776 WOLF_ARMOR_BONUS_MODIFIER_UUID Ljava/util/UUID; - FIELD field_47777 ARMORED Lnet/minecraft/class_2940; FIELD field_6944 furWet Z FIELD field_6945 lastShakeProgress F FIELD field_6946 BEGGING Lnet/minecraft/class_2940; @@ -25,8 +23,6 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity ARG 2 spawnReason ARG 3 pos ARG 4 random - METHOD method_55708 setArmored (Z)V - ARG 1 armored METHOD method_55710 hasArmor ()Z METHOD method_6707 getFurWetBrightnessMultiplier (F)F COMMENT Returns this wolf's brightness multiplier based on the fur wetness. diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index e52f1be203..5a6bd97025 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -80,7 +80,6 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory ARG 1 nbtList METHOD method_7385 addStack (ILnet/minecraft/class_1799;)I ARG 1 slot - ARG 2 stack METHOD method_7386 getSwappableHotbarSlot ()I METHOD method_7387 populateRecipeFinder (Lnet/minecraft/class_1662;)V ARG 1 finder diff --git a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping index 3ff3173a9a..9280417934 100644 --- a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_3855 net/minecraft/entity/projectile/AbstractFireballEntity FIELD field_17081 ITEM Lnet/minecraft/class_2940; METHOD method_16936 setItem (Lnet/minecraft/class_1799;)V - ARG 1 stack - METHOD method_16938 getItem ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping index d06ec04772..d9ffd0451f 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_3857 net/minecraft/entity/projectile/thrown/ThrownItemEntity FIELD field_17082 ITEM Lnet/minecraft/class_2940; METHOD method_16940 setItem (Lnet/minecraft/class_1799;)V - ARG 1 item METHOD method_16942 getDefaultItem ()Lnet/minecraft/class_1792; - METHOD method_16943 getItem ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/inventory/SingleStackInventory.mapping b/mappings/net/minecraft/inventory/SingleStackInventory.mapping index 3d15dfbc59..02203de652 100644 --- a/mappings/net/minecraft/inventory/SingleStackInventory.mapping +++ b/mappings/net/minecraft/inventory/SingleStackInventory.mapping @@ -5,5 +5,4 @@ CLASS net/minecraft/class_8181 net/minecraft/inventory/SingleStackInventory METHOD method_54078 decreaseStack (I)Lnet/minecraft/class_1799; ARG 1 count METHOD method_54079 getStack ()Lnet/minecraft/class_1799; - METHOD method_54080 asBlockEntity ()Lnet/minecraft/class_2586; METHOD method_54099 emptyStack ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/item/AnimalArmorItem.mapping b/mappings/net/minecraft/item/AnimalArmorItem.mapping index aa17f543c4..3213737071 100644 --- a/mappings/net/minecraft/item/AnimalArmorItem.mapping +++ b/mappings/net/minecraft/item/AnimalArmorItem.mapping @@ -1,20 +1,11 @@ CLASS net/minecraft/class_4059 net/minecraft/item/AnimalArmorItem - FIELD field_18136 bonus I FIELD field_47823 entityTexture Lnet/minecraft/class_2960; FIELD field_47824 type Lnet/minecraft/class_4059$class_9076; - METHOD (ILnet/minecraft/class_4059$class_9076;Ljava/lang/String;Lnet/minecraft/class_1792$class_1793;)V - ARG 1 bonus + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_4059$class_9076;Lnet/minecraft/class_1792$class_1793;)V ARG 2 type - ARG 3 name - ARG 4 settings METHOD method_18454 getEntityTexture ()Lnet/minecraft/class_2960; - METHOD method_18455 getBonus ()I METHOD method_55756 getType ()Lnet/minecraft/class_4059$class_9076; CLASS class_9076 Type FIELD field_47827 textureIdFunction Ljava/util/function/Function; METHOD (Ljava/lang/String;ILjava/util/function/Function;)V ARG 3 textureIdFunction - METHOD method_55758 (Ljava/lang/String;)Lnet/minecraft/class_2960; - ARG 0 name - METHOD method_55759 (Ljava/lang/String;)Lnet/minecraft/class_2960; - ARG 0 name diff --git a/mappings/net/minecraft/item/ArmorItem.mapping b/mappings/net/minecraft/item/ArmorItem.mapping index 7fddbcc0a1..6b1bd37c79 100644 --- a/mappings/net/minecraft/item/ArmorItem.mapping +++ b/mappings/net/minecraft/item/ArmorItem.mapping @@ -1,15 +1,10 @@ CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem - FIELD field_21976 knockbackResistance F - FIELD field_23741 attributeModifiers Lcom/google/common/collect/Multimap; + FIELD field_23741 attributeModifiers Ljava/util/function/Supplier; FIELD field_41933 type Lnet/minecraft/class_1738$class_8051; FIELD field_7876 MODIFIERS Ljava/util/EnumMap; - FIELD field_7877 toughness F - FIELD field_7878 protection I FIELD field_7879 DISPENSER_BEHAVIOR Lnet/minecraft/class_2357; - FIELD field_7881 material Lnet/minecraft/class_1741; - METHOD (Lnet/minecraft/class_1741;Lnet/minecraft/class_1738$class_8051;Lnet/minecraft/class_1792$class_1793;)V - ARG 1 material - ARG 2 type + FIELD field_7881 material Lnet/minecraft/class_6880; + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_1738$class_8051;Lnet/minecraft/class_1792$class_1793;)V ARG 3 settings METHOD method_26353 getToughness ()F METHOD method_48397 (Ljava/util/EnumMap;)V @@ -18,7 +13,7 @@ CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem METHOD method_7684 dispenseArmor (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;)Z ARG 0 pointer ARG 1 armor - METHOD method_7686 getMaterial ()Lnet/minecraft/class_1741; + METHOD method_7686 getMaterial ()Lnet/minecraft/class_6880; METHOD method_7687 getProtection ()I CLASS class_8051 Type FIELD field_41938 equipmentSlot Lnet/minecraft/class_1304; diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping index 540d44921e..138de11d73 100644 --- a/mappings/net/minecraft/item/ArmorMaterial.mapping +++ b/mappings/net/minecraft/item/ArmorMaterial.mapping @@ -3,59 +3,12 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial COMMENT COMMENT

COMMENT To view available vanilla armor materials, visit {@link ArmorMaterials}. - METHOD method_24355 getKnockbackResistance ()F - COMMENT {@return the knockback resistance value of an {@link ArmorItem} piece using this {@link ArmorMaterial}} - COMMENT - COMMENT

- COMMENT {@link ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_KNOCKBACK_RESISTANCE} - COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type. - METHOD method_48402 getDurability (Lnet/minecraft/class_1738$class_8051;)I - COMMENT Returns the total amount of durability points an {@link ArmorItem} using this {@link ArmorMaterial} has. - COMMENT - COMMENT

- COMMENT The value returned here will set the {@link Item.Settings} max durability option when passed - COMMENT into {@link ArmorItem#ArmorItem(net.minecraft.item.ArmorMaterial, ArmorItem.Type, Item.Settings)} - COMMENT if the value was not already specified. - COMMENT - COMMENT @return the total durability an {@link ArmorItem} with this {@link ArmorMaterial} has - ARG 1 type - COMMENT the {@link ArmorItem.Type} of the {@link Item} with this {@link ArmorMaterial} - METHOD method_48403 getProtection (Lnet/minecraft/class_1738$class_8051;)I - COMMENT Returns the amount of armor protection points offered by an {@link ArmorItem} - COMMENT using this {@link ArmorMaterial} while it is worn by a player. - COMMENT - COMMENT

- COMMENT The protection value returned here is applied as an {@link net.minecraft.entity.attribute.EntityAttributeModifier} - COMMENT to a player wearing the {@link ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier. - COMMENT - COMMENT @return the amount of armor protection points offered by an {@link ArmorItem} with this {@link ArmorMaterial} - ARG 1 type - COMMENT the {@link ArmorItem.Type} of the {@link Item} with this {@link ArmorMaterial} - METHOD method_7694 getName ()Ljava/lang/String; - COMMENT Returns the {@code name} of this {@link ArmorMaterial}, which is used for locating armor texture files. - COMMENT - COMMENT

- COMMENT The return value of this method should be in {@code snake_case}. - COMMENT {@link net.minecraft.client.render.entity.feature.ArmorFeatureRenderer} will expect to find an armor - COMMENT texture file matching {@code minecraft:textures/models/armor/{material_name}_layer_[1/2].png} - COMMENT based off the return result of this method. - COMMENT - COMMENT

- COMMENT Example: given a return value of {@code cool_material}, {@code ArmorFeatureRenderer} will require a file - COMMENT at {@code minecraft:textures/models/armor/cool_material_layer_1.png} and {@code minecraft:textures/models/armor/cool_material_layer_2.png}. - COMMENT - COMMENT @return the {@code name} of this armor material in snake_case, used for finding armor textures - METHOD method_7695 getRepairIngredient ()Lnet/minecraft/class_1856; - COMMENT Returns the {@link Ingredient} used to repair items using this {@link ArmorMaterial}. - COMMENT - COMMENT

- COMMENT By default, {@link ArmorItem} will delegate {@link Item#canRepair(ItemStack, ItemStack)} - COMMENT back to this method. - COMMENT - COMMENT @return the {@link Ingredient} required to repair items with this {@link ArmorMaterial} - METHOD method_7698 getEquipSound ()Lnet/minecraft/class_3414; - COMMENT @return the {@link SoundEvent} played when a {@link net.minecraft.entity.LivingEntity} equips an {@link ArmorItem} using this {@link ArmorMaterial} - METHOD method_7699 getEnchantability ()I + FIELD comp_2299 getEnchantability I + FIELD comp_2300 getEquipSound Lnet/minecraft/class_6880; + FIELD comp_2301 getRepairIngredient Ljava/util/function/Supplier; + FIELD comp_2303 getToughness F + FIELD comp_2304 getKnockbackResistance F + METHOD comp_2299 getEnchantability ()I COMMENT Returns the base enchantment value used by {@link ArmorItem} with this material. COMMENT COMMENT

@@ -67,7 +20,17 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial COMMENT The highest enchantability value in vanilla is Netherite, at {@code 37}. COMMENT COMMENT @return the enchantment value sent back to {@link Item#getEnchantability()} for armor using this material - METHOD method_7700 getToughness ()F + METHOD comp_2300 getEquipSound ()Lnet/minecraft/class_6880; + COMMENT @return the {@link SoundEvent} played when a {@link net.minecraft.entity.LivingEntity} equips an {@link ArmorItem} using this {@link ArmorMaterial} + METHOD comp_2301 getRepairIngredient ()Ljava/util/function/Supplier; + COMMENT Returns the {@link Ingredient} used to repair items using this {@link ArmorMaterial}. + COMMENT + COMMENT

+ COMMENT By default, {@link ArmorItem} will delegate {@link Item#canRepair(ItemStack, ItemStack)} + COMMENT back to this method. + COMMENT + COMMENT @return the {@link Ingredient} required to repair items with this {@link ArmorMaterial} + METHOD comp_2303 getToughness ()F COMMENT Returns the toughness value of an {@link ArmorItem} piece using this {@link ArmorMaterial}. COMMENT COMMENT

@@ -75,3 +38,20 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type. COMMENT COMMENT @return the toughness value of any {@link ArmorItem} using this {@link ArmorMaterial} + METHOD comp_2304 getKnockbackResistance ()F + COMMENT {@return the knockback resistance value of an {@link ArmorItem} piece using this {@link ArmorMaterial}} + COMMENT + COMMENT

+ COMMENT {@link ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_KNOCKBACK_RESISTANCE} + COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type. + METHOD method_48403 getProtection (Lnet/minecraft/class_1738$class_8051;)I + COMMENT Returns the amount of armor protection points offered by an {@link ArmorItem} + COMMENT using this {@link ArmorMaterial} while it is worn by a player. + COMMENT + COMMENT

+ COMMENT The protection value returned here is applied as an {@link net.minecraft.entity.attribute.EntityAttributeModifier} + COMMENT to a player wearing the {@link ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier. + COMMENT + COMMENT @return the amount of armor protection points offered by an {@link ArmorItem} with this {@link ArmorMaterial} + ARG 1 type + COMMENT the {@link ArmorItem.Type} of the {@link Item} with this {@link ArmorMaterial} diff --git a/mappings/net/minecraft/item/ArmorMaterials.mapping b/mappings/net/minecraft/item/ArmorMaterials.mapping index 5c4738947f..e8ff472ab3 100644 --- a/mappings/net/minecraft/item/ArmorMaterials.mapping +++ b/mappings/net/minecraft/item/ArmorMaterials.mapping @@ -1,24 +1,5 @@ CLASS net/minecraft/class_1740 net/minecraft/item/ArmorMaterials - FIELD field_21978 knockbackResistance F - FIELD field_41941 CODEC Lcom/mojang/serialization/Codec; - FIELD field_41942 BASE_DURABILITY Ljava/util/EnumMap; - FIELD field_41943 protectionAmounts Ljava/util/EnumMap; - FIELD field_7883 durabilityMultiplier I - FIELD field_7884 name Ljava/lang/String; - FIELD field_7885 repairIngredientSupplier Lnet/minecraft/class_3528; - FIELD field_7886 equipSound Lnet/minecraft/class_3414; - FIELD field_7887 CHAIN Lnet/minecraft/class_1740; - FIELD field_7894 toughness F - FIELD field_7896 enchantability I - METHOD (Ljava/lang/String;ILjava/lang/String;ILjava/util/EnumMap;ILnet/minecraft/class_3414;FFLjava/util/function/Supplier;)V - ARG 3 name - ARG 4 durabilityMultiplier - ARG 5 protectionAmounts - ARG 6 enchantability - ARG 7 equipSound - ARG 8 toughness - ARG 9 knockbackResistance - ARG 10 repairIngredientSupplier + FIELD field_7887 CHAIN Lnet/minecraft/class_6880; METHOD method_48405 (Ljava/util/EnumMap;)V ARG 0 map METHOD method_48406 (Ljava/util/EnumMap;)V diff --git a/mappings/net/minecraft/item/DyeableAnimalArmorItem.mapping b/mappings/net/minecraft/item/DyeableAnimalArmorItem.mapping deleted file mode 100644 index 06488ee9e8..0000000000 --- a/mappings/net/minecraft/item/DyeableAnimalArmorItem.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4058 net/minecraft/item/DyeableAnimalArmorItem diff --git a/mappings/net/minecraft/item/DyeableArmorItem.mapping b/mappings/net/minecraft/item/DyeableArmorItem.mapping deleted file mode 100644 index 0785abd352..0000000000 --- a/mappings/net/minecraft/item/DyeableArmorItem.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4057 net/minecraft/item/DyeableArmorItem diff --git a/mappings/net/minecraft/item/DyeableItem.mapping b/mappings/net/minecraft/item/DyeableItem.mapping index 7d10954294..28e4f43ad0 100644 --- a/mappings/net/minecraft/item/DyeableItem.mapping +++ b/mappings/net/minecraft/item/DyeableItem.mapping @@ -6,11 +6,6 @@ CLASS net/minecraft/class_1768 net/minecraft/item/DyeableItem ARG 0 stack ARG 1 colors METHOD method_7798 removeColor (Lnet/minecraft/class_1799;)V - ARG 1 stack METHOD method_7799 setColor (Lnet/minecraft/class_1799;I)V - ARG 1 stack - ARG 2 color METHOD method_7800 getColor (Lnet/minecraft/class_1799;)I - ARG 1 stack METHOD method_7801 hasColor (Lnet/minecraft/class_1799;)Z - ARG 1 stack diff --git a/mappings/net/minecraft/item/Equipment.mapping b/mappings/net/minecraft/item/Equipment.mapping index 0f4fc4d6b4..01719b4d7d 100644 --- a/mappings/net/minecraft/item/Equipment.mapping +++ b/mappings/net/minecraft/item/Equipment.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_5151 net/minecraft/item/Equipment COMMENT Represents a type of item that is wearable in an armor equipment slot, or a shield. COMMENT COMMENT

This type of item can be targeted by the {@code minecraft:binding_curse} enchantment. - METHOD method_31570 getEquipSound ()Lnet/minecraft/class_3414; + METHOD method_31570 getEquipSound ()Lnet/minecraft/class_6880; METHOD method_48576 equipAndSwap (Lnet/minecraft/class_1792;Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1271; ARG 1 item ARG 2 world diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index f3a2e476c0..3500515c03 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -3,15 +3,12 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem FIELD field_30910 MAP_KEY Ljava/lang/String; FIELD field_41067 MAP_SCALE_DIRECTION_KEY Ljava/lang/String; FIELD field_41068 MAP_TO_LOCK_KEY Ljava/lang/String; - METHOD method_17440 getMapName (I)Ljava/lang/String; - ARG 0 mapId METHOD method_17442 copyMap (Lnet/minecraft/class_1937;Lnet/minecraft/class_1799;)V ARG 0 world ARG 1 stack - METHOD method_32348 setMapId (Lnet/minecraft/class_1799;I)V + METHOD method_32348 setMapId (Lnet/minecraft/class_1799;Lnet/minecraft/class_9209;)V ARG 0 stack - ARG 1 id - METHOD method_32349 allocateMapId (Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_5321;)I + METHOD method_32349 allocateMapId (Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_5321;)Lnet/minecraft/class_9209; ARG 0 world ARG 1 x ARG 2 z @@ -23,8 +20,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 0 biomes ARG 1 x ARG 2 z - METHOD method_53836 getIdText (I)Lnet/minecraft/class_2561; - ARG 0 id + METHOD method_53836 getIdText (Lnet/minecraft/class_9209;)Lnet/minecraft/class_2561; METHOD method_53837 getIdText (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2561; ARG 0 stack METHOD method_7995 getFluidStateIfVisible (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; @@ -35,8 +31,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 0 map ARG 1 world ARG 2 amount - METHOD method_7997 getMapState (Ljava/lang/Integer;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22; - ARG 0 id + METHOD method_7997 getMapState (Lnet/minecraft/class_9209;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22; ARG 1 world METHOD method_7998 updateColors (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_22;)V ARG 1 world @@ -59,7 +54,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem METHOD method_8002 fillExplorationMap (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)V ARG 0 world ARG 1 map - METHOD method_8003 getMapId (Lnet/minecraft/class_1799;)Ljava/lang/Integer; + METHOD method_8003 getMapId (Lnet/minecraft/class_1799;)Lnet/minecraft/class_9209; ARG 0 stack METHOD method_8005 createMap (Lnet/minecraft/class_1937;IIBZZ)Lnet/minecraft/class_1799; ARG 0 world diff --git a/mappings/net/minecraft/item/map/MapBannerMarker.mapping b/mappings/net/minecraft/item/map/MapBannerMarker.mapping index 04ec2a794c..7bfbb1cb43 100644 --- a/mappings/net/minecraft/item/map/MapBannerMarker.mapping +++ b/mappings/net/minecraft/item/map/MapBannerMarker.mapping @@ -2,23 +2,19 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker COMMENT Represents a banner marker in world. COMMENT

COMMENT Used to track banners in a map state. - FIELD field_67 name Lnet/minecraft/class_2561; - FIELD field_68 color Lnet/minecraft/class_1767; - FIELD field_69 pos Lnet/minecraft/class_2338; - METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_1767;Lnet/minecraft/class_2561;)V + FIELD comp_2312 pos Lnet/minecraft/class_2338; + FIELD comp_2313 color Lnet/minecraft/class_1767; + FIELD comp_2314 name Ljava/util/Optional; + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_1767;Ljava/util/Optional;)V ARG 1 pos ARG 2 dyeColor - ARG 3 name + METHOD comp_2312 pos ()Lnet/minecraft/class_2338; + METHOD comp_2313 color ()Lnet/minecraft/class_1767; + METHOD comp_2314 name ()Ljava/util/Optional; METHOD equals (Ljava/lang/Object;)Z 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 nbt - METHOD method_68 getName ()Lnet/minecraft/class_2561; - METHOD method_70 getPos ()Lnet/minecraft/class_2338; METHOD method_71 getKey ()Ljava/lang/String; METHOD method_72 getIconType ()Lnet/minecraft/class_20$class_21; METHOD method_73 fromWorldBlock (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_17; ARG 0 blockView ARG 1 blockPos - METHOD method_74 getNbt ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapIcon.mapping index 7654f30eac..5bab715fd3 100644 --- a/mappings/net/minecraft/item/map/MapIcon.mapping +++ b/mappings/net/minecraft/item/map/MapIcon.mapping @@ -3,18 +3,17 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon FIELD comp_1843 x B FIELD comp_1844 z B FIELD comp_1845 rotation B - FIELD comp_1846 text Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_20$class_21;BBBLnet/minecraft/class_2561;)V + FIELD comp_1846 text Ljava/util/Optional; + METHOD (Lnet/minecraft/class_20$class_21;BBBLjava/util/Optional;)V ARG 1 type ARG 2 x ARG 3 z ARG 4 rotation - ARG 5 text METHOD comp_1842 type ()Lnet/minecraft/class_20$class_21; METHOD comp_1843 x ()B METHOD comp_1844 z ()B METHOD comp_1845 rotation ()B - METHOD comp_1846 text ()Lnet/minecraft/class_2561; + METHOD comp_1846 text ()Ljava/util/Optional; METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_92 getTypeId ()B @@ -27,16 +26,6 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon FIELD field_46184 structure Z FIELD field_81 id B FIELD field_82 tintColor I - METHOD (Ljava/lang/String;ILjava/lang/String;ZIZZ)V - ARG 3 name - ARG 4 alwaysRender - ARG 5 tintColor - ARG 6 useIconCountLimit - ARG 7 structure - METHOD (Ljava/lang/String;ILjava/lang/String;ZZ)V - ARG 3 name - ARG 4 alwaysRender - ARG 5 useIconCountLimit METHOD method_37342 shouldUseIconCountLimit ()Z METHOD method_53841 isStructure ()Z METHOD method_95 isAlwaysRendered ()Z diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index 2bafa8cec3..8baa80bc33 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -33,8 +33,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 5 unlimitedTracking ARG 6 locked ARG 7 dimension - METHOD method_100 getPlayerMarkerPacket (ILnet/minecraft/class_1657;)Lnet/minecraft/class_2596; - ARG 1 id + METHOD method_100 getPlayerMarkerPacket (Lnet/minecraft/class_9209;Lnet/minecraft/class_1657;)Lnet/minecraft/class_2596; ARG 2 player METHOD method_101 getPlayerSyncData (Lnet/minecraft/class_1657;)Lnet/minecraft/class_22$class_23; ARG 1 player @@ -108,7 +107,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 1 x ARG 2 z ARG 3 color - METHOD method_32371 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_22; + METHOD method_32371 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_22; ARG 0 nbt METHOD method_32372 hasMonumentIcon ()Z METHOD method_32373 getIcons ()Ljava/lang/Iterable; @@ -119,7 +118,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_52611 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; METHOD method_55784 getEqualPredicate (Lnet/minecraft/class_1799;)Ljava/util/function/Predicate; ARG 0 stack - METHOD method_55785 (Lnet/minecraft/class_1799;Ljava/lang/Integer;Lnet/minecraft/class_1799;)Z + METHOD method_55785 (Lnet/minecraft/class_1799;Lnet/minecraft/class_9209;Lnet/minecraft/class_1799;)Z ARG 2 other CLASS class_23 PlayerUpdateTracker FIELD field_124 emptyPacketsRequested I @@ -135,21 +134,25 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_111 markDirty (II)V ARG 1 startX ARG 2 startZ - METHOD method_112 getPacket (I)Lnet/minecraft/class_2596; - ARG 1 mapId + METHOD method_112 getPacket (Lnet/minecraft/class_9209;)Lnet/minecraft/class_2596; METHOD method_32375 getMapUpdateData ()Lnet/minecraft/class_22$class_5637; METHOD method_32379 markIconsDirty ()V CLASS class_5637 UpdateData - FIELD field_27892 startX I - FIELD field_27893 startZ I - FIELD field_27894 width I - FIELD field_27895 height I - FIELD field_27896 colors [B + FIELD comp_2316 startX I + FIELD comp_2317 startZ I + FIELD comp_2318 width I + FIELD comp_2319 height I + FIELD comp_2320 colors [B METHOD (IIII[B)V ARG 1 startX ARG 2 startZ ARG 3 width ARG 4 height ARG 5 colors + METHOD comp_2316 startX ()I + METHOD comp_2317 startZ ()I + METHOD comp_2318 width ()I + METHOD comp_2319 height ()I + METHOD comp_2320 colors ()[B METHOD method_32380 setColorsTo (Lnet/minecraft/class_22;)V ARG 1 mapState diff --git a/mappings/net/minecraft/item/trim/ArmorTrim.mapping b/mappings/net/minecraft/item/trim/ArmorTrim.mapping index d27a58bcbd..c584a82b7e 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrim.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrim.mapping @@ -33,17 +33,10 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim METHOD method_48430 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 1 path METHOD method_48431 getMaterial ()Lnet/minecraft/class_6880; - METHOD method_48432 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960; - ARG 2 armorMaterial METHOD method_48433 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 1 path - METHOD method_48434 getLeggingsModelId (Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960; - ARG 1 armorMaterial - METHOD method_48435 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960; - ARG 2 armorMaterial - METHOD method_48436 getGenericModelId (Lnet/minecraft/class_1741;)Lnet/minecraft/class_2960; - ARG 1 armorMaterial - METHOD method_48577 getMaterialAssetNameFor (Lnet/minecraft/class_1741;)Ljava/lang/String; - ARG 1 armorMaterial + METHOD method_48434 getLeggingsModelId (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960; + METHOD method_48436 getGenericModelId (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960; + METHOD method_48577 getMaterialAssetNameFor (Lnet/minecraft/class_6880;)Ljava/lang/String; METHOD method_52565 (ZLjava/lang/String;)V ARG 1 error diff --git a/mappings/net/minecraft/loot/LootDataType.mapping b/mappings/net/minecraft/loot/LootDataType.mapping index bf7a07a123..a286aa3aab 100644 --- a/mappings/net/minecraft/loot/LootDataType.mapping +++ b/mappings/net/minecraft/loot/LootDataType.mapping @@ -7,9 +7,8 @@ CLASS net/minecraft/class_8490 net/minecraft/loot/LootDataType ARG 1 codec ARG 2 id ARG 3 validator - METHOD method_51204 parse (Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)Ljava/util/Optional; + METHOD method_51204 parse (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/util/Optional; ARG 1 id - ARG 2 json METHOD method_51207 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_46;)V ARG 0 reporter ARG 1 key diff --git a/mappings/net/minecraft/loot/LootManager.mapping b/mappings/net/minecraft/loot/LootManager.mapping index 26bdb39ddf..99167bf6d6 100644 --- a/mappings/net/minecraft/loot/LootManager.mapping +++ b/mappings/net/minecraft/loot/LootManager.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager FIELD field_975 LOGGER Lorg/slf4j/Logger; METHOD method_20712 validate (Ljava/util/Map;)V ARG 1 lootData - METHOD method_51190 (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;Lnet/minecraft/class_8490;)Ljava/util/concurrent/CompletableFuture; - ARG 3 type METHOD method_51191 (Lcom/google/common/collect/ImmutableMap$Builder;Lcom/google/common/collect/ImmutableMultimap$Builder;Lnet/minecraft/class_8490;Ljava/util/Map;)V ARG 2 type ARG 3 idToValue @@ -16,14 +14,8 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager ARG 4 value METHOD method_51193 getIds (Lnet/minecraft/class_8490;)Ljava/util/Collection; ARG 1 type - METHOD method_51194 load (Lnet/minecraft/class_8490;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletableFuture; + METHOD method_51194 load (Lnet/minecraft/class_8490;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletableFuture; ARG 0 type - ARG 1 resourceManager - ARG 2 executor - ARG 3 results - METHOD method_51195 (Lnet/minecraft/class_8490;Ljava/util/Map;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V - ARG 2 id - ARG 3 json METHOD method_51196 validate (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V ARG 0 reporter ARG 1 key diff --git a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping index e589af981e..371be3bf68 100644 --- a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping @@ -4,19 +4,3 @@ CLASS net/minecraft/class_217 net/minecraft/loot/condition/LootConditionTypes METHOD method_29327 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5342; ARG 0 id ARG 1 codec - METHOD method_921 (Ljava/lang/Object;)Z - ARG 0 predicatesx - METHOD method_924 matchingAll (Ljava/util/List;)Ljava/util/function/Predicate; - COMMENT Returns a predicate that returns true only if all its element predicates - COMMENT return true, as if applied by logical and. - ARG 0 predicates - METHOD method_925 matchingAny (Ljava/util/List;)Ljava/util/function/Predicate; - COMMENT Returns a predicate that returns true if any its element predicates - COMMENT return true, as if applied by logical or. - ARG 0 predicates - METHOD method_927 (Ljava/util/List;Ljava/lang/Object;)Z - ARG 1 operand - METHOD method_928 (Ljava/lang/Object;)Z - ARG 0 predicatesx - METHOD method_929 (Ljava/util/List;Ljava/lang/Object;)Z - ARG 1 operand diff --git a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping index b0ed41e5ce..11ddde2235 100644 --- a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping @@ -6,9 +6,6 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFu ARG 1 conditions ARG 2 enchantments ARG 3 add - METHOD method_32407 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1887;Ljava/lang/Integer;)V - ARG 1 enchantment - ARG 2 level METHOD method_32409 (Lnet/minecraft/class_5658;)Ljava/util/stream/Stream; ARG 0 numberProvider METHOD method_32410 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_47;Lnet/minecraft/class_6880;Lnet/minecraft/class_5658;)V diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index d818468fde..1529dc25cc 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -62,7 +62,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection METHOD method_10752 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V ARG 1 packet ARG 2 callbacks - METHOD method_10753 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_8743;)Lnet/minecraft/class_2535; + METHOD method_10753 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_9191;)Lnet/minecraft/class_2535; ARG 0 address ARG 1 useEpoll ARG 2 packetSizeLog @@ -163,7 +163,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 1 packetListener METHOD method_52915 flush ()V METHOD method_52918 flushInternal ()V - METHOD method_53505 resetPacketSizeLog (Lnet/minecraft/class_8743;)V + METHOD method_53505 resetPacketSizeLog (Lnet/minecraft/class_9191;)V ARG 1 log METHOD method_53859 addFlowControlHandler (Lio/netty/channel/ChannelPipeline;)V ARG 1 pipeline diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index b2f2e462a7..5679482972 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -449,14 +449,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see net.minecraft.network.encoding.VarInts ARG 1 value COMMENT the value to write - METHOD method_10805 writeText (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2540; - COMMENT Writes a text to this buf. A text is represented as an NBT-encoded data. - COMMENT - COMMENT @return this buf, for chaining - COMMENT @see #readText() - COMMENT @see #readUnlimitedText() - ARG 1 text - COMMENT the text to write METHOD method_10806 writeIntArray ([I)Lnet/minecraft/class_2540; COMMENT Writes an array of primitive ints to this buf. The array first has a COMMENT var int indicating its length, followed by the var int entries. @@ -477,16 +469,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @see #readBlockPos() ARG 1 pos COMMENT the pos to write - METHOD method_10808 readText ()Lnet/minecraft/class_2561; - COMMENT Reads a text from this buf. A text is represented as an NBT-encoded data - COMMENT with {@linkplain NbtSizeTracker the maximum size} as {@value #MAX_READ_NBT_SIZE}. - COMMENT - COMMENT @return the read text - COMMENT @throws io.netty.handler.codec.EncoderException if the NBT cannot be read - COMMENT @throws net.minecraft.nbt.NbtSizeValidationException if the serialized text is too big - COMMENT @see #readUnlimitedText() - COMMENT @see #writeText(Text) - COMMENT @see #MAX_READ_NBT_SIZE METHOD method_10809 readLongArray ([JI)[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 @@ -864,7 +846,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT the value is not null. COMMENT COMMENT @see #readNullable(PacketByteBuf.PacketReader) - ARG 1 value ARG 2 writer METHOD method_43827 readNullable (Lnet/minecraft/class_9141;)Ljava/lang/Object; COMMENT Reads a nullable value from this buf. A nullable value is represented by @@ -1064,13 +1045,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT @return the read registry key COMMENT @see #readRegistryKey(RegistryKey) COMMENT @see #writeRegistryKey(RegistryKey) - METHOD method_54148 readUnlimitedText ()Lnet/minecraft/class_2561; - COMMENT Reads a text from this buf. A text is represented as an NBT-encoded data. - COMMENT Unlike {@link #readText()}, this method can read an unlimited amount of text. - COMMENT - COMMENT @return the read text - COMMENT @see #readText() - COMMENT @see #writeText(Text) METHOD method_56335 readBlockPos (Lio/netty/buffer/ByteBuf;)Lnet/minecraft/class_2338; ARG 0 buf METHOD method_56336 writeBlockPos (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index c14bec5679..eb167eb5e2 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -215,14 +215,14 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs ARG 1 codec METHOD method_56385 (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; ARG 0 codec - CLASS 7 + CLASS 10 METHOD method_56419 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V ARG 3 k ARG 4 v - CLASS 9 + CLASS 13 METHOD method_56424 getIterable (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; ARG 1 buf - CLASS 10 + CLASS 14 FIELD field_48562 DIRECT_ENTRY_MARKER I METHOD method_56390 getEntries (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; ARG 1 buf diff --git a/mappings/net/minecraft/network/handler/PacketSizeLogger.mapping b/mappings/net/minecraft/network/handler/PacketSizeLogger.mapping index 54b4b18f82..098bb2e361 100644 --- a/mappings/net/minecraft/network/handler/PacketSizeLogger.mapping +++ b/mappings/net/minecraft/network/handler/PacketSizeLogger.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_8762 net/minecraft/network/handler/PacketSizeLogger FIELD field_45953 packetSizeInBytes Ljava/util/concurrent/atomic/AtomicInteger; - FIELD field_45954 log Lnet/minecraft/class_8743; - METHOD (Lnet/minecraft/class_8743;)V + FIELD field_45954 log Lnet/minecraft/class_9191; + METHOD (Lnet/minecraft/class_9191;)V ARG 1 log METHOD method_53503 push ()V METHOD method_53504 increment (I)V diff --git a/mappings/net/minecraft/network/packet/c2s/common/CookieResponseC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/CookieResponseC2SPacket.mapping index f3c13f3d3e..bf7f581950 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/CookieResponseC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/CookieResponseC2SPacket.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/class_9091 net/minecraft/network/packet/c2s/common/CookieRes ARG 1 buf METHOD method_55853 write (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_55854 (Lnet/minecraft/class_2540;)[B - ARG 0 bufx diff --git a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping index 214a38ac42..e6fda73720 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping @@ -1,29 +1,11 @@ CLASS net/minecraft/class_2820 net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket - FIELD field_26897 slot I + FIELD comp_2285 slot I + FIELD comp_2286 pages Ljava/util/List; + FIELD comp_2287 title Ljava/util/Optional; FIELD field_34039 MAX_TITLE_LENGTH I FIELD field_34040 MAX_PAGE_LENGTH I - FIELD field_34041 pages Ljava/util/List; - FIELD field_34042 title Ljava/util/Optional; FIELD field_34046 MAX_PAGES I FIELD field_48193 CODEC Lnet/minecraft/class_9139; - METHOD (ILjava/util/List;Ljava/util/Optional;)V - ARG 1 slot - ARG 2 pages - ARG 3 title - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_12235 getSlot ()I - METHOD method_37441 (Lnet/minecraft/class_2540;Ljava/lang/String;)V - ARG 0 buf2 - ARG 1 title - METHOD method_37442 getPages ()Ljava/util/List; - METHOD method_37443 (Lnet/minecraft/class_2540;)Ljava/lang/String; - ARG 0 buf2 - METHOD method_37444 (Lnet/minecraft/class_2540;Ljava/lang/String;)V - ARG 0 buf2 - ARG 1 page - METHOD method_37445 getTitle ()Ljava/util/Optional; - METHOD method_37446 (Lnet/minecraft/class_2540;)Ljava/lang/String; - ARG 0 buf2 - METHOD method_55974 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_2285 slot ()I + METHOD comp_2286 pages ()Ljava/util/List; + METHOD comp_2287 title ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping index aabcbae2c7..8f2f0a84a8 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/class_2661 net/minecraft/network/packet/s2c/common/DisconnectS2CPacket - FIELD field_12173 reason Lnet/minecraft/class_2561; + FIELD comp_2325 reason Lnet/minecraft/class_2561; FIELD field_48622 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD (Lnet/minecraft/class_2561;)V - ARG 1 reason - METHOD method_11468 getReason ()Lnet/minecraft/class_2561; - METHOD method_56462 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_2325 reason ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping index 36472b972f..900b9ffb98 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_2720 net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket FIELD field_33340 MAX_HASH_LENGTH I FIELD field_48626 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_56466 write (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping index 8f077197c2..fc34c4d1f3 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping @@ -12,6 +12,5 @@ CLASS net/minecraft/class_2622 net/minecraft/network/packet/s2c/play/BlockEntity METHOD method_11293 getPos ()Lnet/minecraft/class_2338; METHOD method_38585 create (Lnet/minecraft/class_2586;)Lnet/minecraft/class_2622; ARG 0 blockEntity - METHOD method_39026 create (Lnet/minecraft/class_2586;Ljava/util/function/Function;)Lnet/minecraft/class_2622; + METHOD method_39026 create (Lnet/minecraft/class_2586;Ljava/util/function/BiFunction;)Lnet/minecraft/class_2622; ARG 0 blockEntity - ARG 1 nbtGetter diff --git a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping index 5e2460a570..2c8ec63794 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP METHOD (Ljava/util/UUID;Lnet/minecraft/class_2629$class_5882;)V ARG 1 uuid ARG 2 action - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_34089 add (Lnet/minecraft/class_1259;)Lnet/minecraft/class_2629; ARG 0 bar METHOD method_34090 remove (Ljava/util/UUID;)Lnet/minecraft/class_2629; @@ -29,8 +27,7 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP ARG 0 bar METHOD method_34098 updateProperties (Lnet/minecraft/class_1259;)Lnet/minecraft/class_2629; ARG 0 bar - METHOD method_55861 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_55861 write (Lnet/minecraft/class_9129;)V CLASS class_5880 AddAction FIELD field_29100 name Lnet/minecraft/class_2561; FIELD field_29101 percent F @@ -41,8 +38,6 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP FIELD field_29106 thickenFog Z METHOD (Lnet/minecraft/class_1259;)V ARG 1 bar - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf CLASS class_5881 Consumer METHOD method_34099 remove (Ljava/util/UUID;)V ARG 1 uuid @@ -75,32 +70,23 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP METHOD method_34106 accept (Ljava/util/UUID;Lnet/minecraft/class_2629$class_5881;)V ARG 1 uuid ARG 2 consumer - METHOD method_34107 toPacket (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_34107 toPacket (Lnet/minecraft/class_9129;)V CLASS class_5883 Type - FIELD field_29113 parser Ljava/util/function/Function; - METHOD (Ljava/lang/String;ILjava/util/function/Function;)V - ARG 3 parser - METHOD method_34113 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_2629$class_5882; - ARG 0 buf + FIELD field_29113 parser Lnet/minecraft/class_9141; CLASS class_5884 UpdateNameAction - FIELD field_29115 name Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf + FIELD comp_2260 name Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2561;)V ARG 1 name + METHOD comp_2260 name ()Lnet/minecraft/class_2561; CLASS class_5885 UpdateProgressAction - FIELD field_29116 percent F + FIELD comp_2261 percent F METHOD (F)V ARG 1 percent - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_2261 percent ()F CLASS class_5886 UpdatePropertiesAction FIELD field_29117 darkenSky Z FIELD field_29118 dragonMusic Z FIELD field_29119 thickenFog Z - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD (ZZZ)V ARG 1 darkenSky ARG 2 dragonMusic @@ -111,5 +97,3 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP METHOD (Lnet/minecraft/class_1259$class_1260;Lnet/minecraft/class_1259$class_1261;)V ARG 1 color ARG 2 style - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping index 2815398a35..4a0f077724 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping @@ -1,21 +1,10 @@ CLASS net/minecraft/class_2639 net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket - FIELD field_12121 suggestions Lcom/mojang/brigadier/suggestion/Suggestions; - FIELD field_12122 completionId I + FIELD comp_2262 completionId I + FIELD comp_2265 suggestions Ljava/util/List; FIELD field_47913 CODEC Lnet/minecraft/class_9139; METHOD (ILcom/mojang/brigadier/suggestion/Suggestions;)V ARG 1 completionId ARG 2 suggestions - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_2262 completionId ()I + METHOD comp_2265 suggestions ()Ljava/util/List; METHOD method_11397 getSuggestions ()Lcom/mojang/brigadier/suggestion/Suggestions; - METHOD method_11399 getCompletionId ()I - METHOD method_34117 (Lcom/mojang/brigadier/context/StringRange;Lnet/minecraft/class_2540;)Lcom/mojang/brigadier/suggestion/Suggestion; - ARG 1 buf2 - METHOD method_34118 (Lnet/minecraft/class_2540;Lcom/mojang/brigadier/suggestion/Suggestion;)V - ARG 0 buf2 - ARG 1 suggestion - METHOD method_43880 (Lnet/minecraft/class_2540;Lcom/mojang/brigadier/Message;)V - ARG 0 buf3 - ARG 1 tooltip - METHOD method_55866 write (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping index a56051d8ab..137bafd85c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping @@ -1,13 +1,6 @@ CLASS net/minecraft/class_5892 net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket - FIELD field_29133 entityId I - FIELD field_29135 message Lnet/minecraft/class_2561; + FIELD comp_2275 entityId I + FIELD comp_2276 message Lnet/minecraft/class_2561; FIELD field_47953 CODEC Lnet/minecraft/class_9139; - METHOD (ILnet/minecraft/class_2561;)V - ARG 1 entityId - ARG 2 message - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_34144 getEntityId ()I - METHOD method_34145 getMessage ()Lnet/minecraft/class_2561; - METHOD method_55900 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_2275 entityId ()I + METHOD comp_2276 message ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping index 7fcaa68860..aa40cfc51d 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping @@ -1,6 +1,2 @@ CLASS net/minecraft/class_7439 net/minecraft/network/packet/s2c/play/GameMessageS2CPacket FIELD field_48000 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_55945 write (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping b/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping index d7d73f33b6..3290bfc457 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping @@ -26,11 +26,7 @@ CLASS net/minecraft/class_6606 net/minecraft/network/packet/s2c/play/LightData METHOD method_38603 write (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_38604 getUninitedSky ()Ljava/util/BitSet; - METHOD method_38605 (Lnet/minecraft/class_2540;)[B - ARG 0 b METHOD method_38606 getSkyNibbles ()Ljava/util/List; - METHOD method_38607 (Lnet/minecraft/class_2540;)[B - ARG 0 b METHOD method_38608 getInitedBlock ()Ljava/util/BitSet; METHOD method_38609 getUninitedBlock ()Ljava/util/BitSet; METHOD method_38610 getBlockNibbles ()Ljava/util/List; diff --git a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping index 15ce437426..8310d25f07 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping @@ -1,32 +1,19 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket - FIELD field_12296 scale B - FIELD field_12303 id I - FIELD field_12304 icons Ljava/util/List; - FIELD field_17433 locked Z - FIELD field_28016 updateData Lnet/minecraft/class_22$class_5637; + FIELD comp_2270 id Lnet/minecraft/class_9209; + FIELD comp_2271 scale B + FIELD comp_2272 locked Z + FIELD comp_2273 icons Ljava/util/Optional; + FIELD comp_2274 updateData Ljava/util/Optional; FIELD field_47938 CODEC Lnet/minecraft/class_9139; - METHOD (IBZLjava/util/Collection;Lnet/minecraft/class_22$class_5637;)V - ARG 1 id + METHOD (Lnet/minecraft/class_9209;BZLjava/util/Collection;Lnet/minecraft/class_22$class_5637;)V ARG 2 scale ARG 3 locked ARG 4 icons ARG 5 updateData - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_2270 id ()Lnet/minecraft/class_9209; + METHOD comp_2271 scale ()B + METHOD comp_2272 locked ()Z + METHOD comp_2273 icons ()Ljava/util/Optional; + METHOD comp_2274 updateData ()Ljava/util/Optional; METHOD method_11642 apply (Lnet/minecraft/class_22;)V ARG 1 mapState - METHOD method_11644 getId ()I - METHOD method_32701 getScale ()B - METHOD method_32702 isLocked ()Z - METHOD method_34136 (Lnet/minecraft/class_2540;Lnet/minecraft/class_20;)V - ARG 0 b - ARG 1 icon - METHOD method_43881 (Lnet/minecraft/class_2540;Ljava/util/List;)V - ARG 0 buf2 - ARG 1 icons - METHOD method_43882 (Lnet/minecraft/class_2540;)Ljava/util/List; - ARG 0 buf2 - METHOD method_43883 (Lnet/minecraft/class_2540;)Lnet/minecraft/class_20; - ARG 0 buf3 - METHOD method_55888 write (Lnet/minecraft/class_2540;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping index 66cf0a1eba..1a2ce21607 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/class_5894 net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket - FIELD field_29142 message Lnet/minecraft/class_2561; + FIELD comp_2279 message Lnet/minecraft/class_2561; FIELD field_47967 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD (Lnet/minecraft/class_2561;)V - ARG 1 message - METHOD method_34155 getMessage ()Lnet/minecraft/class_2561; - METHOD method_55914 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_2279 message ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping index d020f9b391..62bab7a779 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping @@ -1,13 +1,6 @@ CLASS net/minecraft/class_2772 net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket - FIELD field_12683 header Lnet/minecraft/class_2561; - FIELD field_12684 footer Lnet/minecraft/class_2561; + FIELD comp_2282 header Lnet/minecraft/class_2561; + FIELD comp_2283 footer Lnet/minecraft/class_2561; FIELD field_48001 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V - ARG 1 header - ARG 2 footer - METHOD method_11906 getFooter ()Lnet/minecraft/class_2561; - METHOD method_11908 getHeader ()Lnet/minecraft/class_2561; - METHOD method_55946 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_2282 header ()Lnet/minecraft/class_2561; + METHOD comp_2283 footer ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping index 0b6f227198..f697fc387a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS METHOD (Ljava/util/EnumSet;Ljava/util/Collection;)V ARG 1 actions ARG 2 players - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD (Lnet/minecraft/class_2703$class_5893;Lnet/minecraft/class_3222;)V ARG 1 action ARG 2 player @@ -20,8 +18,7 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS ARG 1 buf2 METHOD method_46329 getEntries ()Ljava/util/List; METHOD method_46330 getPlayerAdditionEntries ()Ljava/util/List; - METHOD method_55902 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_55902 write (Lnet/minecraft/class_9129;)V CLASS class_2705 Entry FIELD comp_1107 profile Lcom/mojang/authlib/GameProfile; FIELD comp_1109 latency I @@ -39,49 +36,35 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS METHOD (Ljava/lang/String;ILnet/minecraft/class_2703$class_5893$class_7829;Lnet/minecraft/class_2703$class_5893$class_7830;)V ARG 3 reader ARG 4 writer - METHOD method_46331 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V - ARG 0 buf + METHOD method_46331 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V ARG 1 entry - METHOD method_46332 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + METHOD method_46332 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 0 serialized - ARG 1 buf - METHOD method_46333 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V - ARG 0 buf + METHOD method_46333 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V ARG 1 entry - METHOD method_46334 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + METHOD method_46334 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 0 serialized - ARG 1 buf - METHOD method_46335 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V - ARG 0 buf + METHOD method_46335 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V ARG 1 entry - METHOD method_46336 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + METHOD method_46336 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 0 serialized - ARG 1 buf - METHOD method_46337 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V - ARG 0 buf + METHOD method_46337 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V ARG 1 entry - METHOD method_46338 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + METHOD method_46338 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 0 serialized - ARG 1 buf - METHOD method_46339 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V - ARG 0 buf + METHOD method_46339 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V ARG 1 entry - METHOD method_46340 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + METHOD method_46340 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 0 serialized - ARG 1 buf - METHOD method_46341 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V - ARG 0 buf + METHOD method_46341 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V ARG 1 entry - METHOD method_46342 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + METHOD method_46342 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 0 serialized - ARG 1 buf CLASS class_7829 Reader - METHOD read (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_2540;)V + METHOD read (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 1 serialized - ARG 2 buf CLASS class_7830 Writer - METHOD write (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V - ARG 1 buf + METHOD write (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V ARG 2 entry CLASS class_7831 Serialized FIELD field_40703 profileId Ljava/util/UUID; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping index c033244df7..a0fe9ce0ed 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/class_2757 net/minecraft/network/packet/s2c/play/ScoreboardScoreUpdateS2CPacket FIELD comp_2122 scoreHolderName Ljava/lang/String; FIELD field_47988 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_9129;)V - ARG 1 buf METHOD comp_2122 scoreHolderName ()Ljava/lang/String; - METHOD method_55935 write (Lnet/minecraft/class_9129;)V - ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping index e14f3c3258..798fda7022 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket.mapping @@ -1,13 +1,6 @@ CLASS net/minecraft/class_7495 net/minecraft/network/packet/s2c/play/ServerMetadataS2CPacket - FIELD field_39387 description Lnet/minecraft/class_2561; - FIELD field_42967 favicon Ljava/util/Optional; + FIELD comp_2277 description Lnet/minecraft/class_2561; + FIELD comp_2278 favicon Ljava/util/Optional; FIELD field_47966 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD (Lnet/minecraft/class_2561;Ljava/util/Optional;)V - ARG 1 description - ARG 2 favicon - METHOD method_44132 getDescription ()Lnet/minecraft/class_2561; - METHOD method_49398 getFavicon ()Ljava/util/Optional; - METHOD method_55913 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_2277 description ()Lnet/minecraft/class_2561; + METHOD comp_2278 favicon ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping index eaa8680db3..9b14cc70c5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/class_5903 net/minecraft/network/packet/s2c/play/SubtitleS2CPacket - FIELD field_29165 subtitle Lnet/minecraft/class_2561; + FIELD comp_2280 subtitle Lnet/minecraft/class_2561; FIELD field_47990 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD (Lnet/minecraft/class_2561;)V - ARG 1 subtitle - METHOD method_34190 getSubtitle ()Lnet/minecraft/class_2561; - METHOD method_55937 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_2280 subtitle ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping index 4828e3b2a7..9eca517f43 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping @@ -28,8 +28,6 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack ARG 2 packetType ARG 3 team ARG 4 playerNames - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD method_34169 containsPlayers (I)Z ARG 0 packetType METHOD method_34170 updateRemovedTeam (Lnet/minecraft/class_268;)Lnet/minecraft/class_5900; @@ -48,8 +46,7 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack METHOD method_34177 getTeamName ()Ljava/lang/String; METHOD method_34178 getPlayerNames ()Ljava/util/Collection; METHOD method_34179 getTeam ()Ljava/util/Optional; - METHOD method_55934 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_55934 write (Lnet/minecraft/class_9129;)V CLASS class_5901 Operation CLASS class_5902 SerializableTeam FIELD field_29158 displayName Lnet/minecraft/class_2561; @@ -59,13 +56,10 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack FIELD field_29162 collisionRule Ljava/lang/String; FIELD field_29163 color Lnet/minecraft/class_124; FIELD field_29164 friendlyFlags I - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf METHOD (Lnet/minecraft/class_268;)V ARG 1 team METHOD method_34181 getDisplayName ()Lnet/minecraft/class_2561; - METHOD method_34182 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD method_34182 write (Lnet/minecraft/class_9129;)V METHOD method_34183 getFriendlyFlagsBitwise ()I METHOD method_34184 getColor ()Lnet/minecraft/class_124; METHOD method_34185 getNameTagVisibilityRule ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping index 49358e77d1..d9660ec517 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/class_5904 net/minecraft/network/packet/s2c/play/TitleS2CPacket - FIELD field_29166 title Lnet/minecraft/class_2561; + FIELD comp_2281 title Lnet/minecraft/class_2561; FIELD field_47992 CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD (Lnet/minecraft/class_2561;)V - ARG 1 title - METHOD method_34192 getTitle ()Lnet/minecraft/class_2561; - METHOD method_55939 write (Lnet/minecraft/class_2540;)V - ARG 1 buf + METHOD comp_2281 title ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/particle/ParticleEffect.mapping b/mappings/net/minecraft/particle/ParticleEffect.mapping index d467f12ca1..55c4c09142 100644 --- a/mappings/net/minecraft/particle/ParticleEffect.mapping +++ b/mappings/net/minecraft/particle/ParticleEffect.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2394 net/minecraft/particle/ParticleEffect - METHOD method_10293 asString ()Ljava/lang/String; + METHOD method_10293 asString (Lnet/minecraft/class_7225$class_7874;)Ljava/lang/String; METHOD method_10295 getType ()Lnet/minecraft/class_2396; CLASS class_2395 Factory - METHOD method_10296 read (Lnet/minecraft/class_2396;Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2394; + METHOD method_10296 read (Lnet/minecraft/class_2396;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394; ARG 1 type ARG 2 reader diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index ad219798c2..7a8b349cdd 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager FIELD field_9027 LOGGER Lorg/slf4j/Logger; METHOD method_17717 getAllOfType (Lnet/minecraft/class_3956;)Ljava/util/Map; ARG 1 type - METHOD method_17720 deserialize (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_8786; + METHOD method_17720 deserialize (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_8786; COMMENT Reads a recipe from a JSON object. COMMENT COMMENT @implNote Even though a recipe's {@linkplain Recipe#getSerializer() serializer} @@ -23,8 +23,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager COMMENT @return the read recipe ARG 0 id COMMENT the recipe's ID - ARG 1 json - COMMENT the recipe JSON METHOD method_17722 (Ljava/util/Map;)Ljava/util/stream/Stream; ARG 0 map METHOD method_17723 (Ljava/util/Map;)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping index a172e9a607..0c034e3d3f 100644 --- a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping +++ b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_4317 net/minecraft/recipe/RepairItemRecipe - METHOD method_24364 (Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_1887;)V + METHOD method_24364 (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_1799;Lnet/minecraft/class_1887;)V ARG 3 enchantment diff --git a/mappings/net/minecraft/registry/RegistryWrapper.mapping b/mappings/net/minecraft/registry/RegistryWrapper.mapping index aa55a21f17..1adf602245 100644 --- a/mappings/net/minecraft/registry/RegistryWrapper.mapping +++ b/mappings/net/minecraft/registry/RegistryWrapper.mapping @@ -6,28 +6,22 @@ CLASS net/minecraft/class_7225 net/minecraft/registry/RegistryWrapper COMMENT @see Registry#getKeys METHOD method_42020 streamTags ()Ljava/util/stream/Stream; COMMENT @see Registry#streamTags - METHOD method_46753 filter (Ljava/util/function/Predicate;)Lnet/minecraft/class_7225; - ARG 1 filter METHOD method_46754 streamKeys ()Ljava/util/stream/Stream; METHOD method_46755 streamTagKeys ()Ljava/util/stream/Stream; - CLASS 1 - METHOD method_46756 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880$class_6883;)Z - ARG 1 entry - METHOD method_46757 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880$class_6883;)Z - ARG 1 entry CLASS class_7226 Impl - METHOD method_45919 withFeatureFilter (Lnet/minecraft/class_7699;)Lnet/minecraft/class_7225; + METHOD method_45919 withFeatureFilter (Lnet/minecraft/class_7699;)Lnet/minecraft/class_7225$class_7226; ARG 1 enabledFeatures METHOD method_45920 (Lnet/minecraft/class_7699;Ljava/lang/Object;)Z ARG 1 feature METHOD method_46765 getRegistryKey ()Lnet/minecraft/class_5321; METHOD method_46766 getLifecycle ()Lcom/mojang/serialization/Lifecycle; + CLASS 1 + METHOD method_46756 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880$class_6883;)Z + ARG 1 entry + METHOD method_46757 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880$class_6883;)Z + ARG 1 entry CLASS class_7875 Delegating METHOD method_46725 getBase ()Lnet/minecraft/class_7225$class_7226; - CLASS class_7873 Delegating - FIELD field_40933 baseWrapper Lnet/minecraft/class_7225; - METHOD (Lnet/minecraft/class_7225;)V - ARG 1 baseWrapper CLASS class_7874 WrapperLookup METHOD method_46758 createRegistryLookup ()Lnet/minecraft/class_7871$class_7872; METHOD method_46759 getOptionalWrapper (Lnet/minecraft/class_5321;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping index eebd98ab9a..7702df308a 100644 --- a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_2995 net/minecraft/scoreboard/ServerScoreboard METHOD method_12940 createRemovePackets (Lnet/minecraft/class_266;)Ljava/util/List; ARG 1 objective METHOD method_12941 runUpdateListeners ()V - METHOD method_32704 stateFromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_273; + METHOD method_32704 stateFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_273; ARG 1 nbt METHOD method_32705 createState ()Lnet/minecraft/class_273; METHOD method_52297 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; diff --git a/mappings/net/minecraft/server/DataPackContents.mapping b/mappings/net/minecraft/server/DataPackContents.mapping index 3b69cb2331..4952b56339 100644 --- a/mappings/net/minecraft/server/DataPackContents.mapping +++ b/mappings/net/minecraft/server/DataPackContents.mapping @@ -12,11 +12,7 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents FIELD field_25341 serverAdvancementLoader Lnet/minecraft/class_2989; FIELD field_25342 functionLoader Lnet/minecraft/class_5349; FIELD field_36491 LOGGER Lorg/slf4j/Logger; - FIELD field_38051 commandRegistryAccess Lnet/minecraft/class_7157$class_7870; METHOD (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;I)V - ARG 1 dynamicRegistryManager - ARG 2 enabledFeatures - ARG 3 environment ARG 4 functionPermissionLevel METHOD method_29465 getFunctionLoader ()Lnet/minecraft/class_5349; COMMENT {@return the function loader} @@ -59,3 +55,14 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents METHOD method_42095 (Lnet/minecraft/class_5350;Ljava/lang/Object;Ljava/lang/Throwable;)V ARG 1 void_ ARG 2 throwable + CLASS class_7158 EntryListCreationPolicy + COMMENT A policy on how to handle a {@link net.minecraft.registry.tag.TagKey} that does not resolve + COMMENT to an existing tag (unrecognized tag) in {@link + COMMENT net.minecraft.registry.RegistryWrapper#getOptional(net.minecraft.registry.tag.TagKey)}. + FIELD field_37824 Lnet/minecraft/class_5350$class_7158; + COMMENT Creates a new {@link net.minecraft.registry.entry.RegistryEntryList}, stores it and returns it. + FIELD field_37826 Lnet/minecraft/class_5350$class_7158; + COMMENT Throws an exception. + CLASS class_9180 2 + FIELD field_40912 entryListCreationPolicy Lnet/minecraft/class_5350$class_7158; + METHOD method_46724 setEntryListCreationPolicy (Lnet/minecraft/class_5350$class_7158;)V diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping index 490bdd20e9..e8173f6173 100644 --- a/mappings/net/minecraft/server/Main.mapping +++ b/mappings/net/minecraft/server/Main.mapping @@ -2,12 +2,11 @@ CLASS net/minecraft/server/Main FIELD field_24625 LOGGER Lorg/slf4j/Logger; METHOD main ([Ljava/lang/String;)V ARG 0 args - METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/class_2378;Z)V + METHOD method_29173 forceUpgradeWorld (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/class_5455;Z)V ARG 0 session ARG 1 dataFixer ARG 2 eraseCache ARG 3 continueCheck - ARG 4 dimensionOptionsRegistry ARG 5 recreateRegionFiles METHOD method_29734 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lnet/minecraft/class_7497;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/class_3176; ARG 11 thread diff --git a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping index 3103954e52..32b90f3456 100644 --- a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping +++ b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping @@ -4,14 +4,9 @@ CLASS net/minecraft/class_2989 net/minecraft/server/ServerAdvancementLoader FIELD field_13406 LOGGER Lorg/slf4j/Logger; FIELD field_44468 conditionManager Lnet/minecraft/class_60; FIELD field_46076 manager Lnet/minecraft/class_163; - METHOD (Lnet/minecraft/class_60;)V - ARG 1 conditionManager METHOD method_12893 getAdvancements ()Ljava/util/Collection; METHOD method_12896 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8779; ARG 1 id - METHOD method_20723 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V - ARG 2 id - ARG 3 json METHOD method_53646 getManager ()Lnet/minecraft/class_163; METHOD method_54921 validate (Lnet/minecraft/class_2960;Lnet/minecraft/class_161;)V ARG 1 id diff --git a/mappings/net/minecraft/server/command/BossBarCommand.mapping b/mappings/net/minecraft/server/command/BossBarCommand.mapping index 0ca7dcd624..86eadc8935 100644 --- a/mappings/net/minecraft/server/command/BossBarCommand.mapping +++ b/mappings/net/minecraft/server/command/BossBarCommand.mapping @@ -73,7 +73,7 @@ CLASS net/minecraft/class_3019 net/minecraft/server/command/BossBarCommand ARG 0 context METHOD method_13052 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_13053 register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD method_13053 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher METHOD method_13054 getBossBar (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3002; ARG 0 context diff --git a/mappings/net/minecraft/server/command/RaidCommand.mapping b/mappings/net/minecraft/server/command/RaidCommand.mapping index f3f73f9fec..cb903aa1de 100644 --- a/mappings/net/minecraft/server/command/RaidCommand.mapping +++ b/mappings/net/minecraft/server/command/RaidCommand.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_6329 net/minecraft/server/command/RaidCommand METHOD method_36191 getRaid (Lnet/minecraft/class_3222;)Lnet/minecraft/class_3765; ARG 0 player - METHOD method_36192 register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD method_36192 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher METHOD method_36193 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context diff --git a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping index ef4a7c0ec7..b78a4dcdab 100644 --- a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping +++ b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping @@ -64,7 +64,7 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand ARG 0 context METHOD method_13594 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_13595 register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD method_13595 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher METHOD method_13596 executeSetDisplay (Lnet/minecraft/class_2168;Lnet/minecraft/class_8646;Lnet/minecraft/class_266;)I ARG 0 source @@ -123,9 +123,7 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand METHOD method_13614 executeListScores (Lnet/minecraft/class_2168;Lnet/minecraft/class_9015;)I ARG 0 source ARG 1 scoreHolder - METHOD method_55345 makeNumberFormatArguments (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_3115$class_9008;)Lcom/mojang/brigadier/builder/ArgumentBuilder; - ARG 0 argumentBuilder - ARG 1 executor + METHOD method_55345 makeNumberFormatArguments (Lnet/minecraft/class_7157;Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_3115$class_9008;)Lcom/mojang/brigadier/builder/ArgumentBuilder; METHOD method_55347 executeModifyObjectiveFormat (Lnet/minecraft/class_2168;Lnet/minecraft/class_266;Lnet/minecraft/class_9022;)I ARG 0 source ARG 1 objective diff --git a/mappings/net/minecraft/server/command/TeamCommand.mapping b/mappings/net/minecraft/server/command/TeamCommand.mapping index 6df77cd82e..1e2740ee3d 100644 --- a/mappings/net/minecraft/server/command/TeamCommand.mapping +++ b/mappings/net/minecraft/server/command/TeamCommand.mapping @@ -74,7 +74,7 @@ CLASS net/minecraft/class_3142 net/minecraft/server/command/TeamCommand ARG 0 source ARG 1 team ARG 2 visibility - METHOD method_13736 register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD method_13736 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher METHOD method_13737 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context diff --git a/mappings/net/minecraft/server/command/TellRawCommand.mapping b/mappings/net/minecraft/server/command/TellRawCommand.mapping index af5d0d866d..c77111ccea 100644 --- a/mappings/net/minecraft/server/command/TellRawCommand.mapping +++ b/mappings/net/minecraft/server/command/TellRawCommand.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3146 net/minecraft/server/command/TellRawCommand - METHOD method_13776 register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD method_13776 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher METHOD method_13777 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context diff --git a/mappings/net/minecraft/server/command/TitleCommand.mapping b/mappings/net/minecraft/server/command/TitleCommand.mapping index fb3b8433de..af7ad4a013 100644 --- a/mappings/net/minecraft/server/command/TitleCommand.mapping +++ b/mappings/net/minecraft/server/command/TitleCommand.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_3151 net/minecraft/server/command/TitleCommand ARG 4 constructor METHOD method_13803 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_13804 register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD method_13804 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher METHOD method_13805 executeClear (Lnet/minecraft/class_2168;Ljava/util/Collection;)I ARG 0 source diff --git a/mappings/net/minecraft/structure/StructureTemplate.mapping b/mappings/net/minecraft/structure/StructureTemplate.mapping index 74501f0459..d0130cbfe3 100644 --- a/mappings/net/minecraft/structure/StructureTemplate.mapping +++ b/mappings/net/minecraft/structure/StructureTemplate.mapping @@ -116,8 +116,6 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate METHOD method_17916 getEntity (Lnet/minecraft/class_5425;Lnet/minecraft/class_2487;)Ljava/util/Optional; ARG 0 world ARG 1 nbt - METHOD method_17917 (Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_243;ZLnet/minecraft/class_5425;Lnet/minecraft/class_2487;Lnet/minecraft/class_1297;)V - ARG 6 entity METHOD method_20532 updateCorner (Lnet/minecraft/class_1936;ILnet/minecraft/class_251;III)V ARG 0 world ARG 1 flags diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index 323a8a3ae3..14e4a8e1c7 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -235,7 +235,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 runnable METHOD method_36019 (Ljava/lang/Runnable;J)V ARG 2 tick - METHOD method_36021 createMockCreativePlayer ()Lnet/minecraft/class_1657; + METHOD method_36021 createMockCreativePlayer (Lnet/minecraft/class_1934;)Lnet/minecraft/class_1657; METHOD method_36022 expectEntityAt (Lnet/minecraft/class_1299;III)V ARG 1 type ARG 2 x @@ -335,7 +335,6 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 2 message METHOD method_46227 getRelative (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 pos - METHOD method_46228 createMockSurvivalPlayer ()Lnet/minecraft/class_1657; METHOD method_46229 useBlock (Lnet/minecraft/class_2338;)V ARG 1 pos METHOD method_47816 useStackOnBlock (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V @@ -415,7 +414,5 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 5 margin METHOD method_56208 getEntities (Lnet/minecraft/class_1299;)Ljava/util/List; ARG 1 type - METHOD method_56606 assertEquals (Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;)V - ARG 1 value - ARG 2 expected + METHOD method_56606 assertEquals (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V ARG 3 name diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9208.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9208.mapping new file mode 100644 index 0000000000..e44e489a3e --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9208.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9208 net/minecraft/unused/packageinfo/PackageInfo9208 diff --git a/mappings/net/minecraft/util/JsonReaderUtils.mapping b/mappings/net/minecraft/util/JsonReaderUtils.mapping index ec65ddb31e..1779d2a9d8 100644 --- a/mappings/net/minecraft/util/JsonReaderUtils.mapping +++ b/mappings/net/minecraft/util/JsonReaderUtils.mapping @@ -3,6 +3,4 @@ CLASS net/minecraft/class_9010 net/minecraft/util/JsonReaderUtils FIELD field_47526 LINE_START Ljava/lang/reflect/Field; METHOD method_55376 getPos (Lcom/google/gson/stream/JsonReader;)I ARG 0 jsonReader - METHOD method_55377 parse (Lcom/mojang/brigadier/StringReader;Lcom/mojang/serialization/Codec;)Ljava/lang/Object; - ARG 0 stringReader - ARG 1 codec + METHOD method_55377 parse (Lnet/minecraft/class_7225$class_7874;Lcom/mojang/brigadier/StringReader;Lcom/mojang/serialization/Codec;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping b/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping index 16782e1faa..f34e237006 100644 --- a/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping +++ b/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping @@ -33,7 +33,7 @@ CLASS net/minecraft/class_8565 net/minecraft/util/math/random/RandomSequencesSta ARG 0 nbt ARG 1 key ARG 2 fallback - METHOD method_52516 (JLnet/minecraft/class_2487;)Lnet/minecraft/class_8565; + METHOD method_52516 (JLnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_8565; ARG 2 nbt METHOD method_52517 reset (Lnet/minecraft/class_2960;)V ARG 1 id diff --git a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping index 74c20a6bfa..de02339e49 100644 --- a/mappings/net/minecraft/util/profiler/PerformanceLog.mapping +++ b/mappings/net/minecraft/util/profiler/PerformanceLog.mapping @@ -1,22 +1,6 @@ CLASS net/minecraft/class_8743 net/minecraft/util/profiler/PerformanceLog - FIELD field_45719 SIZE I - FIELD field_45720 data [[J - FIELD field_45721 currentIndex I - FIELD field_45722 maxIndex I - METHOD (I)V - ARG 1 columns - METHOD method_53064 size ()I - METHOD method_53065 get (I)J - ARG 1 index METHOD method_53066 push (J)V ARG 1 value - METHOD method_53067 getMaxIndex ()I - METHOD method_53068 wrap (I)I - ARG 1 index - METHOD method_53069 reset ()V - METHOD method_56534 get (II)J - ARG 1 index - ARG 2 column METHOD method_56535 push (JI)V ARG 1 value ARG 3 column diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index bd83edd3de..557aa1ca70 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -38,23 +38,13 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 3 sellItem ARG 4 uses ARG 5 maxUses - ARG 6 merchantExperience ARG 7 priceMultiplier - ARG 8 demandBonus - METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFIZ)V + METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIZIIFIZ)V ARG 1 firstBuyItem ARG 2 secondBuyItem ARG 3 sellItem - ARG 4 uses - ARG 5 maxUses - ARG 6 merchantExperience - ARG 7 priceMultiplier - ARG 8 demandBonus - ARG 9 ignoreNbt METHOD (Lnet/minecraft/class_1914;)V ARG 1 offer - METHOD (Lnet/minecraft/class_2487;)V - ARG 1 nbt METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 offered ARG 2 buyItem @@ -134,7 +124,6 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer COMMENT Returns the number of times this trade offer has been used. METHOD method_8250 getSellItem ()Lnet/minecraft/class_1799; COMMENT Returns the sell item of this trade offer. - METHOD method_8251 toNbt ()Lnet/minecraft/class_2487; METHOD method_8254 disable ()V COMMENT Sets the number of times this trade offer has been used to COMMENT its maximum uses, making it disabled. diff --git a/mappings/net/minecraft/village/TradeOfferList.mapping b/mappings/net/minecraft/village/TradeOfferList.mapping index 3df4de5e40..c505eeaa14 100644 --- a/mappings/net/minecraft/village/TradeOfferList.mapping +++ b/mappings/net/minecraft/village/TradeOfferList.mapping @@ -2,11 +2,8 @@ CLASS net/minecraft/class_1916 net/minecraft/village/TradeOfferList FIELD field_48373 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (I)V ARG 1 size - METHOD (Lnet/minecraft/class_2487;)V - ARG 1 nbt METHOD method_53882 copy ()Lnet/minecraft/class_1916; METHOD method_8267 getValidOffer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1914; ARG 1 firstBuyItem ARG 2 secondBuyItem ARG 3 index - METHOD method_8268 toNbt ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/village/raid/RaidManager.mapping b/mappings/net/minecraft/village/raid/RaidManager.mapping index b95887d696..9516739566 100644 --- a/mappings/net/minecraft/village/raid/RaidManager.mapping +++ b/mappings/net/minecraft/village/raid/RaidManager.mapping @@ -27,7 +27,7 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager ARG 0 poiType METHOD method_52559 getPersistentStateType (Lnet/minecraft/class_3218;)Lnet/minecraft/class_18$class_8645; ARG 0 world - METHOD method_52561 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767; + METHOD method_52561 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_3767; ARG 1 nbt METHOD method_77 fromNbt (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767; ARG 0 world diff --git a/mappings/net/minecraft/world/ChunkUpdateState.mapping b/mappings/net/minecraft/world/ChunkUpdateState.mapping index 627ab0222c..cedbed649c 100644 --- a/mappings/net/minecraft/world/ChunkUpdateState.mapping +++ b/mappings/net/minecraft/world/ChunkUpdateState.mapping @@ -15,6 +15,6 @@ CLASS net/minecraft/class_3440 net/minecraft/world/ChunkUpdateState METHOD method_14897 contains (J)Z ARG 1 pos METHOD method_14898 getAll ()Lit/unimi/dsi/fastutil/longs/LongSet; - METHOD method_32358 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3440; + METHOD method_32358 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_3440; ARG 0 nbt METHOD method_52601 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; diff --git a/mappings/net/minecraft/world/ForcedChunkState.mapping b/mappings/net/minecraft/world/ForcedChunkState.mapping index 629d859b73..96e28a06b2 100644 --- a/mappings/net/minecraft/world/ForcedChunkState.mapping +++ b/mappings/net/minecraft/world/ForcedChunkState.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_1932 net/minecraft/world/ForcedChunkState FIELD field_9213 chunks Lit/unimi/dsi/fastutil/longs/LongSet; METHOD (Lit/unimi/dsi/fastutil/longs/LongSet;)V ARG 1 chunks - METHOD method_32350 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1932; + METHOD method_32350 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_1932; ARG 0 nbt METHOD method_52570 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; 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 37f06b5e4b..80b3732789 100644 --- a/mappings/net/minecraft/world/IdCountsState.mapping +++ b/mappings/net/minecraft/world/IdCountsState.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3978 net/minecraft/world/IdCountsState FIELD field_17662 idCounts Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_31830 IDCOUNTS_KEY Ljava/lang/String; - METHOD method_17920 getNextMapId ()I - METHOD method_32360 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3978; + METHOD method_17920 getNextMapId ()Lnet/minecraft/class_9209; + METHOD method_32360 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_3978; ARG 0 nbt METHOD method_52610 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; diff --git a/mappings/net/minecraft/world/PersistentState.mapping b/mappings/net/minecraft/world/PersistentState.mapping index 6816fe182c..c7a6171554 100644 --- a/mappings/net/minecraft/world/PersistentState.mapping +++ b/mappings/net/minecraft/world/PersistentState.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_18 net/minecraft/world/PersistentState FIELD field_17661 LOGGER Lorg/slf4j/Logger; FIELD field_72 dirty Z - METHOD method_17919 save (Ljava/io/File;)V + METHOD method_17919 save (Ljava/io/File;Lnet/minecraft/class_7225$class_7874;)V ARG 1 file - METHOD method_75 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + METHOD method_75 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; ARG 1 nbt METHOD method_78 setDirty (Z)V ARG 1 dirty diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping index 9568170c0d..18976f6f5d 100644 --- a/mappings/net/minecraft/world/PersistentStateManager.mapping +++ b/mappings/net/minecraft/world/PersistentStateManager.mapping @@ -3,11 +3,10 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager FIELD field_136 LOGGER Lorg/slf4j/Logger; FIELD field_17663 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_17664 directory Ljava/io/File; - METHOD (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)V + METHOD (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_7225$class_7874;)V ARG 1 directory ARG 2 dataFixer - METHOD method_120 readFromFile (Ljava/util/function/Function;Lnet/minecraft/class_4284;Ljava/lang/String;)Lnet/minecraft/class_18; - ARG 1 readFunction + METHOD method_120 readFromFile (Ljava/util/function/BiFunction;Lnet/minecraft/class_4284;Ljava/lang/String;)Lnet/minecraft/class_18; ARG 2 dataFixTypes ARG 3 id METHOD method_123 set (Ljava/lang/String;Lnet/minecraft/class_18;)V diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 308f9f6c55..d2a846af18 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -56,12 +56,10 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 9 velocityX ARG 11 velocityY ARG 13 velocityZ - METHOD method_17889 getNextMapId ()I - METHOD method_17890 putMapState (Ljava/lang/String;Lnet/minecraft/class_22;)V - ARG 1 id + METHOD method_17889 getNextMapId ()Lnet/minecraft/class_9209; + METHOD method_17890 putMapState (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V ARG 2 state - METHOD method_17891 getMapState (Ljava/lang/String;)Lnet/minecraft/class_22; - ARG 1 id + METHOD method_17891 getMapState (Lnet/minecraft/class_9209;)Lnet/minecraft/class_22; METHOD method_18471 tickBlockEntities ()V METHOD method_18472 tickEntity (Ljava/util/function/Consumer;Lnet/minecraft/class_1297;)V ARG 1 tickConsumer diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 9a67945691..0cadd49264 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -85,7 +85,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12228 areSectionsEmptyBetween (II)Z ARG 1 lowerHeight ARG 2 upperHeight - METHOD method_20598 getPackedBlockEntityNbt (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; + METHOD method_20598 getPackedBlockEntityNbt (Lnet/minecraft/class_2338;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; ARG 1 pos METHOD method_32914 getGameEventDispatcher (I)Lnet/minecraft/class_5713; ARG 1 ySectionCoord diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 3854667f61..64c7390e04 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -70,9 +70,6 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 1 dynamic ARG 2 save ARG 3 locked - METHOD method_54525 wrap (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_5455$class_6890;)Lcom/mojang/serialization/Dynamic; - ARG 0 dynamic - ARG 1 registryManager METHOD method_54526 getLastModifiedTime (Lnet/minecraft/class_32$class_7411;)J ARG 0 save METHOD method_54527 readSummary (Lnet/minecraft/class_32$class_7411;Z)Lnet/minecraft/class_34; diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index 7a80de090f..8ca01a050a 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -26,10 +26,9 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_5766 upgradedChunkCount I FIELD field_5767 updateThread Ljava/lang/Thread; FIELD field_5768 totalChunkCount I - METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_2378;ZZ)V + METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_5455;ZZ)V ARG 1 session ARG 2 dataFixer - ARG 3 dimensionOptionsRegistry ARG 4 eraseCache ARG 5 recreateRegionFiles METHOD method_28304 getWorlds ()Ljava/util/Set;