Skip to content

Commit

Permalink
25w04a - components and item model data (#4096)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mschae23
mschae23 authored Jan 22, 2025
1 parent 066f683 commit 9cf05c5
Show file tree
Hide file tree
Showing 27 changed files with 163 additions and 3 deletions.
2 changes: 0 additions & 2 deletions mappings/net/minecraft/class_10724.mapping
View file

This file was deleted.

5 changes: 5 additions & 0 deletions mappings/net/minecraft/client/item/ItemAsset.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
CLASS net/minecraft/class_10434 net/minecraft/client/item/ItemAsset
FIELD field_55327 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Lnet/minecraft/class_10439$class_10441;Lnet/minecraft/class_10434$class_10543;)V
ARG 1 model
ARG 2 properties
METHOD method_65588 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_67275 withContextSwapper (Lnet/minecraft/class_10678;)Lnet/minecraft/class_10434;
ARG 1 contextSwapper
CLASS class_10543 Properties
FIELD field_55549 DEFAULT Lnet/minecraft/class_10434$class_10543;
FIELD field_55550 CODEC Lcom/mojang/serialization/MapCodec;
Expand Down
7 changes: 7 additions & 0 deletions mappings/net/minecraft/client/item/ItemAssetsLoader.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,12 @@ CLASS net/minecraft/class_10521 net/minecraft/client/item/ItemAssetsLoader
ARG 1 executor
METHOD method_65930 (Ljava/util/List;)Lnet/minecraft/class_10521$class_10522;
ARG 0 definitions
METHOD method_65931 (Ljava/util/List;Lnet/minecraft/class_5455$class_6890;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)V
ARG 3 itemId
ARG 4 itemResource
METHOD method_65932 (Lnet/minecraft/class_5455$class_6890;Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage;
ARG 2 itemAssets
METHOD method_67292 (Lnet/minecraft/class_10676;Lnet/minecraft/class_10434;)Lnet/minecraft/class_10434;
ARG 1 itemAsset
CLASS class_10522 Result
CLASS class_10523 Definition
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
FIELD field_53032 syncedOptions Lnet/minecraft/class_8791;
FIELD field_54850 recipeManager Lnet/minecraft/class_10333;
FIELD field_54851 removedPlayerVehicleId Ljava/util/OptionalInt;
FIELD field_56354 modelDataToClean Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V
ARG 1 client
METHOD method_16690 getSessionId ()Ljava/util/UUID;
Expand Down Expand Up @@ -160,3 +161,4 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
METHOD method_64898 refreshRecipeBook (Lnet/minecraft/class_299;)V
ARG 1 recipeBook
METHOD method_64899 getRecipeManager ()Lnet/minecraft/class_10286;
METHOD method_67268 cleanModelData ()V
15 changes: 15 additions & 0 deletions mappings/net/minecraft/client/render/item/model/ConditionItemModel.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,18 @@ CLASS net/minecraft/class_10437 net/minecraft/client/render/item/model/Condition
FIELD field_55333 CODEC Lcom/mojang/serialization/MapCodec;
METHOD method_65591 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_67276 makeWorldIndependentProperty (Lnet/minecraft/class_10460;Lnet/minecraft/class_10678;)Lnet/minecraft/class_10724;
ARG 1 property
ARG 2 contextSwapper
METHOD method_67277 swapContext (Lnet/minecraft/class_10460;Lnet/minecraft/class_10678;Lnet/minecraft/class_638;)Lnet/minecraft/class_10460;
ARG 0 value
ARG 1 contextSwapper
ARG 2 world
METHOD method_67278 (Lnet/minecraft/class_10460;Lnet/minecraft/class_10719;Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;ILnet/minecraft/class_811;)Z
ARG 2 stack
ARG 3 world
ARG 4 entity
ARG 5 seed
ARG 6 transformationMode
METHOD method_67279 (Lnet/minecraft/class_10460;Lnet/minecraft/class_10678;Lnet/minecraft/class_638;)Lnet/minecraft/class_10724;
ARG 2 world
7 changes: 7 additions & 0 deletions mappings/net/minecraft/client/render/item/model/ConditionItemModelProperty.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CLASS net/minecraft/class_10724 net/minecraft/client/render/item/model/ConditionItemModelProperty
METHOD method_65638 test (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;Lnet/minecraft/class_1309;ILnet/minecraft/class_811;)Z
ARG 1 stack
ARG 2 world
ARG 3 entity
ARG 4 seed
ARG 5 transformationMode
23 changes: 22 additions & 1 deletion mappings/net/minecraft/client/render/item/model/SelectItemModel.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
CLASS net/minecraft/class_10451 net/minecraft/client/render/item/model/SelectItemModel
FIELD field_55362 property Lnet/minecraft/class_10494;
FIELD field_55363 cases Lnet/minecraft/class_10451$class_10722;
FIELD field_55363 selector Lnet/minecraft/class_10451$class_10722;
METHOD <init> (Lnet/minecraft/class_10494;Lnet/minecraft/class_10451$class_10722;)V
ARG 1 property
ARG 2 selector
CLASS class_10452 SwitchCase
METHOD method_65628 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
ARG 0 conditionCodec
Expand All @@ -25,3 +26,23 @@ CLASS net/minecraft/class_10451 net/minecraft/client/render/item/model/SelectIte
ARG 0 unbakedSwitch
METHOD method_65635 resolveCases (Lnet/minecraft/class_10526$class_10103;)V
ARG 1 resolver
METHOD method_67280 (Lnet/minecraft/class_10678;Lnet/minecraft/class_638;Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/Object;Lnet/minecraft/class_10439;)V
ARG 4 value
ARG 5 world
METHOD method_67281 buildModelSelector (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Lnet/minecraft/class_10678;)Lnet/minecraft/class_10451$class_10722;
ARG 1 models
ARG 2 contextSwapper
METHOD method_67282 (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Lnet/minecraft/class_10439;Lnet/minecraft/class_10678;Lnet/minecraft/class_638;)Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;
ARG 4 world
METHOD method_67283 (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Lnet/minecraft/class_10439;Lnet/minecraft/class_10719;Ljava/lang/Object;Lnet/minecraft/class_638;)Lnet/minecraft/class_10439;
ARG 3 value
ARG 4 world
METHOD method_67284 (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Lnet/minecraft/class_10439;Ljava/lang/Object;)V
ARG 2 swappedValue
METHOD method_67285 (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/Object;Lnet/minecraft/class_638;)Lnet/minecraft/class_10439;
ARG 1 value
ARG 2 world
CLASS class_10722 ModelSelector
METHOD get get (Ljava/lang/Object;Lnet/minecraft/class_638;)Lnet/minecraft/class_10439;
ARG 1 propertyValue
ARG 2 world
12 changes: 12 additions & 0 deletions mappings/net/minecraft/client/render/item/model/WorldDependentModelData.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
CLASS net/minecraft/class_10719 net/minecraft/client/render/item/model/WorldDependentModelData
FIELD field_56351 rebuildModelData Ljava/util/function/Function;
FIELD field_56352 world Lnet/minecraft/class_10719$class_10720;
FIELD field_56353 modelData Ljava/lang/Object;
METHOD <init> (Ljava/util/function/Function;)V
ARG 1 rebuildModelData
METHOD method_67266 clean ()V
METHOD method_67267 get (Lnet/minecraft/class_10719$class_10720;)Ljava/lang/Object;
ARG 1 world
CLASS class_10720 RegisterForCleaning
METHOD registerForCleaning registerForCleaning (Lnet/minecraft/class_10719;)V
ARG 1 instance
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/item/property/select/ChargeTypeProperty.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CLASS net/minecraft/class_10488 net/minecraft/client/render/item/property/select/ChargeTypeProperty
FIELD field_55415 TYPE Lnet/minecraft/class_10494$class_10495;
FIELD field_56368 VALUE_CODEC Lcom/mojang/serialization/Codec;
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/item/property/select/ContextDimensionProperty.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CLASS net/minecraft/class_10548 net/minecraft/client/render/item/property/select/ContextDimensionProperty
FIELD field_55563 TYPE Lnet/minecraft/class_10494$class_10495;
FIELD field_56369 VALUE_CODEC Lcom/mojang/serialization/Codec;
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/item/property/select/ContextEntityTypeProperty.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CLASS net/minecraft/class_10531 net/minecraft/client/render/item/property/select/ContextEntityTypeProperty
FIELD field_55511 TYPE Lnet/minecraft/class_10494$class_10495;
FIELD field_56370 VALUE_CODEC Lcom/mojang/serialization/Codec;
1 change: 1 addition & 0 deletions ...gs/net/minecraft/client/render/item/property/select/CustomModelDataStringProperty.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CLASS net/minecraft/class_10489 net/minecraft/client/render/item/property/select/CustomModelDataStringProperty
FIELD field_55416 TYPE Lnet/minecraft/class_10494$class_10495;
FIELD field_56371 VALUE_CODEC Lcom/mojang/serialization/codecs/PrimitiveCodec;
METHOD method_65677 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/item/property/select/DisplayContextProperty.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CLASS net/minecraft/class_10490 net/minecraft/client/render/item/property/select/DisplayContextProperty
FIELD field_55417 TYPE Lnet/minecraft/class_10494$class_10495;
FIELD field_56372 VALUE_CODEC Lcom/mojang/serialization/Codec;
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/item/property/select/ItemBlockStateProperty.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CLASS net/minecraft/class_10491 net/minecraft/client/render/item/property/select/ItemBlockStateProperty
FIELD field_55418 TYPE Lnet/minecraft/class_10494$class_10495;
FIELD field_56373 VALUE_CODEC Lcom/mojang/serialization/codecs/PrimitiveCodec;
METHOD method_65680 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/item/property/select/LocalTimeProperty.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ CLASS net/minecraft/class_10532 net/minecraft/client/render/item/property/select
FIELD field_55521 currentTimeFormatted Ljava/lang/String;
FIELD field_55564 DATA_CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_55565 data Lnet/minecraft/class_10532$class_10549;
FIELD field_56374 VALUE_CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Lnet/minecraft/class_10532$class_10549;Lcom/ibm/icu/text/DateFormat;)V
ARG 1 data
ARG 2 dateFormat
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/item/property/select/MainHandProperty.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CLASS net/minecraft/class_10492 net/minecraft/client/render/item/property/select/MainHandProperty
FIELD field_55419 TYPE Lnet/minecraft/class_10494$class_10495;
FIELD field_56375 VALUE_CODEC Lcom/mojang/serialization/Codec;
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/item/property/select/SelectProperty.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CLASS net/minecraft/class_10494 net/minecraft/client/render/item/property/select
ARG 3 user
ARG 4 seed
ARG 5 modelTransformationMode
METHOD method_67287 valueCodec ()Lcom/mojang/serialization/Codec;
CLASS class_10495 Type
METHOD method_65686 create (Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_10494$class_10495;
ARG 0 propertyCodec
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/render/item/property/select/TrimMaterialProperty.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
CLASS net/minecraft/class_10496 net/minecraft/client/render/item/property/select/TrimMaterialProperty
FIELD field_55422 TYPE Lnet/minecraft/class_10494$class_10495;
FIELD field_56376 VALUE_CODEC Lcom/mojang/serialization/Codec;
12 changes: 12 additions & 0 deletions mappings/net/minecraft/component/DataComponentTypes.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,3 +201,15 @@ CLASS net/minecraft/class_9334 net/minecraft/component/DataComponentTypes
ARG 0 builder
METHOD method_66898 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
ARG 0 builder
METHOD method_67295 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
ARG 0 builder
METHOD method_67296 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
ARG 0 builder
METHOD method_67297 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
ARG 0 builder
METHOD method_67298 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
ARG 0 builder
METHOD method_67299 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
ARG 0 builder
METHOD method_67300 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332;
ARG 0 builder
4 changes: 4 additions & 0 deletions mappings/net/minecraft/component/type/BeesComponent.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CLASS net/minecraft/class_10706 net/minecraft/component/type/BeesComponent
FIELD field_56298 CODEC Lcom/mojang/serialization/Codec;
FIELD field_56299 PACKET_CODEC Lnet/minecraft/class_9139;
FIELD field_56300 DEFAULT Lnet/minecraft/class_10706;
9 changes: 9 additions & 0 deletions mappings/net/minecraft/component/type/InstrumentComponent.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
CLASS net/minecraft/class_10710 net/minecraft/component/type/InstrumentComponent
FIELD field_56311 CODEC Lcom/mojang/serialization/Codec;
FIELD field_56312 PACKET_CODEC Lnet/minecraft/class_9139;
METHOD <init> (Lnet/minecraft/class_5321;)V
ARG 1 instrument
METHOD <init> (Lnet/minecraft/class_6880;)V
ARG 1 instrument
METHOD method_67211 getInstrument (Lnet/minecraft/class_7225$class_7874;)Ljava/util/Optional;
ARG 1 registries
3 changes: 3 additions & 0 deletions mappings/net/minecraft/component/type/LoreComponent.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ CLASS net/minecraft/class_9290 net/minecraft/component/type/LoreComponent
FIELD field_49344 STYLE Lnet/minecraft/class_2583;
METHOD <init> (Ljava/util/List;)V
ARG 1 lines
METHOD <init> (Ljava/util/List;Ljava/util/List;)V
ARG 1 lines
ARG 2 styledLines
METHOD method_57499 with (Lnet/minecraft/class_2561;)Lnet/minecraft/class_9290;
ARG 1 line
METHOD method_57500 (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561;
Expand Down
9 changes: 9 additions & 0 deletions mappings/net/minecraft/component/type/ProvidesTrimMaterialComponent.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
CLASS net/minecraft/class_10711 net/minecraft/component/type/ProvidesTrimMaterialComponent
FIELD field_56313 CODEC Lcom/mojang/serialization/Codec;
FIELD field_56314 PACKET_CODEC Lnet/minecraft/class_9139;
METHOD <init> (Lnet/minecraft/class_5321;)V
ARG 1 material
METHOD <init> (Lnet/minecraft/class_6880;)V
ARG 1 material
METHOD method_67212 getMaterial (Lnet/minecraft/class_7225$class_7874;)Ljava/util/Optional;
ARG 1 registries
10 changes: 10 additions & 0 deletions mappings/net/minecraft/component/type/TooltipDisplayComponent.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
CLASS net/minecraft/class_10712 net/minecraft/component/type/TooltipDisplayComponent
FIELD field_56316 CODEC Lcom/mojang/serialization/Codec;
FIELD field_56317 PACKET_CODEC Lnet/minecraft/class_9139;
FIELD field_56318 DEFAULT Lnet/minecraft/class_10712;
FIELD field_56319 HIDDEN_COMPONENTS_CODEC Lcom/mojang/serialization/Codec;
METHOD method_67214 test (Lnet/minecraft/class_9331;)Z
ARG 1 component
METHOD method_67215 with (Lnet/minecraft/class_9331;Z)Lnet/minecraft/class_10712;
ARG 1 component
ARG 2 hidden
1 change: 1 addition & 0 deletions mappings/net/minecraft/item/tooltip/TooltipAppender.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ CLASS net/minecraft/class_9299 net/minecraft/item/tooltip/TooltipAppender
ARG 1 context
ARG 2 tooltip
ARG 3 type
ARG 4 components
25 changes: 25 additions & 0 deletions mappings/net/minecraft/registry/ContextSwappableRegistryLookup.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
CLASS net/minecraft/class_10676 net/minecraft/registry/ContextSwappableRegistryLookup
FIELD field_56244 delegate Lnet/minecraft/class_7225$class_7874;
FIELD field_56245 entryLookupImpl Lnet/minecraft/class_10676$class_10677;
FIELD field_56246 entries Ljava/util/Map;
FIELD field_56247 tags Ljava/util/Map;
METHOD <init> (Lnet/minecraft/class_7225$class_7874;)V
ARG 1 delegate
METHOD method_67088 createContextSwapper ()Lnet/minecraft/class_10678;
METHOD method_67089 createRegistryOps (Lcom/mojang/serialization/DynamicOps;)Lnet/minecraft/class_6903;
ARG 1 delegateOps
METHOD method_67090 hasEntries ()Z
CLASS 2
METHOD method_67093 (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_7225$class_7874;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
ARG 2 encodedValue
CLASS class_10677 EntryLookupImpl
METHOD method_67094 asEntryLookup ()Lnet/minecraft/class_7871;
METHOD method_67095 asEntryOwner ()Lnet/minecraft/class_7876;
METHOD method_67096 getOrComputeEntry (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883;
ARG 1 key
METHOD method_67097 getOrComputeTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885$class_6888;
ARG 1 tag
METHOD method_67098 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883;
ARG 1 key2
METHOD method_67099 (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885$class_6888;
ARG 1 tagKey
10 changes: 10 additions & 0 deletions mappings/net/minecraft/registry/ContextSwapper.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
CLASS net/minecraft/class_10678 net/minecraft/registry/ContextSwapper
METHOD method_67092 swapContext (Lcom/mojang/serialization/Codec;Ljava/lang/Object;Lnet/minecraft/class_7225$class_7874;)Lcom/mojang/serialization/DataResult;
COMMENT Recreates a value based on a new registry context (for example, for use in a
COMMENT different world).
COMMENT
COMMENT This is done by encoding the value using the old registry context and immediately
COMMENT decoding it with the new one.
ARG 1 codec
ARG 2 value
ARG 3 registries

0 comments on commit 9cf05c5

Please sign in to comment.