Skip to content

Commit fb5ae3d

Browse files
committed
backport latest gen2 mappings
1 parent 45df401 commit fb5ae3d

28 files changed

Lines changed: 60 additions & 58 deletions

mappings/1.3-pre-07261249#12w30e-server.tinydiff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2033,7 +2033,7 @@ c net/minecraft/unmapped/C_1014639
20332033
p 2 p_2
20342034
p 3 p_3
20352035
p 4 p_4
2036-
c net/minecraft/unmapped/C_1023567 net/minecraft/client/entity/mob/player/InputClientPlayerEntity
2036+
c net/minecraft/unmapped/C_1023567 net/minecraft/client/entity/mob/player/ClientPlayerEntity
20372037
f Lnet/minecraft/unmapped/C_9113835; f_3316508 input
20382038
f Lnet/minecraft/client/Minecraft; f_4887613 minecraft
20392039
f I f_9477356 doubleTapSprintTime

mappings/1.3-pre-07261249.tiny

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4582,7 +4582,7 @@ c net/minecraft/unmapped/C_1014639 net/minecraft/block/VineBlock
45824582
p 4 p_4
45834583
p 5 p_5
45844584
p 6 p_6
4585-
c net/minecraft/unmapped/C_1023567 net/minecraft/client/entity/mob/player/InputClientPlayerEntity
4585+
c net/minecraft/unmapped/C_1023567 net/minecraft/client/entity/mob/player/ClientPlayerEntity
45864586
f Lnet/minecraft/unmapped/C_9113835; f_3316508 input
45874587
f Lnet/minecraft/client/Minecraft; f_4887613 minecraft
45884588
f I f_9477356 doubleTapSprintTime
@@ -7806,7 +7806,7 @@ c net/minecraft/unmapped/C_1820784 net/minecraft/world/storage/McRegionWorldStor
78067806
m (Lnet/minecraft/unmapped/C_4755101;)V <init> <init>
78077807
p 1 p_1
78087808
m ()V <clinit> <clinit>
7809-
c net/minecraft/unmapped/C_1842758 net/minecraft/util/math/Vec3i
7809+
c net/minecraft/unmapped/C_1842758 net/minecraft/util/math/BlockPos
78107810
f I f_8453807 x
78117811
f I f_0363129 y
78127812
f I f_2768144 z
@@ -14386,7 +14386,7 @@ c net/minecraft/unmapped/C_3674509 org/bouncycastle/jce/provider/BouncyCastlePro
1438614386
m (Lnet/minecraft/unmapped/C_3109340;)V <init> <init>
1438714387
p 1 p_1
1438814388
m ()Ljava/lang/Object; run run
14389-
c net/minecraft/unmapped/C_3674802 net/minecraft/util/math/BlockPos
14389+
c net/minecraft/unmapped/C_3674802 net/minecraft/util/math/Vec3i
1439014390
f I f_7795707 x
1439114391
f I f_1706448 y
1439214392
f I f_9469462 z
@@ -14747,7 +14747,7 @@ c net/minecraft/unmapped/C_3755722 net/minecraft/item/Item
1474714747
f Lnet/minecraft/unmapped/C_3755722; f_4784877 BED
1474814748
f Lnet/minecraft/unmapped/C_3755722; f_5571348 REPEATER
1474914749
f Lnet/minecraft/unmapped/C_3755722; f_2539467 COOKIE
14750-
f Lnet/minecraft/unmapped/C_7759616; f_2700568 FILLED_MAP
14750+
f Lnet/minecraft/unmapped/C_7759616; f_2700568 MAP
1475114751
f Lnet/minecraft/unmapped/C_3543399; f_4235685 SHEARS
1475214752
f Lnet/minecraft/unmapped/C_3755722; f_6414855 MELON
1475314753
f Lnet/minecraft/unmapped/C_3755722; f_0836284 PUMPKIN_SEEDS
@@ -17220,7 +17220,7 @@ c net/minecraft/unmapped/C_4594583 net/minecraft/block/BedBlock
1722017220
p 3 p_3
1722117221
p 4 p_4
1722217222
m ()V <clinit> <clinit>
17223-
c net/minecraft/unmapped/C_4613250 net/minecraft/item/WallHangableItem
17223+
c net/minecraft/unmapped/C_4613250 net/minecraft/item/PaintingItem
1722417224
m (I)V <init> <init>
1722517225
p 1 p_1
1722617226
m (Lnet/minecraft/unmapped/C_2454309;Lnet/minecraft/unmapped/C_9590849;Lnet/minecraft/unmapped/C_5553933;IIIIFFF)Z m_3000450 m_3000450
@@ -27401,7 +27401,7 @@ c net/minecraft/unmapped/C_7754971 net/minecraft/network/packet/EntityMovePacket
2740127401
p 1 p_1
2740227402
m ()I m_4040470 m_4040470
2740327403
m ()Ljava/lang/String; m_8387532 m_8387532
27404-
c net/minecraft/unmapped/C_7759616 net/minecraft/item/FilledMapItem
27404+
c net/minecraft/unmapped/C_7759616 net/minecraft/item/MapItem
2740527405
m (I)V <init> <init>
2740627406
p 1 p_1
2740727407
m (SLnet/minecraft/unmapped/C_5553933;)Lnet/minecraft/unmapped/C_8307016; m_4651756 getMapData
@@ -33668,7 +33668,7 @@ c net/minecraft/unmapped/C_9726142 net/minecraft/client/world/color/GrassColors
3366833668
p 0 temperature
3366933669
p 2 humidity
3367033670
m ()V <clinit> <clinit>
33671-
c net/minecraft/unmapped/C_9734049 net/minecraft/item/StickyPistonBlockItem
33671+
c net/minecraft/unmapped/C_9734049 net/minecraft/item/PistonBlockItem
3367233672
m (I)V <init> <init>
3367333673
p 1 p_1
3367433674
m (I)I m_2014915 m_2014915

