From 4bf04724a56d73e15a93d26195827462513c493f Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Fri, 3 Apr 2020 21:12:27 +0200 Subject: [PATCH] Level file mappings (#1253) * level file mappings * synchronous -> dsync, revert enigma update --- .../world/level/storage/AnvilLevelStorage.mapping | 1 + .../world/level/storage/LevelStorageException.mapping | 2 ++ .../minecraft/world/level/storage/LevelSummary.mapping | 10 ++++++++-- .../minecraft/world/storage/RegionBasedStorage.mapping | 4 ++++ .../net/minecraft/world/storage/RegionFile.mapping | 2 ++ .../net/minecraft/world/updater/WorldUpdater.mapping | 3 +++ 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/world/level/storage/AnvilLevelStorage.mapping b/mappings/net/minecraft/world/level/storage/AnvilLevelStorage.mapping index 39900517aa..03ef2549c4 100644 --- a/mappings/net/minecraft/world/level/storage/AnvilLevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/AnvilLevelStorage.mapping @@ -7,4 +7,5 @@ CLASS net/minecraft/class_24 net/minecraft/world/level/storage/AnvilLevelStorage ARG 4 progressStart METHOD method_117 addRegionFiles (Ljava/io/File;Ljava/util/Collection;)V METHOD method_118 makeMcrLevelDatBackup (Ljava/io/File;)V + ARG 0 file METHOD method_234 convertLevel (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3536;)Z diff --git a/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping b/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping index dfd391358b..79a325ac2c 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorageException.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_33 net/minecraft/world/level/storage/LevelStorageException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index 27e4eddc90..a02b16e4e5 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary FIELD field_205 name Ljava/lang/String; FIELD field_206 commandsAllowed Z - FIELD field_207 isHardcore Z + FIELD field_207 hardcore Z FIELD field_208 generatorType Lnet/minecraft/class_1942; FIELD field_209 requiresConversion Z FIELD field_210 getSizeOnDisk J @@ -10,13 +10,17 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary FIELD field_213 gameMode Lnet/minecraft/class_1934; FIELD field_214 versionName Ljava/lang/String; FIELD field_215 versionId I - FIELD field_216 isSnapshot Z + FIELD field_216 snapshot Z + FIELD field_23772 locked Z + FIELD field_23773 file Ljava/io/File; METHOD (Lnet/minecraft/class_31;Ljava/lang/String;Ljava/lang/String;JZZLjava/io/File;)V ARG 1 properties ARG 2 name ARG 3 displayName ARG 4 size ARG 6 requiresConversion + ARG 7 locked + ARG 8 file METHOD method_247 getGameMode ()Lnet/minecraft/class_1934; METHOD method_248 getName ()Ljava/lang/String; METHOD method_249 getLastPlayed ()J @@ -29,3 +33,5 @@ CLASS net/minecraft/class_34 net/minecraft/world/level/storage/LevelSummary METHOD method_258 getVersion ()Lnet/minecraft/class_2561; METHOD method_259 hasCheats ()Z METHOD method_260 isFutureLevel ()Z + METHOD method_27020 getFile ()Ljava/io/File; + METHOD method_27021 isLocked ()Z diff --git a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping index f411eb5a6d..040bd1740f 100644 --- a/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/RegionBasedStorage.mapping @@ -1,10 +1,14 @@ CLASS net/minecraft/class_2867 net/minecraft/world/storage/RegionBasedStorage FIELD field_17657 cachedRegionFiles Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; FIELD field_18690 directory Ljava/io/File; + FIELD field_23748 dsync Z METHOD (Ljava/io/File;Z)V ARG 1 directory + ARG 2 dsync METHOD method_12440 getRegionFile (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2861; ARG 1 pos METHOD method_17911 getTagAt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; ARG 1 pos METHOD method_23726 write (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)V + ARG 1 pos + ARG 2 tag diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping index 59f520deb7..ded209b3bd 100644 --- a/mappings/net/minecraft/world/storage/RegionFile.mapping +++ b/mappings/net/minecraft/world/storage/RegionFile.mapping @@ -11,9 +11,11 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile METHOD (Ljava/io/File;Ljava/io/File;Z)V ARG 1 file ARG 2 directory + ARG 3 dsync METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V ARG 1 file ARG 2 directory + ARG 4 dsync METHOD method_12419 getSectorData (Lnet/minecraft/class_1923;)I ARG 1 pos METHOD method_12423 hasChunk (Lnet/minecraft/class_1923;)Z diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index fb74e11410..1ff99e7049 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -16,6 +16,9 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_5766 upgradedChunkCount I FIELD field_5767 updateThread Ljava/lang/Thread; FIELD field_5768 totalChunkCount I + METHOD (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_31;Z)V + ARG 2 properties + ARG 3 eraseCache METHOD method_17830 getChunkPositions (Lnet/minecraft/class_2874;)Ljava/util/List; ARG 1 dimensionType METHOD method_5393 getProgress (Lnet/minecraft/class_2874;)F