From cdd3db74fb5d9eaabc277fd926ce3723e4ea62a5 Mon Sep 17 00:00:00 2001 From: Player Date: Wed, 15 Jun 2022 19:37:40 +0200 Subject: [PATCH] 22w24a --- build.gradle | 2 +- mappings/net/minecraft/client/gui/hud/InGameHud.mapping | 2 -- .../net/minecraft/client/gui/screen/NoticeScreen.mapping | 2 +- .../multiplayer/SocialInteractionsPlayerListEntry.mapping | 1 - .../minecraft/client/gui/widget/EntryListWidget.mapping | 7 ++----- .../resource/ClientBuiltinResourcePackProvider.mapping | 2 -- mappings/net/minecraft/item/MusicDiscItem.mapping | 2 +- mappings/net/minecraft/nbt/NbtString.mapping | 1 - mappings/net/minecraft/server/MinecraftServer.mapping | 2 +- .../server/network/ServerPlayNetworkHandler.mapping | 2 -- .../minecraft/unused/packageinfo/PackageInfo7554.mapping | 1 + .../minecraft/unused/packageinfo/PackageInfo7562.mapping | 1 + .../minecraft/unused/packageinfo/PackageInfo7575.mapping | 1 + .../world/gen/chunk/GenerationShapeConfig.mapping | 1 - 14 files changed, 9 insertions(+), 18 deletions(-) create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7554.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7562.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo7575.mapping diff --git a/build.gradle b/build.gradle index 4e6649a24b..cfb955536f 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" +def minecraft_version = "22w24a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 956a49b855..83079dcf2f 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -118,8 +118,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 3 yOffset ARG 4 width ARG 5 color - METHOD method_31406 extractSender (Lnet/minecraft/class_2561;)Ljava/util/UUID; - ARG 1 message METHOD method_31977 renderOverlay (Lnet/minecraft/class_2960;F)V ARG 1 texture ARG 2 opacity diff --git a/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping b/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping index de3429c83d..98bc8c89df 100644 --- a/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/NoticeScreen.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_403 net/minecraft/client/gui/screen/NoticeScreen ARG 1 actionHandler ARG 2 title ARG 3 notice - METHOD (Ljava/lang/Runnable;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + METHOD (Ljava/lang/Runnable;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Z)V ARG 1 actionHandler ARG 2 title ARG 3 notice diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping index 5aa6b23a17..59ac947c8b 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.mapping @@ -23,7 +23,6 @@ CLASS net/minecraft/class_5519 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_33837 hideText Lnet/minecraft/class_2561; FIELD field_33838 showText Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_5522;Ljava/util/UUID;Ljava/lang/String;Ljava/util/function/Supplier;)V - ARG 1 client ARG 2 parent ARG 3 uuid ARG 4 name diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index f2d1a97c4a..d28dd6ebbc 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -35,13 +35,10 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25310 clickedHeader (II)V ARG 1 x ARG 2 y - METHOD method_25311 renderList (Lnet/minecraft/class_4587;IIIIF)V + METHOD method_25311 renderList (Lnet/minecraft/class_4587;IIF)V ARG 1 matrices ARG 2 x ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - ARG 6 delta METHOD method_25312 renderHeader (Lnet/minecraft/class_4587;IILnet/minecraft/class_289;)V ARG 1 matrices ARG 2 x @@ -106,7 +103,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 renderSelection METHOD method_29621 setEntryParentList (Lnet/minecraft/class_350$class_351;)V ARG 1 entry - METHOD method_30013 moveSelectionIf (Lnet/minecraft/class_350$class_5403;Ljava/util/function/Predicate;)V + METHOD method_30013 moveSelectionIf (Lnet/minecraft/class_350$class_5403;Ljava/util/function/Predicate;)Z COMMENT Moves the selection in the specified direction until the predicate returns true. ARG 1 direction COMMENT the direction to move the selection diff --git a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping index 50141f8930..b730f32847 100644 --- a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping +++ b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping @@ -20,8 +20,6 @@ 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; diff --git a/mappings/net/minecraft/item/MusicDiscItem.mapping b/mappings/net/minecraft/item/MusicDiscItem.mapping index b71889bde3..ce7b7be136 100644 --- a/mappings/net/minecraft/item/MusicDiscItem.mapping +++ b/mappings/net/minecraft/item/MusicDiscItem.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_1813 net/minecraft/item/MusicDiscItem FIELD field_8900 sound Lnet/minecraft/class_3414; FIELD field_8901 MUSIC_DISCS Ljava/util/Map; FIELD field_8902 comparatorOutput I - METHOD (ILnet/minecraft/class_3414;Lnet/minecraft/class_1792$class_1793;)V + METHOD (ILnet/minecraft/class_3414;Lnet/minecraft/class_1792$class_1793;I)V ARG 1 comparatorOutput ARG 2 sound ARG 3 settings diff --git a/mappings/net/minecraft/nbt/NbtString.mapping b/mappings/net/minecraft/nbt/NbtString.mapping index 24486bd71e..5e57b126c7 100644 --- a/mappings/net/minecraft/nbt/NbtString.mapping +++ b/mappings/net/minecraft/nbt/NbtString.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_2519 net/minecraft/nbt/NbtString FIELD field_33243 SINGLE_QUOTE C FIELD field_33244 BACKSLASH C FIELD field_33245 NULL C - FIELD field_39454 LOGGER Lorg/slf4j/Logger; METHOD (Ljava/lang/String;)V ARG 1 value METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index fc5e61407f..e3edb1f7ad 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -406,7 +406,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_41239 getMaxChainedNeighborUpdates ()I METHOD method_42062 forceStopRecorder ()V METHOD method_43500 shouldEnforceSecureProfile ()Z - METHOD method_43614 logChatMessage (Lnet/minecraft/class_7436;Lnet/minecraft/class_2561;)V + METHOD method_43614 logChatMessage (Lnet/minecraft/class_7436;Lnet/minecraft/class_2561;Lnet/minecraft/class_5321;)V ARG 1 sender ARG 2 message METHOD method_43659 getResourcePackProperties ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index eedb8fbd5c..334797ec1c 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -115,7 +115,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_31285 (Lnet/minecraft/class_2877;Ljava/util/List;)V ARG 2 texts METHOD method_31286 handleMessage (Lnet/minecraft/class_2797;Lnet/minecraft/class_5837;)V - ARG 1 packet ARG 2 message METHOD method_33562 requestTeleportAndDismount (DDDFF)V ARG 1 x @@ -152,7 +151,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 0 message METHOD method_43509 (Lnet/minecraft/class_2797;Lnet/minecraft/class_5837;)V ARG 2 message - METHOD method_43668 checkChatEnabled ()Z METHOD method_43669 checkForSpam ()V METHOD method_44154 (ILnet/minecraft/class_2561;)V ARG 2 decorated diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7554.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7554.mapping new file mode 100644 index 0000000000..08c538a76e --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7554.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7554 net/minecraft/unused/packageinfo/PackageInfo7554 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7562.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7562.mapping new file mode 100644 index 0000000000..cf9aa0a184 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7562.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7562 net/minecraft/unused/packageinfo/PackageInfo7562 diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo7575.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo7575.mapping new file mode 100644 index 0000000000..909005b267 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo7575.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7575 net/minecraft/unused/packageinfo/PackageInfo7575 diff --git a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping index a4ca699ed8..5c25df750c 100644 --- a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping @@ -27,4 +27,3 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf ARG 0 config METHOD method_39545 verticalBlockSize ()I METHOD method_39546 horizontalBlockSize ()I - METHOD method_42368 trimHeight (Lnet/minecraft/world/HeightLimitView;)Lnet/minecraft/world/gen/chunk/GenerationShapeConfig; \ No newline at end of file