mappings/1.3.1#12w32a.tinydiff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ c net/minecraft/unmapped/C_1730529
163163
m (ILjava/lang/String;)Z m_3648734 canUseCommand
164164
p 1 permissionLevel
165165
p 2 command
166-
m ()Lnet/minecraft/unmapped/C_3674802; m_0490395 getSourceBlockPos
166+
m ()Lnet/minecraft/unmapped/C_3674802; m_0490395 getCommandSourceBlockPos
167167
c net/minecraft/unmapped/C_1753171
168168
m (Lnet/minecraft/unmapped/C_0539808;)I m_5253734 m_5253734
169169
p 1 p_1

mappings/1.5.1#13w16a-04192037.tinydiff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ c net/minecraft/unmapped/C_1013023
581581
p 1 p_1
582582
p 2 p_2
583583
p 3 p_3
584-
c net/minecraft/unmapped/C_1023567 net/minecraft/client/entity/mob/player/InputClientPlayerEntity net/minecraft/client/entity/living/player/InputClientPlayerEntity
584+
c net/minecraft/unmapped/C_1023567 net/minecraft/client/entity/mob/player/ClientPlayerEntity net/minecraft/client/entity/living/player/ClientPlayerEntity
585585
f Lnet/minecraft/client/Minecraft; f_4887613 minecraft
586586
f Lnet/minecraft/unmapped/C_8105098; f_4887613 minecraft
587587
f I f_9426781 horseJumpTimer

mappings/1.6.2-091847#13w36a-09051446.tinydiff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3007,7 +3007,7 @@ c net/minecraft/unmapped/C_3755722
30073007
f Lnet/minecraft/unmapped/C_3755722; f_1518907 POTATO
30083008
f Lnet/minecraft/unmapped/C_3755722; f_2664021 BAKED_POTATO
30093009
f Lnet/minecraft/unmapped/C_3755722; f_5798773 POISONOUS_POTATO
3010-
f Lnet/minecraft/unmapped/C_4420379; f_1001460 MAP
3010+
f Lnet/minecraft/unmapped/C_4420379; f_1001460 EMPTY_MAP
30113011
f Lnet/minecraft/unmapped/C_3755722; f_2887852 GOLDEN_CARROT
30123012
f Lnet/minecraft/unmapped/C_3755722; f_9437185 SKULL
30133013
f Lnet/minecraft/unmapped/C_3755722; f_0235310 CARROT_ON_A_STICK
@@ -3633,9 +3633,9 @@ c net/minecraft/unmapped/C_4598210
36333633
c net/minecraft/unmapped/C_4613250
36343634
m (ILjava/lang/Class;)V <init> <init>
36353635
p 1 id
3636-
p 2 p_2
3636+
p 2 type
36373637
m (Ljava/lang/Class;)V <init> <init>
3638-
p 1 decorationClass
3638+
p 1 type
36393639
c net/minecraft/unmapped/C_4680316
36403640
m ()I m_8916405 getRepairIngredient
36413641
m ()Lnet/minecraft/unmapped/C_3755722; m_8916405 getRepairIngredient
@@ -8265,7 +8265,7 @@ c net/minecraft/unmapped/C_3325952 net/minecraft/item/Items
82658265
f Lnet/minecraft/unmapped/C_3755722; f_0055844 POTATO
82668266
f Lnet/minecraft/unmapped/C_3755722; f_0950509 BAKED_POTATO
82678267
f Lnet/minecraft/unmapped/C_3755722; f_2431176 POISONOUS_POTATO
8268-
f Lnet/minecraft/unmapped/C_4420379; f_2437720 MAP
8268+
f Lnet/minecraft/unmapped/C_4420379; f_2437720 EMPTY_MAP
82698269
f Lnet/minecraft/unmapped/C_3755722; f_2265697 GOLDEN_CARROT
82708270
f Lnet/minecraft/unmapped/C_3755722; f_7303481 SKULL
82718271
f Lnet/minecraft/unmapped/C_3755722; f_0202569 CARROT_ON_A_STICK

