Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

23w31a resource #3617

Merged
merged 1 commit into from
Aug 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions mappings/net/minecraft/resource/DirectoryResourcePack.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,9 @@ CLASS net/minecraft/class_3259 net/minecraft/resource/DirectoryResourcePack
ARG 1 segments
METHOD method_45187 open (Ljava/nio/file/Path;)Lnet/minecraft/class_7367;
ARG 0 path
CLASS class_8619 DirectoryBackedFactory
FIELD field_45049 path Ljava/nio/file/Path;
FIELD field_45050 alwaysStable Z
METHOD <init> (Ljava/nio/file/Path;Z)V
ARG 1 path
ARG 2 alwaysStable
11 changes: 11 additions & 0 deletions mappings/net/minecraft/resource/FileResourcePackProvider.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,24 @@ CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider
FIELD field_25345 source Lnet/minecraft/class_5352;
FIELD field_40044 LOGGER Lorg/slf4j/Logger;
FIELD field_40045 type Lnet/minecraft/class_3264;
FIELD field_45054 symlinkFinder Lnet/minecraft/class_8580;
METHOD <init> (Ljava/nio/file/Path;Lnet/minecraft/class_3264;Lnet/minecraft/class_5352;Lnet/minecraft/class_8580;)V
ARG 1 packsDir
ARG 2 type
ARG 3 source
ARG 4 symlinkFinder
METHOD method_45271 forEachProfile (Ljava/nio/file/Path;Lnet/minecraft/class_8580;ZLjava/util/function/BiConsumer;)V
ARG 0 path
ARG 1 symlinkFinder
ARG 2 alwaysStable
ARG 3 consumer
METHOD method_45272 (Ljava/util/function/Consumer;Ljava/nio/file/Path;Lnet/minecraft/class_3288$class_7680;)V
ARG 2 path
ARG 3 packFactory
METHOD method_45273 getFileName (Ljava/nio/file/Path;)Ljava/lang/String;
ARG 0 path
CLASS class_8620 PackOpenerImpl
FIELD field_45055 alwaysStable Z
METHOD <init> (Lnet/minecraft/class_8580;Z)V
ARG 1 symlinkFinder
ARG 2 alwaysStable
6 changes: 6 additions & 0 deletions mappings/net/minecraft/resource/OverlayResourcePack.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CLASS net/minecraft/class_8614 net/minecraft/resource/OverlayResourcePack
FIELD field_45036 base Lnet/minecraft/class_3262;
FIELD field_45037 overlaysAndBase Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_3262;Ljava/util/List;)V
ARG 1 base
ARG 2 overlays
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ CLASS net/minecraft/class_3281 net/minecraft/resource/ResourcePackCompatibility
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 3 translationSuffix
METHOD method_14436 from (Lnet/minecraft/class_6497;I)Lnet/minecraft/class_3281;
ARG 0 range
ARG 1 current
METHOD method_14437 isCompatible ()Z
METHOD method_14438 getConfirmMessage ()Lnet/minecraft/class_2561;
METHOD method_14439 getNotification ()Lnet/minecraft/class_2561;
11 changes: 11 additions & 0 deletions mappings/net/minecraft/resource/ResourcePackOpener.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CLASS net/minecraft/class_8621 net/minecraft/resource/ResourcePackOpener
FIELD field_45057 symlinkFinder Lnet/minecraft/class_8580;
METHOD <init> (Lnet/minecraft/class_8580;)V
ARG 1 symlinkFinder
METHOD method_52438 openDirectory (Ljava/nio/file/Path;)Ljava/lang/Object;
ARG 1 path
METHOD method_52439 openZip (Ljava/nio/file/Path;)Ljava/lang/Object;
ARG 1 path
METHOD method_52441 open (Ljava/nio/file/Path;Ljava/util/List;)Ljava/lang/Object;
ARG 1 path
ARG 2 foundSymlinks
15 changes: 15 additions & 0 deletions mappings/net/minecraft/resource/ResourcePackProfile.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,16 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
FIELD field_14277 position Lnet/minecraft/class_3288$class_3289;
FIELD field_14279 LOGGER Lorg/slf4j/Logger;
FIELD field_25346 source Lnet/minecraft/class_5352;
FIELD field_45056 metadata Lnet/minecraft/class_3288$class_7679;
METHOD <init> (Ljava/lang/String;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_2561;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_5352;)V
ARG 1 name
ARG 2 alwaysEnabled
ARG 3 packFactory
ARG 4 displayName
ARG 5 metadata
ARG 6 position
ARG 7 pinned
ARG 8 source
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_14456 of (Ljava/lang/String;Lnet/minecraft/class_2561;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3288$class_7679;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_5352;)Lnet/minecraft/class_3288;
Expand All @@ -37,6 +41,10 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
ARG 1 displayName
ARG 2 alwaysEnabled
ARG 3 packFactory
ARG 4 metadata
ARG 5 position
ARG 6 pinned
ARG 7 source
METHOD method_14457 getDisplayName ()Lnet/minecraft/class_2561;
METHOD method_14458 createResourcePack ()Lnet/minecraft/class_3262;
METHOD method_14459 getDescription ()Lnet/minecraft/class_2561;
Expand All @@ -53,6 +61,7 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
METHOD method_45274 loadMetadata (Ljava/lang/String;Lnet/minecraft/class_3288$class_7680;I)Lnet/minecraft/class_3288$class_7679;
ARG 0 name
ARG 1 packFactory
ARG 2 currentPackFormat
METHOD method_45275 create (Ljava/lang/String;Lnet/minecraft/class_2561;ZLnet/minecraft/class_3288$class_7680;Lnet/minecraft/class_3264;Lnet/minecraft/class_3288$class_3289;Lnet/minecraft/class_5352;)Lnet/minecraft/class_3288;
ARG 0 name
ARG 1 displayName
Expand All @@ -62,6 +71,9 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
ARG 5 position
ARG 6 source
METHOD method_45276 getRequestedFeatures ()Lnet/minecraft/class_7699;
METHOD method_52440 getSupportedFormats (Ljava/lang/String;Lnet/minecraft/class_3272;)Lnet/minecraft/class_6497;
ARG 0 packName
ARG 1 metadata
CLASS class_3289 InsertionPosition
METHOD method_14467 inverse ()Lnet/minecraft/class_3288$class_3289;
METHOD method_14468 insert (Ljava/util/List;Ljava/lang/Object;Ljava/util/function/Function;Z)I
Expand All @@ -73,3 +85,6 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
CLASS class_7680 PackFactory
METHOD method_52424 open (Ljava/lang/String;)Lnet/minecraft/class_3262;
ARG 1 name
METHOD method_52425 openWithOverlays (Ljava/lang/String;Lnet/minecraft/class_3288$class_7679;)Lnet/minecraft/class_3262;
ARG 1 name
ARG 2 metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvide
FIELD field_40041 type Lnet/minecraft/class_3264;
FIELD field_40042 resourcePack Lnet/minecraft/class_3268;
FIELD field_40043 id Lnet/minecraft/class_2960;
FIELD field_45052 symlinkFinder Lnet/minecraft/class_8580;
METHOD <init> (Lnet/minecraft/class_3264;Lnet/minecraft/class_3268;Lnet/minecraft/class_2960;Lnet/minecraft/class_8580;)V
ARG 1 type
ARG 2 resourcePack
ARG 3 id
ARG 4 symlinkFinder
METHOD method_45256 getResourcePack ()Lnet/minecraft/class_3268;
METHOD method_45257 createDefault (Lnet/minecraft/class_3262;)Lnet/minecraft/class_3288;
ARG 1 pack
Expand Down Expand Up @@ -36,3 +38,5 @@ CLASS net/minecraft/class_7678 net/minecraft/resource/VanillaResourcePackProvide
ARG 2 packFactory
METHOD method_45267 forEachProfile (Ljava/util/function/Consumer;)V
ARG 1 consumer
METHOD method_52435 createPackFactory (Lnet/minecraft/class_3262;)Lnet/minecraft/class_3288$class_7680;
ARG 0 pack
26 changes: 26 additions & 0 deletions mappings/net/minecraft/resource/ZipResourcePack.mapping
Original file line number Diff line number Diff line change
@@ -1,9 +1,35 @@
CLASS net/minecraft/class_3258 net/minecraft/resource/ZipResourcePack
FIELD field_39096 LOGGER Lorg/slf4j/Logger;
FIELD field_45038 zipFile Lnet/minecraft/class_3258$class_8616;
FIELD field_45039 overlay Ljava/lang/String;
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_3258$class_8616;ZLjava/lang/String;)V
ARG 1 name
ARG 2 zipFile
ARG 3 alwaysStable
ARG 4 overlay
METHOD method_14391 openFile (Ljava/lang/String;)Lnet/minecraft/class_7367;
ARG 1 path
METHOD method_45177 toPath (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Ljava/lang/String;
ARG 0 type
ARG 1 id
METHOD method_52422 appendOverlayPrefix (Ljava/lang/String;)Ljava/lang/String;
ARG 1 path
METHOD method_52423 getNamespace (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
ARG 0 prefix
ARG 1 entryName
CLASS class_8615 ZipBackedFactory
FIELD field_45040 file Ljava/io/File;
FIELD field_45041 alwaysStable Z
METHOD <init> (Ljava/io/File;Z)V
ARG 1 file
ARG 2 alwaysStable
METHOD <init> (Ljava/nio/file/Path;Z)V
ARG 1 path
ARG 2 alwaysStable
CLASS class_8616 ZipFileWrapper
FIELD field_45042 file Ljava/io/File;
FIELD field_45043 zip Ljava/util/zip/ZipFile;
FIELD field_45044 closed Z
METHOD <init> (Ljava/io/File;)V
ARG 1 file
METHOD method_52426 open ()Ljava/util/zip/ZipFile;
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CLASS net/minecraft/class_7663 net/minecraft/resource/metadata/PackFeatureSetMetadata
FIELD field_39996 SERIALIZER Lnet/minecraft/class_7677;
FIELD field_39997 CODEC Lcom/mojang/serialization/Codec;
METHOD method_45176 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
CLASS net/minecraft/class_8617 net/minecraft/resource/metadata/PackOverlaysMetadata
FIELD field_45045 SERIALIZER Lnet/minecraft/class_7677;
FIELD field_45046 DIRECTORY_NAME_PATTERN Ljava/util/regex/Pattern;
FIELD field_45047 CODEC Lcom/mojang/serialization/Codec;
METHOD method_52427 getAppliedOverlays (I)Ljava/util/List;
ARG 1 packFormat
METHOD method_52428 (ILnet/minecraft/class_8617$class_8618;)Z
ARG 1 overlay
METHOD method_52429 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_52430 validate (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
ARG 0 directoryName
CLASS class_8618 Entry
FIELD field_45048 CODEC Lcom/mojang/serialization/Codec;
METHOD method_52432 isValid (I)Z
ARG 1 packFormat
METHOD method_52433 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
CLASS net/minecraft/class_3272 net/minecraft/resource/metadata/PackResourceMetadata
FIELD comp_1580 description Lnet/minecraft/class_2561;
FIELD comp_1581 packFormat I
FIELD field_14202 SERIALIZER Lnet/minecraft/class_7677;
FIELD field_45051 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Lnet/minecraft/class_2561;ILjava/util/Optional;)V
ARG 1 description
ARG 2 format
METHOD comp_1580 description ()Lnet/minecraft/class_2561;
METHOD comp_1581 packFormat ()I
METHOD method_52434 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
13 changes: 13 additions & 0 deletions mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,16 @@ CLASS net/minecraft/class_7368 net/minecraft/resource/metadata/ResourceMetadata
ARG 1 reader
METHOD method_43042 create (Ljava/io/InputStream;)Lnet/minecraft/class_7368;
ARG 0 stream
METHOD method_52444 decodeAndAdd (Lnet/minecraft/class_7368$class_8622;Lnet/minecraft/class_3270;)V
ARG 1 builder
ARG 2 reader
METHOD method_52445 (Lnet/minecraft/class_7368$class_8622;Lnet/minecraft/class_3270;Ljava/lang/Object;)V
ARG 2 value
METHOD method_52446 copy (Ljava/util/Collection;)Lnet/minecraft/class_7368;
ARG 1 readers
CLASS class_8622 Builder
FIELD field_45058 values Lcom/google/common/collect/ImmutableMap$Builder;
METHOD method_52447 build ()Lnet/minecraft/class_7368;
METHOD method_52448 add (Lnet/minecraft/class_3270;Ljava/lang/Object;)Lnet/minecraft/class_7368$class_8622;
ARG 1 reader
ARG 2 value