Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

24w03a stuff #3766

Merged
merged 1 commit into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions mappings/net/minecraft/advancement/AdvancementDisplay.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay
METHOD method_811 getTitle ()Lnet/minecraft/class_2561;
METHOD method_812 getBackground ()Ljava/util/Optional;
METHOD method_813 toPacket (Lnet/minecraft/class_9129;)V
ARG 1 buf
METHOD method_815 getFrame ()Lnet/minecraft/class_189;
METHOD method_816 setPos (FF)V
ARG 1 x
Expand All @@ -34,6 +35,7 @@ CLASS net/minecraft/class_185 net/minecraft/advancement/AdvancementDisplay
METHOD method_818 getX ()F
METHOD method_819 getY ()F
METHOD method_820 fromPacket (Lnet/minecraft/class_9129;)Lnet/minecraft/class_185;
ARG 0 buf
METHOD method_821 getIcon ()Lnet/minecraft/class_1799;
METHOD method_823 shouldShowToast ()Z
METHOD method_824 isHidden ()Z
107 changes: 43 additions & 64 deletions mappings/net/minecraft/block/AbstractBlock.mapping

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn
FIELD field_31293 PROPERTY_COUNT I
FIELD field_31294 DEFAULT_COOK_TIME I
FIELD field_38234 matchGetter Lnet/minecraft/class_1863$class_7266;
FIELD field_48375 FUEL_TIMES Ljava/util/Map;
FIELD field_48375 fuelTimes Ljava/util/Map;
METHOD <init> (Lnet/minecraft/class_2591;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3956;)V
ARG 1 blockEntityType
ARG 2 pos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ CLASS net/minecraft/class_4416 net/minecraft/client/realms/gui/screen/RealmsSele
FIELD field_26508 CHEATS_TEXT Lnet/minecraft/class_2561;
FIELD field_44909 LOADING_ERROR_TEXT Lnet/minecraft/class_2561;
FIELD field_46131 TITLE Lnet/minecraft/class_2561;
FIELD field_48387 creationTask Lnet/minecraft/class_4445;
METHOD <init> (Lnet/minecraft/class_4445;JILnet/minecraft/class_4410;)V
ARG 1 creationTask
ARG 2 worldId
ARG 4 slotId
ARG 5 parent
METHOD method_21396 loadLevelList ()V
METHOD method_21400 getGameModeName (Lnet/minecraft/class_34;)Lnet/minecraft/class_2561;
ARG 0 summary
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@ CLASS net/minecraft/class_4530 net/minecraft/command/argument/TestFunctionArgume
ARG 0 context
ARG 1 name
METHOD method_22371 testFunction ()Lnet/minecraft/class_4530;
METHOD method_56325 suggestTestNames (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
ARG 0 context
ARG 1 builder
METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object;
ARG 1 reader
4 changes: 4 additions & 0 deletions mappings/net/minecraft/data/DataCache.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ CLASS net/minecraft/class_2408 net/minecraft/data/DataCache
METHOD method_46571 (Ljava/util/Set;Ljava/lang/String;Lnet/minecraft/class_2408$class_7405;)V
ARG 2 providerName
ARG 3 cachedData
CLASS 1
METHOD visitFile (Ljava/lang/Object;Ljava/nio/file/attribute/BasicFileAttributes;)Ljava/nio/file/FileVisitResult;
ARG 1 path
ARG 2 attributes
CLASS class_7404 CachedDataWriter
FIELD field_38919 oldCache Lnet/minecraft/class_2408$class_7405;
FIELD field_38920 newCache Lnet/minecraft/class_2408$class_7858;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/inventory/Inventory.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ CLASS net/minecraft/class_1263 net/minecraft/inventory/Inventory
COMMENT @see net.minecraft.entity.vehicle.VehicleInventory
COMMENT @see net.minecraft.block.entity.LockableContainerBlockEntity
FIELD field_29952 MAX_COUNT_PER_STACK I
FIELD field_48319 DEFAULT_MAX_INTERACTION_RANGE F
METHOD method_18861 count (Lnet/minecraft/class_1792;)I
COMMENT {@return the number of times {@code item} occurs in this inventory
COMMENT across all stored stacks}
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/loot/context/LootContextTypes.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes
ARG 0 builder
METHOD method_53401 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult;
ARG 0 id
METHOD method_56128 (Lnet/minecraft/class_176$class_177;)V
ARG 0 builder
METHOD method_755 (Lnet/minecraft/class_176$class_177;)V
ARG 0 builder
METHOD method_756 (Lnet/minecraft/class_176$class_177;)V
Expand Down
6 changes: 3 additions & 3 deletions mappings/net/minecraft/network/codec/PacketCodec.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec
ARG 2 from
METHOD method_56433 mapResult (Lnet/minecraft/class_9139$class_9140;)Lnet/minecraft/class_9139;
ARG 1 function
METHOD method_56434 record (Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_9139;
METHOD method_56434 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_9139;
ARG 0 codec
ARG 1 from
ARG 2 to
METHOD method_56435 record (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Lnet/minecraft/class_9139;
METHOD method_56435 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Lnet/minecraft/class_9139;
ARG 0 codec1
ARG 1 from1
ARG 2 codec2
ARG 3 from2
ARG 4 to
METHOD method_56436 record (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function3;)Lnet/minecraft/class_9139;
METHOD method_56436 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function3;)Lnet/minecraft/class_9139;
ARG 0 codec1
ARG 1 from1
ARG 2 codec2
Expand Down
18 changes: 10 additions & 8 deletions mappings/net/minecraft/network/packet/CustomPayload.mapping
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
CLASS net/minecraft/class_8710 net/minecraft/network/packet/CustomPayload
METHOD method_56479 getKey ()Lnet/minecraft/class_8710$class_9154;
METHOD method_56483 keyOf (Ljava/lang/String;)Lnet/minecraft/class_8710$class_9154;
METHOD method_56479 getId ()Lnet/minecraft/class_8710$class_9154;
METHOD method_56483 id (Ljava/lang/String;)Lnet/minecraft/class_8710$class_9154;
ARG 0 id
METHOD method_56484 codecOf (Lnet/minecraft/class_9143;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139;
ARG 0 encoder
ARG 1 decoder
METHOD method_56485 createCodec (Lnet/minecraft/class_8710$class_9153;Ljava/util/List;)Lnet/minecraft/class_9139;
ARG 0 factory
ARG 1 codecs
ARG 0 unknownCodecFactory
ARG 1 types
METHOD method_56486 (Lnet/minecraft/class_8710$class_9155;)Lnet/minecraft/class_2960;
ARG 0 pair
ARG 0 type
CLASS 1
METHOD method_56487 getCodec (Lnet/minecraft/class_2960;)Lnet/minecraft/class_9139;
ARG 1 id
METHOD method_56489 encode (Lnet/minecraft/class_2540;Lnet/minecraft/class_8710$class_9154;Lnet/minecraft/class_8710;)V
ARG 1 value
ARG 2 type
ARG 2 id
ARG 3 payload
CLASS class_9153 CodecFactory
METHOD create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_9139;
ARG 1 id
CLASS class_9154 Type
CLASS class_9155 CodecPair
CLASS class_9154 Id
CLASS class_9155 Type
FIELD comp_2243 id Lnet/minecraft/class_8710$class_9154;
METHOD comp_2243 id ()Lnet/minecraft/class_8710$class_9154;
5 changes: 5 additions & 0 deletions mappings/net/minecraft/network/packet/Packet.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ CLASS net/minecraft/class_2596 net/minecraft/network/packet/Packet
METHOD method_11054 apply (Lnet/minecraft/class_2547;)V
ARG 1 listener
METHOD method_55846 getPacketId ()Lnet/minecraft/class_9145;
METHOD method_55943 transitionsNetworkState ()Z
COMMENT {@return {@code true} if the packet signals transitioning between {@link
COMMENT net.minecraft.network.NetworkState}s}
COMMENT
COMMENT <p>Such packets cannot be {@linkplain BundlePacket bundled}.
METHOD method_56443 createCodec (Lnet/minecraft/class_9143;Lnet/minecraft/class_9141;)Lnet/minecraft/class_9139;
ARG 0 encoder
ARG 1 decoder
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
CLASS net/minecraft/class_9145 net/minecraft/network/packet/PacketIdentifier
FIELD comp_2230 side Lnet/minecraft/class_2598;
METHOD comp_2230 side ()Lnet/minecraft/class_2598;
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
CLASS net/minecraft/class_8711 net/minecraft/network/packet/UnknownCustomPayload
METHOD method_56491 (ILnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8711;
ARG 2 buf
METHOD method_56492 createCodec (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_9139;
ARG 0 id
ARG 1 maxBytes
METHOD method_56493 (Lnet/minecraft/class_8711;Lnet/minecraft/class_2540;)V
ARG 0 value
ARG 1 buf
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,9 @@ CLASS net/minecraft/class_5743 net/minecraft/particle/DustColorTransitionParticl
METHOD method_33111 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f;
ARG 0 effect
METHOD method_33112 getToColor ()Lorg/joml/Vector3f;
METHOD method_56171 (Lnet/minecraft/class_5743;)Ljava/lang/Float;
ARG 0 effect
METHOD method_56172 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f;
ARG 0 effect
METHOD method_56173 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f;
ARG 0 effect
4 changes: 4 additions & 0 deletions mappings/net/minecraft/particle/DustParticleEffect.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ CLASS net/minecraft/class_2390 net/minecraft/particle/DustParticleEffect
ARG 0 effect
METHOD method_33117 (Lnet/minecraft/class_2390;)Lorg/joml/Vector3f;
ARG 0 effect
METHOD method_56174 (Lnet/minecraft/class_2390;)Ljava/lang/Float;
ARG 0 effect
METHOD method_56175 (Lnet/minecraft/class_2390;)Lorg/joml/Vector3f;
ARG 0 effect
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@ CLASS net/minecraft/class_2392 net/minecraft/particle/ItemStackParticleEffect
ARG 0 type
METHOD method_29137 (Lnet/minecraft/class_2396;Lnet/minecraft/class_1799;)Lnet/minecraft/class_2392;
ARG 1 stack
METHOD method_56176 (Lnet/minecraft/class_2392;)Lnet/minecraft/class_1799;
ARG 0 effect
METHOD method_56177 (Lnet/minecraft/class_2396;Lnet/minecraft/class_1799;)Lnet/minecraft/class_2392;
ARG 1 stack
METHOD method_56178 createPacketCodec (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139;
ARG 0 type
17 changes: 17 additions & 0 deletions mappings/net/minecraft/particle/ParticleTypes.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,29 @@ CLASS net/minecraft/class_2398 net/minecraft/particle/ParticleTypes
METHOD method_10303 register (Ljava/lang/String;Z)Lnet/minecraft/class_2400;
ARG 0 name
ARG 1 alwaysShow
METHOD method_29139 (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec;
ARG 0 type
METHOD method_33121 (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec;
ARG 0 type
METHOD method_33122 (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec;
ARG 0 type
METHOD method_42022 register (Ljava/lang/String;ZLnet/minecraft/class_2394$class_2395;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/class_2396;
ARG 0 name
ARG 1 alwaysShow
ARG 2 factory
ARG 3 codecGetter
ARG 4 packetCodecGetter
METHOD method_42023 (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec;
ARG 0 type
METHOD method_42616 (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec;
ARG 0 type
METHOD method_56180 (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139;
ARG 0 type
METHOD method_56181 (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139;
ARG 0 type
METHOD method_56182 (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139;
ARG 0 type
METHOD method_56183 (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139;
ARG 0 type
METHOD method_56184 (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139;
ARG 0 type
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ CLASS net/minecraft/class_7227 net/minecraft/particle/SculkChargeParticleEffect
ARG 0 instance
METHOD method_42025 (Lnet/minecraft/class_7227;)Ljava/lang/Float;
ARG 0 particleEffect
METHOD method_56185 (Lnet/minecraft/class_7227;)Ljava/lang/Float;
ARG 0 effect
6 changes: 6 additions & 0 deletions mappings/net/minecraft/recipe/CuttingRecipe.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ CLASS net/minecraft/class_3972 net/minecraft/recipe/CuttingRecipe
ARG 0 recipe
METHOD method_53879 (Lnet/minecraft/class_3972;)Lnet/minecraft/class_1799;
ARG 0 recipe
METHOD method_56106 (Lnet/minecraft/class_3972;)Lnet/minecraft/class_1799;
ARG 0 recipe
METHOD method_56107 (Lnet/minecraft/class_3972;)Lnet/minecraft/class_1856;
ARG 0 recipe
METHOD method_56108 (Lnet/minecraft/class_3972;)Ljava/lang/String;
ARG 0 recipe
CLASS class_3974 RecipeFactory
METHOD create (Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)Lnet/minecraft/class_3972;
ARG 1 group
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/recipe/RawShapedRecipe.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ CLASS net/minecraft/class_8957 net/minecraft/recipe/RawShapedRecipe
ARG 0 key
ARG 1 pattern
METHOD method_55087 writeToBuf (Lnet/minecraft/class_9129;)V
ARG 1 buf
METHOD method_55088 (Lnet/minecraft/class_9129;Lnet/minecraft/class_1856;)Lnet/minecraft/class_1856;
ARG 1 ingredient
METHOD method_55089 findLastSymbol (Ljava/lang/String;)I
ARG 0 line
METHOD method_55090 readFromBuf (Lnet/minecraft/class_9129;)Lnet/minecraft/class_8957;
ARG 0 buf
CLASS class_8958 Data
FIELD field_47323 CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_47324 PATTERN_CODEC Lcom/mojang/serialization/Codec;
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/recipe/ShapelessRecipe.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ CLASS net/minecraft/class_1867 net/minecraft/recipe/ShapelessRecipe
ARG 0 recipe
METHOD method_53765 (Lnet/minecraft/class_1867;)Ljava/lang/String;
ARG 0 recipe
METHOD method_56105 (Lnet/minecraft/class_9129;Lnet/minecraft/class_1856;)Lnet/minecraft/class_1856;
ARG 1 empty
METHOD method_8141 read (Lnet/minecraft/class_9129;)Lnet/minecraft/class_1867;
ARG 0 buf
METHOD method_8143 write (Lnet/minecraft/class_9129;Lnet/minecraft/class_1867;)V
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/registry/RegistryKey.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ CLASS net/minecraft/class_5321 net/minecraft/registry/RegistryKey
METHOD method_41185 getRegistry ()Lnet/minecraft/class_2960;
METHOD method_56038 createPacketCodec (Lnet/minecraft/class_5321;)Lnet/minecraft/class_9139;
ARG 0 registry
METHOD method_56039 (Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321;
ARG 1 id
CLASS class_7892 RegistryIdPair
FIELD comp_1150 id Lnet/minecraft/class_2960;
METHOD comp_1150 id ()Lnet/minecraft/class_2960;
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ CLASS net/minecraft/class_9021 net/minecraft/scoreboard/number/FixedNumberFormat
FIELD field_48543 PACKET_CODEC Lnet/minecraft/class_9139;
METHOD method_55465 (Lnet/minecraft/class_9021;)Lnet/minecraft/class_2561;
ARG 0 format
METHOD method_56361 (Lnet/minecraft/class_9021;)Lnet/minecraft/class_2561;
ARG 0 format
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ CLASS net/minecraft/class_9025 net/minecraft/scoreboard/number/StyledNumberForma
FIELD field_48546 PACKET_CODEC Lnet/minecraft/class_9139;
METHOD method_55472 (Lnet/minecraft/class_9025;)Lnet/minecraft/class_2583;
ARG 0 format
METHOD method_56362 (Lnet/minecraft/class_9025;)Lnet/minecraft/class_2583;
ARG 0 format
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@ CLASS net/minecraft/class_3951 net/minecraft/server/WorldGenerationProgressLogge
METHOD <init> (I)V
ARG 1 radius
METHOD method_17672 getProgressPercentage ()I
METHOD method_56042 create (I)Lnet/minecraft/class_3951;
ARG 0 spawnChunkRadius
METHOD method_56043 noSpawnChunks ()Lnet/minecraft/class_3951;
METHOD method_56044 forSpawnChunks (I)Lnet/minecraft/class_3951;
ARG 0 spawnChunkRadius
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,19 @@ CLASS net/minecraft/class_3953 net/minecraft/server/WorldGenerationProgressTrack
FIELD field_17478 radius I
FIELD field_17479 size I
FIELD field_17480 running Z
METHOD <init> (Lnet/minecraft/class_3951;III)V
ARG 1 progressLogger
ARG 2 centerSize
ARG 3 radius
ARG 4 size
METHOD method_17676 getChunkStatus (II)Lnet/minecraft/class_2806;
ARG 1 x
ARG 2 z
METHOD method_17677 getCenterSize ()I
METHOD method_17678 getSize ()I
METHOD method_17679 getProgressPercentage ()I
METHOD method_56045 create (I)Lnet/minecraft/class_3953;
ARG 0 spawnChunkRadius
METHOD method_56046 noSpawnChunks ()Lnet/minecraft/class_3953;
METHOD method_56047 forSpawnChunks (I)Lnet/minecraft/class_3953;
ARG 0 spawnChunkRadius
Loading