Skip to content

Commit 2803f2b

Browse files
authored
Map 26.1-pre-1 (#24)
1 parent 907a12a commit 2803f2b

File tree

82 files changed

+631
-13
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+631
-13
lines changed

mappings/net/minecraft/block/AbstractBlock.mapping

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
439439
ARG 3 pos
440440
ARG 4 entity
441441
ARG 5 handler
442+
ARG 6 substantial
442443
METHOD method_9549 getCollisionShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265;
443444
COMMENT @see AbstractBlockState#getCollisionShape(BlockView, BlockPos, ShapeContext)
444445
ARG 1 state
@@ -869,6 +870,11 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
869870
ARG 4 moved
870871
METHOD method_72600 keepBlockEntityWhenReplacedWith (Lnet/minecraft/class_2680;)Z
871872
ARG 1 state
873+
CLASS class_1_474 PostProcessPredicate
874+
METHOD method_1_3010 getPos (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
875+
ARG 1 state
876+
ARG 2 world
877+
ARG 3 pos
872878
CLASS class_2250 OffsetType
873879
CLASS class_2251 Settings
874880
FIELD field_10660 resistance F
@@ -961,6 +967,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
961967
ARG 1 world
962968
ARG 2 pos
963969
METHOD method_26247 postProcess (Lnet/minecraft/class_4970$class_1_474;)Lnet/minecraft/class_4970$class_2251;
970+
ARG 1 postProcessPredicate
964971
METHOD method_26249 emissiveLighting (Lnet/minecraft/class_4970$class_4973;)Lnet/minecraft/class_4970$class_2251;
965972
ARG 1 predicate
966973
METHOD method_26250 air ()Lnet/minecraft/class_4970$class_2251;
@@ -1017,6 +1024,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
10171024
METHOD method_63505 getLootTableKey ()Ljava/util/Optional;
10181025
METHOD method_63506 getTranslationKey ()Ljava/lang/String;
10191026
CLASS class_4971 AbstractBlockState
1027+
FIELD field_1_2487 postProcessPredicate Lnet/minecraft/class_4970$class_1_474;
10201028
FIELD field_23166 shapeCache Lnet/minecraft/class_4970$class_4971$class_3752;
10211029
FIELD field_23167 luminance I
10221030
FIELD field_23168 hasSidedTransparency Z
@@ -1049,6 +1057,11 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
10491057
FIELD field_52646 FULL_CULLING_FACES [Lnet/minecraft/class_265;
10501058
METHOD <init> (Lnet/minecraft/class_2248;[Lnet/minecraft/class_2769;[Ljava/lang/Comparable;)V
10511059
ARG 1 block
1060+
ARG 2 properties
1061+
ARG 3 values
1062+
METHOD method_1_3009 getPostProcessPos (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
1063+
ARG 1 world
1064+
ARG 2 pos
10521065
METHOD method_26165 calcBlockBreakingDelta (Lnet/minecraft/class_1657;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F
10531066
ARG 1 player
10541067
ARG 2 world
@@ -1085,6 +1098,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
10851098
METHOD method_26176 getComparatorOutput (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I
10861099
ARG 1 world
10871100
ARG 2 pos
1101+
ARG 3 direction
10881102
METHOD method_26177 onSyncedBlockEvent (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;II)Z
10891103
ARG 1 world
10901104
ARG 2 pos
@@ -1094,6 +1108,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
10941108
ARG 1 world
10951109
ARG 2 pos
10961110
ARG 3 entity
1111+
ARG 4 collisionHandler
10971112
METHOD method_26179 onBlockBreakStart (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V
10981113
ARG 1 world
10991114
ARG 2 pos
@@ -1294,7 +1309,9 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
12941309
METHOD method_61766 ([Lnet/minecraft/class_265;)V
12951310
ARG 0 direction
12961311
METHOD method_64025 getInsideCollisionShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Lnet/minecraft/class_265;
1312+
ARG 1 world
12971313
ARG 2 pos
1314+
ARG 3 entity
12981315
METHOD method_65171 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_1799;
12991316
ARG 1 world
13001317
ARG 2 pos

mappings/net/minecraft/block/Blocks.mapping

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CLASS net/minecraft/class_2246 net/minecraft/block/Blocks
22
COMMENT Contains all the minecraft blocks.
3+
FIELD field_10566 DIRT Lnet/minecraft/class_2248;
34
FIELD field_23985 IRON_CHAIN Lnet/minecraft/class_2248;
45
FIELD field_46282 PUMPKIN Lnet/minecraft/class_2248;
56
FIELD field_46283 MELON Lnet/minecraft/class_2248;
@@ -16,8 +17,34 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks
1617
ARG 0 settings
1718
METHOD method_1_874 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
1819
ARG 0 settings
20+
METHOD method_1_875 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
21+
ARG 0 settings
22+
METHOD method_1_876 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
23+
ARG 0 settings
24+
METHOD method_1_877 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
25+
ARG 0 settings
26+
METHOD method_1_878 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
27+
ARG 0 settings
28+
METHOD method_1_1251 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
29+
ARG 0 settings
1930
METHOD method_1_1252 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
2031
ARG 0 settings
32+
METHOD method_1_1253 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
33+
ARG 0 settings
34+
METHOD method_1_1254 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
35+
ARG 0 settings
36+
METHOD method_1_1255 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
37+
ARG 0 settings
38+
METHOD method_1_1256 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
39+
ARG 0 settings
40+
METHOD method_1_2936 getAbovePosition (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
41+
ARG 0 state
42+
ARG 1 world
43+
ARG 2 pos
44+
METHOD method_1_2937 getSelfPosition (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
45+
ARG 0 state
46+
ARG 1 world
47+
ARG 2 pos
2148
METHOD method_9492 register (Ljava/lang/String;Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248;
2249
ARG 0 id
2350
ARG 1 settings

mappings/net/minecraft/client/data/BlockStateModelGenerator.mapping

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerator
2+
FIELD field_1_2306 SKULL_TRANSFORMATION Lnet/minecraft/class_4590;
23
FIELD field_22830 blockStateCollector Ljava/util/function/Consumer;
34
FIELD field_22831 modelCollector Ljava/util/function/BiConsumer;
45
FIELD field_28548 CONNECTION_VARIANT_FUNCTIONS Ljava/util/Map;
@@ -36,6 +37,13 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato
3637
ARG 1 blockStateCollector
3738
ARG 2 itemModelOutput
3839
ARG 3 modelCollector
40+
METHOD method_1_2322 (Lnet/minecraft/class_4944;)V
41+
ARG 0 textureMap
42+
METHOD method_1_3013 registerChest (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_1_477;Z)V
43+
ARG 1 block
44+
ARG 2 articleSource
45+
ARG 3 texture
46+
ARG 4 christmas
3947
METHOD method_25508 registerChorusPlant ()V
4048
METHOD method_25509 registerComposter ()V
4149
METHOD method_25510 registerDaylightDetector ()V
@@ -130,6 +138,7 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato
130138
ARG 3 snowyVariant
131139
METHOD method_25561 registerPiston (Lnet/minecraft/class_2248;Lnet/minecraft/class_807;Lnet/minecraft/class_4944;)V
132140
ARG 1 piston
141+
ARG 2 submodelVariant
133142
ARG 3 textures
134143
METHOD method_25565 createBooleanModelMap (Lnet/minecraft/class_2746;Lnet/minecraft/class_807;Lnet/minecraft/class_807;)Lnet/minecraft/class_4926;
135144
ARG 0 property
@@ -253,6 +262,7 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato
253262
ARG 1 doorBlock
254263
METHOD method_25660 registerBuiltinWithParticle (Lnet/minecraft/class_2248;Lnet/minecraft/class_1_314;)V
255264
ARG 1 block
265+
ARG 2 particleTexture
256266
METHOD method_25661 createFenceBlockState (Lnet/minecraft/class_2248;Lnet/minecraft/class_807;Lnet/minecraft/class_807;)Lnet/minecraft/class_4917;
257267
ARG 0 fenceBlock
258268
ARG 1 postModel
@@ -395,13 +405,17 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato
395405
ARG 0 tick
396406
ARG 1 locked
397407
ARG 2 on
408+
METHOD method_34624 (Lnet/minecraft/class_4944;Lnet/minecraft/class_1_314;)Lnet/minecraft/class_4944;
409+
ARG 1 texture
398410
METHOD method_34626 (Lnet/minecraft/class_1_314;Lnet/minecraft/class_4944;)V
399411
ARG 1 textures
400412
METHOD method_34631 createDeepslateState (Lnet/minecraft/class_2248;Lnet/minecraft/class_813;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_4917;
401413
ARG 0 block
402414
ARG 1 variant
403415
ARG 2 textures
404416
ARG 3 modelCollector
417+
METHOD method_34637 (Lnet/minecraft/class_4944;Lnet/minecraft/class_1_314;)Lnet/minecraft/class_4944;
418+
ARG 1 texture
405419
METHOD method_34639 (Lnet/minecraft/class_1_314;Lnet/minecraft/class_4944;)V
406420
ARG 1 textures
407421
METHOD method_34645 (Lnet/minecraft/class_1_314;Lnet/minecraft/class_4944;)V
@@ -553,6 +567,8 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato
553567
ARG 3 tintColor
554568
METHOD method_65409 registerSpecialItemModel (Lnet/minecraft/class_2248;Ljava/util/Optional;Lnet/minecraft/class_10515$class_10516;)V
555569
ARG 1 block
570+
ARG 2 transformation
571+
ARG 3 model
556572
METHOD method_65410 registerSkulls ()V
557573
METHOD method_65411 registerBanners ()V
558574
METHOD method_65412 registerChests ()V
@@ -656,6 +672,8 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato
656672
METHOD method_67826 (Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/class_807;
657673
ARG 1 eggs
658674
ARG 2 hatch
675+
METHOD method_67827 (Ljava/lang/String;I)Lnet/minecraft/class_6010;
676+
ARG 1 variant
659677
METHOD method_67828 (Ljava/util/Map;Lnet/minecraft/class_10641;)Lnet/minecraft/class_807;
660678
ARG 1 mode
661679
METHOD method_67829 (Ljava/util/function/Function;Lnet/minecraft/class_2688;Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2350;Lnet/minecraft/class_10804;)V
@@ -714,6 +732,7 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato
714732
ARG 1 hydration
715733
METHOD method_72719 registerShelf (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V
716734
ARG 1 block
735+
ARG 2 strippedLog
717736
METHOD method_72720 registerCopperGolemStatue (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_5955$class_5811;)V
718737
ARG 1 block
719738
ARG 2 particleBlock
@@ -777,6 +796,8 @@ CLASS net/minecraft/class_4910 net/minecraft/client/data/BlockStateModelGenerato
777796
FIELD field_47134 children Ljava/util/Set;
778797
METHOD <init> (Lnet/minecraft/class_4910;Lnet/minecraft/class_4944;)V
779798
ARG 2 textures
799+
METHOD method_1_1046 (Lnet/minecraft/class_2248;Lnet/minecraft/class_5794;)Z
800+
ARG 1 family
780801
METHOD method_25716 button (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912;
781802
ARG 1 buttonBlock
782803
METHOD method_25717 sign (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4910$class_4912;

mappings/net/minecraft/client/data/ItemModels.mapping

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,19 @@ CLASS net/minecraft/class_10410 net/minecraft/client/data/ItemModels
2020
METHOD method_1_2734 special (Lnet/minecraft/class_2960;Lnet/minecraft/class_10515$class_10516;)Lnet/minecraft/class_10439$class_10441;
2121
ARG 0 base
2222
ARG 1 specialModel
23+
METHOD method_1_3014 generateCases (Lnet/minecraft/class_2769;Ljava/util/Map;)Ljava/util/List;
24+
ARG 0 property
25+
ARG 1 valuesToModels
26+
METHOD method_1_3015 select (Lnet/minecraft/class_4590;Lnet/minecraft/class_10494;Lnet/minecraft/class_10439$class_10441;Ljava/util/List;)Lnet/minecraft/class_10439$class_10441;
27+
ARG 0 transformation
28+
ARG 1 property
29+
ARG 2 fallback
30+
ARG 3 cases
31+
METHOD method_1_3016 select (Lnet/minecraft/class_4590;Lnet/minecraft/class_2769;Lnet/minecraft/class_10439$class_10441;Ljava/util/Map;)Lnet/minecraft/class_10439$class_10441;
32+
ARG 0 transformation
33+
ARG 1 property
34+
ARG 2 fallback
35+
ARG 3 valuesToModels
2336
METHOD method_65479 usingItemProperty ()Lnet/minecraft/class_10460;
2437
METHOD method_65480 constantTintSource (I)Lnet/minecraft/class_10401;
2538
ARG 0 value

mappings/net/minecraft/client/data/TexturedModel.mapping

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ CLASS net/minecraft/class_4946 net/minecraft/client/data/TexturedModel
5252
METHOD method_25919 (Ljava/util/function/Function;Lnet/minecraft/class_4942;Lnet/minecraft/class_2248;)Lnet/minecraft/class_4946;
5353
ARG 2 block
5454
METHOD method_25920 getCubeAll (Lnet/minecraft/class_1_314;)Lnet/minecraft/class_4946;
55+
ARG 0 texture
5556
METHOD method_25921 getTextures ()Lnet/minecraft/class_4944;
5657
CLASS class_4947 Factory
5758
METHOD method_1_235 get (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4946;

mappings/net/minecraft/client/gl/RenderPipelines.mapping

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ CLASS net/minecraft/class_10799 net/minecraft/client/gl/RenderPipelines
66
FIELD field_1_1477 ITEM_CUTOUT Lcom/mojang/blaze3d/pipeline/RenderPipeline;
77
FIELD field_1_1478 ITEM_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
88
FIELD field_1_1479 ITEM_TRANSLUCENT Lcom/mojang/blaze3d/pipeline/RenderPipeline;
9+
FIELD field_1_2466 BANNER_PATTERN Lcom/mojang/blaze3d/pipeline/RenderPipeline;
10+
FIELD field_1_2467 TRANSLUCENT_BLOCK Lcom/mojang/blaze3d/pipeline/RenderPipeline;
911
FIELD field_56812 BEACON_BEAM_TRANSLUCENT Lcom/mojang/blaze3d/pipeline/RenderPipeline;
1012
FIELD field_56814 RENDERTYPE_LEASH Lcom/mojang/blaze3d/pipeline/RenderPipeline;
1113
FIELD field_56815 RENDERTYPE_WATER_MASK Lcom/mojang/blaze3d/pipeline/RenderPipeline;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CLASS net/minecraft/class_1_486 net/minecraft/client/gui/DifficultyChangeListener
2+
METHOD method_1_3069 onDifficultyChange ()V
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
CLASS net/minecraft/class_11606 net/minecraft/client/gui/hud/debug/ChunkGenerationStatsDebugHudEntry
2+
FIELD field_1_2557 blockPos Lnet/minecraft/class_2338;
3+
FIELD field_1_2558 lines Ljava/util/List;
24
FIELD field_61540 SECTION_ID Lnet/minecraft/class_2960;
5+
METHOD method_1_3073 recompute (Lnet/minecraft/class_2818;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V
6+
ARG 1 chunk
7+
ARG 2 pos
8+
ARG 3 world

mappings/net/minecraft/client/gui/screen/DifficultySelection.mapping

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
CLASS net/minecraft/class_1_181 net/minecraft/client/gui/screen/DifficultySelection
22
METHOD method_1_1620 createDifficultySelector (Lnet/minecraft/class_310;Lnet/minecraft/class_1937;Lnet/minecraft/class_437;)Lnet/minecraft/class_1_181;
33
ARG 0 client
4+
ARG 1 world
45
ARG 2 screen
56
METHOD method_1_1621 isDifficultyLocked (Lnet/minecraft/class_1937;)Z
7+
ARG 0 world
68
METHOD method_1_1622 (Lnet/minecraft/class_310;Lnet/minecraft/class_5676;Lnet/minecraft/class_1267;)V
79
ARG 1 button
810
ARG 2 value
@@ -18,3 +20,5 @@ CLASS net/minecraft/class_1_181 net/minecraft/client/gui/screen/DifficultySelect
1820
ARG 4 lockButton
1921
METHOD method_1_1626 canChangeDifficultyInOptions (Lnet/minecraft/class_310;)Z
2022
ARG 0 client
23+
METHOD method_1_3057 update (Lnet/minecraft/class_310;)V
24+
ARG 1 client

mappings/net/minecraft/client/gui/screen/option/OptionsScreen.mapping

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/option/OptionsScreen
22
FIELD field_1_1041 inGame Z
3+
FIELD field_1_2497 difficultySelection Lnet/minecraft/class_1_181;
34
FIELD field_2501 parent Lnet/minecraft/class_437;
45
FIELD field_2502 settings Lnet/minecraft/class_315;
56
FIELD field_41345 SKIN_CUSTOMIZATION_TEXT Lnet/minecraft/class_2561;
@@ -23,6 +24,7 @@ CLASS net/minecraft/class_429 net/minecraft/client/gui/screen/option/OptionsScre
2324
METHOD method_1_1050 (Lnet/minecraft/class_1937;Lnet/minecraft/class_4185;)V
2425
ARG 2 button
2526
METHOD method_1_1542 createWorldOptionsButton (Lnet/minecraft/class_1937;)Lnet/minecraft/class_8021;
27+
ARG 1 world
2628
METHOD method_1_1543 getParent ()Lnet/minecraft/class_437;
2729
METHOD method_1_2349 needsAdditionalWorldOptions ()Z
2830
METHOD method_47623 (Lnet/minecraft/class_4185;)V

0 commit comments

Comments
 (0)