diff --git a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping index 28bf01ad7d..11fc33c774 100644 --- a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping +++ b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResourcePackProvider FIELD field_16263 index Lnet/minecraft/class_1064; FIELD field_27772 DEFAULT_PACK_METADATA Lnet/minecraft/class_3272; + FIELD field_32958 MAX_FILE_SIZE I + FIELD field_32959 MAX_SAVED_PACKS I FIELD field_32960 VANILLA Ljava/lang/String; FIELD field_32961 SERVER Ljava/lang/String; FIELD field_32962 PROGRAMER_ART_ID Ljava/lang/String; @@ -10,7 +12,7 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResour FIELD field_5293 pack Lnet/minecraft/class_3268; FIELD field_5294 downloadTask Ljava/util/concurrent/CompletableFuture; FIELD field_5295 serverContainer Lnet/minecraft/class_3288; - FIELD field_5296 ALPHANUMERAL Ljava/util/regex/Pattern; + FIELD field_5296 SHA1_PATTERN Ljava/util/regex/Pattern; FIELD field_5297 lock Ljava/util/concurrent/locks/ReentrantLock; FIELD field_5298 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Ljava/io/File;Lnet/minecraft/class_1064;)V @@ -18,6 +20,8 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResour ARG 2 index METHOD method_16048 getProgrammerArtResourcePackFromZipFile (Ljava/io/File;)Lnet/minecraft/class_3262; ARG 0 zipFile + METHOD method_19436 (Ljava/io/File;Ljava/lang/Void;Ljava/lang/Throwable;)V + ARG 2 throwable METHOD method_19437 delete (Ljava/io/File;)V ARG 0 file METHOD method_25453 getProgrammerArtResourcePackProfile (Lnet/minecraft/class_3288$class_5351;Ljava/util/function/Supplier;)Lnet/minecraft/class_3288; @@ -27,12 +31,17 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResour ARG 1 factory METHOD method_25455 getProgrammerArtResourcePackFromDirectory (Ljava/io/File;)Lnet/minecraft/class_3259; ARG 0 packDirectory + METHOD method_36324 (Lnet/minecraft/class_310;Z)V + ARG 1 confirmed METHOD method_4633 getPack ()Lnet/minecraft/class_3268; METHOD method_4636 getDownloadHeaders ()Ljava/util/Map; METHOD method_4638 loadServerPack (Ljava/io/File;Lnet/minecraft/class_5352;)Ljava/util/concurrent/CompletableFuture; ARG 1 packZip ARG 2 packSource METHOD method_4640 download (Ljava/lang/String;Ljava/lang/String;Z)Ljava/util/concurrent/CompletableFuture; + ARG 1 url + ARG 2 packSha1 + ARG 3 closeAfterDownload METHOD method_4641 verifyFile (Ljava/lang/String;Ljava/io/File;)Z ARG 1 expectedSha1 ARG 2 file diff --git a/mappings/net/minecraft/client/resource/DirectResourceIndex.mapping b/mappings/net/minecraft/client/resource/DirectResourceIndex.mapping index 0d27c3d493..2c815203e7 100644 --- a/mappings/net/minecraft/client/resource/DirectResourceIndex.mapping +++ b/mappings/net/minecraft/client/resource/DirectResourceIndex.mapping @@ -2,3 +2,11 @@ CLASS net/minecraft/class_1067 net/minecraft/client/resource/DirectResourceIndex FIELD field_5299 assetDir Ljava/io/File; METHOD (Ljava/io/File;)V ARG 1 assetDir + METHOD method_23844 (Ljava/lang/String;Ljava/nio/file/Path;Ljava/nio/file/Path;)Lnet/minecraft/class_2960; + ARG 2 path + METHOD method_23845 (Ljava/util/function/Predicate;Ljava/nio/file/Path;)Z + ARG 1 path + METHOD method_4644 (Ljava/nio/file/Path;)Z + ARG 0 path + METHOD method_4646 (Ljava/nio/file/Path;)Z + ARG 0 path diff --git a/mappings/net/minecraft/client/resource/Format3ResourcePack.mapping b/mappings/net/minecraft/client/resource/Format3ResourcePack.mapping index 8b4e1e82f2..b21aa4a99d 100644 --- a/mappings/net/minecraft/client/resource/Format3ResourcePack.mapping +++ b/mappings/net/minecraft/client/resource/Format3ResourcePack.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_1073 net/minecraft/client/resource/Format3ResourcePack METHOD (Lnet/minecraft/class_3262;Ljava/util/Map;)V ARG 1 parent ARG 2 idMap + METHOD method_29712 (Lcom/google/common/collect/ImmutableMap$Builder;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 newId + ARG 2 oldId METHOD method_4658 getRedirectedId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 1 id METHOD method_4660 getMetadataLocation (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/resource/Format4ResourcePack.mapping b/mappings/net/minecraft/client/resource/Format4ResourcePack.mapping index 4ab0daefde..8b29020288 100644 --- a/mappings/net/minecraft/client/resource/Format4ResourcePack.mapping +++ b/mappings/net/minecraft/client/resource/Format4ResourcePack.mapping @@ -13,9 +13,34 @@ CLASS net/minecraft/class_4729 net/minecraft/client/resource/Format4ResourcePack METHOD method_24132 loadBytes (Lnet/minecraft/class_1011;Lnet/minecraft/class_1011;IIIIIIIZZ)V ARG 0 source ARG 1 target + ARG 2 sourceLeft + ARG 3 sourceTop + ARG 4 left + ARG 5 top + ARG 6 right + ARG 7 bottom + ARG 8 multiplier + ARG 9 mirrorX + ARG 10 mirrorY METHOD method_24133 cropLeftChestTexture (Ljava/io/InputStream;)Ljava/io/InputStream; + ARG 0 stream METHOD method_24134 openCroppedStream (Ljava/io/InputStream;Ljava/io/InputStream;IIIII)Ljava/io/InputStream; + ARG 0 base + ARG 1 overlay + ARG 2 width + ARG 3 left + ARG 4 top + ARG 5 right + ARG 6 bottom + METHOD method_24135 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 patternName METHOD method_24136 (Ljava/util/HashMap;)V ARG 0 map METHOD method_24137 cropRightChestTexture (Ljava/io/InputStream;)Ljava/io/InputStream; + ARG 0 stream METHOD method_24138 cropSingleChestTexture (Ljava/io/InputStream;)Ljava/io/InputStream; + ARG 0 stream + METHOD method_24139 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 patternName + METHOD method_24199 cropConduitTexture (Ljava/io/InputStream;)Ljava/io/InputStream; + ARG 0 stream diff --git a/mappings/net/minecraft/client/resource/ResourceIndex.mapping b/mappings/net/minecraft/client/resource/ResourceIndex.mapping index de1589bc15..86d577bc11 100644 --- a/mappings/net/minecraft/client/resource/ResourceIndex.mapping +++ b/mappings/net/minecraft/client/resource/ResourceIndex.mapping @@ -5,8 +5,14 @@ CLASS net/minecraft/class_1064 net/minecraft/client/resource/ResourceIndex METHOD (Ljava/io/File;Ljava/lang/String;)V ARG 1 directory ARG 2 indexName + METHOD method_23843 (Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Predicate;Lnet/minecraft/class_2960;)Z + ARG 3 id METHOD method_4630 getResource (Lnet/minecraft/class_2960;)Ljava/io/File; ARG 1 identifier METHOD method_4631 findFile (Ljava/lang/String;)Ljava/io/File; ARG 1 path METHOD method_4632 getFilesRecursively (Ljava/lang/String;Ljava/lang/String;ILjava/util/function/Predicate;)Ljava/util/Collection; + ARG 1 prefix + ARG 2 namespace + ARG 3 maxDepth + ARG 4 pathFilter diff --git a/mappings/net/minecraft/client/resource/ResourceReloadLogger.mapping b/mappings/net/minecraft/client/resource/ResourceReloadLogger.mapping index 919da2bafb..5e004eae44 100644 --- a/mappings/net/minecraft/client/resource/ResourceReloadLogger.mapping +++ b/mappings/net/minecraft/client/resource/ResourceReloadLogger.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/class_6360 net/minecraft/client/resource/ResourceReloadLogge ARG 1 report CLASS class_6361 RecoveryEntry FIELD field_33701 throwable Ljava/lang/Throwable; + METHOD (Ljava/lang/Throwable;)V + ARG 1 throwable METHOD method_36567 addRecoverySection (Lnet/minecraft/class_129;)V ARG 1 section CLASS class_6362 ReloadReason diff --git a/mappings/net/minecraft/client/resource/SplashTextResourceSupplier.mapping b/mappings/net/minecraft/client/resource/SplashTextResourceSupplier.mapping index 7daacd9f1e..692da107c1 100644 --- a/mappings/net/minecraft/client/resource/SplashTextResourceSupplier.mapping +++ b/mappings/net/minecraft/client/resource/SplashTextResourceSupplier.mapping @@ -6,3 +6,5 @@ CLASS net/minecraft/class_4008 net/minecraft/client/resource/SplashTextResourceS METHOD (Lnet/minecraft/class_320;)V ARG 1 session METHOD method_18174 get ()Ljava/lang/String; + METHOD method_18664 (Ljava/lang/String;)Z + ARG 0 splashText diff --git a/mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping b/mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping index cd73e7c50b..33300e781e 100644 --- a/mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping +++ b/mappings/net/minecraft/client/resource/language/TextReorderingProcessor.mapping @@ -21,5 +21,10 @@ CLASS net/minecraft/class_5492 net/minecraft/client/resource/language/TextReorde METHOD method_30943 create (Lnet/minecraft/class_5348;Lit/unimi/dsi/fastutil/ints/Int2IntFunction;Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_5492; ARG 0 visitable ARG 1 reverser + ARG 2 shaper + METHOD method_36142 (I)I + ARG 0 codePoint + METHOD method_36143 (Ljava/lang/String;)Ljava/lang/String; + ARG 0 string METHOD method_36144 create (Lnet/minecraft/class_5348;)Lnet/minecraft/class_5492; ARG 0 visitable diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping index 4c8760699d..cc61994a41 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1080 net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata + FIELD field_32973 UNDEFINED_TIME I FIELD field_5340 time I FIELD field_5341 index I METHOD (I)V diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping index 03131a9c43..8e3f7f0491 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationResourceMetadata.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_1079 net/minecraft/client/resource/metadata/AnimationResourceMetadata FIELD field_21768 EMPTY Lnet/minecraft/class_1079; FIELD field_32974 KEY Ljava/lang/String; + FIELD field_32975 EMPTY_FRAME_TIME I + FIELD field_32976 UNDEFINED I FIELD field_5334 defaultFrameTime I FIELD field_5335 interpolate Z FIELD field_5336 height I diff --git a/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadataReader.mapping b/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadataReader.mapping index 34d98552c6..715bb0a550 100644 --- a/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadataReader.mapping +++ b/mappings/net/minecraft/client/resource/metadata/LanguageResourceMetadataReader.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_1083 net/minecraft/client/resource/metadata/LanguageResourceMetadataReader + FIELD field_32979 MAX_CODE_LENGTH I diff --git a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping index bc770b74ee..3cf6516818 100644 --- a/mappings/net/minecraft/resource/FileResourcePackProvider.mapping +++ b/mappings/net/minecraft/resource/FileResourcePackProvider.mapping @@ -5,5 +5,7 @@ CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider METHOD (Ljava/io/File;Lnet/minecraft/class_5352;)V ARG 1 packsFolder ARG 2 source + METHOD method_14431 (Ljava/io/File;)Z + ARG 0 file METHOD method_14432 createResourcePack (Ljava/io/File;)Ljava/util/function/Supplier; ARG 1 file diff --git a/mappings/net/minecraft/resource/JsonDataLoader.mapping b/mappings/net/minecraft/resource/JsonDataLoader.mapping index d0f9360ca5..ba74251dbd 100644 --- a/mappings/net/minecraft/resource/JsonDataLoader.mapping +++ b/mappings/net/minecraft/resource/JsonDataLoader.mapping @@ -9,3 +9,5 @@ CLASS net/minecraft/class_4309 net/minecraft/resource/JsonDataLoader METHOD (Lcom/google/gson/Gson;Ljava/lang/String;)V ARG 1 gson ARG 2 dataType + METHOD method_20730 (Ljava/lang/String;)Z + ARG 0 path diff --git a/mappings/net/minecraft/resource/ProfiledResourceReload.mapping b/mappings/net/minecraft/resource/ProfiledResourceReload.mapping index 78ca44eb62..92b61f0963 100644 --- a/mappings/net/minecraft/resource/ProfiledResourceReload.mapping +++ b/mappings/net/minecraft/resource/ProfiledResourceReload.mapping @@ -28,3 +28,9 @@ CLASS net/minecraft/class_4010 net/minecraft/resource/ProfiledResourceReload FIELD field_18039 applyProfile Lnet/minecraft/class_3696; FIELD field_18040 prepareTimeMs Ljava/util/concurrent/atomic/AtomicLong; FIELD field_18041 applyTimeMs Ljava/util/concurrent/atomic/AtomicLong; + METHOD (Ljava/lang/String;Lnet/minecraft/class_3696;Lnet/minecraft/class_3696;Ljava/util/concurrent/atomic/AtomicLong;Ljava/util/concurrent/atomic/AtomicLong;)V + ARG 1 name + ARG 2 prepareProfile + ARG 3 applyProfile + ARG 4 prepareTimeMs + ARG 5 applyTimeMs diff --git a/mappings/net/minecraft/resource/ResourcePackManager.mapping b/mappings/net/minecraft/resource/ResourcePackManager.mapping index e6431d0e5f..9fa8878efe 100644 --- a/mappings/net/minecraft/resource/ResourcePackManager.mapping +++ b/mappings/net/minecraft/resource/ResourcePackManager.mapping @@ -29,3 +29,13 @@ CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager METHOD method_29210 getEnabledNames ()Ljava/util/Collection; METHOD method_29211 createResourcePacks ()Ljava/util/List; METHOD method_29212 providePackProfiles ()Ljava/util/Map; + METHOD method_29484 (Ljava/util/Map;Lnet/minecraft/class_3288;)V + ARG 1 profile + METHOD method_31440 (Lnet/minecraft/class_3264;Ljava/lang/String;Lnet/minecraft/class_2561;ZLjava/util/function/Supplier;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288; + ARG 1 name + ARG 2 displayName + ARG 3 alwaysEnabled + ARG 4 packFactory + ARG 5 metadata + ARG 6 direction + ARG 7 source diff --git a/mappings/net/minecraft/resource/ResourcePackProfile.mapping b/mappings/net/minecraft/resource/ResourcePackProfile.mapping index 8435acf43a..963929b024 100644 --- a/mappings/net/minecraft/resource/ResourcePackProfile.mapping +++ b/mappings/net/minecraft/resource/ResourcePackProfile.mapping @@ -60,6 +60,8 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile METHOD method_14460 getCompatibility ()Lnet/minecraft/class_3281; METHOD method_14461 getInformationText (Z)Lnet/minecraft/class_2561; ARG 1 enabled + METHOD method_14462 (ZLnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + ARG 2 style METHOD method_14463 getName ()Ljava/lang/String; METHOD method_14464 isAlwaysEnabled ()Z METHOD method_14465 isPinned ()Z diff --git a/mappings/net/minecraft/resource/ResourcePackSource.mapping b/mappings/net/minecraft/resource/ResourcePackSource.mapping index deed429d7c..34d1547da5 100644 --- a/mappings/net/minecraft/resource/ResourcePackSource.mapping +++ b/mappings/net/minecraft/resource/ResourcePackSource.mapping @@ -5,3 +5,7 @@ CLASS net/minecraft/class_5352 net/minecraft/resource/ResourcePackSource METHOD method_29485 onlyName ()Lnet/minecraft/class_5352; METHOD method_29486 nameAndSource (Ljava/lang/String;)Lnet/minecraft/class_5352; ARG 0 source + METHOD method_29487 (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + ARG 0 name + METHOD method_29488 (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; + ARG 1 name diff --git a/mappings/net/minecraft/resource/ServerResourceManager.mapping b/mappings/net/minecraft/resource/ServerResourceManager.mapping index fc809382e1..c1bf059177 100644 --- a/mappings/net/minecraft/resource/ServerResourceManager.mapping +++ b/mappings/net/minecraft/resource/ServerResourceManager.mapping @@ -29,4 +29,6 @@ CLASS net/minecraft/class_5350 net/minecraft/resource/ServerResourceManager METHOD method_29473 getServerAdvancementLoader ()Lnet/minecraft/class_2989; METHOD method_29474 getResourceManager ()Lnet/minecraft/class_3300; METHOD method_29475 loadRegistryTags ()V + METHOD method_29774 (Lnet/minecraft/class_5350;Lnet/minecraft/class_3902;Ljava/lang/Throwable;)V + ARG 2 throwable METHOD method_32703 getLootFunctionManager ()Lnet/minecraft/class_5640;