Skip to content

Commit 05b6e59

Browse files
SpaceWalkerRSSpaceWalkerRS
committed
level-ify and tile-ify classic mappings
there are plenty of unobfuscated elements using the 'level' and 'tile' nomenclature that we don't remap so that level saving works, so change the rest of the mappings to match it
1 parent f2fead2 commit 05b6e59

24 files changed

Lines changed: 619 additions & 623 deletions

‎mappings/c0.0.13a_03#c0.0.12a_03.tinydiff‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ c com/mojang/minecraft/Minecraft
99
f Lcom/mojang/minecraft/unmapped/C_87604186; f_69329575 session
1010
f Ljava/lang/String; f_56220406 hostAddress
1111
f Lcom/mojang/minecraft/unmapped/C_85740840; f_70816363 screen
12-
f Lcom/mojang/minecraft/unmapped/C_01953097; f_76403675 worldStorage
12+
f Lcom/mojang/minecraft/unmapped/C_01953097; f_76403675 levelStorage
1313
f Ljava/lang/String; f_54761474 loadmapUser
1414
f I f_42708324 loadmapId
15-
f Lcom/mojang/minecraft/unmapped/C_49004282; f_87010853 worldGenerator
15+
f Lcom/mojang/minecraft/unmapped/C_49004282; f_87010853 levelGenerator
1616
f Ljava/lang/String; f_34969745 f_34969745
1717
f Ljava/lang/String; f_12927917 f_12927917
1818
m (Lcom/mojang/minecraft/unmapped/C_85740840;)V m_52715402 openScreen
1919
p 1 screen
20-
m (Ljava/lang/String;I)Z m_71173280 loadWorld
20+
m (Ljava/lang/String;I)Z m_71173280 loadLevel
2121
p 1 username
2222
p 2 slot
2323
m (Ljava/lang/String;)V m_57841518 m_57841518
@@ -27,7 +27,7 @@ c com/mojang/minecraft/Minecraft
2727
m (I)V m_24418873 m_24418873
2828
p 1 p_1
2929
m ()V m_07488744 m_07488744
30-
m ()V m_16924879 createWorld
30+
m ()V m_16924879 createLevel
3131
m (Ljava/lang/String;Ljava/lang/String;)V m_24418873 m_24418873
3232
p 1 p_1
3333
p 2 p_2
@@ -44,7 +44,7 @@ c com/mojang/minecraft/level/Level
4444
p 1 sizeX
4545
p 2 sizeZ
4646
p 3 sizeY
47-
p 4 blocks
47+
p 4 tiles
4848
m (Lcom/mojang/minecraft/phys/AABB;)Ljava/util/ArrayList; getCubes getCubes
4949
p 1 shape
5050
m (Lcom/mojang/minecraft/Minecraft;III)V <init> <init>
@@ -68,7 +68,7 @@ c com/mojang/minecraft/phys/AABB
6868
p 3 dz
6969
c com/mojang/minecraft/player/Player
7070
f [Z f_41485549 f_41485549
71-
c com/mojang/minecraft/unmapped/C_01953097 com/mojang/minecraft/world/storage/WorldStorage
71+
c com/mojang/minecraft/unmapped/C_01953097 com/mojang/minecraft/level/storage/LevelStorage
7272
f Lcom/mojang/minecraft/Minecraft; f_71688092 listener
7373
m (Lcom/mojang/minecraft/level/Level;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Z m_22342627 save
7474
p 1 p_1
@@ -93,22 +93,22 @@ c com/mojang/minecraft/unmapped/C_01953097 com/mojang/minecraft/world/storage/Wo
9393
m (Lcom/mojang/minecraft/level/Level;Ljava/io/InputStream;)Z m_32100412 m_32100412
9494
p 1 p_1
9595
p 2 p_2
96-
c com/mojang/minecraft/unmapped/C_11443481 com/mojang/minecraft/client/gui/screen/world/LoadWorldScreen
96+
c com/mojang/minecraft/unmapped/C_11443481 com/mojang/minecraft/client/gui/screen/level/LoadLevelScreen
9797
f Lcom/mojang/minecraft/unmapped/C_85740840; f_58703230 parent
98-
f Z f_31927864 worldListLoaded
99-
f Z f_19830747 worldListHasNonEmptySlot
100-
f [Ljava/lang/String; f_80889912 worldNames
98+
f Z f_31927864 levelListLoaded
99+
f Z f_19830747 levelListHasNonEmptySlot
100+
f [Ljava/lang/String; f_80889912 levelNames
101101
f Ljava/lang/String; f_93041140 description
102102
f Ljava/lang/String; f_80925663 title
103103
m (Lcom/mojang/minecraft/unmapped/C_85740840;)V <init> <init>
104104
p 1 parent
105105
m ()V run run
106106
m ([Ljava/lang/String;)V m_35428992 updateButtons
107-
p 1 worldNames
107+
p 1 levelNames
108108
m ()V m_41805697 m_41805697
109109
m (Lcom/mojang/minecraft/unmapped/C_85125467;)V m_30778170 m_30778170
110110
p 1 p_1
111-
m (I)V m_19582291 selectWorld
111+
m (I)V m_19582291 selectLevel
112112
p 1 slot
113113
m (II)V m_93956703 m_93956703
114114
p 1 p_1
@@ -136,7 +136,7 @@ c com/mojang/minecraft/unmapped/C_24384787
136136
m ()V m_00274507 m_00274507
137137
m ()V m_64828041 m_64828041
138138
m ()V m_32256754 m_32256754
139-
c com/mojang/minecraft/unmapped/C_29873255 com/mojang/minecraft/client/gui/screen/world/EnterWorldNameScreen
139+
c com/mojang/minecraft/unmapped/C_29873255 com/mojang/minecraft/client/gui/screen/level/EnterLevelNameScreen
140140
f Lcom/mojang/minecraft/unmapped/C_85740840; f_84731181 parent
141141
f Ljava/lang/String; f_97027081 title
142142
f I f_29538896 slot
@@ -157,7 +157,7 @@ c com/mojang/minecraft/unmapped/C_29873255 com/mojang/minecraft/client/gui/scree
157157
m (II)V m_93956703 m_93956703
158158
p 1 p_1
159159
p 2 p_2
160-
c com/mojang/minecraft/unmapped/C_43697299 com/mojang/minecraft/world/gen/noise/PerlinNoise
160+
c com/mojang/minecraft/unmapped/C_43697299 com/mojang/minecraft/level/gen/noise/PerlinNoise
161161
f [Lcom/mojang/minecraft/unmapped/C_64070979; f_41761733 noiseLevels
162162
f I f_65414037 levels
163163
m (Ljava/util/Random;I)V <init> <init>
@@ -182,7 +182,7 @@ c com/mojang/minecraft/unmapped/C_45448523
182182
p 5 p_5
183183
p 6 p_6
184184
c com/mojang/minecraft/unmapped/C_49004282
185-
f [B f_92788646 blocks
185+
f [B f_92788646 tiles
186186
f [I f_69652274 f_69652274
187187
f Lcom/mojang/minecraft/Minecraft; f_76014930 listener
188188
m (I)V m_19571503 phaseProgress
@@ -214,14 +214,14 @@ c com/mojang/minecraft/unmapped/C_55401126 com/mojang/minecraft/client/gui/scree
214214
m (II)V m_93956703 m_93956703
215215
p 1 p_1
216216
p 2 p_2
217-
c com/mojang/minecraft/unmapped/C_58526296 com/mojang/minecraft/client/gui/screen/world/SaveWorldScreen
217+
c com/mojang/minecraft/unmapped/C_58526296 com/mojang/minecraft/client/gui/screen/level/SaveLevelScreen
218218
m (Lcom/mojang/minecraft/unmapped/C_85740840;)V <init> <init>
219219
p 1 p_1
220220
m ([Ljava/lang/String;)V m_35428992 m_35428992
221221
p 1 p_1
222222
m (I)V m_19582291 m_19582291
223223
p 1 p_1
224-
c com/mojang/minecraft/unmapped/C_64070979 com/mojang/minecraft/world/gen/noise/ImprovedNoise
224+
c com/mojang/minecraft/unmapped/C_64070979 com/mojang/minecraft/level/gen/noise/ImprovedNoise
225225
f [I f_53655487 permutations
226226
c A randomly generated permutation table used to determine\nthe gradient vector for each grid intersection.
227227
m ()V <init> <init>
@@ -251,7 +251,7 @@ c com/mojang/minecraft/unmapped/C_68333747
251251
m (I)V m_82846651 getGlList
252252
p 1 layer
253253
m (Lcom/mojang/minecraft/player/Player;)F m_10836237 squaredDistanceToCenter m_10836237
254-
c com/mojang/minecraft/unmapped/C_72769465 com/mojang/minecraft/world/gen/noise/Distort
254+
c com/mojang/minecraft/unmapped/C_72769465 com/mojang/minecraft/level/gen/noise/Distort
255255
f Lcom/mojang/minecraft/unmapped/C_98456746; f_82914404 source
256256
f Lcom/mojang/minecraft/unmapped/C_98456746; f_25971830 distort
257257
m (Lcom/mojang/minecraft/unmapped/C_98456746;Lcom/mojang/minecraft/unmapped/C_98456746;)V <init> <init>
@@ -263,27 +263,27 @@ c com/mojang/minecraft/unmapped/C_72769465 com/mojang/minecraft/world/gen/noise/
263263
c com/mojang/minecraft/unmapped/C_81592558
264264
m (Lcom/mojang/minecraft/unmapped/C_96603444;Lcom/mojang/minecraft/level/Level;IIII)Z m_25385284 render
265265
p 1 tesselator
266-
p 2 world
266+
p 2 level
267267
p 3 layer
268268
p 4 x
269269
p 5 y
270270
p 6 z
271271
m (Lcom/mojang/minecraft/level/Level;IIIII)Z m_28922194 shouldRenderFace
272-
p 1 world
272+
p 1 level
273273
p 2 x
274274
p 3 y
275275
p 4 z
276276
p 5 layer
277277
p 6 face
278278
m (Lcom/mojang/minecraft/unmapped/C_96603444;Lcom/mojang/minecraft/level/Level;IIII)V m_25385284 render
279279
p 1 tesselator
280-
p 2 world
280+
p 2 level
281281
p 3 layer
282282
p 4 x
283283
p 5 y
284284
p 6 z
285285
m (Lcom/mojang/minecraft/level/Level;IIII)Z m_28922194 shouldRenderFace
286-
p 1 world
286+
p 1 level
287287
p 2 x
288288
p 3 y
289289
p 4 z
@@ -355,12 +355,12 @@ c com/mojang/minecraft/unmapped/C_87604186 com/mojang/minecraft/Session
355355
m (Ljava/lang/String;Ljava/lang/String;)V <init> <init>
356356
p 1 username
357357
p 2 id
358-
c com/mojang/minecraft/unmapped/C_98456746 com/mojang/minecraft/world/gen/noise/Noise
358+
c com/mojang/minecraft/unmapped/C_98456746 com/mojang/minecraft/level/gen/noise/Noise
359359
m ()V <init> <init>
360360
m (DD)D m_99527025 getValue
361361
p 1 x
362362
p 3 y
363-
c com/mojang/minecraft/unmapped/C_88434182 com/mojang/minecraft/world/gen/noise/NoiseGenerator
363+
c com/mojang/minecraft/unmapped/C_88434182 com/mojang/minecraft/level/gen/noise/NoiseGenerator
364364
f Ljava/util/Random; f_30359699 random
365365
f I f_54380172 octaves
366366
f I f_54022890 heightScale

‎mappings/c0.0.14a_08#c0.0.13a_03-launcher.tinydiff‎

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ c com/mojang/minecraft/Minecraft
3838
f I f_31188738 f_31188738
3939
f [I f_83349805 f_83349805
4040
f Ljava/util/ArrayList; f_91079080 entities
41-
m (I)V m_16924879 createWorld
41+
m (I)V m_16924879 createLevel
4242
p 1 size
43-
m (Lcom/mojang/minecraft/level/Level;)V m_75727284 setWorld
44-
p 1 world
43+
m (Lcom/mojang/minecraft/level/Level;)V m_75727284 setLevel
44+
p 1 level
4545
m ()V m_61857590 handleMouseClick
4646
m ()V m_73794756 m_73794756
4747
m (ILjava/lang/String;)Z m_96182988 m_96182988
4848
p 1 p_1
4949
p 2 p_2
5050
m ()V <clinit> <clinit>
5151
m ()V m_07488744 m_07488744
52-
m ()V m_16924879 createWorld
52+
m ()V m_16924879 createLevel
5353
c com/mojang/minecraft/MinecraftApplet
5454
m ()V startGameThread startGameThread
5555
c com/mojang/minecraft/level/Level
@@ -83,12 +83,12 @@ c com/mojang/minecraft/level/Level
8383
p 1 x
8484
p 2 y
8585
p 3 z
86-
p 4 block
86+
p 4 tile
8787
m (IIII)V updateNeighborsAt updateNeighborsAt
8888
p 1 x
8989
p 2 y
9090
p 3 z
91-
p 4 block
91+
p 4 tile
9292
m (III)Z isSolidTile isSolidTile
9393
p 1 x
9494
p 2 y
@@ -106,26 +106,26 @@ c com/mojang/minecraft/level/Level
106106
p 1 x
107107
p 2 y
108108
p 3 z
109-
p 4 block
109+
p 4 tile
110110
m (Lcom/mojang/minecraft/phys/AABB;)Z isFree isFree
111111
p 1 bounds
112112
m (FFFF)Z isSolid isSolid
113113
p 1 p_1
114114
p 2 p_2
115115
p 3 p_3
116116
p 4 p_4
117-
m (FFF)Z m_13752006 isSolidBlock
117+
m (FFF)Z m_13752006 isSolidTile
118118
p 1 x
119119
p 2 y
120120
p 3 z
121121
m (II)I getHighestTile getHighestTile
122122
p 1 x
123123
p 2 z
124124
m (IIIF)V setSpawnPos setSpawnPos
125-
p 1 p_1
126-
p 2 p_2
127-
p 3 p_3
128-
p 4 p_4
125+
p 1 x
126+
p 2 y
127+
p 3 z
128+
p 4 rot
129129
m (III)F getBrightness getBrightness
130130
p 1 p_1
131131
p 2 p_2
@@ -159,7 +159,7 @@ c com/mojang/minecraft/particle/Particle
159159
p 6 forwards
160160
p 7 sideways
161161
m (Lcom/mojang/minecraft/level/Level;FFFFFFI)V <init>
162-
p 1 p_1 world
162+
p 1 p_1 level
163163
p 2 p_2 x
164164
p 3 p_3 y
165165
p 4 p_4 z
@@ -199,7 +199,7 @@ c com/mojang/minecraft/player/Player
199199
p 1 p_1
200200
p 2 p_2
201201
m (Lcom/mojang/minecraft/level/Level;)V <init> <init>
202-
p 1 world
202+
p 1 level
203203
c com/mojang/minecraft/unmapped/C_01953097
204204
m (Ljava/lang/String;Ljava/lang/String;I)Lcom/mojang/minecraft/level/Level; m_33030028 load
205205
p 1 hostAddress
@@ -221,14 +221,14 @@ c com/mojang/minecraft/unmapped/C_01953097
221221
p 1 p_1
222222
p 2 p_2
223223
m (Lcom/mojang/minecraft/level/Level;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Z m_22342627
224-
p 1 world p_1
224+
p 1 level p_1
225225
p 2 hostAddress p_2
226226
p 3 username p_3
227227
p 4 sessionId p_4
228228
p 5 name p_5
229229
p 6 slot p_6
230230
m (Lcom/mojang/minecraft/level/Level;Ljava/io/OutputStream;)V m_16689239
231-
p 0 world p_0
231+
p 0 level p_0
232232
p 1 output p_1
233233
c com/mojang/minecraft/unmapped/C_08381405 com/mojang/minecraft/client/entity/mob/player/KeyboardInput
234234
f [Z f_41423547 inputKeys
@@ -270,7 +270,7 @@ c com/mojang/minecraft/unmapped/C_16190149
270270
p 1 camera
271271
p 2 tickDelta
272272
p 3 layer
273-
c com/mojang/minecraft/unmapped/C_23330260 com/mojang/minecraft/block/LogBlock
273+
c com/mojang/minecraft/unmapped/C_23330260 com/mojang/minecraft/tile/LogTile
274274
m (I)V <init> <init>
275275
p 1 p_1
276276
m (I)I m_79262324 m_79262324
@@ -292,14 +292,14 @@ c com/mojang/minecraft/unmapped/C_24384787
292292
m (Lcom/mojang/minecraft/level/Level;)V m_89303267 m_89303267
293293
p 1 p_1
294294
m (Lcom/mojang/minecraft/level/Level;Lcom/mojang/minecraft/unmapped/C_82920792;)V <init> <init>
295-
p 1 world
295+
p 1 level
296296
p 2 textureManager
297297
m (Lcom/mojang/minecraft/player/Player;Lcom/mojang/minecraft/unmapped/C_24654288;II)V m_85117450
298-
p 4 p_4 block
298+
p 4 p_4 tile
299299
m (Lcom/mojang/minecraft/player/Player;I)V m_72725110
300300
p 1 p_1 camera
301301
p 2 p_2 layer
302-
c com/mojang/minecraft/unmapped/C_48207600 com/mojang/minecraft/client/gui/screen/world/CreateWorldScreen
302+
c com/mojang/minecraft/unmapped/C_48207600 com/mojang/minecraft/client/gui/screen/level/CreateLevelScreen
303303
f Lcom/mojang/minecraft/unmapped/C_85740840; f_14795955 parent
304304
m (Lcom/mojang/minecraft/unmapped/C_85740840;)V <init> <init>
305305
p 1 parent
@@ -316,7 +316,7 @@ c com/mojang/minecraft/unmapped/C_49004282
316316
p 3 sizeZ
317317
p 4 sizeY
318318
m (IIII)V m_59714535 placeOre
319-
p 1 block
319+
p 1 tile
320320
p 2 p_2
321321
p 3 p_3
322322
p 4 p_4
@@ -378,13 +378,13 @@ c com/mojang/minecraft/unmapped/C_68333747
378378
p 1 buffer
379379
p 2 layer
380380
m (Lcom/mojang/minecraft/level/Level;IIII)V <init> <init>
381-
p 1 world
381+
p 1 level
382382
p 2 originX
383383
p 3 originY
384384
p 4 originZ
385385
p 5 p_5
386386
m (Lcom/mojang/minecraft/level/Level;IIIIII)V <init> <init>
387-
p 1 world
387+
p 1 level
388388
p 2 originX
389389
p 3 originY
390390
p 4 originZ
@@ -397,17 +397,17 @@ c com/mojang/minecraft/unmapped/C_68333747
397397
p 1 layer
398398
m ()V m_89180230 markDirty
399399
m ()Z m_79879218 isDirty
400-
c com/mojang/minecraft/unmapped/C_71226614 com/mojang/minecraft/world/ScheduledTick
400+
c com/mojang/minecraft/unmapped/C_71226614 com/mojang/minecraft/level/ScheduledTick
401401
f I f_56729292 x
402402
f I f_21025042 y
403403
f I f_92395359 z
404-
f I f_09204826 block
404+
f I f_09204826 tile
405405
m (IIII)V <init> <init>
406406
p 1 x
407407
p 2 y
408408
p 3 z
409-
p 4 block
410-
c com/mojang/minecraft/unmapped/C_77418302 com/mojang/minecraft/block/FallingBlock
409+
p 4 tile
410+
c com/mojang/minecraft/unmapped/C_77418302 com/mojang/minecraft/tile/FallingTile
411411
m (II)V <init> <init>
412412
p 1 id
413413
p 2 sprite
@@ -423,7 +423,7 @@ c com/mojang/minecraft/unmapped/C_77418302 com/mojang/minecraft/block/FallingBlo
423423
p 4 p_4
424424
p 5 p_5
425425
m (Lcom/mojang/minecraft/level/Level;III)V m_10468001 tryFall
426-
p 1 world
426+
p 1 level
427427
p 2 x
428428
p 3 y
429429
p 0 p_0
@@ -439,8 +439,8 @@ c com/mojang/minecraft/unmapped/C_81592558
439439
f Lcom/mojang/minecraft/unmapped/C_81592558; f_00276986 LEAVES
440440
f Lcom/mojang/minecraft/unmapped/C_81592558; f_91815060 COBBLESTONE
441441
m (Lcom/mojang/minecraft/level/Level;III)V m_54926959 onPlaced
442-
c Called when this block is placed by an entity.
443-
p 1 world
442+
c Called when this tile is placed by an entity.
443+
p 1 level
444444
p 2 x
445445
p 3 y
446446
p 4 z
@@ -450,11 +450,7 @@ c com/mojang/minecraft/unmapped/C_81592558
450450
p 2 p_2
451451
p 3 p_3
452452
p 4 p_4
453-
m (Lcom/mojang/minecraft/unmapped/C_96603444;Lcom/mojang/minecraft/level/Level;IIII)Z m_25385284
454-
p 2 level world
455-
m (Lcom/mojang/minecraft/level/Level;IIIII)Z m_28922194
456-
p 1 level world
457-
c com/mojang/minecraft/unmapped/C_94962583 com/mojang/minecraft/block/TranslucentBlock
453+
c com/mojang/minecraft/unmapped/C_94962583 com/mojang/minecraft/tile/TranslucentTile
458454
m ()Z m_57757663 m_57757663
459455
m ()Z m_91902994 m_91902994
460456
m (II)V <init> <init>
@@ -481,7 +477,7 @@ c com/mojang/minecraft/character/Zombie
481477
p 1 p_1
482478
p 2 p_2
483479
m (Lcom/mojang/minecraft/level/Level;Lcom/mojang/minecraft/unmapped/C_82920792;FFF)V <init> <init>
484-
p 1 world
480+
p 1 level
485481
p 2 textureManager
486482
p 3 x
487483
p 4 y

0 commit comments

Comments
 (0)