diff --git a/build.gradle b/build.gradle index 6021b38e42..efbb683931 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.20.2-pre2" +def minecraft_version = "1.20.2-pre3" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/client/realms/RealmsPeriodicCheckers.mapping b/mappings/net/minecraft/client/realms/RealmsPeriodicCheckers.mapping index 180e58028e..c05c2b8f7a 100644 --- a/mappings/net/minecraft/client/realms/RealmsPeriodicCheckers.mapping +++ b/mappings/net/minecraft/client/realms/RealmsPeriodicCheckers.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_7578 net/minecraft/client/realms/RealmsPeriodicCheckers FIELD field_39682 runnerFactory Lnet/minecraft/class_7581; FIELD field_39683 serverList Lnet/minecraft/class_7581$class_7586; - FIELD field_39684 liveStats Lnet/minecraft/class_7581$class_7586; FIELD field_39685 pendingInvitesCount Lnet/minecraft/class_7581$class_7586; FIELD field_39686 trialAvailability Lnet/minecraft/class_7581$class_7586; FIELD field_39687 news Lnet/minecraft/class_7581$class_7586; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping index 1a6123515f..f745cc93ba 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_4384 net/minecraft/client/realms/gui/screen/RealmsBrokenWorldScreen FIELD field_19763 LOGGER Lorg/slf4j/Logger; FIELD field_19764 parent Lnet/minecraft/class_437; - FIELD field_19765 mainScreen Lnet/minecraft/class_4325; FIELD field_19767 serverId J FIELD field_19769 message [Lnet/minecraft/class_2561; FIELD field_19770 left_x I @@ -9,11 +8,8 @@ CLASS net/minecraft/class_4384 net/minecraft/client/realms/gui/screen/RealmsBrok FIELD field_19779 animTick I FIELD field_20492 serverData Lnet/minecraft/class_4877; FIELD field_45239 SLOT_FRAME_TEXTURE Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4325;JZ)V + METHOD (Lnet/minecraft/class_437;JZ)V ARG 1 parent - ARG 2 mainScreen - ARG 3 serverId - ARG 5 minigame METHOD method_21178 addButtons ()V METHOD method_21179 getFramePositionX (I)I ARG 1 i diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index adc4acbf6e..f8236c4b59 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMainScreen FIELD field_19464 regionsPinged Z - FIELD field_19467 connectLock Ljava/util/concurrent/locks/ReentrantLock; FIELD field_19475 LOGGER Lorg/slf4j/Logger; FIELD field_19477 rateLimiter Lcom/google/common/util/concurrent/RateLimiter; FIELD field_19482 parent Lnet/minecraft/class_437; @@ -55,13 +54,10 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain METHOD (Lnet/minecraft/class_437;)V ARG 1 parent METHOD method_20853 play (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;)V - ARG 1 serverData - ARG 2 parent METHOD method_20874 shouldPlayButtonBeActive (Lnet/minecraft/class_4877;)Z ARG 1 server METHOD method_20884 shouldRenewButtonBeActive (Lnet/minecraft/class_4877;)Z ARG 1 server - METHOD method_20902 newScreen ()Lnet/minecraft/class_4325; METHOD method_20903 configureClicked (Lnet/minecraft/class_4877;)V ARG 1 serverData METHOD method_20906 leaveClicked (Lnet/minecraft/class_4877;)V @@ -85,8 +81,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain METHOD method_38504 (Lnet/minecraft/class_4877;Z)V ARG 2 confirmed METHOD method_38505 removeSelection ()V - METHOD method_44610 (Lnet/minecraft/class_4882;)V - ARG 1 liveStats METHOD method_44611 createPeriodicRunnersManager (Lnet/minecraft/class_7578;)Lnet/minecraft/class_7581$class_7584; ARG 1 periodicCheckers METHOD method_44612 (Lnet/minecraft/class_7578;Lnet/minecraft/class_4876;)V @@ -190,7 +184,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain METHOD method_38506 getRealmsServer ()Lnet/minecraft/class_4877; CLASS class_8200 VisitButtonEntry FIELD field_42999 button Lnet/minecraft/class_4185; - FIELD field_43000 x I METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_4185;)V ARG 2 button CLASS class_8201 CrossButton diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping index 4bc3962fa3..3b5264bb17 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsTermsScreen.mapping @@ -1,16 +1,13 @@ CLASS net/minecraft/class_4426 net/minecraft/client/realms/gui/screen/RealmsTermsScreen FIELD field_20165 LOGGER Lorg/slf4j/Logger; - FIELD field_20167 mainScreen Lnet/minecraft/class_4325; FIELD field_20168 realmsServer Lnet/minecraft/class_4877; FIELD field_20170 onLink Z FIELD field_22727 parent Lnet/minecraft/class_437; FIELD field_26523 TITLE Lnet/minecraft/class_2561; FIELD field_26524 SENTENCE_ONE_TEXT Lnet/minecraft/class_2561; FIELD field_26525 SENTENCE_TWO_TEXT Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4325;Lnet/minecraft/class_4877;)V + METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;)V ARG 1 parent - ARG 2 mainScreen - ARG 3 realmsServer METHOD method_21505 agreedToTos ()V METHOD method_25274 (Lnet/minecraft/class_4185;)V ARG 1 button diff --git a/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping b/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping index fe21580755..19446fa347 100644 --- a/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping +++ b/mappings/net/minecraft/client/realms/task/OpenServerTask.mapping @@ -2,13 +2,9 @@ CLASS net/minecraft/class_4437 net/minecraft/client/realms/task/OpenServerTask FIELD field_20218 serverData Lnet/minecraft/class_4877; FIELD field_20219 returnScreen Lnet/minecraft/class_437; FIELD field_20220 join Z - FIELD field_20221 mainScreen Lnet/minecraft/class_4325; FIELD field_34016 client Lnet/minecraft/class_310; FIELD field_36357 LOGGER Lorg/slf4j/Logger; FIELD field_46137 TITLE Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;Lnet/minecraft/class_4325;ZLnet/minecraft/class_310;)V + METHOD (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;ZLnet/minecraft/class_310;)V ARG 1 realmsServer ARG 2 returnScreen - ARG 3 mainScreen - ARG 4 join - ARG 5 client diff --git a/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping b/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping index fc168098a7..bcb796d76b 100644 --- a/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping +++ b/mappings/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.mapping @@ -1,15 +1,8 @@ CLASS net/minecraft/class_4439 net/minecraft/client/realms/task/RealmsGetServerDetailsTask FIELD field_20224 server Lnet/minecraft/class_4877; FIELD field_20225 lastScreen Lnet/minecraft/class_437; - FIELD field_20226 mainScreen Lnet/minecraft/class_4325; - FIELD field_20227 connectLock Ljava/util/concurrent/locks/ReentrantLock; FIELD field_36356 LOGGER Lorg/slf4j/Logger; FIELD field_46135 TITLE Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_4325;Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Ljava/util/concurrent/locks/ReentrantLock;)V - ARG 1 mainScreen - ARG 2 lastScreen - ARG 3 server - ARG 4 connectLock METHOD method_25286 (Lnet/minecraft/class_4878;Ljava/lang/Throwable;)Ljava/lang/Void; ARG 2 throwable METHOD method_32511 createConnectingScreen (Lnet/minecraft/class_4878;)Lnet/minecraft/class_4398; diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index a6b1f7a584..0668962d64 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -22,8 +22,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_5895 duration I FIELD field_5896 type Lnet/minecraft/class_1291; FIELD field_5897 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_1291;)V - ARG 1 type METHOD (Lnet/minecraft/class_1291;I)V ARG 1 type ARG 2 duration @@ -53,8 +51,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 6 showIcon ARG 7 hiddenEffect ARG 8 factorCalculationData - METHOD (Lnet/minecraft/class_1293;)V - ARG 1 instance METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/nbt/NbtCompound.mapping b/mappings/net/minecraft/nbt/NbtCompound.mapping index 9571263814..e7cb79d0c0 100644 --- a/mappings/net/minecraft/nbt/NbtCompound.mapping +++ b/mappings/net/minecraft/nbt/NbtCompound.mapping @@ -52,9 +52,6 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound ARG 1 key METHOD method_10541 getKeys ()Ljava/util/Set; COMMENT {@return the set of keys in this compound} - METHOD method_10542 readByte (Ljava/io/DataInput;Lnet/minecraft/class_2505;)B - ARG 0 input - ARG 1 tracker METHOD method_10543 copyFrom (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; COMMENT Merges the entries of {@code source} to this compound. The passed compound will not COMMENT be modified. If both compounds contain a compound with the same key, they will be @@ -108,9 +105,6 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound METHOD method_10551 remove (Ljava/lang/String;)V COMMENT Removes the entry with the specified {@code key}. Does nothing if there is none. ARG 1 key - METHOD method_10552 readString (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Ljava/lang/String; - ARG 0 input - ARG 1 tracker METHOD method_10554 getList (Ljava/lang/String;I)Lnet/minecraft/class_2499; COMMENT {@return the list associated with {@code key}, or an empty list if there is no COMMENT list stored with the key and the type} @@ -264,12 +258,10 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound COMMENT COMMENT @see #put(String, NbtElement) ARG 1 key - METHOD method_10581 read (Lnet/minecraft/class_4614;Ljava/lang/String;Ljava/io/DataInput;ILnet/minecraft/class_2505;)Lnet/minecraft/class_2520; + METHOD method_10581 read (Lnet/minecraft/class_4614;Ljava/lang/String;Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2520; ARG 0 reader ARG 1 key ARG 2 input - ARG 3 depth - ARG 4 tracker METHOD method_10582 putString (Ljava/lang/String;Ljava/lang/String;)V COMMENT Puts a {@link String} to this compound. COMMENT diff --git a/mappings/net/minecraft/nbt/NbtIo.mapping b/mappings/net/minecraft/nbt/NbtIo.mapping index 81844d6af3..e1c2018281 100644 --- a/mappings/net/minecraft/nbt/NbtIo.mapping +++ b/mappings/net/minecraft/nbt/NbtIo.mapping @@ -8,10 +8,8 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT not a compound ARG 0 input ARG 1 tracker - METHOD method_10626 read (Ljava/io/DataInput;ILnet/minecraft/class_2505;)Lnet/minecraft/class_2520; + METHOD method_10626 read (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2520; ARG 0 input - ARG 1 depth - ARG 2 tracker METHOD method_10627 readCompound (Ljava/io/DataInput;)Lnet/minecraft/class_2487; COMMENT Reads an NBT compound from {@code input}. COMMENT @@ -80,7 +78,7 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT @see #writeCompressed(NbtCompound, OutputStream) ARG 0 nbt ARG 1 file - METHOD method_39855 scan (Ljava/io/DataInput;Lnet/minecraft/class_6836;)V + METHOD method_39855 scan (Ljava/io/DataInput;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)V COMMENT Scans the NBT input using {@code scanner}. COMMENT COMMENT @apiNote This method does not return the scan result; the user is expected @@ -90,7 +88,7 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT @throws IOException if the IO operation fails ARG 0 input ARG 1 scanner - METHOD method_40057 scanCompressed (Ljava/io/File;Lnet/minecraft/class_6836;)V + METHOD method_40057 scanCompressed (Ljava/io/File;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)V COMMENT Scans the compressed NBT file using {@code scanner}. COMMENT COMMENT @apiNote This method does not return the scan result; the user is expected @@ -101,7 +99,7 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT @see #scanCompressed(InputStream, NbtScanner) ARG 0 file ARG 1 scanner - METHOD method_40058 scanCompressed (Ljava/io/InputStream;Lnet/minecraft/class_6836;)V + METHOD method_40058 scanCompressed (Ljava/io/InputStream;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)V COMMENT Scans the compressed NBT stream using {@code scanner}. COMMENT COMMENT @apiNote This method does not return the scan result; the user is expected @@ -115,11 +113,8 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo METHOD method_40059 decompress (Ljava/io/InputStream;)Ljava/io/DataInputStream; COMMENT {@return a new input stream that decompresses the input {@code stream}} ARG 0 stream - METHOD method_52892 read (Ljava/io/DataInput;ILnet/minecraft/class_2505;B)Lnet/minecraft/class_2520; + METHOD method_52892 read (Ljava/io/DataInput;Lnet/minecraft/class_2505;B)Lnet/minecraft/class_2520; ARG 0 input - ARG 1 depth - ARG 2 tracker - ARG 3 type METHOD method_52893 writeForPacket (Lnet/minecraft/class_2520;Ljava/io/DataOutput;)V COMMENT Writes the {@code nbt} to {@code output}. The output is the byte indicating COMMENT the element type, followed by the NBT data. diff --git a/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping b/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping index 439a1ed6fc..a172867283 100644 --- a/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping +++ b/mappings/net/minecraft/nbt/NbtTagSizeTracker.mapping @@ -2,9 +2,8 @@ CLASS net/minecraft/class_2505 net/minecraft/nbt/NbtTagSizeTracker COMMENT Tracks the size of NBT elements. Throws {@link RuntimeException} if the COMMENT tracked element becomes larger than {@link #maxBytes} during addition. FIELD field_11555 allocatedBytes J - FIELD field_11556 EMPTY Lnet/minecraft/class_2505; FIELD field_11557 maxBytes J - METHOD (J)V + METHOD (JI)V ARG 1 maxBytes METHOD method_47987 getAllocatedBytes ()J METHOD method_48004 add (J)V diff --git a/mappings/net/minecraft/nbt/NbtType.mapping b/mappings/net/minecraft/nbt/NbtType.mapping index ebddc9e7dd..2ba0ab769a 100644 --- a/mappings/net/minecraft/nbt/NbtType.mapping +++ b/mappings/net/minecraft/nbt/NbtType.mapping @@ -9,10 +9,8 @@ CLASS net/minecraft/class_4614 net/minecraft/nbt/NbtType COMMENT @see NbtTypes#byId(int) ARG 0 type METHOD method_23261 getCommandFeedbackName ()Ljava/lang/String; - METHOD method_23262 read (Ljava/io/DataInput;ILnet/minecraft/class_2505;)Lnet/minecraft/class_2520; + METHOD method_23262 read (Ljava/io/DataInput;Lnet/minecraft/class_2505;)Lnet/minecraft/class_2520; ARG 1 input - ARG 2 depth - ARG 3 tracker METHOD method_23263 isImmutable ()Z COMMENT Determines the immutability of this type. COMMENT

