diff --git a/build.gradle b/build.gradle index dbb12a9e35..a9b1f580aa 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "1.19.1-pre1" +def minecraft_version = "1.19.1-rc1" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/client/gui/screen/RunningTaskScreen.mapping b/mappings/net/minecraft/client/gui/screen/RunningTaskScreen.mapping index 64e06441b6..80e94d0394 100644 --- a/mappings/net/minecraft/client/gui/screen/RunningTaskScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/RunningTaskScreen.mapping @@ -9,23 +9,6 @@ CLASS net/minecraft/class_7534 net/minecraft/client/gui/screen/RunningTaskScreen FIELD field_39545 buttonCallback Ljava/lang/Runnable; FIELD field_39546 description Lnet/minecraft/class_5489; FIELD field_39547 button Lnet/minecraft/class_4185; - FIELD field_39548 buttonActivationTime J - METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/Runnable;)V + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/Runnable;I)V ARG 1 title ARG 2 cancelButtonText - ARG 3 cancelCallback - METHOD method_44447 (Lnet/minecraft/class_4185;)V - ARG 1 button - METHOD method_44448 replaceButton ()V - METHOD method_44449 setDisplay (Lnet/minecraft/class_2561;Ljava/lang/Runnable;)V - COMMENT Removes the description and changes the button text and callback to the provided one. - COMMENT The button will be deactivated for 1 second after calling this. - ARG 1 buttonText - ARG 2 buttonCallback - METHOD method_44450 setDisplay (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/lang/Runnable;)V - COMMENT Changes the description, the button text and callback to the provided one. - COMMENT The new description will be narrated, and the button will be deactivated for - COMMENT 1 second after calling this. - ARG 1 description - ARG 2 buttonText - ARG 3 buttonCallback diff --git a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping index f79f0cc503..74048070c3 100644 --- a/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/TitleScreen.mapping @@ -58,7 +58,6 @@ CLASS net/minecraft/class_442 net/minecraft/client/gui/screen/TitleScreen METHOD method_41198 (Lnet/minecraft/class_4185;)V ARG 1 button CLASS 1 - FIELD field_33829 MULTIPLAYER_DISABLED_TEXT Lnet/minecraft/class_2561; CLASS class_7063 DeprecationNotice FIELD comp_829 textRenderer Lnet/minecraft/class_327; METHOD comp_829 textRenderer ()Lnet/minecraft/class_327; diff --git a/mappings/net/minecraft/client/gui/screen/abusereport/AbuseReportReasonScreen.mapping b/mappings/net/minecraft/client/gui/screen/abusereport/AbuseReportReasonScreen.mapping index 76fcdcbcba..8dd2442504 100644 --- a/mappings/net/minecraft/client/gui/screen/abusereport/AbuseReportReasonScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/abusereport/AbuseReportReasonScreen.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_7551 net/minecraft/client/gui/screen/abusereport/Abuse FIELD field_39616 reasonList Lnet/minecraft/class_7551$class_7552; FIELD field_39617 reason Lnet/minecraft/class_7573; FIELD field_39618 reasonConsumer Ljava/util/function/Consumer; - FIELD field_39730 COMMUNITY_STANDARDS_URL Ljava/lang/String; - FIELD field_39731 STANDARDS_TEXT Lnet/minecraft/class_2561; FIELD field_39732 DONE_BUTTON_WIDTH I FIELD field_39733 DONE_BUTTON_HEIGHT I FIELD field_39734 SCREEN_WIDTH I @@ -24,7 +22,6 @@ CLASS net/minecraft/class_7551 net/minecraft/client/gui/screen/abusereport/Abuse ARG 1 button METHOD method_44672 (Z)V ARG 1 confirmed - METHOD method_44673 getDoneButtonX ()I METHOD method_44674 getDoneButtonY ()I METHOD method_44675 getLeft ()I METHOD method_44676 getRight ()I diff --git a/mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping b/mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping index eaafea5381..8b52b989a4 100644 --- a/mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/abusereport/ChatReportScreen.mapping @@ -34,14 +34,8 @@ CLASS net/minecraft/class_7538 net/minecraft/client/gui/screen/abusereport/ChatR METHOD method_44462 getBottomButtonsY ()I METHOD method_44465 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_44466 onSubmissionFinished (Lnet/minecraft/class_7534;)V - ARG 1 sendingScreen - METHOD method_44467 (Lnet/minecraft/class_7534;Ljava/lang/Object;Ljava/lang/Throwable;)Ljava/lang/Object; - ARG 2 unit - ARG 3 throwable - METHOD method_44468 onSubmissionError (Lnet/minecraft/class_7534;Ljava/lang/Throwable;)V - ARG 1 sendingScreen - ARG 2 throwable + METHOD method_44466 onSubmissionFinished ()V + METHOD method_44468 onSubmissionError (Ljava/lang/Throwable;)V METHOD method_44470 (Lnet/minecraft/class_7566$class_7568;)V ARG 1 report METHOD method_44471 (Lnet/minecraft/class_7566;)V diff --git a/mappings/net/minecraft/client/gui/screen/abusereport/ChatSelectionScreen.mapping b/mappings/net/minecraft/client/gui/screen/abusereport/ChatSelectionScreen.mapping index 9c5b642519..132617df1e 100644 --- a/mappings/net/minecraft/client/gui/screen/abusereport/ChatSelectionScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/abusereport/ChatSelectionScreen.mapping @@ -75,8 +75,6 @@ CLASS net/minecraft/class_7543 net/minecraft/client/gui/screen/abusereport/ChatS ARG 2 gameProfile ARG 3 headingText ARG 4 fromReportedPlayer - METHOD method_44518 getSkinTextureId (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2960; - ARG 1 gameProfile METHOD method_44519 drawSkin (Lnet/minecraft/class_4587;IILnet/minecraft/class_2960;)V ARG 1 matrices ARG 2 x diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping index c60f3342fe..a361798f89 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping @@ -12,9 +12,6 @@ CLASS net/minecraft/class_5521 net/minecraft/client/gui/screen/multiplayer/Socia ARG 7 itemHeight METHOD method_31342 (Lnet/minecraft/class_5519;)Z ARG 1 player - METHOD method_31343 (Lnet/minecraft/class_5519;Lnet/minecraft/class_5519;)I - ARG 0 player1 - ARG 1 player2 METHOD method_31345 setPlayerOnline (Lnet/minecraft/class_640;Lnet/minecraft/class_5522$class_5523;)V ARG 1 player ARG 2 tab diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping index 7387822ad8..7d3f2f461b 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.mapping @@ -50,5 +50,4 @@ CLASS net/minecraft/class_5522 net/minecraft/client/gui/screen/multiplayer/Socia ARG 1 button METHOD method_31398 (Z)V ARG 1 confirmed - METHOD method_44528 createAbuseReportNoticeScreen ()Lnet/minecraft/class_437; CLASS class_5523 Tab diff --git a/mappings/net/minecraft/client/network/abusereport/ChatAbuseReport.mapping b/mappings/net/minecraft/client/network/abusereport/ChatAbuseReport.mapping index cd3b0e1f96..bcd9392505 100644 --- a/mappings/net/minecraft/client/network/abusereport/ChatAbuseReport.mapping +++ b/mappings/net/minecraft/client/network/abusereport/ChatAbuseReport.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_7566 net/minecraft/client/network/abusereport/ChatAbuseReport FIELD field_39645 CHAT Ljava/lang/String; - FIELD field_39646 EVIDENTIAL_SUCCEEDING_MESSAGES I - FIELD field_39647 EVIDENTIAL_PRECEDING_MESSAGES I FIELD field_39648 id Ljava/util/UUID; FIELD field_39649 timestamp Ljava/time/Instant; FIELD field_39650 reportedPlayerUuid Ljava/util/UUID; diff --git a/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping b/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping index b21c91f7df..6ce4426fc1 100644 --- a/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/BlendingDataFix.mapping @@ -5,8 +5,7 @@ CLASS net/minecraft/class_7090 net/minecraft/datafixer/fix/BlendingDataFix ARG 1 schema METHOD method_41311 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; ARG 0 typed - METHOD method_41312 update (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; - ARG 0 dynamic + METHOD method_41312 update (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/OptionalDynamic;)Lcom/mojang/serialization/Dynamic; METHOD method_41313 setSections (Lcom/mojang/serialization/Dynamic;II)Lcom/mojang/serialization/Dynamic; ARG 0 dynamic ARG 1 height diff --git a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping index 094e68499e..944936b0f6 100644 --- a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping +++ b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey COMMENT @see net.minecraft.client.util.ProfileKeys COMMENT @see PlayerKeyPair FIELD field_39050 CODEC Lcom/mojang/serialization/Codec; - METHOD method_43550 verifyAndDecode (Lnet/minecraft/class_7500;Lnet/minecraft/class_7428$class_7443;)Lnet/minecraft/class_7428; + METHOD method_43550 verifyAndDecode (Lnet/minecraft/class_7500;Ljava/util/UUID;Lnet/minecraft/class_7428$class_7443;)Lnet/minecraft/class_7428; COMMENT Verifies the public key and decodes it. COMMENT COMMENT

The checks whether the public key is present, signed with the Mojang's private key, @@ -17,7 +17,6 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey COMMENT @throws InsecurePublicKeyException.InvalidException when the key is unsigned or expired COMMENT @throws NetworkEncryptionException when the key is malformed ARG 0 servicesSignatureVerifier - ARG 1 publicKeyData METHOD method_43697 createSignatureInstance ()Lnet/minecraft/class_7500; METHOD method_43698 fromKeyData (Lnet/minecraft/class_7428$class_7443;)Lnet/minecraft/class_7428; ARG 0 publicKeyData @@ -30,9 +29,9 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey ARG 1 buf METHOD method_43701 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_43702 toSerializedString ()Ljava/lang/String; + METHOD method_43702 toSerializedString (Ljava/util/UUID;)[B METHOD method_43704 isExpired ()Z METHOD method_44011 write (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_44205 verifyKey (Lnet/minecraft/class_7500;)Z + METHOD method_44205 verifyKey (Lnet/minecraft/class_7500;Ljava/util/UUID;)Z ARG 1 servicesSignatureVerifier diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index 9047fe6808..37eb757ac8 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -32,7 +32,6 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa FIELD field_39020 MISSING_PUBLIC_KEY_TEXT Lnet/minecraft/class_2561; FIELD field_39021 INVALID_PUBLIC_KEY_SIGNATURE_TEXT Lnet/minecraft/class_2561; FIELD field_39022 INVALID_PUBLIC_KEY_TEXT Lnet/minecraft/class_2561; - FIELD field_39023 publicKey Lnet/minecraft/class_7428; METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;)V ARG 1 server ARG 2 connection @@ -62,10 +61,7 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa ARG 0 c METHOD method_40085 isValidName (Ljava/lang/String;)Z ARG 0 name - METHOD method_43510 getVerifiedPublicKey (Lnet/minecraft/class_2915;Lnet/minecraft/class_7500;Z)Lnet/minecraft/class_7428; - ARG 0 packet - ARG 1 servicesSignatureVerifier - ARG 2 shouldThrowOnMissingKey + METHOD method_43510 getVerifiedPublicKey (Lnet/minecraft/class_7428$class_7443;Ljava/util/UUID;Lnet/minecraft/class_7500;Z)Lnet/minecraft/class_7428; CLASS 1 METHOD method_14386 getClientAddress ()Ljava/net/InetAddress; CLASS class_3249 State