mappings/1.7.4#14w02a.tinydiff

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2625,7 +2625,7 @@ c net/minecraft/unmapped/C_1797947
26252625
p 0 world
26262626
p 1 x
26272627
p 2 y
2628-
c net/minecraft/unmapped/C_1842758 net/minecraft/util/math/Vec3i
2628+
c net/minecraft/unmapped/C_1842758 net/minecraft/util/math/BlockPos
26292629
f I f_8453807 x
26302630
f I f_0363129 y
26312631
f I f_2768144 z
@@ -5383,7 +5383,7 @@ c net/minecraft/unmapped/C_3633110
53835383
p 3 z
53845384
m (Lnet/minecraft/unmapped/C_3674802;)Z m_2568953 isWitchHut
53855385
p 1 pos
5386-
c net/minecraft/unmapped/C_3674802
5386+
c net/minecraft/unmapped/C_3674802 net/minecraft/util/math/Vec3i net/minecraft/util/math/BlockPos
53875387
f Lnet/minecraft/unmapped/C_3674802; f_2146235 ORIGIN
53885388
m ()V <init> <init>
53895389
m (Lnet/minecraft/unmapped/C_3674802;)V <init> <init>
@@ -6563,12 +6563,12 @@ c net/minecraft/unmapped/C_4613250
65636563
p 8 p_8
65646564
p 9 p_9
65656565
p 10 p_10
6566-
m (Lnet/minecraft/unmapped/C_5553933;IIII)Lnet/minecraft/unmapped/C_3961659; m_9381078 hang
6566+
m (Lnet/minecraft/unmapped/C_5553933;IIII)Lnet/minecraft/unmapped/C_3961659; m_9381078 place
65676567
p 1 world
65686568
p 2 x
65696569
p 3 y
65706570
p 4 z
6571-
p 5 dir
6571+
p 5 facing
65726572
m (Lnet/minecraft/unmapped/C_2454309;Lnet/minecraft/unmapped/C_9590849;Lnet/minecraft/unmapped/C_5553933;Lnet/minecraft/unmapped/C_3674802;Lnet/minecraft/unmapped/C_3544601;FFF)Z m_3000450 m_3000450
65736573
p 1 p_1
65746574
p 2 p_2
@@ -6578,10 +6578,10 @@ c net/minecraft/unmapped/C_4613250
65786578
p 6 p_6
65796579
p 7 p_7
65806580
p 8 p_8
6581-
m (Lnet/minecraft/unmapped/C_5553933;Lnet/minecraft/unmapped/C_3674802;I)Lnet/minecraft/unmapped/C_3961659; m_9381078 hang
6582-
p 1 p_1
6583-
p 2 p_2
6584-
p 3 p_3
6581+
m (Lnet/minecraft/unmapped/C_5553933;Lnet/minecraft/unmapped/C_3674802;I)Lnet/minecraft/unmapped/C_3961659; m_9381078 place
6582+
p 1 world
6583+
p 2 pos
6584+
p 3 facing
65856585
c net/minecraft/unmapped/C_4625666
65866586
m (Lnet/minecraft/unmapped/C_5553933;Ljava/util/Random;III)Z m_5378046 m_5378046
65876587
p 1 p_1

