Skip to content

Commit c1927ff

Browse files
authored
Map BlockStateModel and friends (#4141)
* Map BlockStateModel and friends * Misc changes
1 parent 77973fe commit c1927ff

File tree

11 files changed

+74
-13
lines changed

11 files changed

+74
-13
lines changed

mappings/net/minecraft/class_10889.mapping

Lines changed: 0 additions & 3 deletions
This file was deleted.

mappings/net/minecraft/client/render/model/BakedModel.mapping

Lines changed: 0 additions & 9 deletions
This file was deleted.

mappings/net/minecraft/client/render/model/Baker.mapping

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@ CLASS net/minecraft/class_7775 net/minecraft/client/render/model/Baker
22
METHOD method_45872 getModel (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10819;
33
ARG 1 id
44
METHOD method_65732 getSpriteGetter ()Lnet/minecraft/class_9826;
5+
METHOD method_68549 compute (Lnet/minecraft/class_7775$class_10897;)Ljava/lang/Object;
6+
CLASS class_10897 ResolvableCacheKey
7+
METHOD compute compute (Lnet/minecraft/class_7775;)Ljava/lang/Object;
8+
ARG 1 baker
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
CLASS net/minecraft/class_10889 net/minecraft/client/render/model/BlockModelPart
2+
METHOD comp_3751 useAmbientOcclusion ()Z
3+
METHOD comp_3752 particleSprite ()Lnet/minecraft/class_1058;
4+
METHOD method_68509 getQuads (Lnet/minecraft/class_2350;)Ljava/util/List;
5+
ARG 1 Direction
6+
CLASS class_10890 Unbaked
7+
METHOD method_68510 bake (Lnet/minecraft/class_7775;)Lnet/minecraft/class_10889;
8+
ARG 1 baker
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
CLASS net/minecraft/class_1087 net/minecraft/client/render/model/BlockStateModel
2+
METHOD method_68511 particleSprite ()Lnet/minecraft/class_1058;
3+
COMMENT {@return a texture that represents the model}
4+
COMMENT
5+
COMMENT <p>This is primarily used in particles. For example, block break particles use this sprite.
6+
METHOD method_68512 getParts (Lnet/minecraft/class_5819;)Ljava/util/List;
7+
ARG 1 random
8+
METHOD method_68513 addParts (Lnet/minecraft/class_5819;Ljava/util/List;)V
9+
ARG 1 random
10+
ARG 2 parts
11+
CLASS class_10891 CachedUnbaked
12+
FIELD field_57939 delegate Lnet/minecraft/class_1087$class_10892;
13+
FIELD field_57940 cacheKey Lnet/minecraft/class_7775$class_10897;
14+
METHOD <init> (Lnet/minecraft/class_1087$class_10892;)V
15+
ARG 1 delegate
16+
CLASS class_10892 Unbaked
17+
FIELD field_57942 WEIGHTED_VARIANT_CODEC Lcom/mojang/serialization/Codec;
18+
FIELD field_57943 WEIGHTED_CODEC Lcom/mojang/serialization/Codec;
19+
FIELD field_57944 CODEC Lcom/mojang/serialization/Codec;
20+
METHOD method_68515 cached ()Lnet/minecraft/class_1087$class_9979;
21+
METHOD method_68516 (Lnet/minecraft/class_6010;)Lnet/minecraft/class_6010;
22+
ARG 0 weighted
23+
METHOD method_68517 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_1087$class_10892;
24+
ARG 0 either
25+
METHOD method_68518 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
26+
ARG 0 instance
27+
METHOD method_68519 (Lnet/minecraft/class_1087$class_10892;)Lcom/mojang/serialization/DataResult;
28+
ARG 0 variant
29+
METHOD method_68520 (Lnet/minecraft/class_10893$class_10894;)Ljava/lang/Record;
30+
ARG 0 right
31+
METHOD method_68521 getModel (Lnet/minecraft/class_7775;)Lnet/minecraft/class_1087;
32+
ARG 1 baker
33+
METHOD method_68522 (Lnet/minecraft/class_1097$class_10898;)Ljava/lang/Record;
34+
ARG 0 left
35+
CLASS class_9979 UnbakedGrouped
36+
METHOD method_62332 getEqualityGroup (Lnet/minecraft/class_2680;)Ljava/lang/Object;
37+
ARG 1 state
38+
METHOD method_65542 getModel (Lnet/minecraft/class_2680;Lnet/minecraft/class_7775;)Lnet/minecraft/class_1087;
39+
ARG 1 state
40+
ARG 2 baker

mappings/net/minecraft/client/render/model/ModelBaker.mapping

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,5 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelBaker
3737
ARG 0 model
3838
CLASS class_7778 BakerImpl
3939
FIELD field_56988 spriteGetter Lnet/minecraft/class_9826;
40+
FIELD field_57959 cache Ljava/util/Map;
41+
FIELD field_57960 cacheValueFunction Ljava/util/function/Function;
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
CLASS net/minecraft/class_10893 net/minecraft/client/render/model/SimpleBlockStateModel
2+
FIELD field_57945 part Lnet/minecraft/class_10889;
3+
METHOD <init> (Lnet/minecraft/class_10889;)V
4+
ARG 1 part
5+
CLASS class_10894 Unbaked
6+
FIELD field_57946 CODEC Lcom/mojang/serialization/Codec;

mappings/net/minecraft/client/render/model/WeightedBakedModel.mapping renamed to mappings/net/minecraft/client/render/model/WeightedBlockStateModel.mapping

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
CLASS net/minecraft/class_1097 net/minecraft/client/render/model/WeightedBakedModel
1+
CLASS net/minecraft/class_1097 net/minecraft/client/render/model/WeightedBlockStateModel
22
FIELD field_5434 models Lnet/minecraft/class_6012;
33
FIELD field_57028 particleSprite Lnet/minecraft/class_1058;
44
METHOD <init> (Lnet/minecraft/class_6012;)V
55
ARG 1 models
6+
CLASS class_10898 Unbaked
7+
METHOD method_68552 (Lnet/minecraft/class_10526$class_10103;Lnet/minecraft/class_6010;)V
8+
ARG 1 entry

mappings/net/minecraft/client/render/model/json/ModelVariant.mapping

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
CLASS net/minecraft/class_813 net/minecraft/client/render/model/json/ModelVariant
22
FIELD comp_3379 modelId Lnet/minecraft/class_2960;
33
FIELD field_56933 CODEC Lcom/mojang/serialization/Codec;
4+
FIELD field_57947 MAP_CODEC Lcom/mojang/serialization/MapCodec;
45
METHOD <init> (Lnet/minecraft/class_2960;)V
56
ARG 1 model
67
METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_813$class_10803;)V

mappings/net/minecraft/util/collection/Pool.mapping

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ CLASS net/minecraft/class_6012 net/minecraft/util/collection/Pool
3131
ARG 0 entryCodec
3232
METHOD method_66647 contains (Ljava/lang/Object;)Z
3333
ARG 1 value
34+
METHOD method_68256 transform (Ljava/util/function/Function;)Lnet/minecraft/class_6012;
35+
ARG 1 function
36+
METHOD method_68257 (Ljava/util/function/Function;Lnet/minecraft/class_6010;)Lnet/minecraft/class_6010;
37+
ARG 1 entry
3438
CLASS class_10579 WrappedContent
3539
FIELD field_55648 entries [Lnet/minecraft/class_6010;
3640
METHOD <init> (Ljava/util/List;)V

0 commit comments

Comments
 (0)