diff --git a/build.gradle b/build.gradle index 8c720131fc..82ec0b9b27 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w35a" +def minecraft_version = "1.20.2-pre1" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index 187a1db06f..28f8418358 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement FIELD field_1148 criteria Lcom/google/common/collect/ImmutableMap$Builder; FIELD field_1149 parentObj Ljava/util/Optional; FIELD field_1150 requirements Ljava/util/Optional; - FIELD field_1151 merger Lnet/minecraft/class_8782$net/minecraft/class_necraft/class_193; + FIELD field_1151 merger Lnet/minecraft/class_8782$net/minecraft/class_necraft/class_necraft/class_193; FIELD field_1153 rewards Lnet/minecraft/class_170; FIELD field_44783 sendsTelemetryEvent Z METHOD method_20416 display (Lnet/minecraft/class_1799;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2960;Lnet/minecraft/class_189;ZZZ)Lnet/minecraft/class_161$class_162; @@ -71,7 +71,7 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement ARG 1 parent METHOD method_703 rewards (Lnet/minecraft/class_170$class_171;)Lnet/minecraft/class_161$class_162; ARG 1 builder - METHOD method_704 criteriaMerger (Lnet/minecraft/class_8782$net/minecraft/class_necraft/class_193;)Lnet/minecraft/class_161$class_162; + METHOD method_704 criteriaMerger (Lnet/minecraft/class_8782$net/minecraft/class_necraft/class_necraft/class_193;)Lnet/minecraft/class_161$class_162; ARG 1 merger METHOD method_705 criterion (Ljava/lang/String;Lnet/minecraft/class_175;)Lnet/minecraft/class_161$class_162; ARG 1 name diff --git a/mappings/net/minecraft/advancement/AdvancementProgress.mapping b/mappings/net/minecraft/advancement/AdvancementProgress.mapping index c14a9817a6..a6c3c0f15b 100644 --- a/mappings/net/minecraft/advancement/AdvancementProgress.mapping +++ b/mappings/net/minecraft/advancement/AdvancementProgress.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_167 net/minecraft/advancement/AdvancementProgress ARG 1 name METHOD method_727 init (Lnet/minecraft/class_8782;)V ARG 1 requirements - METHOD method_728 getProgressBarFraction ()Ljava/lang/String; + METHOD method_728 getProgressBarFraction ()Lnet/minecraft/class_2561; METHOD method_729 reset (Ljava/lang/String;)Z ARG 1 name METHOD method_730 (Ljava/util/Set;Ljava/util/Map$Entry;)Z diff --git a/mappings/net/minecraft/advancement/AdvancementRequirements.mapping b/mappings/net/minecraft/advancement/AdvancementRequirements.mapping index efbf13d97e..58ecbde6af 100644 --- a/mappings/net/minecraft/advancement/AdvancementRequirements.mapping +++ b/mappings/net/minecraft/advancement/AdvancementRequirements.mapping @@ -26,8 +26,8 @@ CLASS net/minecraft/class_8782 net/minecraft/advancement/AdvancementRequirements ARG 0 buf METHOD method_53677 isEmpty ()Z METHOD method_53678 getNames ()Ljava/util/Set; - CLASS net/minecraft/class_necraft/class_193 CriterionMerger - FIELD field_1257 OR Lnet/minecraft/class_8782$net/minecraft/class_necraft/class_193; - FIELD field_16882 AND Lnet/minecraft/class_8782$net/minecraft/class_necraft/class_193; + CLASS net/minecraft/class_necraft/class_necraft/class_193 CriterionMerger + FIELD field_1257 OR Lnet/minecraft/class_8782$net/minecraft/class_necraft/class_necraft/class_193; + FIELD field_16882 AND Lnet/minecraft/class_8782$net/minecraft/class_necraft/class_necraft/class_193; METHOD create (Ljava/util/Collection;)Lnet/minecraft/class_8782; ARG 1 requirements diff --git a/mappings/net/minecraft/block/HopperBlock.mapping b/mappings/net/minecraft/block/HopperBlock.mapping index 938fabdec9..fd0f57c0ec 100644 --- a/mappings/net/minecraft/block/HopperBlock.mapping +++ b/mappings/net/minecraft/block/HopperBlock.mapping @@ -15,8 +15,7 @@ CLASS net/minecraft/class_2377 net/minecraft/block/HopperBlock FIELD field_11133 EAST_RAYCAST_SHAPE Lnet/minecraft/class_265; FIELD field_11134 EAST_SHAPE Lnet/minecraft/class_265; FIELD field_11135 WEST_RAYCAST_SHAPE Lnet/minecraft/class_265; - METHOD method_10217 updateEnabled (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)V + METHOD method_10217 updateEnabled (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 world ARG 2 pos ARG 3 state - ARG 4 flags diff --git a/mappings/net/minecraft/class_5699.mapping b/mappings/net/minecraft/class_5699.mapping deleted file mode 100644 index 7dfeeb7bc2..0000000000 --- a/mappings/net/minecraft/class_5699.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_5699 - CLASS class_8783 - FIELD a keyCodec Lcom/mojang/serialization/Codec; - FIELD b elementCodec Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 659894c4aa..fdf62df3ef 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -463,23 +463,13 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_43587 setCrashReportSupplier (Lnet/minecraft/class_128;)V ARG 1 crashReport METHOD method_43590 getProfileKeys ()Lnet/minecraft/class_7853; - METHOD method_43758 (Lnet/minecraft/class_516;)Ljava/util/stream/Stream; - ARG 0 resultCollection METHOD method_43759 reloadSearchProvider (Lnet/minecraft/class_1124$class_1125;Ljava/util/List;)V ARG 1 key ARG 2 values - METHOD method_43760 (Ljava/util/List;)Lnet/minecraft/class_1123; - ARG 0 resultCollections - METHOD method_43761 (Lnet/minecraft/class_516;)Ljava/util/stream/Stream; - ARG 0 resultCollection METHOD method_43762 (Ljava/util/List;)Lnet/minecraft/class_1123; ARG 0 stacks - METHOD method_43763 (Ljava/lang/String;)Z - ARG 0 text METHOD method_43764 (Ljava/util/List;)Lnet/minecraft/class_1123; ARG 0 stacks - METHOD method_43765 (Lnet/minecraft/class_2561;)Ljava/lang/String; - ARG 0 text METHOD method_44024 getRealms32BitWarningChecker ()Lnet/minecraft/class_7478; METHOD method_44256 getServicesSignatureVerifier ()Lnet/minecraft/class_7500; METHOD method_44352 (Z)V diff --git a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping index 6f3c628d9e..efc25a0d74 100644 --- a/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/LevelLoadingScreen.mapping @@ -15,4 +15,4 @@ CLASS net/minecraft/class_3928 net/minecraft/client/gui/screen/LevelLoadingScree ARG 3 centerY ARG 4 pixelSize ARG 5 pixelMargin - METHOD method_37057 getPercentage ()Ljava/lang/String; + METHOD method_37057 getPercentage ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping index 8bb760171b..53bd768f33 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_492 net/minecraft/client/gui/screen/ingame/MerchantScr FIELD field_19163 indexStartOffset I FIELD field_19164 scrolling Z FIELD field_26569 TRADES_TEXT Lnet/minecraft/class_2561; - FIELD field_26570 SEPARATOR_TEXT Lnet/minecraft/class_2561; FIELD field_26571 DEPRECATED_TEXT Lnet/minecraft/class_2561; FIELD field_2950 TEXTURE Lnet/minecraft/class_2960; FIELD field_32354 TEXTURE_WIDTH I diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping index 02477a0783..3d494c10de 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping @@ -26,8 +26,6 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_17064 getToggleCraftableButtonText ()Lnet/minecraft/class_2561; METHOD method_2576 triggerPirateSpeakEasterEgg (Ljava/lang/String;)V ARG 1 search - METHOD method_2577 (Lnet/minecraft/class_516;)V - ARG 1 resultCollection METHOD method_2579 reset ()V METHOD method_2580 (Lnet/minecraft/class_516;)Z ARG 0 resultCollection @@ -53,8 +51,6 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB METHOD method_2592 refresh ()V METHOD method_2593 setOpen (Z)V ARG 1 opened - METHOD method_2594 (Lit/unimi/dsi/fastutil/objects/ObjectSet;Lnet/minecraft/class_516;)Z - ARG 0 resultCollection METHOD method_2595 findLeftEdge (II)I ARG 1 width ARG 2 backgroundWidth diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping index e9046cbb07..6835be7c73 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeResultCollection.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_516 net/minecraft/client/gui/screen/recipebook/RecipeR ARG 1 recipeBook METHOD method_2648 getRecipes (Z)Ljava/util/List; ARG 1 craftable - METHOD method_2649 computeCraftables (Lnet/minecraft/class_1662;IILnet/minecraft/class_3439;)V + METHOD method_2649 computeCraftables (Lnet/minecraft/class_1662;IILnet/minecraft/class_3439;Z)V ARG 1 recipeFinder ARG 2 gridWidth ARG 3 gridHeight diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index 639bdf9550..ed76e7179c 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -37,7 +37,6 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_44911 nauseaIntensity F FIELD field_44912 prevNauseaIntensity F METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_638;Lnet/minecraft/class_634;Lnet/minecraft/class_3469;Lnet/minecraft/class_299;ZZ)V - ARG 1 client ARG 2 world ARG 3 networkHandler ARG 4 stats diff --git a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping index ea9254e551..fcb0608c49 100644 --- a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping +++ b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_1076 net/minecraft/client/resource/language/LanguageManager FIELD field_25291 ENGLISH_US Lnet/minecraft/class_1077; - FIELD field_32971 DEFAULT_LANGUAGE_CODE Ljava/lang/String; FIELD field_5323 currentLanguageCode Ljava/lang/String; FIELD field_5324 languageDefs Ljava/util/Map; FIELD field_5325 LOGGER Lorg/slf4j/Logger; diff --git a/mappings/net/minecraft/client/search/SearchManager.mapping b/mappings/net/minecraft/client/search/SearchManager.mapping index 88c760f47c..fef475dde8 100644 --- a/mappings/net/minecraft/client/search/SearchManager.mapping +++ b/mappings/net/minecraft/client/search/SearchManager.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_1124 net/minecraft/client/search/SearchManager FIELD field_5493 instances Ljava/util/Map; FIELD field_5494 ITEM_TAG Lnet/minecraft/class_1124$class_1125; FIELD field_5495 ITEM_TOOLTIP Lnet/minecraft/class_1124$class_1125; - FIELD field_5496 RECIPE_OUTPUT Lnet/minecraft/class_1124$class_1125; METHOD method_43804 reload (Lnet/minecraft/class_1124$class_1125;Ljava/util/List;)V ARG 1 key ARG 2 values diff --git a/mappings/net/minecraft/data/SnbtProvider.mapping b/mappings/net/minecraft/data/SnbtProvider.mapping index 7b8fffec39..5e0845f231 100644 --- a/mappings/net/minecraft/data/SnbtProvider.mapping +++ b/mappings/net/minecraft/data/SnbtProvider.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider FIELD field_11454 LOGGER Lorg/slf4j/Logger; FIELD field_20309 write Ljava/util/List; - FIELD field_24615 DEBUG_OUTPUT_DIRECTORY Ljava/nio/file/Path; FIELD field_40662 output Lnet/minecraft/class_7784; FIELD field_40663 paths Ljava/lang/Iterable; METHOD (Lnet/minecraft/class_7784;Ljava/lang/Iterable;)V @@ -35,15 +34,12 @@ CLASS net/minecraft/class_2463 net/minecraft/data/SnbtProvider CLASS class_4511 CompressedData FIELD comp_780 name Ljava/lang/String; FIELD comp_781 bytes [B - FIELD comp_782 snbtContent Ljava/lang/String; FIELD comp_783 sha1 Lcom/google/common/hash/HashCode; - METHOD (Ljava/lang/String;[BLjava/lang/String;Lcom/google/common/hash/HashCode;)V + METHOD (Ljava/lang/String;[BLcom/google/common/hash/HashCode;)V ARG 1 name ARG 2 bytes - ARG 3 snbtContent METHOD comp_780 name ()Ljava/lang/String; METHOD comp_781 bytes ()[B - METHOD comp_782 snbtContent ()Ljava/lang/String; METHOD comp_783 sha1 ()Lcom/google/common/hash/HashCode; CLASS class_5621 CompressionException METHOD (Ljava/nio/file/Path;Ljava/lang/Throwable;)V diff --git a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping index b20f961e82..060a50061b 100644 --- a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping @@ -57,15 +57,13 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso METHOD method_46217 getBlastingRecipeCategory (Lnet/minecraft/class_1935;)Lnet/minecraft/class_7709; ARG 0 output CLASS class_2455 CookingRecipeJsonProvider - FIELD comp_1222 id Lnet/minecraft/class_2960; - FIELD comp_1223 serializer Lnet/minecraft/class_1865; + FIELD comp_1231 serializer Lnet/minecraft/class_1865; FIELD comp_1940 group Ljava/lang/String; FIELD comp_1941 category Lnet/minecraft/class_7709; FIELD comp_1942 input Lnet/minecraft/class_1856; FIELD comp_1943 result Lnet/minecraft/class_1792; FIELD comp_1944 experience F FIELD comp_1945 cookingTime I - FIELD comp_1946 advancement Lnet/minecraft/class_8779; METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;FILnet/minecraft/class_8779;Lnet/minecraft/class_1865;)V ARG 1 id ARG 2 group diff --git a/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping index 3cda0123d4..b426f60e98 100644 --- a/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping +++ b/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2444 net/minecraft/data/server/recipe/RecipeJsonProvider + METHOD comp_1230 id ()Lnet/minecraft/class_2960; METHOD comp_1231 serializer ()Lnet/minecraft/class_1865; + METHOD comp_1235 advancement ()Lnet/minecraft/class_8779; METHOD method_10416 serialize (Lcom/google/gson/JsonObject;)V ARG 1 json METHOD method_17799 toJson ()Lcom/google/gson/JsonObject; diff --git a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping index fec2ab34dc..13f9e094e3 100644 --- a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping @@ -24,9 +24,9 @@ CLASS net/minecraft/class_3981 net/minecraft/data/server/recipe/SingleItemRecipe METHOD method_17973 validate (Lnet/minecraft/class_2960;)V ARG 1 recipeId CLASS class_3982 SingleItemRecipeJsonProvider - FIELD comp_1222 id Lnet/minecraft/class_2960; - FIELD comp_1223 serializer Lnet/minecraft/class_1865; - FIELD comp_1946 advancement Lnet/minecraft/class_8779; + FIELD comp_1230 id Lnet/minecraft/class_2960; + FIELD comp_1231 serializer Lnet/minecraft/class_1865; + FIELD comp_1235 advancement Lnet/minecraft/class_8779; FIELD comp_1947 group Ljava/lang/String; FIELD comp_1948 input Lnet/minecraft/class_1856; FIELD comp_1949 output Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping b/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping index 92f008bf0e..3687040116 100644 --- a/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping +++ b/mappings/net/minecraft/data/server/recipe/SmithingTransformRecipeJsonBuilder.mapping @@ -31,7 +31,9 @@ CLASS net/minecraft/class_8074 net/minecraft/data/server/recipe/SmithingTransfor ARG 1 exporter ARG 2 recipeId CLASS class_8075 SmithingTransformRecipeJsonProvider - FIELD comp_1228 advancement Lnet/minecraft/class_8779; + FIELD comp_1230 id Lnet/minecraft/class_2960; + FIELD comp_1231 serializer Lnet/minecraft/class_1865; + FIELD comp_1235 advancement Lnet/minecraft/class_8779; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;Lnet/minecraft/class_8779;)V ARG 1 id ARG 2 type diff --git a/mappings/net/minecraft/entity/passive/MerchantEntity.mapping b/mappings/net/minecraft/entity/passive/MerchantEntity.mapping index 3095eacde3..768004b103 100644 --- a/mappings/net/minecraft/entity/passive/MerchantEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MerchantEntity.mapping @@ -13,7 +13,6 @@ CLASS net/minecraft/class_3988 net/minecraft/entity/passive/MerchantEntity ARG 1 sold METHOD method_19170 fillRecipesFromPool (Lnet/minecraft/class_1916;[Lnet/minecraft/class_3853$class_1652;I)V ARG 1 recipeList - ARG 2 pool ARG 3 count METHOD method_19181 resetCustomer ()V METHOD method_20010 playCelebrateSound ()V diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapIcon.mapping index c9b716bd54..6a3931bd3c 100644 --- a/mappings/net/minecraft/item/map/MapIcon.mapping +++ b/mappings/net/minecraft/item/map/MapIcon.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon FIELD field_45789 name Ljava/lang/String; FIELD field_81 id B FIELD field_82 tintColor I - METHOD (Ljava/lang/String;ILjava/lang/String;ZIZ)V + METHOD (Ljava/lang/String;ILjava/lang/String;ZIZZ)V ARG 3 name ARG 4 alwaysRender ARG 5 tintColor diff --git a/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping index 60a28fc960..3af692815b 100644 --- a/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerCommonPacketListener.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_8706 net/minecraft/network/listener/ServerCommonPacketListener + METHOD method_12069 onClientSettings (Lnet/minecraft/class_2803;)V METHOD method_52392 onCustomPayload (Lnet/minecraft/class_2817;)V ARG 1 packet METHOD method_52393 onKeepAlive (Lnet/minecraft/class_2827;)V diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index 71458e4064..aee27152ad 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -48,8 +48,6 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_12068 onClientStatus (Lnet/minecraft/class_2799;)V ARG 1 packet - METHOD method_12069 onClientSettings (Lnet/minecraft/class_2803;)V - ARG 1 packet METHOD method_12070 onCreativeInventoryAction (Lnet/minecraft/class_2873;)V ARG 1 packet METHOD method_12071 onUpdateSign (Lnet/minecraft/class_2877;)V diff --git a/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping index 50e6d54c0d..5783369937 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket.mapping @@ -1,26 +1,3 @@ CLASS net/minecraft/class_2803 net/minecraft/network/packet/c2s/play/ClientSettingsC2SPacket - FIELD comp_266 language Ljava/lang/String; - FIELD comp_267 viewDistance I - FIELD comp_268 chatVisibility Lnet/minecraft/class_1659; - FIELD comp_269 chatColors Z - FIELD comp_270 playerModelBitMask I - FIELD comp_271 mainArm Lnet/minecraft/class_1306; - FIELD comp_272 filterText Z - FIELD field_33360 MAX_LANGUAGE_LENGTH I - METHOD (Ljava/lang/String;ILnet/minecraft/class_1659;ZILnet/minecraft/class_1306;ZZ)V - ARG 1 language - ARG 2 viewDistance - ARG 3 chatVisibility - ARG 4 chatColors - ARG 5 modelBitMask - ARG 6 mainArm - ARG 7 filterText METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD comp_266 language ()Ljava/lang/String; - METHOD comp_267 viewDistance ()I - METHOD comp_268 chatVisibility ()Lnet/minecraft/class_1659; - METHOD comp_269 chatColors ()Z - METHOD comp_270 playerModelBitMask ()I - METHOD comp_271 mainArm ()Lnet/minecraft/class_1306; - METHOD comp_272 filterText ()Z diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index fd33399acd..d699054a5c 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C FIELD comp_97 maxPlayers I FIELD comp_98 viewDistance I FIELD comp_99 reducedDebugInfo Z - METHOD (IZLjava/util/Set;IIIZZLnet/minecraft/class_8589;)V + METHOD (IZLjava/util/Set;IIIZZZLnet/minecraft/class_8589;)V ARG 1 playerEntityId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index b5cfb270df..62c30496ac 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -55,10 +55,9 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager METHOD method_14568 getViewDistance ()I METHOD method_14569 isOperator (Lcom/mojang/authlib/GameProfile;)Z ARG 1 profile - METHOD method_14570 onPlayerConnect (Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;I)V + METHOD method_14570 onPlayerConnect (Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;Lnet/minecraft/class_8792;)V ARG 1 connection ARG 2 player - ARG 3 latency METHOD method_14571 getPlayerList ()Ljava/util/List; COMMENT Gets a list of all players on a Minecraft server. COMMENT This list should not be modified! @@ -129,7 +128,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 1 profile METHOD method_14611 remove (Lnet/minecraft/class_3222;)V ARG 1 player - METHOD method_14613 createPlayer (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_3222; + METHOD method_14613 createPlayer (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_8791;)Lnet/minecraft/class_3222; ARG 1 profile METHOD method_14614 isWhitelistEnabled ()Z METHOD method_14617 saveAllPlayerData ()V diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index ec01171b13..54b535ff17 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -261,11 +261,6 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 0 context METHOD method_49419 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; ARG 0 context - METHOD method_52307 (Lcom/mojang/brigadier/context/CommandContext;)Z - ARG 0 context - METHOD method_52308 testFunction (Lnet/minecraft/class_2168;Ljava/util/Collection;)Z - ARG 0 source - ARG 1 functions CLASS class_3051 ExistsCondition METHOD test (Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context diff --git a/mappings/net/minecraft/server/command/ReturnCommand.mapping b/mappings/net/minecraft/server/command/ReturnCommand.mapping index 30efeba5c5..47e8db37b6 100644 --- a/mappings/net/minecraft/server/command/ReturnCommand.mapping +++ b/mappings/net/minecraft/server/command/ReturnCommand.mapping @@ -8,9 +8,3 @@ CLASS net/minecraft/class_8503 net/minecraft/server/command/ReturnCommand METHOD method_51280 execute (Lnet/minecraft/class_2168;I)I ARG 0 source ARG 1 value - METHOD method_52342 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; - ARG 0 context - METHOD method_52343 executeRun (Lcom/mojang/brigadier/context/CommandContext;ZI)I - ARG 0 context - ARG 1 success - ARG 2 value diff --git a/mappings/net/minecraft/server/command/ServerCommandSource.mapping b/mappings/net/minecraft/server/command/ServerCommandSource.mapping index 85a1b09a17..8a1c9c15ff 100644 --- a/mappings/net/minecraft/server/command/ServerCommandSource.mapping +++ b/mappings/net/minecraft/server/command/ServerCommandSource.mapping @@ -50,7 +50,7 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 1 output METHOD method_41212 (Lnet/minecraft/class_2172$class_7078;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2378;)Ljava/util/concurrent/CompletableFuture; ARG 3 registry - METHOD method_43735 withSignedArguments (Lnet/minecraft/class_7448;)Lnet/minecraft/class_2168; + METHOD method_43735 withSignedArguments (Lnet/minecraft/class_7448;Lnet/minecraft/class_7620;)Lnet/minecraft/class_2168; ARG 1 signedArguments METHOD method_43737 isExecutedByPlayer ()Z METHOD method_43738 getSignedArguments ()Lnet/minecraft/class_7448; @@ -62,8 +62,6 @@ CLASS net/minecraft/class_2168 net/minecraft/server/command/ServerCommandSource ARG 1 message ARG 2 filterMaskEnabled ARG 3 params - METHOD method_44908 withMessageChainTaskQueue (Lnet/minecraft/class_7620;)Lnet/minecraft/class_2168; - ARG 1 messageChainTaskQueue METHOD method_44909 getMessageChainTaskQueue ()Lnet/minecraft/class_7620; METHOD method_45067 shouldFilterText (Lnet/minecraft/class_3222;)Z COMMENT {@return whether to filter text sent to {@code recipient}} diff --git a/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping index fa1cc3806a..2b03908cfc 100644 --- a/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping @@ -9,10 +9,9 @@ CLASS net/minecraft/class_8609 net/minecraft/server/network/ServerCommonNetworkH FIELD field_45018 keepAliveId J FIELD field_45019 latency I FIELD field_45715 flushDisabled Z - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;I)V + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_8792;)V ARG 1 server ARG 2 connection - ARG 3 keepAliveId METHOD method_14364 sendPacket (Lnet/minecraft/class_2596;)V ARG 1 packet METHOD method_52391 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V diff --git a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping index 2de5813176..e313f207e6 100644 --- a/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerConfigurationNetworkHandler.mapping @@ -4,10 +4,6 @@ CLASS net/minecraft/class_8610 net/minecraft/server/network/ServerConfigurationN FIELD field_45022 profile Lcom/mojang/authlib/GameProfile; FIELD field_45023 tasks Ljava/util/Queue; FIELD field_45024 currentTask Lnet/minecraft/class_8605; - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lcom/mojang/authlib/GameProfile;)V - ARG 1 server - ARG 2 connection - ARG 3 profile METHOD method_52406 onTaskFinished (Lnet/minecraft/class_8605$class_8606;)V ARG 1 key METHOD method_52407 (Lnet/minecraft/server/MinecraftServer$class_7460;)V diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 4a380c3ef6..428561b2e4 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -39,11 +39,10 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan FIELD field_40720 session Lnet/minecraft/class_7822; FIELD field_45025 requestedReconfiguration Z FIELD field_45026 chunkDataSender Lnet/minecraft/class_8608; - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;I)V + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;Lnet/minecraft/class_3222;Lnet/minecraft/class_8792;)V ARG 1 server ARG 2 connection ARG 3 player - ARG 4 latency METHOD method_14360 requestTeleport (DDDFFLjava/util/Set;)V ARG 1 x ARG 3 y @@ -151,8 +150,6 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 3 acknowledgment METHOD method_44897 addPendingAcknowledgment (Lnet/minecraft/class_7471;)V ARG 1 message - METHOD method_45002 (Lnet/minecraft/class_7448;Lnet/minecraft/class_2168;)Lnet/minecraft/class_2168; - ARG 1 source METHOD method_45003 parse (Ljava/lang/String;)Lcom/mojang/brigadier/ParseResults; COMMENT {@return the result of parsing {@code command}} ARG 1 command diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 18f921158a..ced9ed8071 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -49,9 +49,9 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_35566 allowServerListing Z FIELD field_39985 sculkShriekerWarningManager Lnet/minecraft/class_7262; FIELD field_39986 session Lnet/minecraft/class_7822; - FIELD field_44990 viewDistance Ljava/util/OptionalInt; + FIELD field_44990 viewDistance I FIELD field_44991 chunkFilter Lnet/minecraft/class_8603; - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;)V + METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_3218;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_8791;)V ARG 1 server ARG 2 world ARG 3 profile @@ -71,7 +71,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14212 updateScores (Lnet/minecraft/class_274;I)V ARG 1 criterion ARG 2 score - METHOD method_14213 setClientSettings (Lnet/minecraft/class_2803;)V + METHOD method_14213 setClientSettings (Lnet/minecraft/class_8791;)V ARG 1 packet METHOD method_14217 markHealthDirty ()V METHOD method_14218 updateInput (FFZZ)V @@ -238,7 +238,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_51468 setServerWorld (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_51469 getServerWorld ()Lnet/minecraft/class_3218; - METHOD method_52371 getViewDistance ()Ljava/util/OptionalInt; + METHOD method_52371 getViewDistance ()I METHOD method_52372 getChunkFilter ()Lnet/minecraft/class_8603; METHOD method_52373 setChunkFilter (Lnet/minecraft/class_8603;)V ARG 1 chunkFilter diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index af223cb248..8620c0d458 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -76,9 +76,3 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 structureBlockEntity METHOD method_36105 getRotationSteps (Lnet/minecraft/class_2470;)I ARG 0 rotation - METHOD method_36106 main ([Ljava/lang/String;)V - ARG 0 args - METHOD method_36107 (Ljava/nio/file/Path;)V - ARG 0 path - METHOD method_36108 (Ljava/nio/file/Path;)Z - ARG 0 path diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 89d0b17662..53ffab9a7f 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -417,7 +417,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 o METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; ARG 1 ops - CLASS class_8783 StrictUnboundedMap + CLASS class_8783 FIELD a keyCodec Lcom/mojang/serialization/Codec; FIELD b elementCodec Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)V diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 11e0e13680..3fa340b8f7 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -133,28 +133,21 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 5 multiplier CLASS class_4164 ProcessItemFactory FIELD field_18563 secondBuy Lnet/minecraft/class_1799; - FIELD field_18564 secondCount I FIELD field_18565 price I FIELD field_18566 sell Lnet/minecraft/class_1799; - FIELD field_18567 sellCount I FIELD field_18568 maxUses I FIELD field_18569 experience I FIELD field_18570 multiplier F - METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1792;III)V + METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1792;IIIF)V + ARG 1 item + ARG 2 secondCount + METHOD (Lnet/minecraft/class_1935;IILnet/minecraft/class_1799;IIIF)V ARG 1 item ARG 2 secondCount ARG 3 price - ARG 4 sellItem ARG 5 sellCount ARG 6 maxUses ARG 7 experience - METHOD (Lnet/minecraft/class_1935;ILnet/minecraft/class_1792;III)V - ARG 1 item - ARG 2 secondCount - ARG 3 sellItem - ARG 4 sellCount - ARG 5 maxUses - ARG 6 experience CLASS class_4165 SellItemFactory FIELD field_18571 sell Lnet/minecraft/class_1799; FIELD field_18572 price I @@ -167,24 +160,21 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 3 count ARG 4 experience METHOD (Lnet/minecraft/class_1792;IIII)V - ARG 1 item ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience - METHOD (Lnet/minecraft/class_1799;IIII)V - ARG 1 stack - ARG 2 price - ARG 3 count - ARG 4 maxUses - ARG 5 experience - METHOD (Lnet/minecraft/class_1799;IIIIF)V - ARG 1 stack + METHOD (Lnet/minecraft/class_1792;IIIIF)V ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience ARG 6 multiplier + METHOD (Lnet/minecraft/class_1799;IIII)V + ARG 2 price + ARG 3 count + ARG 4 maxUses + ARG 5 experience METHOD (Lnet/minecraft/class_2248;IIII)V ARG 1 block ARG 2 price @@ -223,10 +213,5 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers METHOD method_19203 (Lnet/minecraft/class_1842;)Z ARG 0 potion CLASS class_8640 TypedWrapperFactory - FIELD field_45134 typeToFactory Ljava/util/Map; - METHOD (Ljava/util/Map;)V - ARG 1 typeToFactory - METHOD method_52555 (Lnet/minecraft/class_3854;)V - ARG 0 type - METHOD method_52556 (Ljava/util/Map;Lnet/minecraft/class_3854;)Z - ARG 1 type + FIELD comp_1962 typeToFactory Ljava/util/Map; + METHOD comp_1962 typeToFactory ()Ljava/util/Map; diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping index c23dd4999e..c26628b44e 100644 --- a/mappings/net/minecraft/village/raid/Raid.mapping +++ b/mappings/net/minecraft/village/raid/Raid.mapping @@ -15,8 +15,6 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid FIELD field_16623 badOmenLevel I FIELD field_16625 id I FIELD field_19016 EVENT_TEXT Lnet/minecraft/class_2561; - FIELD field_19017 VICTORY_SUFFIX_TEXT Lnet/minecraft/class_2561; - FIELD field_19018 DEFEAT_SUFFIX_TEXT Lnet/minecraft/class_2561; FIELD field_19019 VICTORY_TITLE Lnet/minecraft/class_2561; FIELD field_19020 DEFEAT_TITLE Lnet/minecraft/class_2561; FIELD field_19021 heroesOfTheVillage Ljava/util/Set; diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index 85ce362ac0..1bae224256 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -65,9 +65,6 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules ARG 2 rule METHOD method_20752 (Lnet/minecraft/class_1928$class_4313;)Ljava/lang/String; ARG 0 key - METHOD method_22386 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1928$class_4310;)V - ARG 0 server - ARG 1 rule METHOD method_27321 setValue (Lnet/minecraft/class_1928$class_4313;Lnet/minecraft/class_1928;Lnet/minecraft/server/MinecraftServer;)V ARG 1 key ARG 2 rules