mappings/12w07a-client#12w06a-client.tinydiff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ c net/minecraft/unmapped/C_8478147 net/minecraft/world/biome/layer/TemperatureL
915915
p 2 p_2
916916
p 3 p_3
917917
p 4 p_4
918-
c net/minecraft/unmapped/C_9866692 net/minecraft/unmapped/C_9866692
918+
c net/minecraft/unmapped/C_9866692 net/minecraft/world/biome/layer/SmoothZoomLayer
919919
m (JLnet/minecraft/unmapped/C_5540234;)V <init> <init>
920920
p 1 seed
921921
p 3 parent

mappings/12w07a-server#12w06a-server.tinydiff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ c net/minecraft/unmapped/C_0256083 net/minecraft/world/biome/layer/TemperatureB
790790
p 2 p_2
791791
p 3 p_3
792792
p 4 p_4
793-
c net/minecraft/unmapped/C_2345716 net/minecraft/unmapped/C_2345716
793+
c net/minecraft/unmapped/C_2345716 net/minecraft/world/biome/layer/SmoothZoomLayer
794794
m (JLnet/minecraft/unmapped/C_5540234;)V <init> <init>
795795
p 1 seed
796796
p 3 parent

mappings/12w32a#12w34a.tinydiff

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,9 @@ c net/minecraft/unmapped/C_3755722
288288
f Lnet/minecraft/unmapped/C_3755722; f_1518907 POTATO
289289
f Lnet/minecraft/unmapped/C_3755722; f_2664021 BAKED_POTATO
290290
f Lnet/minecraft/unmapped/C_3755722; f_5798773 POISONOUS_POTATO
291-
f Lnet/minecraft/unmapped/C_4420379; f_1001460 MAP
291+
f Lnet/minecraft/unmapped/C_4420379; f_1001460 EMPTY_MAP
292292
f Lnet/minecraft/unmapped/C_3755722; f_2887852 GOLDEN_CARROT
293+
f Lnet/minecraft/unmapped/C_7759616; f_2700568 MAP FILLED_MAP
293294
m (II)I m_9419526 getDisplayColor
294295
p 1 metadata
295296
p 2 layer
@@ -338,19 +339,19 @@ c net/minecraft/unmapped/C_4551488
338339
p 2 amount
339340
m ()Lnet/minecraft/unmapped/C_5553933; m_9009862 m_9009862
340341
m ()I m_8116444 getDisplayHealth m_8116444
341-
c net/minecraft/unmapped/C_4613250
342+
c net/minecraft/unmapped/C_4613250 net/minecraft/item/PaintingItem net/minecraft/item/DecorationItem
342343
f Ljava/lang/Class; f_7359841 type
343344
m (I)V <init> <init>
344345
p 1 p_1
345346
m (ILjava/lang/Class;)V <init> <init>
346347
p 1 id
347-
p 2 p_2
348-
m (Lnet/minecraft/unmapped/C_5553933;IIII)Lnet/minecraft/unmapped/C_3961659; m_9381078 hang
348+
p 2 type
349+
m (Lnet/minecraft/unmapped/C_5553933;IIII)Lnet/minecraft/unmapped/C_3961659; m_9381078 place
349350
p 1 world
350351
p 2 x
351352
p 3 y
352353
p 4 z
353-
p 5 dir
354+
p 5 facing
354355
c net/minecraft/unmapped/C_5025378
355356
f Lnet/minecraft/unmapped/C_5553933; f_4775830 world
356357
f I f_0522143 cooldown
@@ -1170,3 +1171,4 @@ c net/minecraft/unmapped/C_9685768 net/minecraft/block/FlowerPotBlock
11701171
p 0 item
11711172
c net/minecraft/unmapped/C_3366538 net/minecraft/entity/projectile/FireballEntity net/minecraft/entity/projectile/ProjectileEntity
11721173
c net/minecraft/unmapped/C_8876491 net/minecraft/client/render/entity/FireballRenderer net/minecraft/client/render/entity/ProjectileRenderer
1174+
c net/minecraft/unmapped/C_7759616 net/minecraft/item/MapItem net/minecraft/item/FilledMapItem

mappings/13w17a#13w18a.tinydiff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ c net/minecraft/unmapped/C_0876962
182182
m ()V m_1976244 m_1976244
183183
m (Ljava/lang/String;)V m_6976760 remove
184184
p 1 path
185-
c net/minecraft/unmapped/C_1023567
185+
c net/minecraft/unmapped/C_1023567 net/minecraft/client/entity/living/player/ClientPlayerEntity net/minecraft/client/entity/living/player/InputClientPlayerEntity
186186
m ()V m_3816455 m_3816455
187187
c net/minecraft/unmapped/C_1128759
188188
f I f_7533350 count

0 commit comments

Comments
 (0)