From 29219941aff9390f0c9e4755e42ab6d11c72c60a Mon Sep 17 00:00:00 2001 From: Glitch Date: Thu, 7 May 2020 20:45:40 -0500 Subject: [PATCH] Level storage mappings (#35) * Add public domain RegionFile names. The only names I wrote myself here are the ones involving the timestamp array, which was added by Notch. * Level format conversion mappings Some of these names are not great but they're better than being obf'd * Bump build number --- build.gradle | 4 +- .../level/storage/LevelStorage.mapping | 2 + .../storage/McRegionLevelStorage.mapping | 15 ++++- .../level/storage/OldRegionComparable.mapping | 7 ++ .../level/storage/RegionFile.mapping | 67 +++++++++++++++++++ .../level/storage/RegionLoader.mapping | 7 ++ 6 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 mappings/net/minecraft/level/storage/OldRegionComparable.mapping create mode 100644 mappings/net/minecraft/level/storage/RegionFile.mapping create mode 100644 mappings/net/minecraft/level/storage/RegionLoader.mapping diff --git a/build.gradle b/build.gradle index 10e22861..0b1f599b 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ def minecraft_version = "b1.7.3" def ENV = System.getenv() //def build_number = ENV.BUILD_NUMBER ?: "local" -def build_number = 5 +def build_number = 6 def yarnVersion = "${minecraft_version}+build.$build_number" @@ -491,7 +491,7 @@ publishing { IMappingProvider createMappingsProvider(input, from, to) { Mappings mappings = MappingsProvider.readTinyMappings(java.nio.file.Files.newInputStream(input), false) - return {classMap, fieldMap, methodMap -> + return {classMap, fieldMap, methodMap -> for (ClassEntry entry : mappings.getClassEntries()) { classMap.put(entry.get(from), entry.get(to)); } diff --git a/mappings/net/minecraft/level/storage/LevelStorage.mapping b/mappings/net/minecraft/level/storage/LevelStorage.mapping index 96340789..b7ac9762 100644 --- a/mappings/net/minecraft/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/level/storage/LevelStorage.mapping @@ -5,4 +5,6 @@ CLASS net/minecraft/class_182 net/minecraft/level/storage/LevelStorage METHOD method_1005 (Ljava/lang/String;Ljava/lang/String;)V ARG 2 levelName METHOD method_1007 isOld (Ljava/lang/String;)Z + METHOD method_1008 convertLevel (Ljava/lang/String;Lnet/minecraft/class_62;)Z + ARG 1 levelDir METHOD method_1009 createDimensionFile (Ljava/lang/String;Z)Lnet/minecraft/class_52; diff --git a/mappings/net/minecraft/level/storage/McRegionLevelStorage.mapping b/mappings/net/minecraft/level/storage/McRegionLevelStorage.mapping index 7ad035b3..5d797339 100644 --- a/mappings/net/minecraft/level/storage/McRegionLevelStorage.mapping +++ b/mappings/net/minecraft/level/storage/McRegionLevelStorage.mapping @@ -1,3 +1,14 @@ CLASS net/minecraft/class_157 net/minecraft/level/storage/McRegionLevelStorage - METHOD method_536 (Ljava/io/File;Ljava/util/ArrayList;Ljava/util/ArrayList;)V - ARG 1 file + METHOD method_535 convertChunks (Ljava/io/File;Ljava/util/ArrayList;IILnet/minecraft/class_62;)V + ARG 1 levelDir + ARG 2 comparableList + ARG 3 startCount + ARG 4 endCount + METHOD method_536 scanLevelDir (Ljava/io/File;Ljava/util/ArrayList;Ljava/util/ArrayList;)V + ARG 1 levelDir + ARG 2 comparableList + ARG 3 fileList + METHOD method_537 deleteOldFiles (Ljava/util/ArrayList;IILnet/minecraft/class_62;)V + ARG 1 fileList + ARG 2 startCount + ARG 3 endCount diff --git a/mappings/net/minecraft/level/storage/OldRegionComparable.mapping b/mappings/net/minecraft/level/storage/OldRegionComparable.mapping new file mode 100644 index 00000000..e25e30ac --- /dev/null +++ b/mappings/net/minecraft/level/storage/OldRegionComparable.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_634 net/minecraft/level/storage/OldRegionComparable + FIELD field_2754 file Ljava/io/File; + FIELD field_2755 x I + FIELD field_2756 z I + METHOD method_2095 getFile ()Ljava/io/File; + METHOD method_2097 getX ()I + METHOD method_2098 getZ ()I diff --git a/mappings/net/minecraft/level/storage/RegionFile.mapping b/mappings/net/minecraft/level/storage/RegionFile.mapping new file mode 100644 index 00000000..1e24879d --- /dev/null +++ b/mappings/net/minecraft/level/storage/RegionFile.mapping @@ -0,0 +1,67 @@ +CLASS net/minecraft/class_353 net/minecraft/level/storage/RegionFile + CLASS class_354 ChunkBuffer + FIELD field_1324 x I + FIELD field_1325 z I + METHOD (Lnet/minecraft/class_353;II)V + ARG 2 x + ARG 3 z + FIELD field_1315 emptySector [B + FIELD field_1316 fileName Ljava/io/File; + FIELD field_1317 file Ljava/io/RandomAccessFile; + FIELD field_1318 offsets [I + FIELD field_1319 timestamps [I + FIELD field_1320 sectorFree Ljava/util/ArrayList; + FIELD field_1321 sizeDelta I + FIELD field_1322 lastModified J + METHOD method_1158 getSizeDelta ()I + METHOD method_1159 getChunkDataInputStream (II)Ljava/io/DataInputStream; + ARG 1 x + ARG 2 z + METHOD method_1160 setOffset (III)V + ARG 1 x + ARG 2 z + ARG 3 offset + METHOD method_1161 write (II[BI)V + ARG 1 x + ARG 2 z + ARG 3 data + ARG 4 length + METHOD method_1162 write (I[BI)V + ARG 1 sector + ARG 2 data + ARG 3 length + METHOD method_1163 debug (Ljava/lang/String;)V + ARG 1 in + METHOD method_1164 debug (Ljava/lang/String;IIILjava/lang/String;)V + ARG 1 mode + ARG 2 x + ARG 3 z + ARG 4 count + ARG 5 in + METHOD method_1165 debug (Ljava/lang/String;IILjava/lang/String;)V + ARG 1 mode + ARG 2 x + ARG 3 z + ARG 4 in + METHOD method_1166 close ()V + METHOD method_1167 getChunkDataOutputStream (II)Ljava/io/DataOutputStream; + ARG 1 x + ARG 2 z + METHOD method_1168 writeTimestamp (III)V + ARG 1 x + ARG 2 z + ARG 3 timestamp + METHOD method_1169 debugln (Ljava/lang/String;)V + ARG 1 in + METHOD method_1170 debugln (Ljava/lang/String;IILjava/lang/String;)V + ARG 1 mode + ARG 2 x + ARG 3 z + ARG 4 in + METHOD method_1171 offsetHasData (II)Z + METHOD method_1172 outOfBounds (II)Z + ARG 1 x + ARG 2 z + METHOD method_1173 getOffset (II)I + ARG 1 x + ARG 2 z diff --git a/mappings/net/minecraft/level/storage/RegionLoader.mapping b/mappings/net/minecraft/level/storage/RegionLoader.mapping new file mode 100644 index 00000000..8cbdd3f7 --- /dev/null +++ b/mappings/net/minecraft/level/storage/RegionLoader.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_379 net/minecraft/level/storage/RegionLoader + FIELD field_1429 regionCache Ljava/util/Map; + METHOD method_1212 clearCache ()V + METHOD method_1213 getRegion (Ljava/io/File;II)Lnet/minecraft/class_353; + ARG 0 levelDir + ARG 1 x + ARG 2 z