@@ -20,15 +18,15 @@ CLASS net/minecraft/class_4614 net/minecraft/nbt/NbtType COMMENT after the NBT element is instantiated. COMMENT COMMENT @return {@code true} if this NBT type is immutable, else {@code false} - METHOD method_39851 skip (Ljava/io/DataInput;)V + METHOD method_39851 skip (Ljava/io/DataInput;Lnet/minecraft/class_2505;)V ARG 1 input - METHOD method_39852 doAccept (Ljava/io/DataInput;Lnet/minecraft/class_6836;)Lnet/minecraft/class_6836$class_6838; + METHOD method_39852 doAccept (Ljava/io/DataInput;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)Lnet/minecraft/class_6836$class_6838; ARG 1 input ARG 2 visitor - METHOD method_39854 skip (Ljava/io/DataInput;I)V + METHOD method_39854 skip (Ljava/io/DataInput;ILnet/minecraft/class_2505;)V ARG 1 input ARG 2 count - METHOD method_39877 accept (Ljava/io/DataInput;Lnet/minecraft/class_6836;)V + METHOD method_39877 accept (Ljava/io/DataInput;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)V ARG 1 input ARG 2 visitor CLASS 1 diff --git a/mappings/net/minecraft/recipe/CuttingRecipe.mapping b/mappings/net/minecraft/recipe/CuttingRecipe.mapping index 61af74d9e4..d966b79c66 100644 --- a/mappings/net/minecraft/recipe/CuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/CuttingRecipe.mapping @@ -19,17 +19,11 @@ CLASS net/minecraft/class_3972 net/minecraft/recipe/CuttingRecipe ARG 1 recipeFactory METHOD method_53774 (Lnet/minecraft/class_3972$class_3973$class_3974;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 1 instance - METHOD method_53775 (Lnet/minecraft/class_3972;)Ljava/lang/Integer; - ARG 0 recipe - METHOD method_53776 (Lnet/minecraft/class_3972;)Lnet/minecraft/class_1792; - ARG 0 recipe METHOD method_53777 (Lnet/minecraft/class_3972;)Lnet/minecraft/class_1856; ARG 0 recipe METHOD method_53778 (Lnet/minecraft/class_3972;)Ljava/lang/String; ARG 0 recipe CLASS class_3974 RecipeFactory - METHOD create (Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;I)Lnet/minecraft/class_3972; + METHOD create (Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)Lnet/minecraft/class_3972; ARG 1 group ARG 2 ingredient - ARG 3 result - ARG 4 count diff --git a/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping b/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping index 185e850520..fddb64c17b 100644 --- a/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping +++ b/mappings/net/minecraft/recipe/StonecuttingRecipe.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_3975 net/minecraft/recipe/StonecuttingRecipe - METHOD (Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;I)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;)V ARG 1 group ARG 2 ingredient - ARG 3 result - ARG 4 count